Renamed Rebalance(Long)Test to NonZonedRebalanceLongTest.java. Added …

…ZonedRebalanceLongTest.java.

src/java/voldemort/server/rebalance/async/RebalanceAsyncOperation.java

@@ -28,6 +28,7 @@ protected ExecutorService createExecutors(int numThreads) {
 
         return Executors.newFixedThreadPool(numThreads, new ThreadFactory() {
 
+            @Override
             public Thread newThread(Runnable r) {
                 Thread thread = new Thread(r);
                 thread.setName(r.getClass().getName());

test/long/voldemort/client/rebalance/NonZonedRebalanceLongTest.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013 LinkedIn, Inc
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package voldemort.client.rebalance;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Run a version of RebalanceTests with a lot more keys.
+ * 
+ */
+@RunWith(Parameterized.class)
+public class NonZonedRebalanceLongTest extends AbstractNonZonedRebalanceTest {
+
+    private final int NUM_KEYS = 10100;
+
+    // TODO: Add back donor-based tests. These tests are broken because it is
+    // near impossible to get the replica-type handshake correct between the
+    // client & server. Once replicaTypes are removed from the fetchEntries code
+    // paths (e.g.,
+    // DonorBasedRebalanceAsyncOperation.fetchEntriesForStealersPartitionScan),
+    // then donor-based code should work again.
+    // public RebalanceLongTest(boolean useNio, boolean useDonorBased) {
+    public NonZonedRebalanceLongTest(boolean useNio) {
+        super(useNio, false);
+    }
+
+    @Parameters
+    public static Collection<Object[]> configs() {
+        /*-
+        return Arrays.asList(new Object[][] { { true, true }, { true, false }, { false, true },
+                { false, false } });
+         */
+        return Arrays.asList(new Object[][] { { true }, { false } });
+    }
+
+    @Override
+    protected int getNumKeys() {
+        return NUM_KEYS;
+    }
+
+}

test/long/voldemort/client/rebalance/RebalanceLongTest.java → test/long/voldemort/client/rebalance/ZonedRebalanceLongTest.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013 LinkedIn, Inc
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package voldemort.client.rebalance;
 
 import java.util.Arrays;
@@ -11,10 +27,8 @@
  * Run a version of RebalanceTests with a lot more keys.
  * 
  */
-// TODO: rename this to NonZonedRebalanceLongTest (or some such, whatever the
-// pattern is). And, add a long ZonedRebalance equivalent test.
 @RunWith(Parameterized.class)
-public class RebalanceLongTest extends RebalanceTest {
+public class ZonedRebalanceLongTest extends AbstractZonedRebalanceTest {
 
     private final int NUM_KEYS = 10100;
 
@@ -25,8 +39,8 @@ public class RebalanceLongTest extends RebalanceTest {
     // DonorBasedRebalanceAsyncOperation.fetchEntriesForStealersPartitionScan),
     // then donor-based code should work again.
     // public RebalanceLongTest(boolean useNio, boolean useDonorBased) {
-    public RebalanceLongTest(boolean useNio) {
-        super(useNio);
+    public ZonedRebalanceLongTest(boolean useNio) {
+        super(useNio, false);
     }
 
     @Parameters

test/unit/voldemort/client/rebalance/RebalanceTest.java → test/unit/voldemort/client/rebalance/NonZonedRebalanceTest.java

@@ -29,9 +29,8 @@
  * 
  * 
  */
-// TODO: Rename RebalanceTest -> NonZonedRebalanceTest
 @RunWith(Parameterized.class)
-public class RebalanceTest extends AbstractNonZonedRebalanceTest {
+public class NonZonedRebalanceTest extends AbstractNonZonedRebalanceTest {
 
     private final int NUM_KEYS = 20;
 
@@ -42,7 +41,7 @@ public class RebalanceTest extends AbstractNonZonedRebalanceTest {
     // DonorBasedRebalanceAsyncOperation.fetchEntriesForStealersPartitionScan),
     // then donor-based code should work again.
     // public RebalanceTest(boolean useNio, boolean useDonorBased) {
-    public RebalanceTest(boolean useNio) {
+    public NonZonedRebalanceTest(boolean useNio) {
         super(useNio, false);
     }