Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote branch 'alex/master' into voldemort-master

  • Loading branch information...
commit b9d885faa6516c61e217928b62984a7d115d4add 2 parents ba1512e + 983dbd0
@rsumbaly rsumbaly authored
View
1  src/java/voldemort/client/rebalance/MigratePartitions.java
@@ -408,6 +408,7 @@ public void run() {
} catch(Exception e) {
logger.error("Exception in full process", e);
executor.shutdownNow();
+ throw new VoldemortException(e);
} finally {
// Move all nodes in grandfathered state back to normal
if(donorStates != null && transitionToNormal) {
View
4 test/unit/voldemort/client/rebalance/MigratePartitionsTest.java
@@ -184,7 +184,7 @@ public void testStateChange() {
adminClient,
voldemortConfig,
null,
- 2,
+ 1,
true);
try {
tool.migrate();
@@ -225,7 +225,7 @@ public void testStateChange() {
adminClient,
voldemortConfig,
null,
- 2,
+ 1,
true);
tool.migrate();
Please sign in to comment.
Something went wrong with that request. Please try again.