From aa8b761502d96d9e97a8573ddea97d8f3d8c0fff Mon Sep 17 00:00:00 2001 From: gavingaozhangmin Date: Tue, 8 Mar 2022 13:45:13 +0800 Subject: [PATCH 1/2] Fix potential npe bug of #14384 --- .../storage/bookkeeper/BookKeeperPackagesStorage.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorage.java b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorage.java index 45fce3a62bce9..14436c48a10ba 100644 --- a/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorage.java +++ b/pulsar-package-management/bookkeeper-storage/src/main/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorage.java @@ -104,8 +104,7 @@ private URI initializeDlogNamespace() throws IOException { } BKDLConfig bkdlConfig = new BKDLConfig(ledgersStoreServers, ledgersRootPath); DLMetadata dlMetadata = DLMetadata.create(bkdlConfig); - URI dlogURI = URI.create(String.format("distributedlog://%s/pulsar/packages", - configuration.getZookeeperServers())); + URI dlogURI = URI.create(String.format("distributedlog://%s/pulsar/packages", ledgersStoreServers)); try { dlMetadata.create(dlogURI); } catch (ZKException e) { From 6f2a34b7146e74deb0eb55d6c4dc66d2202c5dcb Mon Sep 17 00:00:00 2001 From: gavingaozhangmin Date: Tue, 8 Mar 2022 15:52:07 +0800 Subject: [PATCH 2/2] fix unit test --- .../storage/bookkeeper/BookKeeperPackagesStorageTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java index 69312076410ca..90458f96a2498 100644 --- a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java +++ b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java @@ -50,7 +50,7 @@ public void setup() throws Exception { PackagesStorageProvider provider = PackagesStorageProvider .newProvider(BookKeeperPackagesStorageProvider.class.getName()); DefaultPackagesStorageConfiguration configuration = new DefaultPackagesStorageConfiguration(); - configuration.setProperty("zookeeperServers", zkUtil.getZooKeeperConnectString()); + configuration.setProperty("metadataStoreUrl", zkUtil.getZooKeeperConnectString()); configuration.setProperty("packagesReplicas", "1"); configuration.setProperty("packagesManagementLedgerRootPath", "/ledgers"); storage = provider.getStorage(configuration); @@ -68,7 +68,7 @@ public void teardown() throws Exception { public void testConfiguration() { assertTrue(storage instanceof BookKeeperPackagesStorage); BookKeeperPackagesStorage bkStorage = (BookKeeperPackagesStorage) storage; - assertEquals(bkStorage.configuration.getZookeeperServers(), zkUtil.getZooKeeperConnectString()); + assertEquals(bkStorage.configuration.getMetadataStoreUrl(), zkUtil.getZooKeeperConnectString()); assertEquals(bkStorage.configuration.getPackagesReplicas(), 1); assertEquals(bkStorage.configuration.getPackagesManagementLedgerRootPath(), "/ledgers"); } @@ -198,7 +198,7 @@ public void testReadWriteOperationsWithSeparatedBkCluster() throws Exception { .newProvider(BookKeeperPackagesStorageProvider.class.getName()); DefaultPackagesStorageConfiguration configuration = new DefaultPackagesStorageConfiguration(); // set the unavailable bk cluster with mock zookeeper path - configuration.setProperty("zookeeperServers", zkUtil.getZooKeeperConnectString() + "/mock"); + configuration.setProperty("metadataStoreUrl", zkUtil.getZooKeeperConnectString() + "/mock"); configuration.setProperty("packagesReplicas", "1"); configuration.setProperty("packagesManagementLedgerRootPath", "/ledgers"); PackagesStorage storage1 = provider.getStorage(configuration); @@ -221,7 +221,7 @@ public void testReadWriteOperationsWithSeparatedBkCluster() throws Exception { // set the available bk cluster with bookkeeperMetadataServiceUri using actual zookeeper path String bookkeeperMetadataServiceUri = String.format("zk+null://%s/ledgers", zkUtil.getZooKeeperConnectString()); DefaultPackagesStorageConfiguration configuration2 = new DefaultPackagesStorageConfiguration(); - configuration2.setProperty("zookeeperServers", zkUtil.getZooKeeperConnectString()); + configuration2.setProperty("metadataStoreUrl", zkUtil.getZooKeeperConnectString()); configuration2.setProperty("bookkeeperMetadataServiceUri", bookkeeperMetadataServiceUri); configuration2.setProperty("packagesReplicas", "1"); PackagesStorage storage2 = provider.getStorage(configuration2);