Updated Branches: refs/heads/master 177fb3420 -> e7855b847
ACCUMULO-1685 fixed the logger in VolumeManagerImpl and added an integration test in an attempt to reproduce bench-test Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7855b84 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7855b84 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7855b84 Branch: refs/heads/master Commit: e7855b8477694d120f228f2b2747e72a826c52c4 Parents: 177fb34 Author: Eric Newton <[email protected]> Authored: Wed Sep 4 12:54:05 2013 -0400 Committer: Eric Newton <[email protected]> Committed: Wed Sep 4 12:54:05 2013 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/fs/VolumeManagerImpl.java | 2 +- .../org/apache/accumulo/test/functional/RestartIT.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7855b84/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java index ccf9b10..4313ca4 100644 --- a/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java +++ b/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java @@ -53,7 +53,7 @@ import org.apache.log4j.Logger; public class VolumeManagerImpl implements VolumeManager { - private static final Logger log = Logger.getLogger(FileSystem.class); + private static final Logger log = Logger.getLogger(VolumeManagerImpl.class); Map<String, ? extends FileSystem> volumes; String defaultVolume; http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7855b84/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java index aeaa1b3..218a475 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java @@ -117,6 +117,18 @@ public class RestartIT extends ConfigurableMacIT { VerifyIngest.verifyIngest(c, VOPTS, SOPTS); } + @Test(timeout = 2 * 60 * 1000) + public void killedTabletServer2() throws Exception { + Connector c = getConnector(); + c.tableOperations().create("t"); + List<ProcessReference> procs = new ArrayList<ProcessReference>(cluster.getProcesses().get(ServerType.TABLET_SERVER)); + for (ProcessReference tserver : procs) { + cluster.killProcess(ServerType.TABLET_SERVER, tserver); + } + cluster.start(); + c.tableOperations().create("tt"); + } + @Test(timeout = 4 * 60 * 1000) public void killedTabletServerDuringShutdown() throws Exception { Connector c = getConnector();
