You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/01/29 21:36:43 UTC
[01/12] git commit: ACCUMULO-2279 Add use of timeout_factor
Updated Branches:
refs/heads/1.5.1-SNAPSHOT cabdbe829 -> 6716227f4
refs/heads/1.6.0-SNAPSHOT d22816cb4 -> 3eccc3533
refs/heads/master 008540105 -> 5e6da84c4
ACCUMULO-2279 Add use of timeout_factor
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6716227f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6716227f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6716227f
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 6716227f441eaae35bd25a9c95d33c7fa29753df
Parents: 25a0493
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 15:18:16 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:24:57 2014 -0500
----------------------------------------------------------------------
test/system/auto/simple/zoo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6716227f/test/system/auto/simple/zoo.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/zoo.py b/test/system/auto/simple/zoo.py
index d84cbe9..68d337e 100755
--- a/test/system/auto/simple/zoo.py
+++ b/test/system/auto/simple/zoo.py
@@ -44,7 +44,7 @@ class SessionExpired(SunnyDayTest):
# handles)
for h in self.accumuloHandles[1:-1]:
if 'tserver' in h.cmd:
- self.waitForStop(h, 5)
+ self.waitForStop(h, 5 * self.timeout_factor)
self.cleanupAccumuloHandles()
[07/12] git commit: ACCUMULO-2276 Re-fix the package names to the
correct ones.
Posted by el...@apache.org.
ACCUMULO-2276 Re-fix the package names to the correct ones.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a0493e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25a0493e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25a0493e
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 25a0493e3bf61ad8f6b2fef5a6bf269e52d13911
Parents: 265a99b
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 14:31:35 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:24:57 2014 -0500
----------------------------------------------------------------------
test/system/auto/simple/zooCacheTest.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/25a0493e/test/system/auto/simple/zooCacheTest.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/zooCacheTest.py b/test/system/auto/simple/zooCacheTest.py
index 6f8113f..771e34d 100755
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@ -34,10 +34,10 @@ class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)
handleCC = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestClean', ['/zcTest-42','/tmp/zcTest-42'])
self.waitForStop(handleCC, 10)
- handleR1 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleR2 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleR3 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleW = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestWriter', ['/zcTest-42','/tmp/zcTest-42','3','500'])
+ handleR1 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleR2 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleR3 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleW = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestWriter', ['/zcTest-42','/tmp/zcTest-42','3','500'])
self.waitForStop(handleW, 120 * self.timeout_factor)
self.waitForStop(handleR1, 1)
self.waitForStop(handleR2, 1)
[05/12] git commit: ACCUMULO-2276 Re-fix the package names to the
correct ones.
Posted by el...@apache.org.
ACCUMULO-2276 Re-fix the package names to the correct ones.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a0493e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25a0493e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25a0493e
Branch: refs/heads/master
Commit: 25a0493e3bf61ad8f6b2fef5a6bf269e52d13911
Parents: 265a99b
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 14:31:35 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:24:57 2014 -0500
----------------------------------------------------------------------
test/system/auto/simple/zooCacheTest.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/25a0493e/test/system/auto/simple/zooCacheTest.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/zooCacheTest.py b/test/system/auto/simple/zooCacheTest.py
index 6f8113f..771e34d 100755
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@ -34,10 +34,10 @@ class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)
handleCC = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestClean', ['/zcTest-42','/tmp/zcTest-42'])
self.waitForStop(handleCC, 10)
- handleR1 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleR2 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleR3 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleW = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestWriter', ['/zcTest-42','/tmp/zcTest-42','3','500'])
+ handleR1 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleR2 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleR3 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleW = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestWriter', ['/zcTest-42','/tmp/zcTest-42','3','500'])
self.waitForStop(handleW, 120 * self.timeout_factor)
self.waitForStop(handleR1, 1)
self.waitForStop(handleR2, 1)
[06/12] git commit: ACCUMULO-2279 Add use of timeout_factor
Posted by el...@apache.org.
ACCUMULO-2279 Add use of timeout_factor
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6716227f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6716227f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6716227f
Branch: refs/heads/master
Commit: 6716227f441eaae35bd25a9c95d33c7fa29753df
Parents: 25a0493
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 15:18:16 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:24:57 2014 -0500
----------------------------------------------------------------------
test/system/auto/simple/zoo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6716227f/test/system/auto/simple/zoo.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/zoo.py b/test/system/auto/simple/zoo.py
index d84cbe9..68d337e 100755
--- a/test/system/auto/simple/zoo.py
+++ b/test/system/auto/simple/zoo.py
@@ -44,7 +44,7 @@ class SessionExpired(SunnyDayTest):
# handles)
for h in self.accumuloHandles[1:-1]:
if 'tserver' in h.cmd:
- self.waitForStop(h, 5)
+ self.waitForStop(h, 5 * self.timeout_factor)
self.cleanupAccumuloHandles()
[04/12] git commit: ACCUMULO-2275 Fix up the options provided to work
with TestIngest.
Posted by el...@apache.org.
ACCUMULO-2275 Fix up the options provided to work with TestIngest.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/265a99b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/265a99b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/265a99b8
Branch: refs/heads/master
Commit: 265a99b8e23e3a18fdc28dfdb46f02bc0f6a6849
Parents: cabdbe8
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 13:36:09 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:24:57 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/test/functional/FateStarvationTest.java | 5 +++--
.../java/org/apache/accumulo/test/functional/MaxOpenTest.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/265a99b8/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
index 01cf658..f88c74d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
@@ -50,8 +50,9 @@ public class FateStarvationTest extends FunctionalTest {
getConnector().tableOperations().addSplits("test_ingest", TestIngest.getSplitPoints(0, 100000, 50));
- TestIngest.main(new String[] {"-random", "89", "-timestamp", "7", "-size", "" + 50, "100000", "0", "1"});
-
+ TestIngest.main(new String[] {"-u", "root", "-p", "secret", "--random", "89", "--timestamp", "7", "--size", "" + 50, "--rows", "100000", "--start", "0",
+ "--cols", "1"});
+
getConnector().tableOperations().flush("test_ingest", null, null, true);
List<Text> splits = new ArrayList<Text>(TestIngest.getSplitPoints(0, 100000, 67));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/265a99b8/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
index 6dea01c..c256cce 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
@@ -63,7 +63,7 @@ public class MaxOpenTest extends FunctionalTest {
// the following loop should create three tablets in each map file
for (int i = 0; i < 3; i++) {
- TestIngest.main(new String[] {"-random", "" + i, "-timestamp", "" + i, "-size", "" + 50, "" + NUM_TO_INGEST, "0", "1"});
+ TestIngest.main(new String[] {"-u", "root", "-p", "secret", "--random", "" + i, "--timestamp", "" + i, "--size", "" + 50, "--rows", "" + NUM_TO_INGEST, "--start", "0", "--cols", "1"});
getConnector().tableOperations().flush("test_ingest", null, null, true);
checkRFiles("test_ingest", NUM_TABLETS, NUM_TABLETS, i + 1, i + 1);
[11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java
test/system/auto/simple/zoo.py
test/system/auto/simple/zooCacheTest.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3eccc353
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3eccc353
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3eccc353
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3eccc35334949692d706eb80bdfb4835c581f6bf
Parents: d22816c 6716227
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 15:26:54 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:26:54 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/12] git commit: ACCUMULO-2275 Fix up the options provided to work
with TestIngest.
Posted by el...@apache.org.
ACCUMULO-2275 Fix up the options provided to work with TestIngest.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/265a99b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/265a99b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/265a99b8
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 265a99b8e23e3a18fdc28dfdb46f02bc0f6a6849
Parents: cabdbe8
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 13:36:09 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:24:57 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/test/functional/FateStarvationTest.java | 5 +++--
.../java/org/apache/accumulo/test/functional/MaxOpenTest.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/265a99b8/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
index 01cf658..f88c74d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
@@ -50,8 +50,9 @@ public class FateStarvationTest extends FunctionalTest {
getConnector().tableOperations().addSplits("test_ingest", TestIngest.getSplitPoints(0, 100000, 50));
- TestIngest.main(new String[] {"-random", "89", "-timestamp", "7", "-size", "" + 50, "100000", "0", "1"});
-
+ TestIngest.main(new String[] {"-u", "root", "-p", "secret", "--random", "89", "--timestamp", "7", "--size", "" + 50, "--rows", "100000", "--start", "0",
+ "--cols", "1"});
+
getConnector().tableOperations().flush("test_ingest", null, null, true);
List<Text> splits = new ArrayList<Text>(TestIngest.getSplitPoints(0, 100000, 67));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/265a99b8/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
index 6dea01c..c256cce 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
@@ -63,7 +63,7 @@ public class MaxOpenTest extends FunctionalTest {
// the following loop should create three tablets in each map file
for (int i = 0; i < 3; i++) {
- TestIngest.main(new String[] {"-random", "" + i, "-timestamp", "" + i, "-size", "" + 50, "" + NUM_TO_INGEST, "0", "1"});
+ TestIngest.main(new String[] {"-u", "root", "-p", "secret", "--random", "" + i, "--timestamp", "" + i, "--size", "" + 50, "--rows", "" + NUM_TO_INGEST, "--start", "0", "--cols", "1"});
getConnector().tableOperations().flush("test_ingest", null, null, true);
checkRFiles("test_ingest", NUM_TABLETS, NUM_TABLETS, i + 1, i + 1);
[03/12] git commit: ACCUMULO-2275 Fix up the options provided to work
with TestIngest.
Posted by el...@apache.org.
ACCUMULO-2275 Fix up the options provided to work with TestIngest.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/265a99b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/265a99b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/265a99b8
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 265a99b8e23e3a18fdc28dfdb46f02bc0f6a6849
Parents: cabdbe8
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 13:36:09 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:24:57 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/test/functional/FateStarvationTest.java | 5 +++--
.../java/org/apache/accumulo/test/functional/MaxOpenTest.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/265a99b8/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
index 01cf658..f88c74d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java
@@ -50,8 +50,9 @@ public class FateStarvationTest extends FunctionalTest {
getConnector().tableOperations().addSplits("test_ingest", TestIngest.getSplitPoints(0, 100000, 50));
- TestIngest.main(new String[] {"-random", "89", "-timestamp", "7", "-size", "" + 50, "100000", "0", "1"});
-
+ TestIngest.main(new String[] {"-u", "root", "-p", "secret", "--random", "89", "--timestamp", "7", "--size", "" + 50, "--rows", "100000", "--start", "0",
+ "--cols", "1"});
+
getConnector().tableOperations().flush("test_ingest", null, null, true);
List<Text> splits = new ArrayList<Text>(TestIngest.getSplitPoints(0, 100000, 67));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/265a99b8/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
index 6dea01c..c256cce 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java
@@ -63,7 +63,7 @@ public class MaxOpenTest extends FunctionalTest {
// the following loop should create three tablets in each map file
for (int i = 0; i < 3; i++) {
- TestIngest.main(new String[] {"-random", "" + i, "-timestamp", "" + i, "-size", "" + 50, "" + NUM_TO_INGEST, "0", "1"});
+ TestIngest.main(new String[] {"-u", "root", "-p", "secret", "--random", "" + i, "--timestamp", "" + i, "--size", "" + 50, "--rows", "" + NUM_TO_INGEST, "--start", "0", "--cols", "1"});
getConnector().tableOperations().flush("test_ingest", null, null, true);
checkRFiles("test_ingest", NUM_TABLETS, NUM_TABLETS, i + 1, i + 1);
[12/12] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e6da84c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e6da84c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e6da84c
Branch: refs/heads/master
Commit: 5e6da84c40f306387e563b5bb35fa534e6fa5247
Parents: 0085401 3eccc35
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 15:36:13 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:36:13 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java
test/system/auto/simple/zoo.py
test/system/auto/simple/zooCacheTest.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3eccc353
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3eccc353
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3eccc353
Branch: refs/heads/master
Commit: 3eccc35334949692d706eb80bdfb4835c581f6bf
Parents: d22816c 6716227
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 15:26:54 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:26:54 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/12] git commit: ACCUMULO-2279 Add use of timeout_factor
Posted by el...@apache.org.
ACCUMULO-2279 Add use of timeout_factor
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6716227f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6716227f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6716227f
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6716227f441eaae35bd25a9c95d33c7fa29753df
Parents: 25a0493
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 15:18:16 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:24:57 2014 -0500
----------------------------------------------------------------------
test/system/auto/simple/zoo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6716227f/test/system/auto/simple/zoo.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/zoo.py b/test/system/auto/simple/zoo.py
index d84cbe9..68d337e 100755
--- a/test/system/auto/simple/zoo.py
+++ b/test/system/auto/simple/zoo.py
@@ -44,7 +44,7 @@ class SessionExpired(SunnyDayTest):
# handles)
for h in self.accumuloHandles[1:-1]:
if 'tserver' in h.cmd:
- self.waitForStop(h, 5)
+ self.waitForStop(h, 5 * self.timeout_factor)
self.cleanupAccumuloHandles()
[08/12] git commit: ACCUMULO-2276 Re-fix the package names to the
correct ones.
Posted by el...@apache.org.
ACCUMULO-2276 Re-fix the package names to the correct ones.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a0493e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25a0493e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25a0493e
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 25a0493e3bf61ad8f6b2fef5a6bf269e52d13911
Parents: 265a99b
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 14:31:35 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:24:57 2014 -0500
----------------------------------------------------------------------
test/system/auto/simple/zooCacheTest.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/25a0493e/test/system/auto/simple/zooCacheTest.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/zooCacheTest.py b/test/system/auto/simple/zooCacheTest.py
index 6f8113f..771e34d 100755
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@ -34,10 +34,10 @@ class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)
handleCC = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestClean', ['/zcTest-42','/tmp/zcTest-42'])
self.waitForStop(handleCC, 10)
- handleR1 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleR2 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleR3 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleW = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestWriter', ['/zcTest-42','/tmp/zcTest-42','3','500'])
+ handleR1 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleR2 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleR3 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleW = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestWriter', ['/zcTest-42','/tmp/zcTest-42','3','500'])
self.waitForStop(handleW, 120 * self.timeout_factor)
self.waitForStop(handleR1, 1)
self.waitForStop(handleR2, 1)