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 20:11:21 UTC
[1/2] accumulo git commit: ACCUMULO-3603 fix timings in 1.6
Repository: accumulo
Updated Branches:
refs/heads/master a20484c25 -> c8a30df18
ACCUMULO-3603 fix timings in 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a570bd8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7a570bd8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7a570bd8
Branch: refs/heads/master
Commit: 7a570bd885049324878e52d06d3a1371308aa783
Parents: c3a76f6
Author: Eric Newton <Eric Newton>
Authored: Thu Feb 19 14:10:32 2015 -0500
Committer: Eric Newton <Eric Newton>
Committed: Thu Feb 19 14:10:32 2015 -0500
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a570bd8/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..3b25655 100644
--- a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
@@ -79,7 +79,7 @@ public class MultiTableRecoveryIT extends ConfigurableMacIT {
final Mutation m = new Mutation(Long.toHexString(randomRow));
m.put(new byte[0], new byte[0], values[table]);
writers[table].addMutation(m);
- if ((i % 10 * 1000) == 0) {
+ if ((i % (10 * 1000)) == 0) {
System.out.println("flushing");
for (int w = 0; w < N; w++) {
writers[w].flush();
@@ -114,7 +114,7 @@ public class MultiTableRecoveryIT extends ConfigurableMacIT {
try {
int i = 0;
while (!stop.get()) {
- UtilWaitThread.sleep(10 * 1000);
+ UtilWaitThread.sleep(5 * 1000);
System.out.println("Restarting");
for (ProcessReference proc : getCluster().getProcesses().get(ServerType.TABLET_SERVER)) {
getCluster().killProcess(ServerType.TABLET_SERVER, proc);
[2/2] accumulo git commit: Merge branch '1.6'
Posted by ec...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8a30df1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8a30df1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8a30df1
Branch: refs/heads/master
Commit: c8a30df18c2661f0a8658c58e3f588dc27b8bd9f
Parents: a20484c 7a570bd
Author: Eric Newton <Eric Newton>
Authored: Thu Feb 19 14:10:42 2015 -0500
Committer: Eric Newton <Eric Newton>
Committed: Thu Feb 19 14:10:42 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------