Addressed gpang's comments

Alluxio · Aug 26, 2015 · e3a4177 · e3a4177
1 parent 376bf31
commit e3a4177
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/servers/src/main/java/tachyon/master/next/block/meta/MasterBlockInfo.java b/servers/src/main/java/tachyon/master/next/block/meta/MasterBlockInfo.java
@@ -57,8 +57,8 @@ public synchronized void addWorker(long workerId, int tierAlias) {
     mWorkerIdToAlias.put(workerId, tierAlias);
   }
 
-  public int removeWorker(long workerId) {
-    return mWorkerIdToAlias.remove(workerId);
+  public void removeWorker(long workerId) {
+    mWorkerIdToAlias.remove(workerId);
   }
 
   public Set<Long> getWorkers() {

diff --git a/servers/src/test/java/tachyon/master/next/block/meta/MasterBlockInfoTests.java b/servers/src/test/java/tachyon/master/next/block/meta/MasterBlockInfoTests.java
@@ -40,6 +40,8 @@ public void addWorkerTest() {
     Assert.assertEquals(0, mInfo.getWorkers().size());
     mInfo.addWorker(1, StorageLevelAlias.MEM.getValue());
     Assert.assertTrue(mInfo.getWorkers().contains(1L));
+    mInfo.addWorker(1, StorageLevelAlias.MEM.getValue());
+    Assert.assertEquals(1, mInfo.getWorkers().size());
   }
 
   @Test
@@ -48,6 +50,10 @@ public void removeWorkerTest() {
     Assert.assertTrue(mInfo.getWorkers().contains(1L));
     mInfo.removeWorker(1);
     Assert.assertEquals(0, mInfo.getWorkers().size());
+
+    // remove nonexiting worker.
+    mInfo.removeWorker(1);
+    Assert.assertEquals(0, mInfo.getWorkers().size());
   }
 
   @Test