diff --git a/src/java/voldemort/client/ClientConfig.java b/src/java/voldemort/client/ClientConfig.java index 66b85c915a..0091110301 100644 --- a/src/java/voldemort/client/ClientConfig.java +++ b/src/java/voldemort/client/ClientConfig.java @@ -626,8 +626,9 @@ public int getClientZoneId() { return this.clientZoneId; } - public void enableDefaultClient(boolean enableDefault) { + public ClientConfig enableDefaultClient(boolean enableDefault) { this.useDefaultClient = enableDefault; + return this; } public boolean isDefaultClientEnabled() { diff --git a/src/java/voldemort/client/SystemStore.java b/src/java/voldemort/client/SystemStore.java index 5ae4913550..814265b732 100644 --- a/src/java/voldemort/client/SystemStore.java +++ b/src/java/voldemort/client/SystemStore.java @@ -46,7 +46,11 @@ public SystemStore(String storeName, .setClientZoneId(clientZoneID); this.systemStoreFactory = new SystemStoreClientFactory(config); this.storeName = storeName; - this.sysStore = this.systemStoreFactory.getSystemStore(this.storeName, clusterXml, fd); + try { + this.sysStore = this.systemStoreFactory.getSystemStore(this.storeName, clusterXml, fd); + } catch(Exception e) { + logger.debug("Error while creating a system store client for store : " + this.storeName); + } } public Version putSysStore(K key, V value) { @@ -61,9 +65,8 @@ public Version putSysStore(K key, V value) { this.sysStore.put(key, versioned, null); version = versioned.getVersion(); } catch(Exception e) { - logger.info("Exception caught during putSysStore: " + e); if(logger.isDebugEnabled()) { - e.printStackTrace(); + logger.debug("Exception caught during putSysStore: " + e); } } return version; @@ -76,9 +79,8 @@ public Version putSysStore(K key, Versioned value) { this.sysStore.put(key, value, null); version = value.getVersion(); } catch(Exception e) { - logger.info("Exception caught during putSysStore: " + e); if(logger.isDebugEnabled()) { - e.printStackTrace(); + logger.debug("Exception caught during putSysStore: " + e); } } return version; @@ -89,6 +91,7 @@ public Versioned getSysStore(K key) { Versioned versioned = null; try { List> items = this.sysStore.get(key, null); + if(items.size() == 1) versioned = items.get(0); else if(items.size() > 1) @@ -100,9 +103,8 @@ else if(items.size() > 1) else logger.debug("Got null value"); } catch(Exception e) { - logger.info("Exception caught during getSysStore: " + e); if(logger.isDebugEnabled()) { - e.printStackTrace(); + logger.debug("Exception caught during getSysStore: " + e); } } return versioned; @@ -119,9 +121,8 @@ public V getValueSysStore(K key) { value = versioned.getValue(); } } catch(Exception e) { - logger.info("Exception caught during getSysStore: " + e); if(logger.isDebugEnabled()) { - e.printStackTrace(); + logger.debug("Exception caught during getSysStore: " + e); } } return value; diff --git a/src/java/voldemort/client/protocol/admin/AdminClient.java b/src/java/voldemort/client/protocol/admin/AdminClient.java index e54afba1de..e17193a0a5 100644 --- a/src/java/voldemort/client/protocol/admin/AdminClient.java +++ b/src/java/voldemort/client/protocol/admin/AdminClient.java @@ -213,9 +213,13 @@ public AdminClient(String bootstrapURL, AdminClientConfig adminClientConfig, int private void initSystemStoreClient(String bootstrapURL, int zoneID) { String[] bootstrapUrls = new String[1]; bootstrapUrls[0] = bootstrapURL; - this.sysStoreVersion = new SystemStore(SystemStoreConstants.SystemStoreName.voldsys$_metadata_version_persistence.name(), - bootstrapUrls, - zoneID); + try { + this.sysStoreVersion = new SystemStore(SystemStoreConstants.SystemStoreName.voldsys$_metadata_version_persistence.name(), + bootstrapUrls, + zoneID); + } catch(Exception e) { + logger.debug("Error while creating a system store client for metadata version store."); + } } /** @@ -226,12 +230,15 @@ private void initSystemStoreClient(String bootstrapURL, int zoneID) { */ public void updateMetadataversion(String versionKey) { Properties props = MetadataVersionStoreUtils.getProperties(this.sysStoreVersion); - if(props.getProperty(versionKey) != null) { + if(props != null && props.getProperty(versionKey) != null) { logger.debug("Version obtained = " + props.getProperty(versionKey)); long newValue = Long.parseLong(props.getProperty(versionKey)) + 1; props.setProperty(versionKey, Long.toString(newValue)); } else { logger.debug("Current version is null. Assuming version 0."); + if(props == null) { + props = new Properties(); + } props.setProperty(versionKey, "0"); } MetadataVersionStoreUtils.setProperties(this.sysStoreVersion, props); @@ -2403,7 +2410,11 @@ public void rebalanceStateChange(Cluster existingCluster, * metadata */ if(changeClusterMetadata) { - updateMetadataversion(CLUSTER_VERSION_KEY); + try { + updateMetadataversion(CLUSTER_VERSION_KEY); + } catch(Exception e) { + logger.info("Exception occurred while setting cluster metadata version during Rebalance state change !!!"); + } } } catch(Exception e) { diff --git a/src/java/voldemort/client/scheduler/AsyncMetadataVersionManager.java b/src/java/voldemort/client/scheduler/AsyncMetadataVersionManager.java index a9d5029e8b..fe55c4c8d4 100644 --- a/src/java/voldemort/client/scheduler/AsyncMetadataVersionManager.java +++ b/src/java/voldemort/client/scheduler/AsyncMetadataVersionManager.java @@ -94,7 +94,7 @@ public Long fetchNewVersion(String versionKey, Long curVersion, Properties versi // Swallow all exceptions here (we dont want to fail the client). catch(Exception e) { - logger.info("Could not retrieve Metadata Version. Exception : " + e); + logger.debug("Could not retrieve Metadata Version."); } return null; @@ -102,43 +102,51 @@ public Long fetchNewVersion(String versionKey, Long curVersion, Properties versi public void run() { - // Get the properties object from the system store (containing versions) - Properties versionProps = MetadataVersionStoreUtils.getProperties(this.sysRepository.getMetadataVersionStore()); - Long newClusterVersion = fetchNewVersion(CLUSTER_VERSION_KEY, - currentClusterVersion, - versionProps); - - // If nothing has been updated, continue - if(newClusterVersion != null) { - - logger.info("Metadata version mismatch detected."); + try { + // Get the properties object from the system store (containing + // versions) + Properties versionProps = MetadataVersionStoreUtils.getProperties(this.sysRepository.getMetadataVersionStore()); + Long newClusterVersion = fetchNewVersion(CLUSTER_VERSION_KEY, + currentClusterVersion, + versionProps); - // Determine a random delta delay between 0 to DELTA_MAX to sleep - int delta = randomGenerator.nextInt(DELTA_MAX); + // If nothing has been updated, continue + if(newClusterVersion != null) { - try { - logger.info("Sleeping for delta : " + delta + " (ms) before re-bootstrapping."); - Thread.sleep(delta); - } catch(InterruptedException e) { - // do nothing, continue. - } + logger.info("Metadata version mismatch detected."); - /* - * Do another check for mismatch here since the versions might have - * been updated while we were sleeping - */ - if(!newClusterVersion.equals(currentClusterVersion)) { + // Determine a random delta delay between 0 to DELTA_MAX to + // sleep + int delta = randomGenerator.nextInt(DELTA_MAX); try { - logger.info("Updating cluster version"); - currentClusterVersion = newClusterVersion; + logger.info("Sleeping for delta : " + delta + " (ms) before re-bootstrapping."); + Thread.sleep(delta); + } catch(InterruptedException e) { + // do nothing, continue. + } - this.storeClientThunk.call(); - } catch(Exception e) { - e.printStackTrace(); - logger.info(e.getMessage()); + /* + * Do another check for mismatch here since the versions might + * have been updated while we were sleeping + */ + if(!newClusterVersion.equals(currentClusterVersion)) { + + try { + logger.info("Updating cluster version"); + currentClusterVersion = newClusterVersion; + + this.storeClientThunk.call(); + } catch(Exception e) { + if(logger.isDebugEnabled()) { + e.printStackTrace(); + logger.debug(e.getMessage()); + } + } } } + } catch(Exception e) { + logger.debug("Could not retrieve metadata versions from the server."); } } diff --git a/src/java/voldemort/cluster/failuredetector/FailureDetectorConfig.java b/src/java/voldemort/cluster/failuredetector/FailureDetectorConfig.java index be389cdd7c..5856d22254 100644 --- a/src/java/voldemort/cluster/failuredetector/FailureDetectorConfig.java +++ b/src/java/voldemort/cluster/failuredetector/FailureDetectorConfig.java @@ -548,7 +548,6 @@ public FailureDetectorConfig setRequestLengthThreshold(long requestLengthThresho */ public synchronized Cluster getCluster() { - System.err.println("Cluster = " + cluster); return this.cluster; } @@ -577,6 +576,7 @@ public synchronized FailureDetectorConfig setCluster(Cluster cluster) { */ public synchronized Collection getNodes() { + System.err.println("DEPRECATED !!! Please use getCluster().getNodes() method instead !"); return ImmutableSet.copyOf(this.cluster.getNodes()); } @@ -593,6 +593,7 @@ public synchronized Collection getNodes() { */ public synchronized FailureDetectorConfig setNodes(Collection nodes) { + System.err.println("DEPRECATED !!! Please use setCluster method instead !"); Utils.notNull(nodes); this.nodes = new HashSet(nodes); return this; diff --git a/src/java/voldemort/server/storage/StorageService.java b/src/java/voldemort/server/storage/StorageService.java index daacf7e8a2..940f5f49f1 100644 --- a/src/java/voldemort/server/storage/StorageService.java +++ b/src/java/voldemort/server/storage/StorageService.java @@ -372,7 +372,6 @@ protected void initializeMetadataVersions(List storeDefs) { for(String propName: props.stringPropertyNames()) { finalVersionList.append(propName + "=" + props.getProperty(propName) + "\n"); } - System.err.println(finalVersionList); versionStore.put(metadataVersionsKey, new Versioned(finalVersionList.toString().getBytes(), newClock), null); @@ -424,33 +423,6 @@ public void registerSystemEngine(StorageEngine engine store = new LoggingStore(store, cluster.getName(), SystemTime.INSTANCE); - /* TODO: Do we really need rebalancing for system stores? */ - if(voldemortConfig.isEnableRebalanceService()) { - store = new RedirectingStore(store, - metadata, - storeRepository, - failureDetector, - storeFactory); - if(voldemortConfig.isJmxEnabled()) { - MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); - ObjectName name = null; - if(this.voldemortConfig.isEnableJmxClusterName()) - name = JmxUtils.createObjectName(cluster.getName() - + "." - + JmxUtils.getPackageName(RedirectingStore.class), - store.getName()); - else - name = JmxUtils.createObjectName(JmxUtils.getPackageName(RedirectingStore.class), - store.getName()); - - synchronized(mbeanServer) { - if(mbeanServer.isRegistered(name)) - JmxUtils.unregisterMbean(mbeanServer, name); - JmxUtils.registerMbean(mbeanServer, JmxUtils.createModelMBean(store), name); - } - - } - } if(voldemortConfig.isMetadataCheckingEnabled()) store = new InvalidMetadataCheckingStore(metadata.getNodeId(), store, metadata); diff --git a/src/java/voldemort/store/configuration/FileBackedCachingStorageConfiguration.java b/src/java/voldemort/store/configuration/FileBackedCachingStorageConfiguration.java index c43c781e3a..d9570c393f 100644 --- a/src/java/voldemort/store/configuration/FileBackedCachingStorageConfiguration.java +++ b/src/java/voldemort/store/configuration/FileBackedCachingStorageConfiguration.java @@ -12,7 +12,6 @@ public class FileBackedCachingStorageConfiguration implements StorageConfigurati public FileBackedCachingStorageConfiguration(VoldemortConfig config) { this.inputPath = config.getMetadataDirectory(); - System.err.println("Created a new File backed caching engine config ..."); } public StorageEngine getStore(String name) { diff --git a/src/java/voldemort/store/configuration/FileBackedCachingStorageEngine.java b/src/java/voldemort/store/configuration/FileBackedCachingStorageEngine.java index 0b4d0961ba..62830af188 100644 --- a/src/java/voldemort/store/configuration/FileBackedCachingStorageEngine.java +++ b/src/java/voldemort/store/configuration/FileBackedCachingStorageEngine.java @@ -54,7 +54,9 @@ public FileBackedCachingStorageEngine(String name, String inputDirectory) { this.inputPath = inputDirectory + "/" + name; this.metadataMap = new HashMap(); this.loadData(); - logger.debug("Created a new File backed caching engine. File location = " + inputPath); + if(logger.isDebugEnabled()) { + logger.debug("Created a new File backed caching engine. File location = " + inputPath); + } } private File getVersionFile() { diff --git a/src/java/voldemort/store/logging/LoggingStore.java b/src/java/voldemort/store/logging/LoggingStore.java index 753834f8ee..cac0acebb9 100644 --- a/src/java/voldemort/store/logging/LoggingStore.java +++ b/src/java/voldemort/store/logging/LoggingStore.java @@ -128,9 +128,8 @@ public void put(K key, Versioned value, T transform) throws VoldemortExceptio private void printTimedMessage(String operation, boolean success, long startNs) { if(logger.isDebugEnabled()) { double elapsedMs = (time.getNanoseconds() - startNs) / (double) Time.NS_PER_MS; - logger.debug(instanceName + operation + " " + getName() - + " " + (success ? "successful" : "unsuccessful") + " in " - + elapsedMs + " ms"); + logger.debug(instanceName + operation + " " + getName() + " " + + (success ? "successful" : "unsuccessful") + " in " + elapsedMs + " ms"); } } diff --git a/src/java/voldemort/store/routed/action/ConfigureNodesLocalHost.java b/src/java/voldemort/store/routed/action/ConfigureNodesLocalHost.java index 4eb2237380..443a538b25 100644 --- a/src/java/voldemort/store/routed/action/ConfigureNodesLocalHost.java +++ b/src/java/voldemort/store/routed/action/ConfigureNodesLocalHost.java @@ -47,6 +47,10 @@ public List getNodes(ByteArray key) { try { nodes = super.getNodes(key); + if(nodes == null) { + return null; + } + String currentHost = InetAddress.getLocalHost().getHostName(); for(Node n: nodes) { if(currentHost.contains(n.getHost()) || n.getHost().contains(currentHost)) { diff --git a/src/java/voldemort/utils/MetadataVersionStoreUtils.java b/src/java/voldemort/utils/MetadataVersionStoreUtils.java index 5809a9c5c9..dc6d917052 100644 --- a/src/java/voldemort/utils/MetadataVersionStoreUtils.java +++ b/src/java/voldemort/utils/MetadataVersionStoreUtils.java @@ -44,14 +44,22 @@ public static Properties getProperties(SystemStore versionStore) * @param props The Properties object to write to the System store */ public static void setProperties(SystemStore versionStore, Properties props) { - StringBuilder finalVersionList = new StringBuilder(); - for(String propName: props.stringPropertyNames()) { - if(finalVersionList.length() == 0) { - finalVersionList.append(propName + "=" + props.getProperty(propName)); - } else { - finalVersionList.append("\n" + propName + "=" + props.getProperty(propName)); + if(props == null) { + return; + } + + try { + StringBuilder finalVersionList = new StringBuilder(); + for(String propName: props.stringPropertyNames()) { + if(finalVersionList.length() == 0) { + finalVersionList.append(propName + "=" + props.getProperty(propName)); + } else { + finalVersionList.append("\n" + propName + "=" + props.getProperty(propName)); + } } + versionStore.putSysStore(VERSIONS_METADATA_KEY, finalVersionList.toString()); + } catch(Exception e) { + logger.debug("Got exception in setting properties : " + e.getMessage()); } - versionStore.putSysStore(VERSIONS_METADATA_KEY, finalVersionList.toString()); } } diff --git a/test/integration/voldemort/cluster/failuredetector/FailureDetectorPerformanceTest.java b/test/integration/voldemort/cluster/failuredetector/FailureDetectorPerformanceTest.java index f8775b9ff9..d9d76a08f4 100644 --- a/test/integration/voldemort/cluster/failuredetector/FailureDetectorPerformanceTest.java +++ b/test/integration/voldemort/cluster/failuredetector/FailureDetectorPerformanceTest.java @@ -16,9 +16,9 @@ package voldemort.cluster.failuredetector; -import static voldemort.cluster.failuredetector.MutableStoreVerifier.create; import static voldemort.VoldemortTestConstants.getNineNodeCluster; import static voldemort.cluster.failuredetector.FailureDetectorUtils.create; +import static voldemort.cluster.failuredetector.MutableStoreVerifier.create; import java.io.IOException; @@ -71,7 +71,7 @@ protected FailureDetectorPerformanceTest(String[] args) { failureDetectorConfig.getThresholdInterval()); Cluster cluster = getNineNodeCluster(); - failureDetectorConfig.setNodes(cluster.getNodes()) + failureDetectorConfig.setCluster(cluster) .setStoreVerifier(create(cluster.getNodes())) .setAsyncRecoveryInterval(asyncScanInterval) .setBannagePeriod(bannagePeriod) diff --git a/test/integration/voldemort/performance/RoutedStoreParallelismTest.java b/test/integration/voldemort/performance/RoutedStoreParallelismTest.java index 0397416613..aecfd0394a 100644 --- a/test/integration/voldemort/performance/RoutedStoreParallelismTest.java +++ b/test/integration/voldemort/performance/RoutedStoreParallelismTest.java @@ -195,7 +195,7 @@ public static void main(String[] args) throws Throwable { } FailureDetectorConfig failureDetectorConfig = new FailureDetectorConfig().setImplementationClassName(BannagePeriodFailureDetector.class.getName()) - .setNodes(cluster.getNodes()) + .setCluster(cluster) .setStoreVerifier(MutableStoreVerifier.create(stores)); FailureDetector failureDetector = FailureDetectorUtils.create(failureDetectorConfig, false); diff --git a/test/unit/voldemort/client/ClientJmxTest.java b/test/unit/voldemort/client/ClientJmxTest.java index cb67bb1ff7..1e5529c09e 100644 --- a/test/unit/voldemort/client/ClientJmxTest.java +++ b/test/unit/voldemort/client/ClientJmxTest.java @@ -74,7 +74,8 @@ public void tearDown() throws Exception { protected StoreClientFactory getFactory(String... bootstrapUrls) { return new SocketStoreClientFactory(new ClientConfig().setBootstrapUrls(bootstrapUrls) .setEnableLazy(false) - .setEnableJmx(true)); + .setEnableJmx(true) + .enableDefaultClient(true)); } protected StoreClientFactory getFactoryWithClientContext(String clientContext, @@ -82,7 +83,8 @@ protected StoreClientFactory getFactoryWithClientContext(String clientContext, return new SocketStoreClientFactory(new ClientConfig().setBootstrapUrls(bootstrapUrls) .setEnableLazy(false) .setClientContextName(clientContext) - .setEnableJmx(true)); + .setEnableJmx(true) + .enableDefaultClient(true)); } @Test @@ -280,7 +282,8 @@ protected StoreClientFactory getFactoryWithSerializer(SerializerFactory factory, String... bootstrapUrls) { return new SocketStoreClientFactory(new ClientConfig().setBootstrapUrls(bootstrapUrls) .setEnableLazy(false) - .setSerializerFactory(factory)); + .setSerializerFactory(factory) + .enableDefaultClient(true)); } @Override diff --git a/test/unit/voldemort/client/EndToEndRebootstrapTest.java b/test/unit/voldemort/client/EndToEndRebootstrapTest.java index 024e6a2873..2202bfb41e 100644 --- a/test/unit/voldemort/client/EndToEndRebootstrapTest.java +++ b/test/unit/voldemort/client/EndToEndRebootstrapTest.java @@ -115,7 +115,9 @@ public void testEndToEndRebootstrap() { String value = "SF"; String bootstrapTime = ""; String newBootstrapTime = ""; - AdminClient adminClient = new AdminClient(bootStrapUrls[0], new AdminClientConfig()); + AdminClient adminClient = new AdminClient(bootStrapUrls[0], + new AdminClientConfig(), + CLIENT_ZONE_ID); try { storeClient.put(key, value); diff --git a/test/unit/voldemort/cluster/TestCluster.java b/test/unit/voldemort/cluster/TestCluster.java index 3e516005b8..1229c43d5f 100644 --- a/test/unit/voldemort/cluster/TestCluster.java +++ b/test/unit/voldemort/cluster/TestCluster.java @@ -16,8 +16,8 @@ package voldemort.cluster; -import static voldemort.cluster.failuredetector.MutableStoreVerifier.create; import static voldemort.cluster.failuredetector.FailureDetectorUtils.create; +import static voldemort.cluster.failuredetector.MutableStoreVerifier.create; import java.util.Arrays; import java.util.Collection; @@ -69,7 +69,7 @@ public void setUp() throws Exception { FailureDetectorConfig failureDetectorConfig = new FailureDetectorConfig().setImplementationClassName(failureDetectorClass.getName()) .setBannagePeriod(1000) - .setNodes(cluster.getNodes()) + .setCluster(cluster) .setStoreVerifier(create(cluster.getNodes())) .setTime(time); diff --git a/test/unit/voldemort/cluster/failuredetector/BannagePeriodFailureDetectorTest.java b/test/unit/voldemort/cluster/failuredetector/BannagePeriodFailureDetectorTest.java index 7acd98423e..ef2fd3252d 100644 --- a/test/unit/voldemort/cluster/failuredetector/BannagePeriodFailureDetectorTest.java +++ b/test/unit/voldemort/cluster/failuredetector/BannagePeriodFailureDetectorTest.java @@ -20,8 +20,8 @@ import static org.junit.Assert.assertTrue; import static voldemort.FailureDetectorTestUtils.recordException; import static voldemort.FailureDetectorTestUtils.recordSuccess; -import static voldemort.cluster.failuredetector.MutableStoreVerifier.create; import static voldemort.cluster.failuredetector.FailureDetectorUtils.create; +import static voldemort.cluster.failuredetector.MutableStoreVerifier.create; import java.net.ConnectException; import java.net.NoRouteToHostException; @@ -42,7 +42,7 @@ public class BannagePeriodFailureDetectorTest extends AbstractFailureDetectorTes public FailureDetector createFailureDetector() throws Exception { FailureDetectorConfig failureDetectorConfig = new FailureDetectorConfig().setImplementationClassName(BannagePeriodFailureDetector.class.getName()) .setBannagePeriod(BANNAGE_MILLIS) - .setNodes(cluster.getNodes()) + .setCluster(cluster) .setStoreVerifier(create(cluster.getNodes())) .setTime(time); return create(failureDetectorConfig, true); diff --git a/test/unit/voldemort/cluster/failuredetector/ThresholdFailureDetectorTest.java b/test/unit/voldemort/cluster/failuredetector/ThresholdFailureDetectorTest.java index 7a9e409846..25aa19ebc5 100644 --- a/test/unit/voldemort/cluster/failuredetector/ThresholdFailureDetectorTest.java +++ b/test/unit/voldemort/cluster/failuredetector/ThresholdFailureDetectorTest.java @@ -20,9 +20,9 @@ import static org.junit.Assert.assertTrue; import static voldemort.FailureDetectorTestUtils.recordException; import static voldemort.FailureDetectorTestUtils.recordSuccess; -import static voldemort.cluster.failuredetector.MutableStoreVerifier.create; -import static voldemort.cluster.failuredetector.FailureDetectorUtils.create; import static voldemort.VoldemortTestConstants.getTenNodeCluster; +import static voldemort.cluster.failuredetector.FailureDetectorUtils.create; +import static voldemort.cluster.failuredetector.MutableStoreVerifier.create; import java.net.ConnectException; import java.net.NoRouteToHostException; @@ -48,7 +48,7 @@ public FailureDetector createFailureDetector() throws Exception { .setBannagePeriod(BANNAGE_MILLIS) .setAsyncRecoveryInterval(250) .setThresholdInterval(500) - .setNodes(cluster.getNodes()) + .setCluster(cluster) .setStoreVerifier(storeVerifier) .setTime(time); return create(failureDetectorConfig, true); @@ -179,6 +179,11 @@ public void testChangeMetadata() throws Exception { new UnreachableStoreException("intentionalerror", new ConnectException("intentionalerror"))); + /** + * Update the failure detector state with the new cluster + */ + failureDetector.getConfig().setCluster(this.cluster); + assertEquals(false, failureDetector.isAvailable(node)); Thread.sleep(failureDetector.getConfig().getAsyncRecoveryInterval() * 2); assertEquals(true, failureDetector.isAvailable(node)); diff --git a/test/unit/voldemort/scheduled/StreamingSlopPusherTest.java b/test/unit/voldemort/scheduled/StreamingSlopPusherTest.java index f0a045face..2c3a732f5a 100644 --- a/test/unit/voldemort/scheduled/StreamingSlopPusherTest.java +++ b/test/unit/voldemort/scheduled/StreamingSlopPusherTest.java @@ -136,7 +136,7 @@ public void testFailedServer() throws IOException, InterruptedException { StreamingSlopPusherJob pusher = new StreamingSlopPusherJob(getVoldemortServer(0).getStoreRepository(), getVoldemortServer(0).getMetadataStore(), - new BannagePeriodFailureDetector(new FailureDetectorConfig().setNodes(cluster.getNodes()) + new BannagePeriodFailureDetector(new FailureDetectorConfig().setCluster(cluster) .setStoreVerifier(new ServerStoreVerifier(socketStoreFactory, metadataStore, configs[0]))), @@ -270,7 +270,7 @@ public void testOutOfOrder() throws InterruptedException, IOException { StreamingSlopPusherJob pusher = new StreamingSlopPusherJob(getVoldemortServer(0).getStoreRepository(), getVoldemortServer(0).getMetadataStore(), - new BannagePeriodFailureDetector(new FailureDetectorConfig().setNodes(cluster.getNodes()) + new BannagePeriodFailureDetector(new FailureDetectorConfig().setCluster(cluster) .setStoreVerifier(new ServerStoreVerifier(socketStoreFactory, metadataStore, configs[0]))), @@ -321,7 +321,7 @@ public void testNormalPush() throws InterruptedException, IOException { StreamingSlopPusherJob pusher = new StreamingSlopPusherJob(getVoldemortServer(0).getStoreRepository(), getVoldemortServer(0).getMetadataStore(), - new BannagePeriodFailureDetector(new FailureDetectorConfig().setNodes(cluster.getNodes()) + new BannagePeriodFailureDetector(new FailureDetectorConfig().setCluster(cluster) .setStoreVerifier(new ServerStoreVerifier(socketStoreFactory, metadataStore, configs[0]))), @@ -437,14 +437,14 @@ public void testNormalPushBothWays() throws InterruptedException, IOException { StreamingSlopPusherJob pusher0 = new StreamingSlopPusherJob(getVoldemortServer(0).getStoreRepository(), getVoldemortServer(0).getMetadataStore(), - new BannagePeriodFailureDetector(new FailureDetectorConfig().setNodes(cluster.getNodes()) + new BannagePeriodFailureDetector(new FailureDetectorConfig().setCluster(cluster) .setStoreVerifier(new ServerStoreVerifier(socketStoreFactory, metadataStore, configs[0]))), configs[0], new ScanPermitWrapper(1)), pusher1 = new StreamingSlopPusherJob(getVoldemortServer(1).getStoreRepository(), getVoldemortServer(1).getMetadataStore(), - new BannagePeriodFailureDetector(new FailureDetectorConfig().setNodes(cluster.getNodes()) + new BannagePeriodFailureDetector(new FailureDetectorConfig().setCluster(cluster) .setStoreVerifier(new ServerStoreVerifier(socketStoreFactory, metadataStore, configs[1]))), @@ -546,7 +546,7 @@ public void testServerReplacementWithoutBounce() throws IOException, Interrupted StreamingSlopPusherJob pusher = new StreamingSlopPusherJob(getVoldemortServer(0).getStoreRepository(), getVoldemortServer(0).getMetadataStore(), - new BannagePeriodFailureDetector(new FailureDetectorConfig().setNodes(cluster.getNodes()) + new BannagePeriodFailureDetector(new FailureDetectorConfig().setCluster(cluster) .setStoreVerifier(new ServerStoreVerifier(socketStoreFactory, metadataStore, configs[0]))), diff --git a/test/unit/voldemort/store/routed/HintedHandoffTest.java b/test/unit/voldemort/store/routed/HintedHandoffTest.java index 7f6d7d695e..a2c5ee197a 100644 --- a/test/unit/voldemort/store/routed/HintedHandoffTest.java +++ b/test/unit/voldemort/store/routed/HintedHandoffTest.java @@ -442,7 +442,7 @@ private void setFailureDetector(Map> s FailureDetectorConfig failureDetectorConfig = new FailureDetectorConfig(); failureDetectorConfig.setImplementationClassName(failureDetectorCls.getName()); failureDetectorConfig.setBannagePeriod(500); - failureDetectorConfig.setNodes(cluster.getNodes()); + failureDetectorConfig.setCluster(cluster); failureDetectorConfig.setStoreVerifier(MutableStoreVerifier.create(subStores)); failureDetector = FailureDetectorUtils.create(failureDetectorConfig, false); diff --git a/test/unit/voldemort/store/routed/ReadRepairerTest.java b/test/unit/voldemort/store/routed/ReadRepairerTest.java index c7d64e2e9a..61e41981c8 100644 --- a/test/unit/voldemort/store/routed/ReadRepairerTest.java +++ b/test/unit/voldemort/store/routed/ReadRepairerTest.java @@ -148,7 +148,7 @@ public void testMissingKeysAreAddedToNodeWhenDoingReadRepair() throws Exception FailureDetectorConfig failureDetectorConfig = new FailureDetectorConfig().setImplementationClassName(failureDetectorClass.getName()) .setBannagePeriod(1000) - .setNodes(cluster.getNodes()) + .setCluster(cluster) .setStoreVerifier(create(subStores)) .setTime(time); diff --git a/test/unit/voldemort/store/routed/RoutedStoreTest.java b/test/unit/voldemort/store/routed/RoutedStoreTest.java index 1b1ed1428e..a7fbcf22b6 100644 --- a/test/unit/voldemort/store/routed/RoutedStoreTest.java +++ b/test/unit/voldemort/store/routed/RoutedStoreTest.java @@ -1481,7 +1481,7 @@ private void setFailureDetector(Map> s FailureDetectorConfig failureDetectorConfig = new FailureDetectorConfig().setImplementationClassName(failureDetectorClass.getName()) .setBannagePeriod(BANNAGE_PERIOD) - .setNodes(cluster.getNodes()) + .setCluster(cluster) .setStoreVerifier(create(subStores)); failureDetector = create(failureDetectorConfig, false); } diff --git a/test/unit/voldemort/store/routed/action/AbstractActionTest.java b/test/unit/voldemort/store/routed/action/AbstractActionTest.java index 68e408f7e5..269b50366f 100644 --- a/test/unit/voldemort/store/routed/action/AbstractActionTest.java +++ b/test/unit/voldemort/store/routed/action/AbstractActionTest.java @@ -41,9 +41,9 @@ public class AbstractActionTest { @Before public void setUp() throws Exception { cluster = VoldemortTestConstants.getThreeNodeCluster(); - failureDetector = new BannagePeriodFailureDetector(new FailureDetectorConfig().setNodes(cluster.getNodes())); + failureDetector = new BannagePeriodFailureDetector(new FailureDetectorConfig().setCluster(cluster)); clusterWithZones = VoldemortTestConstants.getFourNodeClusterWithZones(); - failureDetectorWithZones = new BannagePeriodFailureDetector(new FailureDetectorConfig().setNodes(clusterWithZones.getNodes())); + failureDetectorWithZones = new BannagePeriodFailureDetector(new FailureDetectorConfig().setCluster(clusterWithZones)); storeDef = new StoreDefinitionsMapper().readStoreList(new StringReader(VoldemortTestConstants.getSingleStoreWithZonesXml())) .get(0); } diff --git a/test/unit/voldemort/store/routed/action/ConfigureNodesLocalHostTest.java b/test/unit/voldemort/store/routed/action/ConfigureNodesLocalHostTest.java index e89d43e2b6..97ceff026b 100644 --- a/test/unit/voldemort/store/routed/action/ConfigureNodesLocalHostTest.java +++ b/test/unit/voldemort/store/routed/action/ConfigureNodesLocalHostTest.java @@ -57,7 +57,7 @@ private Node node(int id, String hostName, int... tags) { public void testConfigureNodesLocalHost() throws Exception { List nodes = getTestNodes(); Cluster cluster = new Cluster("test-route-all-local-pref-cluster", nodes); - FailureDetector failureDetector = new ThresholdFailureDetector(new FailureDetectorConfig().setNodes(nodes)); + FailureDetector failureDetector = new ThresholdFailureDetector(new FailureDetectorConfig().setCluster(cluster)); RoutingStrategy routingStrategy = new RouteToAllLocalPrefStrategy(cluster.getNodes()); BasicPipelineData pipelineData = new BasicPipelineData(); ConfigureNodesLocalHost> action = new ConfigureNodesLocalHost>(pipelineData,