[pulsar-broker] Fix: Deserialization failing for ZkIsolatedBookieEnse…

…mblePlacementPolicy (apache#3918)
nicky1 · Mar 28, 2019 · 012b818 · 012b818
1 parent 4a739e5
commit 012b818
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/...ls/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java b/...ls/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java
@@ -36,21 +36,20 @@
 import org.apache.bookkeeper.stats.StatsLogger;
 import org.apache.bookkeeper.zookeeper.ZooKeeperClient;
 import org.apache.commons.configuration.Configuration;
-import org.apache.pulsar.common.policies.data.BookieInfo;
+import org.apache.pulsar.common.policies.data.BookiesRackConfiguration;
 import org.apache.pulsar.common.util.ObjectMapperFactory;
 import org.apache.pulsar.zookeeper.ZooKeeperCache.Deserializer;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooKeeper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.netty.util.HashedWheelTimer;
 
 public class ZkIsolatedBookieEnsemblePlacementPolicy extends RackawareEnsemblePlacementPolicy
-        implements Deserializer<Map<String, Map<BookieSocketAddress, BookieInfo>>> {
+        implements Deserializer<BookiesRackConfiguration> {
     private static final Logger LOG = LoggerFactory.getLogger(ZkIsolatedBookieEnsemblePlacementPolicy.class);
 
     public static final String ISOLATION_BOOKIE_GROUPS = "isolationBookieGroups";
@@ -59,8 +58,6 @@ public class ZkIsolatedBookieEnsemblePlacementPolicy extends RackawareEnsemblePl
 
     private final List<String> isolationGroups = new ArrayList<String>();
     private final ObjectMapper jsonMapper = ObjectMapperFactory.create();
-    private final TypeReference<Map<String, Map<BookieSocketAddress, BookieInfo>>> typeRef = new TypeReference<Map<String, Map<BookieSocketAddress, BookieInfo>>>() {
-    };
 
     public ZkIsolatedBookieEnsemblePlacementPolicy() {
         super();
@@ -139,14 +136,14 @@ private Set<BookieSocketAddress> getBlacklistedBookies() {
         Set<BookieSocketAddress> blacklistedBookies = new HashSet<BookieSocketAddress>();
         try {
             if (bookieMappingCache != null) {
-                Map<String, Map<BookieSocketAddress, BookieInfo>> allGroupsBookieMapping = bookieMappingCache
+                BookiesRackConfiguration allGroupsBookieMapping = bookieMappingCache
                         .getData(ZkBookieRackAffinityMapping.BOOKIE_INFO_ROOT_PATH, this)
                         .orElseThrow(() -> new KeeperException.NoNodeException(
                                 ZkBookieRackAffinityMapping.BOOKIE_INFO_ROOT_PATH));
                 for (String group : allGroupsBookieMapping.keySet()) {
                     if (!isolationGroups.contains(group)) {
-                        for (BookieSocketAddress bookieAddress : allGroupsBookieMapping.get(group).keySet()) {
-                            blacklistedBookies.add(bookieAddress);
+                        for (String bookieAddress : allGroupsBookieMapping.get(group).keySet()) {
+                            blacklistedBookies.add(new BookieSocketAddress(bookieAddress));
                         }
                     }
                 }
@@ -158,11 +155,11 @@ private Set<BookieSocketAddress> getBlacklistedBookies() {
     }
 
     @Override
-    public Map<String, Map<BookieSocketAddress, BookieInfo>> deserialize(String key, byte[] content) throws Exception {
+    public BookiesRackConfiguration deserialize(String key, byte[] content) throws Exception {
         LOG.info("Reloading the bookie isolation groups mapping cache.");
         if (LOG.isDebugEnabled()) {
             LOG.debug("Loading the bookie mappings with bookie info data: {}", new String(content));
         }
-        return jsonMapper.readValue(content, typeRef);
+        return jsonMapper.readValue(content, BookiesRackConfiguration.class);
     }
 }