You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by gh...@apache.org on 2020/12/11 23:01:40 UTC

[bookkeeper] branch master updated: Allow DNSToSwitchMapping to access BookieAddressResolver

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

ghatage pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new a1af31e  Allow DNSToSwitchMapping to access BookieAddressResolver
a1af31e is described below

commit a1af31e915ec74a5066b8f1dadb15fd8cfaf8d43
Author: Enrico Olivelli <eo...@gmail.com>
AuthorDate: Sat Dec 12 00:01:30 2020 +0100

    Allow DNSToSwitchMapping to access BookieAddressResolver
    
    In order to allow Pulsar to leverage BookieId with custom Bookie-To-Rack Mapping (ZkBookieRackAffinityMapping) we need to inject the BookieAddressResolver into it.
    
    There is not way to do it currently because it is created by the BookKeeper client, and we have to inject the same BookieAddressResolver used by the client itself.
    
    *Changes*
    - add new setBookieAddressResolver method (use 'default' methods in order to preserve backward compatibility
    - call the new method in every point in which we instantiate a DNSToSwitchMapping and when we receive an instance at construction time
    
    *Compatibility*
    - this change is 100% compatible with previous versions
    
    Reviewers: Rajan Dhabalia <rd...@apache.org>, Anup Ghatage <gh...@apache.org>
    
    This closes #2519 from eolivelli/fix/dnsswitch-access-bookieaddress-resolver
---
 .../org/apache/bookkeeper/client/BookKeeper.java     |  4 +++-
 .../client/RackawareEnsemblePlacementPolicyImpl.java |  3 +++
 .../client/TopologyAwareEnsemblePlacementPolicy.java |  5 +++++
 .../client/ZoneawareEnsemblePlacementPolicyImpl.java |  1 +
 .../bookkeeper/net/AbstractDNSToSwitchMapping.java   | 11 +++++++++++
 .../apache/bookkeeper/net/DNSToSwitchMapping.java    |  8 ++++++++
 .../org/apache/bookkeeper/client/BookKeeperTest.java | 20 +++++++++++++++++++-
 .../apache/bookkeeper/util/StaticDNSResolver.java    |  4 ++++
 8 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
index 0a594d3..c34defa 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
@@ -499,7 +499,9 @@ public class BookKeeper implements org.apache.bookkeeper.client.api.BookKeeper {
 
         BookieAddressResolver bookieAddressResolver =
                 new DefaultBookieAddressResolver(metadataDriver.getRegistrationClient());
-
+        if (dnsResolver != null) {
+            dnsResolver.setBookieAddressResolver(bookieAddressResolver);
+        }
         // initialize the ensemble placement
         this.placementPolicy = initializeEnsemblePlacementPolicy(conf,
                 dnsResolver, this.requestTimer, this.featureProvider, this.statsLogger, bookieAddressResolver);
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
index 5568f0a..8ee3f69 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
@@ -282,6 +282,9 @@ public class RackawareEnsemblePlacementPolicyImpl extends TopologyAwareEnsembleP
                 }
             }
         }
