Renamed AdminStoreSwapper#swapStoreData() to #fetchAndSwapStoreData()

Also clarified one of the logs so that BnP announces that it's about to fetch (previously, it mentioned "swap" instead).
voldemort · May 5, 2016 · 205a6d5 · 205a6d5
1 parent b01ad7a
commit 205a6d5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/...b/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/VoldemortSwapJob.java b/...b/hadoop-store-builder/src/java/voldemort/store/readonly/mr/azkaban/VoldemortSwapJob.java
@@ -143,8 +143,8 @@ public void run() throws Exception {
             pushVersion++;
         }
 
-        // do the swap
-        info("Initiating swap of " + storeName + " with dataDir: " + dataDir);
+        // do the fetch, and if it succeeds, the swap
+        info("Initiating fetch of " + storeName + " with dataDir: " + dataDir);
         AdminStoreSwapper swapper = new AdminStoreSwapper(
                 cluster,
                 executor,
@@ -154,7 +154,7 @@ public void run() throws Exception {
                 failedFetchStrategyList,
                 clusterName,
                 buildPrimaryReplicasOnly);
-        swapper.swapStoreData(storeName, modifiedDataDir, pushVersion);
+        swapper.fetchAndSwapStoreData(storeName, modifiedDataDir, pushVersion);
         info("Swap complete.");
         executor.shutdownNow();
         executor.awaitTermination(10, TimeUnit.SECONDS);

diff --git a/src/java/voldemort/store/readonly/swapper/AdminStoreSwapper.java b/src/java/voldemort/store/readonly/swapper/AdminStoreSwapper.java
@@ -119,7 +119,7 @@ public AdminStoreSwapper(Cluster cluster,
         this(cluster, executor, adminClient, timeoutMs, false, new ArrayList<FailedFetchStrategy>(), null, false);
     }
 
-    public void swapStoreData(String storeName, String basePath, long pushVersion) {
+    public void fetchAndSwapStoreData(String storeName, String basePath, long pushVersion) {
         Map<Node, Response> fetchResponseMap = invokeFetch(storeName, basePath, pushVersion);
         invokeSwap(storeName, fetchResponseMap);
         for (AdminStoreSwapper.Response response: fetchResponseMap.values()) {
@@ -376,7 +376,7 @@ public static void main(String[] args) throws Exception {
             if(rollbackStore) {
                 swapper.invokeRollback(storeName, pushVersion.longValue());
             } else {
-                swapper.swapStoreData(storeName, filePath, pushVersion.longValue());
+                swapper.fetchAndSwapStoreData(storeName, filePath, pushVersion.longValue());
             }
             long end = System.currentTimeMillis();
             swapper.logger.info("Succeeded on all nodes in " + ((end - start) / Time.MS_PER_SECOND)

diff --git a/test/unit/voldemort/client/rebalance/AbstractNonZonedRebalanceTest.java b/test/unit/voldemort/client/rebalance/AbstractNonZonedRebalanceTest.java
@@ -1303,7 +1303,7 @@ protected void populateData(Cluster cluster,
                                                               Executors.newFixedThreadPool(cluster.getNumberOfNodes()),
                                                               adminClient,
                                                               100000);
-            swapper.swapStoreData(testStoreNameRO, outputDir.getAbsolutePath(), 1L);
+            swapper.fetchAndSwapStoreData(testStoreNameRO, outputDir.getAbsolutePath(), 1L);
         }
     }
 }
diff --git a/test/unit/voldemort/store/readonly/swapper/StoreSwapperTest.java b/test/unit/voldemort/store/readonly/swapper/StoreSwapperTest.java
@@ -21,8 +21,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import voldemort.ServerTestUtils;
 import voldemort.TestUtils;
 import voldemort.VoldemortException;
@@ -36,7 +34,6 @@
 import voldemort.store.StoreDefinition;
 import voldemort.store.StoreDefinitionBuilder;
 import voldemort.store.metadata.MetadataStore;
-import voldemort.store.nonblockingstore.ThreadPoolBasedNonblockingStoreImpl;
 import voldemort.store.readonly.ReadOnlyStorageConfiguration;
 import voldemort.store.readonly.ReadOnlyUtils;
 import voldemort.store.socket.SocketStoreFactory;
@@ -47,8 +44,6 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -258,7 +253,7 @@ public RuntimeException call(){
 
             RuntimeException result = null;
             try {
-                swapper.swapStoreData(STORE_NAME, tempDir.getAbsolutePath(), currentVersion + 1);
+                swapper.fetchAndSwapStoreData(STORE_NAME, tempDir.getAbsolutePath(), currentVersion + 1);
             }catch (RuntimeException e){
                 result = e;
             }
@@ -293,7 +288,7 @@ public void testFetchSwapWithoutRollback(AdminStoreSwapper swapper) throws Excep
                      + " is not equal to others");
         }
 
-        swapper.swapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 1);
+        swapper.fetchAndSwapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 1);
 
         // Check the directories and entries
         for(int nodeId = 0; nodeId < NUM_NODES; nodeId++) {
@@ -312,7 +307,7 @@ public void testFetchSwapWithoutRollback(AdminStoreSwapper swapper) throws Excep
         Utils.mkdirs(new File(baseDirs[1], "version-" + Long.toString(currentVersion + 3)));
 
         try {
-            swapper.swapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 3);
+            swapper.fetchAndSwapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 3);
             fail("Should throw a VoldemortException during pushing to node 0");
         } catch(VoldemortException e) {}
 
@@ -345,7 +340,7 @@ public void testFetchSwap(AdminStoreSwapper swapper) throws Exception {
                      + " is not equal to others");
         }
 
-        swapper.swapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 1);
+        swapper.fetchAndSwapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 1);
 
         // Check the directories and entries
         for(int nodeId = 0; nodeId < NUM_NODES; nodeId++) {
@@ -364,7 +359,7 @@ public void testFetchSwap(AdminStoreSwapper swapper) throws Exception {
         Utils.mkdirs(new File(baseDirs[1], "version-" + Long.toString(currentVersion + 3)));
 
         try {
-            swapper.swapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 3);
+            swapper.fetchAndSwapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 3);
             fail("Should throw a VoldemortException during pushing to node 0");
         } catch(VoldemortException e) {}
 
@@ -403,7 +398,7 @@ public void testFetchSwap(AdminStoreSwapper swapper) throws Exception {
 
         // Try to fetch in v2, which should fail on all
         try {
-            swapper.swapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 2);
+            swapper.fetchAndSwapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 2);
             fail("Should throw a VoldemortException during pushing to node 0, 1");
         } catch(VoldemortException e) {}
 
@@ -423,7 +418,7 @@ public void testFetchSwap(AdminStoreSwapper swapper) throws Exception {
                                           MetadataStore.VoldemortState.REBALANCING_MASTER_SERVER);
 
         try {
-            swapper.swapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 4);
+            swapper.fetchAndSwapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 4);
             fail("Should have thrown exception during swapping");
         } catch(VoldemortException e) {}
 
@@ -441,7 +436,7 @@ public void testFetchSwap(AdminStoreSwapper swapper) throws Exception {
         servers[1].getMetadataStore().put(MetadataStore.SERVER_STATE_KEY,
                                           MetadataStore.VoldemortState.NORMAL_SERVER);
 
-        swapper.swapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 5);
+        swapper.fetchAndSwapStoreData(STORE_NAME, temporaryDir.getAbsolutePath(), currentVersion + 5);
 
         for(int nodeId = 0; nodeId < NUM_NODES; nodeId++) {
             long currentNodeVersion = adminClient.readonlyOps.getROCurrentVersion(nodeId,