[bookkeeper] branch branch-4.7 updated: Fallback to use `getZkServers` and `getZkLedgersPath` when resolving from metadata service uri

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch branch-4.7
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/branch-4.7 by this push:
     new 0794762  Fallback to use `getZkServers` and `getZkLedgersPath` when resolving from metadata service uri
0794762 is described below

commit 07947629f11525839cdc2c5d7fd44d2743eb4640
Author: Sijie Guo <si...@apache.org>
AuthorDate: Fri Apr 13 09:44:13 2018 -0700

    Fallback to use `getZkServers` and `getZkLedgersPath` when resolving from metadata service uri
    
    Descriptions of the changes in this PR:
    
    *Problme*
    
    Dlog tests are failing because dlog is using an external zookeeper client, where both `zkServers` and `metadataServiceUri`
    are not set on client configuration. It will throw NPE when trying to resolve `zkServers` and `zkLedgersRootPath` from metadata service uri.
    
    *Solution*
    
    Fallback to use deprecated `getZkServers` and `getZkLedgersPath` when metadata service uri is null
    
    Related Issues: #1336
    
    Author: Sijie Guo <si...@apache.org>
    
    Reviewers: Enrico Olivelli <eo...@gmail.com>, Jia Zhai <None>
    
    This closes #1338 from sijie/fix_dlog_tests
    
    (cherry picked from commit c3e96a76be35a0adb6f700491dd0a8786d5b2957)
    Signed-off-by: Sijie Guo <si...@apache.org>
---
 .../java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java    | 6 ++++--
 stream/distributedlog/pom.xml                                       | 1 +
 stream/pom.xml                                                      | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java
index d5d0601..a9e1a13 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBase.java
@@ -64,19 +64,21 @@ public class ZKMetadataDriverBase implements AutoCloseable {
         return uri.getAuthority().replace(";", ",");
     }
 
+    @SuppressWarnings("deprecation")
     public static String resolveZkServers(AbstractConfiguration<?> conf) {
         String metadataServiceUriStr = conf.getMetadataServiceUriUnchecked();
         if (null == metadataServiceUriStr) {
-            return null;
+            return conf.getZkServers();
         }
         URI metadataServiceUri = URI.create(metadataServiceUriStr);
         return getZKServersFromServiceUri(metadataServiceUri);
     }
 
+    @SuppressWarnings("deprecation")
     public static String resolveZkLedgersRootPath(AbstractConfiguration<?> conf) {
         String metadataServiceUriStr = conf.getMetadataServiceUriUnchecked();
         if (null == metadataServiceUriStr) {
-            return null;
+            return conf.getZkLedgersRootPath();
         }
         URI metadataServiceUri = URI.create(metadataServiceUriStr);
         return metadataServiceUri.getPath();
diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml
index a76449f..80dd708 100644
--- a/stream/distributedlog/pom.xml
+++ b/stream/distributedlog/pom.xml
@@ -110,3 +110,4 @@
     </profile>
   </profiles>
 </project>
+
diff --git a/stream/pom.xml b/stream/pom.xml
index fdba026..74ddd19 100644
--- a/stream/pom.xml
+++ b/stream/pom.xml
@@ -88,3 +88,4 @@
   </profiles>
 
 </project>
+

-- 
To stop receiving notification emails like this one, please contact
sijie@apache.org.