You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by sh...@apache.org on 2014/09/10 09:00:31 UTC
svn commit: r1623916 - in /zookeeper/trunk: CHANGES.txt
src/java/test/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java
Author: shralex
Date: Wed Sep 10 07:00:31 2014
New Revision: 1623916
URL: http://svn.apache.org/r1623916
Log:
ZOOKEEPER-2032. Cleaning up resources in ReconfigBackupTest (Hongchao Deng via shralex)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1623916&r1=1623915&r2=1623916&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Sep 10 07:00:31 2014
@@ -46,6 +46,8 @@ NEW FEATURES:
(Skye Wanderman-Milne, Bill Havanki via phunt)
BUGFIXES:
+ ZOOKEEPER-2032. Cleaning up resources in ReconfigBackupTest (Hongchao Deng via shralex)
+
ZOOKEEPER-2013. Typos in programmer guide. (Tim Chambers via Alex Shraer)
ZOOKEEPER-2006. Standalone mode won't take client port from dynamic config. (Hongchao Deng via Alex Shraer)
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java?rev=1623916&r1=1623915&r2=1623916&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigBackupTest.java Wed Sep 10 07:00:31 2014
@@ -104,6 +104,10 @@ public class ReconfigBackupTest extends
staticBackupContent[i] = getFileContent(backupFile);
Assert.assertEquals(staticFileContent[i], staticBackupContent[i]);
}
+
+ for (int i = 0; i < SERVER_COUNT; i++) {
+ mt[i].shutdown();
+ }
}
/**
@@ -334,6 +338,8 @@ public class ReconfigBackupTest extends
String otherDynamicFileContent = getFileContent(dynamicConfigFile);
Assert.assertEquals(dynamicFileContent, otherDynamicFileContent);
}
+
+ zk.close();
}
// finally, we should also check that the lag-off server has updated
@@ -341,5 +347,9 @@ public class ReconfigBackupTest extends
Assert.assertTrue(
mt[lagOffServerId].getPropFromStaticFile("dynamicConfigFile")
.endsWith(".200000000"));
+
+ for (int i = 0; i < SERVER_COUNT; i++) {
+ mt[i].shutdown();
+ }
}
}
\ No newline at end of file