+        if (dnsResolver != null) {
+            dnsResolver.setBookieAddressResolver(bookieAddressResolver);
+        }
         slowBookies = CacheBuilder.newBuilder()
             .expireAfterWrite(conf.getBookieFailureHistoryExpirationMSec(), TimeUnit.MILLISECONDS)
             .build(new CacheLoader<BookieId, Long>() {
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/TopologyAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/TopologyAwareEnsemblePlacementPolicy.java
index 7167c96..438053f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/TopologyAwareEnsemblePlacementPolicy.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/TopologyAwareEnsemblePlacementPolicy.java
@@ -546,6 +546,11 @@ abstract class TopologyAwareEnsemblePlacementPolicy implements
         }
 
         @Override
+        public void setBookieAddressResolver(BookieAddressResolver bookieAddressResolver) {
+            this.resolver.setBookieAddressResolver(bookieAddressResolver);
+        }
+
+        @Override
         public List<String> resolve(List<String> names) {
             if (names == null) {
                 return Collections.emptyList();
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ZoneawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ZoneawareEnsemblePlacementPolicyImpl.java
index fcb3c73..990d60f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ZoneawareEnsemblePlacementPolicyImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ZoneawareEnsemblePlacementPolicyImpl.java
@@ -240,6 +240,7 @@ public class ZoneawareEnsemblePlacementPolicyImpl extends TopologyAwareEnsembleP
 
         this.dnsResolver = new DNSResolverDecorator(actualDNSResolver, () -> this.getDefaultFaultDomain(),
                 failedToResolveNetworkLocationCounter);
+        dnsResolver.setBookieAddressResolver(bookieAddressResolver);
         this.stabilizePeriodSeconds = conf.getNetworkTopologyStabilizePeriodSeconds();
         // create the network topology
         if (stabilizePeriodSeconds > 0) {
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
index a0ee422..d658d8e 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/AbstractDNSToSwitchMapping.java
@@ -22,6 +22,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.bookkeeper.conf.Configurable;
+import org.apache.bookkeeper.proto.BookieAddressResolver;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang.StringUtils;
 
@@ -42,6 +43,7 @@ import org.apache.commons.lang.StringUtils;
 public abstract class AbstractDNSToSwitchMapping implements DNSToSwitchMapping, Configurable {
 
     private Configuration conf;
+    private BookieAddressResolver bookieAddressResolver;
 
     /**
      * Create an unconfigured instance.
@@ -59,6 +61,15 @@ public abstract class AbstractDNSToSwitchMapping implements DNSToSwitchMapping,
         this.conf = conf;
     }
 
+    public BookieAddressResolver getBookieAddressResolver() {
+        return bookieAddressResolver;
+    }
+
+    @Override
+    public void setBookieAddressResolver(BookieAddressResolver bookieAddressResolver) {
+        this.bookieAddressResolver = bookieAddressResolver;
+    }
+
     @Override
     public Configuration getConf() {
         return conf;
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNSToSwitchMapping.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNSToSwitchMapping.java
index bdf9ce5..c2a8152 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNSToSwitchMapping.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/DNSToSwitchMapping.java
@@ -20,6 +20,7 @@ package org.apache.bookkeeper.net;
 import com.google.common.annotations.Beta;
 
 import java.util.List;
+import org.apache.bookkeeper.proto.BookieAddressResolver;
 
 /**
  * An interface that must be implemented to allow pluggable
@@ -67,4 +68,11 @@ public interface DNSToSwitchMapping {
     default boolean useHostName() {
         return true;
     }
+
+    /**
+     * Receives the current BookieAddressResolver.
+     * @param bookieAddressResolver
+     */
+    default void setBookieAddressResolver(BookieAddressResolver bookieAddressResolver) {
+    }
 }
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
index c19e391..d1ad5fd 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -58,6 +59,7 @@ import org.apache.bookkeeper.stats.NullStatsLogger;
 import org.apache.bookkeeper.stats.StatsLogger;
 import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
 import org.apache.bookkeeper.test.TestStatsProvider;
+import org.apache.bookkeeper.util.StaticDNSResolver;
 import org.apache.bookkeeper.zookeeper.BoundExponentialBackoffRetryPolicy;
 import org.apache.bookkeeper.zookeeper.ZooKeeperClient;
 import org.apache.bookkeeper.zookeeper.ZooKeeperWatcherBase;
@@ -85,7 +87,7 @@ public class BookKeeperTest extends BookKeeperClusterTestCase {
     private final DigestType digestType;
 
     public BookKeeperTest() {
-        super(4);
+        super(3);
         this.digestType = DigestType.CRC32;
     }
 
@@ -1112,4 +1114,20 @@ public class BookKeeperTest extends BookKeeperClusterTestCase {
                          1);
         }
     }
+
+    @Test
+    public void testBookieAddressResolverPassedToDNSToSwitchMapping() throws Exception {
+        ClientConfiguration conf = new ClientConfiguration();
+        conf.setMetadataServiceUri(zkUtil.getMetadataServiceUri());
+
+        StaticDNSResolver tested = new StaticDNSResolver();
+        try (BookKeeper bkc = BookKeeper
+                        .forConfig(conf)
+                        .dnsResolver(tested)
+                        .build()) {
+            bkc.createLedger(digestType, "testPasswd".getBytes()).close();
+            assertSame(bkc.getBookieAddressResolver(), tested.getBookieAddressResolver());
+        }
+    }
+
 }
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/StaticDNSResolver.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/StaticDNSResolver.java
index f82310a..43a1cf6 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/StaticDNSResolver.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/StaticDNSResolver.java
@@ -73,6 +73,10 @@ public class StaticDNSResolver extends AbstractDNSToSwitchMapping implements Rac
 
     @Override
     public List<String> resolve(List<String> names) {
+        if (getBookieAddressResolver() == null) {
+            // test that this istance has been properly initialized
+            throw new IllegalStateException("bookieAddressResolver was not set");
+        }
         List<String> racks = new ArrayList<String>();
         for (String n : names) {
             String rack = name2Racks.get(n);