You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/02/19 19:27:23 UTC
[3/3] accumulo git commit: ACCUMULO-3603 port back to 1.7
ACCUMULO-3603 port back to 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a20484c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a20484c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a20484c2
Branch: refs/heads/master
Commit: a20484c254d0d9fc03d4629767099c95567c47a3
Parents: 5559b31
Author: Eric Newton <Eric Newton>
Authored: Thu Feb 19 13:27:07 2015 -0500
Committer: Eric Newton <Eric Newton>
Committed: Thu Feb 19 13:27:07 2015 -0500
----------------------------------------------------------------------
core/.gitignore | 2 ++
minicluster/.gitignore | 1 +
proxy/.gitignore | 1 +
.../java/org/apache/accumulo/test/MultiTableRecoveryIT.java | 9 +++------
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20484c2/core/.gitignore
----------------------------------------------------------------------
diff --git a/core/.gitignore b/core/.gitignore
index 56204d2..8847bdd 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -23,3 +23,5 @@
/.pydevproject
/.idea
/*.iml
+/target/
+/bin/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20484c2/minicluster/.gitignore
----------------------------------------------------------------------
diff --git a/minicluster/.gitignore b/minicluster/.gitignore
index 56204d2..e7d7fb1 100644
--- a/minicluster/.gitignore
+++ b/minicluster/.gitignore
@@ -23,3 +23,4 @@
/.pydevproject
/.idea
/*.iml
+/target/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20484c2/proxy/.gitignore
----------------------------------------------------------------------
diff --git a/proxy/.gitignore b/proxy/.gitignore
index 5def651..98fdcca 100644
--- a/proxy/.gitignore
+++ b/proxy/.gitignore
@@ -26,3 +26,4 @@
# python ignores
*.pyc
+/bin/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20484c2/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
index dcb7bae..1bbbba6 100644
--- a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
@@ -35,7 +35,6 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
-import org.apache.accumulo.minicluster.impl.ProcessReference;
import org.apache.accumulo.test.functional.ConfigurableMacIT;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.RawLocalFileSystem;
@@ -72,7 +71,7 @@ public class MultiTableRecoveryIT extends ConfigurableMacIT {
agitator.start();
System.out.println("writing");
final Random random = new Random();
- for (i = 0; i < 1000 * 1000; i++) {
+ for (i = 0; i < 1_000_000; i++) {
long randomRow = Math.abs(random.nextLong());
assertTrue(randomRow >= 0);
final int table = (int) (randomRow % N);
@@ -104,7 +103,7 @@ public class MultiTableRecoveryIT extends ConfigurableMacIT {
}
scanner.close();
}
- assertEquals(1000 * 1000, count);
+ assertEquals(1_000_000, count);
}
private Thread agitator(final AtomicBoolean stop) {
@@ -116,9 +115,7 @@ public class MultiTableRecoveryIT extends ConfigurableMacIT {
while (!stop.get()) {
UtilWaitThread.sleep(10 * 1000);
System.out.println("Restarting");
- for (ProcessReference proc : getCluster().getProcesses().get(ServerType.TABLET_SERVER)) {
- getCluster().killProcess(ServerType.TABLET_SERVER, proc);
- }
+ getCluster().getClusterControl().stop(ServerType.TABLET_SERVER);
getCluster().start();
// read the metadata table to know everything is back up
for (@SuppressWarnings("unused")