[08/10] git commit: ACCUMULO-1829 merge 1.5 - 1.6
ACCUMULO-1829 merge 1.5 - 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0d056ee Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b0d056ee Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b0d056ee Branch: refs/heads/1.6.0-SNAPSHOT Commit: b0d056eeb45ded85a63ef1a765d751318eed0263 Parents: 61a4298 1096fbb Author: Eric Newton eric.new...@gmail.com Authored: Thu Nov 7 13:49:47 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:49:47 2013 -0500 -- --
[05/10] git commit: ACCUMULO-1829 merge 1.4 - 1.5
ACCUMULO-1829 merge 1.4 - 1.5
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1096fbb9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1096fbb9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1096fbb9
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 1096fbb9a8fed8ad207169491f265fc810fc64a1
Parents: 806f00e 41efe1a
Author: Eric Newton eric.new...@gmail.com
Authored: Thu Nov 7 13:48:49 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Thu Nov 7 13:48:49 2013 -0500
--
test/system/auto/simple/zooCacheTest.py | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1096fbb9/test/system/auto/simple/zooCacheTest.py
--
diff --cc test/system/auto/simple/zooCacheTest.py
index 6bda870,b9beacb..07190bb
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@@ -31,13 -32,13 +32,13 @@@ class ZooCacheTest(TestUtilsMixin, unit
def runTest(self):
shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)
-handleCC = self.runClassOn('localhost',
'org.apache.accumulo.server.test.functional.CacheTestClean',
['/zcTest-42','/tmp/zcTest-42'])
+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.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, 200)
+ 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'])
+ self.waitForStop(handleW, 120 * self.timeout_factor)
self.waitForStop(handleR1, 1)
self.waitForStop(handleR2, 1)
self.waitForStop(handleR3, 1)
[01/10] git commit: ACCUMULO-1829 Add timeout scaling factor to tests (1.4.x)
Updated Branches:
refs/heads/1.5.1-SNAPSHOT 806f00e7e - 1096fbb9a
refs/heads/1.6.0-SNAPSHOT 61a4298c6 - b0d056eeb
refs/heads/master 31c8b5ab7 - 0a0ab3250
ACCUMULO-1829 Add timeout scaling factor to tests (1.4.x)
Slower hardware or VMs may have trouble completing tests within the timeouts
specified. This change adds a -f option to run.py to add a scaling factor
to the maxRuntime for tests, the timeout for Accumulo to shut down, and to
specific timeouts in SimpleBalancerFairness and ZooCacheTest.
Compare to a similar change for ACCUMULO-1789.
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/41efe1a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/41efe1a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/41efe1a7
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 41efe1a7e07d3abae1d82bc6d8340e78210cadc0
Parents: 62c6a22
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Oct 30 09:58:33 2013 -0400
Committer: Eric Newton eric.new...@gmail.com
Committed: Wed Nov 6 16:07:07 2013 -0500
--
test/system/auto/JavaTest.py | 1 +
test/system/auto/TestUtils.py | 3 ++-
test/system/auto/run.py | 3 +++
test/system/auto/simple/simpleBalancer.py | 2 +-
test/system/auto/simple/zooCacheTest.py | 3 ++-
5 files changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/JavaTest.py
--
diff --git a/test/system/auto/JavaTest.py b/test/system/auto/JavaTest.py
index f80848c..7c22bdb 100755
--- a/test/system/auto/JavaTest.py
+++ b/test/system/auto/JavaTest.py
@@ -41,6 +41,7 @@ class JavaTest(TestUtilsMixin, unittest.TestCase):
self.settings = TestUtilsMixin.settings.copy()
self.settings.update(eval(out))
TestUtilsMixin.setUp(self);
+self.maxRuntime = self.timeout_factor * self.maxRuntime
handle = self.runJTest(self.masterHost(),'setup')
out,err = handle.communicate()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index 4b5efdf..f953bca 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -388,7 +388,7 @@ class TestUtilsMixin:
handle = self.runOn(self.masterHost(),
[self.accumulo_sh(), 'admin', '-u', ROOT,
'-p', ROOT_PASSWORD, 'stopAll'])
-self.waitForStop(handle, seconds)
+self.waitForStop(handle, self.timeout_factor * seconds)
for host in self.hosts:
self.stop_logger(host)
self.stop_monitor(self.masterHost())
@@ -417,6 +417,7 @@ class TestUtilsMixin:
def setUp(self):
self.hosts = self.options.hosts
+self.timeout_factor = self.options.timeout_factor
self.clean_accumulo(self.masterHost())
self.setup_logging()
self.start_accumulo()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/run.py
--
diff --git a/test/system/auto/run.py b/test/system/auto/run.py
index 5a0678b..8e1a9bb 100755
--- a/test/system/auto/run.py
+++ b/test/system/auto/run.py
@@ -243,6 +243,9 @@ def main():
help='Start the test list at the given test name')
parser.add_option('-x', '--xml', dest='xmlreport', default=False,
action='store_true',
help='Output tests results to xml (jenkins conpatible)')
+parser.add_option('-f', '--timeout-factor', dest='timeout_factor',
+ default=1, type=int,
+ help=Multiplier for some timeouts (use on slower
hardware) (%default))
allTests = getTests()
options = parseArguments(parser, allTests)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/simple/simpleBalancer.py
--
diff --git a/test/system/auto/simple/simpleBalancer.py
b/test/system/auto/simple/simpleBalancer.py
index f77c9c0..00a2021 100755
--- a/test/system/auto/simple/simpleBalancer.py
+++ b/test/system/auto/simple/simpleBalancer.py
@@ -71,7 +71,7 @@ class SimpleBalancerFairness(SunnyDayTest):
self.ingester = self.ingest(self.masterHost(),
20,
size=self.options.size)
-self.waitForStop(self.ingester, 120)
+self.waitForStop(self.ingester, self.timeout_factor * 120)
[04/10] git commit: ACCUMULO-1614 fixed bug in conditional writer random walk test.
ACCUMULO-1614 fixed bug in conditional writer random walk test.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61a4298c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61a4298c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61a4298c
Branch: refs/heads/master
Commit: 61a4298c60c00bc9ae1db4ef02b5dca13f2f3c5b
Parents: 7a83c14
Author: Keith Turner ktur...@apache.org
Authored: Wed Nov 6 22:13:03 2013 -0500
Committer: Keith Turner ktur...@apache.org
Committed: Wed Nov 6 22:13:03 2013 -0500
--
.../core/client/impl/ConditionalWriterImpl.java | 3 ++-
.../accumulo/test/randomwalk/conditional/Transfer.java | 12 +---
2 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61a4298c/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index bb5987d..6b2a1cf 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -380,7 +380,8 @@ class ConditionalWriterImpl implements ConditionalWriter {
public void run() {
ListQCMutation mutations = new ArrayListQCMutation();
failedMutations.drainTo(mutations);
-queue(mutations);
+if (mutations.size() 0)
+ queue(mutations);
}
};
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61a4298c/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
--
diff --git
a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
index be4deb1..70aa3dd 100644
---
a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
+++
b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
@@ -67,6 +67,8 @@ public class Transfer extends Test {
String bank = Utils.getBank(rand.nextInt((Integer) state.get(numBanks)));
String acct1 = Utils.getAccount(rand.nextInt(numAccts));
String acct2 = Utils.getAccount(rand.nextInt(numAccts));
+while (acct2.equals(acct1))
+ acct2 = Utils.getAccount(rand.nextInt(numAccts));
// TODO document how data should be read when using ConditionalWriter
Scanner scanner = new IsolatedScanner(conn.createScanner(table,
Authorizations.EMPTY));
@@ -85,19 +87,23 @@ public class Transfer extends Test {
if (cf.equals(acct1))
a = a1;
- else
+ else if (cf.equals(acct2))
a = a2;
+ else
+throw new Exception(Unexpected column fam: + cf);
if (cq.equals(bal))
a.setBal(entry.getValue().toString());
- else
+ else if (cq.equals(seq))
a.setSeq(entry.getValue().toString());
+ else
+throw new Exception(Unexpected column qual: + cq);
}
int amt = rand.nextInt(50);
-log.debug(transfer req + bank + + amt + + a1 + + a2);
+log.debug(transfer req + bank + + amt + + acct1 + + a1 +
+ acct2 + + a2);
if (a1.bal = amt) {
ConditionalMutation cm = new ConditionalMutation(bank, new
Condition(acct1, seq).setValue(Utils.getSeq(a1.seq)),
[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'
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/0a0ab325 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0a0ab325 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0a0ab325 Branch: refs/heads/master Commit: 0a0ab3250ecadd29400c8a4642761a4bdcd0d3e0 Parents: 31c8b5a b0d056e Author: Eric Newton eric.new...@gmail.com Authored: Thu Nov 7 13:49:57 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:49:57 2013 -0500 -- .../core/client/impl/ConditionalWriterImpl.java | 3 ++- .../accumulo/test/randomwalk/conditional/Transfer.java | 12 +--- 2 files changed, 11 insertions(+), 4 deletions(-) --
[02/10] git commit: ACCUMULO-1829 Add timeout scaling factor to tests (1.4.x)
ACCUMULO-1829 Add timeout scaling factor to tests (1.4.x)
Slower hardware or VMs may have trouble completing tests within the timeouts
specified. This change adds a -f option to run.py to add a scaling factor
to the maxRuntime for tests, the timeout for Accumulo to shut down, and to
specific timeouts in SimpleBalancerFairness and ZooCacheTest.
Compare to a similar change for ACCUMULO-1789.
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/41efe1a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/41efe1a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/41efe1a7
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 41efe1a7e07d3abae1d82bc6d8340e78210cadc0
Parents: 62c6a22
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Oct 30 09:58:33 2013 -0400
Committer: Eric Newton eric.new...@gmail.com
Committed: Wed Nov 6 16:07:07 2013 -0500
--
test/system/auto/JavaTest.py | 1 +
test/system/auto/TestUtils.py | 3 ++-
test/system/auto/run.py | 3 +++
test/system/auto/simple/simpleBalancer.py | 2 +-
test/system/auto/simple/zooCacheTest.py | 3 ++-
5 files changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/JavaTest.py
--
diff --git a/test/system/auto/JavaTest.py b/test/system/auto/JavaTest.py
index f80848c..7c22bdb 100755
--- a/test/system/auto/JavaTest.py
+++ b/test/system/auto/JavaTest.py
@@ -41,6 +41,7 @@ class JavaTest(TestUtilsMixin, unittest.TestCase):
self.settings = TestUtilsMixin.settings.copy()
self.settings.update(eval(out))
TestUtilsMixin.setUp(self);
+self.maxRuntime = self.timeout_factor * self.maxRuntime
handle = self.runJTest(self.masterHost(),'setup')
out,err = handle.communicate()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index 4b5efdf..f953bca 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -388,7 +388,7 @@ class TestUtilsMixin:
handle = self.runOn(self.masterHost(),
[self.accumulo_sh(), 'admin', '-u', ROOT,
'-p', ROOT_PASSWORD, 'stopAll'])
-self.waitForStop(handle, seconds)
+self.waitForStop(handle, self.timeout_factor * seconds)
for host in self.hosts:
self.stop_logger(host)
self.stop_monitor(self.masterHost())
@@ -417,6 +417,7 @@ class TestUtilsMixin:
def setUp(self):
self.hosts = self.options.hosts
+self.timeout_factor = self.options.timeout_factor
self.clean_accumulo(self.masterHost())
self.setup_logging()
self.start_accumulo()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/run.py
--
diff --git a/test/system/auto/run.py b/test/system/auto/run.py
index 5a0678b..8e1a9bb 100755
--- a/test/system/auto/run.py
+++ b/test/system/auto/run.py
@@ -243,6 +243,9 @@ def main():
help='Start the test list at the given test name')
parser.add_option('-x', '--xml', dest='xmlreport', default=False,
action='store_true',
help='Output tests results to xml (jenkins conpatible)')
+parser.add_option('-f', '--timeout-factor', dest='timeout_factor',
+ default=1, type=int,
+ help=Multiplier for some timeouts (use on slower
hardware) (%default))
allTests = getTests()
options = parseArguments(parser, allTests)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/simple/simpleBalancer.py
--
diff --git a/test/system/auto/simple/simpleBalancer.py
b/test/system/auto/simple/simpleBalancer.py
index f77c9c0..00a2021 100755
--- a/test/system/auto/simple/simpleBalancer.py
+++ b/test/system/auto/simple/simpleBalancer.py
@@ -71,7 +71,7 @@ class SimpleBalancerFairness(SunnyDayTest):
self.ingester = self.ingest(self.masterHost(),
20,
size=self.options.size)
-self.waitForStop(self.ingester, 120)
+self.waitForStop(self.ingester, self.timeout_factor * 120)
self.shell(self.masterHost(), 'flush -t test_ingest')
self.waitForStop(self.verify(self.masterHost(), self.options.rows), 60)
[09/10] git commit: ACCUMULO-1829 merge 1.5 - 1.6
ACCUMULO-1829 merge 1.5 - 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0d056ee Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b0d056ee Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b0d056ee Branch: refs/heads/master Commit: b0d056eeb45ded85a63ef1a765d751318eed0263 Parents: 61a4298 1096fbb Author: Eric Newton eric.new...@gmail.com Authored: Thu Nov 7 13:49:47 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:49:47 2013 -0500 -- --
[03/10] git commit: ACCUMULO-1829 Add timeout scaling factor to tests (1.4.x)
ACCUMULO-1829 Add timeout scaling factor to tests (1.4.x)
Slower hardware or VMs may have trouble completing tests within the timeouts
specified. This change adds a -f option to run.py to add a scaling factor
to the maxRuntime for tests, the timeout for Accumulo to shut down, and to
specific timeouts in SimpleBalancerFairness and ZooCacheTest.
Compare to a similar change for ACCUMULO-1789.
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/41efe1a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/41efe1a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/41efe1a7
Branch: refs/heads/master
Commit: 41efe1a7e07d3abae1d82bc6d8340e78210cadc0
Parents: 62c6a22
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Oct 30 09:58:33 2013 -0400
Committer: Eric Newton eric.new...@gmail.com
Committed: Wed Nov 6 16:07:07 2013 -0500
--
test/system/auto/JavaTest.py | 1 +
test/system/auto/TestUtils.py | 3 ++-
test/system/auto/run.py | 3 +++
test/system/auto/simple/simpleBalancer.py | 2 +-
test/system/auto/simple/zooCacheTest.py | 3 ++-
5 files changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/JavaTest.py
--
diff --git a/test/system/auto/JavaTest.py b/test/system/auto/JavaTest.py
index f80848c..7c22bdb 100755
--- a/test/system/auto/JavaTest.py
+++ b/test/system/auto/JavaTest.py
@@ -41,6 +41,7 @@ class JavaTest(TestUtilsMixin, unittest.TestCase):
self.settings = TestUtilsMixin.settings.copy()
self.settings.update(eval(out))
TestUtilsMixin.setUp(self);
+self.maxRuntime = self.timeout_factor * self.maxRuntime
handle = self.runJTest(self.masterHost(),'setup')
out,err = handle.communicate()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index 4b5efdf..f953bca 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -388,7 +388,7 @@ class TestUtilsMixin:
handle = self.runOn(self.masterHost(),
[self.accumulo_sh(), 'admin', '-u', ROOT,
'-p', ROOT_PASSWORD, 'stopAll'])
-self.waitForStop(handle, seconds)
+self.waitForStop(handle, self.timeout_factor * seconds)
for host in self.hosts:
self.stop_logger(host)
self.stop_monitor(self.masterHost())
@@ -417,6 +417,7 @@ class TestUtilsMixin:
def setUp(self):
self.hosts = self.options.hosts
+self.timeout_factor = self.options.timeout_factor
self.clean_accumulo(self.masterHost())
self.setup_logging()
self.start_accumulo()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/run.py
--
diff --git a/test/system/auto/run.py b/test/system/auto/run.py
index 5a0678b..8e1a9bb 100755
--- a/test/system/auto/run.py
+++ b/test/system/auto/run.py
@@ -243,6 +243,9 @@ def main():
help='Start the test list at the given test name')
parser.add_option('-x', '--xml', dest='xmlreport', default=False,
action='store_true',
help='Output tests results to xml (jenkins conpatible)')
+parser.add_option('-f', '--timeout-factor', dest='timeout_factor',
+ default=1, type=int,
+ help=Multiplier for some timeouts (use on slower
hardware) (%default))
allTests = getTests()
options = parseArguments(parser, allTests)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/41efe1a7/test/system/auto/simple/simpleBalancer.py
--
diff --git a/test/system/auto/simple/simpleBalancer.py
b/test/system/auto/simple/simpleBalancer.py
index f77c9c0..00a2021 100755
--- a/test/system/auto/simple/simpleBalancer.py
+++ b/test/system/auto/simple/simpleBalancer.py
@@ -71,7 +71,7 @@ class SimpleBalancerFairness(SunnyDayTest):
self.ingester = self.ingest(self.masterHost(),
20,
size=self.options.size)
-self.waitForStop(self.ingester, 120)
+self.waitForStop(self.ingester, self.timeout_factor * 120)
self.shell(self.masterHost(), 'flush -t test_ingest')
self.waitForStop(self.verify(self.masterHost(), self.options.rows), 60)
[12/14] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 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/81861db9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81861db9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81861db9 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 81861db9ca39e6d9de37d7c05dc9304c0931e725 Parents: b0d056e 060188a Author: Eric Newton eric.new...@gmail.com Authored: Thu Nov 7 13:51:43 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:51:43 2013 -0500 -- bin/config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/81861db9/bin/config.sh --
[14/14] git commit: Merge branch '1.6.0-SNAPSHOT'
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/ddde450b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ddde450b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ddde450b Branch: refs/heads/master Commit: ddde450b9b065fdf34bf0f1c775eeac409e1015a Parents: 0a0ab32 81861db Author: Eric Newton eric.new...@gmail.com Authored: Thu Nov 7 13:51:53 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:51:53 2013 -0500 -- bin/config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[10/14] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/060188a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/060188a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/060188a7
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 060188a746311852c0c2544b0a3b5ba1bd868f99
Parents: 1096fbb 579c274
Author: Eric Newton eric.new...@gmail.com
Authored: Thu Nov 7 13:51:29 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Thu Nov 7 13:51:29 2013 -0500
--
bin/config.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/060188a7/bin/config.sh
--
diff --cc bin/config.sh
index 6c4d74a,2d9e6fe..5f560e3
--- a/bin/config.sh
+++ b/bin/config.sh
@@@ -22,27 -22,31 +22,28 @@@
# ACCUMULO_HOME Home directory for Accumulo
# ACCUMULO_LOG_DIR Directory for Accumulo daemon logs
# ACCUMULO_VERSION Accumulo version name
-# HADOOP_HOMEHome dir for hadoop.
+# HADOOP_PREFIX Prefix to the home dir for hadoop.
#
# Values always set by script.
- # GC Machine to rn GC daemon on. Used by start-here.sh
script
+ # MALLOC_ARENA_MAX To work around a memory management bug (see
ACCUMULO-847)
+ # GC Machine to run GC daemon on. Used by start-here.sh
script
# MONITORMachine to run monitor daemon on. Used by start-here.sh
script
# SSHDefault ssh parameters used to start daemons
+# HADOOP_HOMEHome dir for hadoop. TODO fix this.
-this=$0
-while [ -h $this ]; do
-ls=`ls -ld $this`
-link=`expr $ls : '.*- \(.*\)$'`
-if expr $link : '.*/.*' /dev/null; then
-this=$link
-else
-this=`dirname $this`/$link
-fi
+# Start: Resolve Script Directory
+SOURCE=${BASH_SOURCE[0]}
+while [ -h $SOURCE ]; do # resolve $SOURCE until the file is no longer a
symlink
+ bin=$( cd -P $( dirname $SOURCE ) pwd )
+ SOURCE=$(readlink $SOURCE)
+ [[ $SOURCE != /* ]] SOURCE=$bin/$SOURCE # if $SOURCE was a relative
symlink, we need to resolve it relative to the path where the symlink file was
located
done
-bin=`dirname $this`
-script=`basename $this`
-bin=`cd $bin; pwd`
-this=$bin/$script
+bin=$( cd -P $( dirname $SOURCE ) pwd )
+script=$( basename $SOURCE )
+# Stop: Resolve Script Directory
-ACCUMULO_HOME=`dirname $this`/..
-export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
+ACCUMULO_HOME=$( cd -P ${bin}/.. pwd )
+export ACCUMULO_HOME
ACCUMULO_CONF_DIR=${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}
export ACCUMULO_CONF_DIR
[06/14] git commit: ACCUMULO-1810 fix typo in comment
ACCUMULO-1810 fix typo in comment Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/579c274c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/579c274c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/579c274c Branch: refs/heads/1.4.5-SNAPSHOT Commit: 579c274c2ef04ba19dc085787bf21c4564c0eff9 Parents: 0657a3a Author: Eric Newton eric.new...@gmail.com Authored: Thu Nov 7 13:51:10 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:51:10 2013 -0500 -- bin/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/579c274c/bin/config.sh -- diff --git a/bin/config.sh b/bin/config.sh index 162c2d5..2d9e6fe 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -26,7 +26,7 @@ # # Values always set by script. # MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) -# GC Machine to rn GC daemon on. Used by start-here.sh script +# GC Machine to run GC daemon on. Used by start-here.sh script # MONITORMachine to run monitor daemon on. Used by start-here.sh script # SSHDefault ssh parameters used to start daemons
[05/14] git commit: ACCUMULO-1810 fix typo in comment
ACCUMULO-1810 fix typo in comment Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/579c274c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/579c274c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/579c274c Branch: refs/heads/master Commit: 579c274c2ef04ba19dc085787bf21c4564c0eff9 Parents: 0657a3a Author: Eric Newton eric.new...@gmail.com Authored: Thu Nov 7 13:51:10 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:51:10 2013 -0500 -- bin/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/579c274c/bin/config.sh -- diff --git a/bin/config.sh b/bin/config.sh index 162c2d5..2d9e6fe 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -26,7 +26,7 @@ # # Values always set by script. # MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) -# GC Machine to rn GC daemon on. Used by start-here.sh script +# GC Machine to run GC daemon on. Used by start-here.sh script # MONITORMachine to run monitor daemon on. Used by start-here.sh script # SSHDefault ssh parameters used to start daemons
[01/14] git commit: ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.
Updated Branches: refs/heads/1.4.5-SNAPSHOT 41efe1a7e - 579c274c2 refs/heads/1.5.1-SNAPSHOT 1096fbb9a - 060188a74 refs/heads/1.6.0-SNAPSHOT b0d056eeb - 81861db9c refs/heads/master 0a0ab3250 - ddde450b9 ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0657a3aa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0657a3aa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0657a3aa Branch: refs/heads/1.4.5-SNAPSHOT Commit: 0657a3aaa054d001fcafceea98a9c22d06145cb0 Parents: 41efe1a Author: Sean Busbey bus...@clouderagovt.com Authored: Wed Oct 23 16:46:14 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:50:45 2013 -0500 -- bin/config.sh | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0657a3aa/bin/config.sh -- diff --git a/bin/config.sh b/bin/config.sh index 9277406..162c2d5 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -25,6 +25,7 @@ # HADOOP_HOMEHome dir for hadoop. # # Values always set by script. +# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) # GC Machine to rn GC daemon on. Used by start-here.sh script # MONITORMachine to run monitor daemon on. Used by start-here.sh script # SSHDefault ssh parameters used to start daemons
[02/14] git commit: ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.
ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0657a3aa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0657a3aa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0657a3aa Branch: refs/heads/master Commit: 0657a3aaa054d001fcafceea98a9c22d06145cb0 Parents: 41efe1a Author: Sean Busbey bus...@clouderagovt.com Authored: Wed Oct 23 16:46:14 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:50:45 2013 -0500 -- bin/config.sh | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0657a3aa/bin/config.sh -- diff --git a/bin/config.sh b/bin/config.sh index 9277406..162c2d5 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -25,6 +25,7 @@ # HADOOP_HOMEHome dir for hadoop. # # Values always set by script. +# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) # GC Machine to rn GC daemon on. Used by start-here.sh script # MONITORMachine to run monitor daemon on. Used by start-here.sh script # SSHDefault ssh parameters used to start daemons
[13/14] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 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/81861db9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81861db9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81861db9 Branch: refs/heads/master Commit: 81861db9ca39e6d9de37d7c05dc9304c0931e725 Parents: b0d056e 060188a Author: Eric Newton eric.new...@gmail.com Authored: Thu Nov 7 13:51:43 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:51:43 2013 -0500 -- bin/config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/81861db9/bin/config.sh --
[03/14] git commit: ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.
ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0657a3aa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0657a3aa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0657a3aa Branch: refs/heads/1.5.1-SNAPSHOT Commit: 0657a3aaa054d001fcafceea98a9c22d06145cb0 Parents: 41efe1a Author: Sean Busbey bus...@clouderagovt.com Authored: Wed Oct 23 16:46:14 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:50:45 2013 -0500 -- bin/config.sh | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0657a3aa/bin/config.sh -- diff --git a/bin/config.sh b/bin/config.sh index 9277406..162c2d5 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -25,6 +25,7 @@ # HADOOP_HOMEHome dir for hadoop. # # Values always set by script. +# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) # GC Machine to rn GC daemon on. Used by start-here.sh script # MONITORMachine to run monitor daemon on. Used by start-here.sh script # SSHDefault ssh parameters used to start daemons
[04/14] git commit: ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.
ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0657a3aa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0657a3aa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0657a3aa Branch: refs/heads/1.6.0-SNAPSHOT Commit: 0657a3aaa054d001fcafceea98a9c22d06145cb0 Parents: 41efe1a Author: Sean Busbey bus...@clouderagovt.com Authored: Wed Oct 23 16:46:14 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:50:45 2013 -0500 -- bin/config.sh | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0657a3aa/bin/config.sh -- diff --git a/bin/config.sh b/bin/config.sh index 9277406..162c2d5 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -25,6 +25,7 @@ # HADOOP_HOMEHome dir for hadoop. # # Values always set by script. +# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) # GC Machine to rn GC daemon on. Used by start-here.sh script # MONITORMachine to run monitor daemon on. Used by start-here.sh script # SSHDefault ssh parameters used to start daemons
[07/14] git commit: ACCUMULO-1810 fix typo in comment
ACCUMULO-1810 fix typo in comment Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/579c274c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/579c274c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/579c274c Branch: refs/heads/1.5.1-SNAPSHOT Commit: 579c274c2ef04ba19dc085787bf21c4564c0eff9 Parents: 0657a3a Author: Eric Newton eric.new...@gmail.com Authored: Thu Nov 7 13:51:10 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Thu Nov 7 13:51:10 2013 -0500 -- bin/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/579c274c/bin/config.sh -- diff --git a/bin/config.sh b/bin/config.sh index 162c2d5..2d9e6fe 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -26,7 +26,7 @@ # # Values always set by script. # MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) -# GC Machine to rn GC daemon on. Used by start-here.sh script +# GC Machine to run GC daemon on. Used by start-here.sh script # MONITORMachine to run monitor daemon on. Used by start-here.sh script # SSHDefault ssh parameters used to start daemons
[11/14] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/060188a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/060188a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/060188a7
Branch: refs/heads/master
Commit: 060188a746311852c0c2544b0a3b5ba1bd868f99
Parents: 1096fbb 579c274
Author: Eric Newton eric.new...@gmail.com
Authored: Thu Nov 7 13:51:29 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Thu Nov 7 13:51:29 2013 -0500
--
bin/config.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/060188a7/bin/config.sh
--
diff --cc bin/config.sh
index 6c4d74a,2d9e6fe..5f560e3
--- a/bin/config.sh
+++ b/bin/config.sh
@@@ -22,27 -22,31 +22,28 @@@
# ACCUMULO_HOME Home directory for Accumulo
# ACCUMULO_LOG_DIR Directory for Accumulo daemon logs
# ACCUMULO_VERSION Accumulo version name
-# HADOOP_HOMEHome dir for hadoop.
+# HADOOP_PREFIX Prefix to the home dir for hadoop.
#
# Values always set by script.
- # GC Machine to rn GC daemon on. Used by start-here.sh
script
+ # MALLOC_ARENA_MAX To work around a memory management bug (see
ACCUMULO-847)
+ # GC Machine to run GC daemon on. Used by start-here.sh
script
# MONITORMachine to run monitor daemon on. Used by start-here.sh
script
# SSHDefault ssh parameters used to start daemons
+# HADOOP_HOMEHome dir for hadoop. TODO fix this.
-this=$0
-while [ -h $this ]; do
-ls=`ls -ld $this`
-link=`expr $ls : '.*- \(.*\)$'`
-if expr $link : '.*/.*' /dev/null; then
-this=$link
-else
-this=`dirname $this`/$link
-fi
+# Start: Resolve Script Directory
+SOURCE=${BASH_SOURCE[0]}
+while [ -h $SOURCE ]; do # resolve $SOURCE until the file is no longer a
symlink
+ bin=$( cd -P $( dirname $SOURCE ) pwd )
+ SOURCE=$(readlink $SOURCE)
+ [[ $SOURCE != /* ]] SOURCE=$bin/$SOURCE # if $SOURCE was a relative
symlink, we need to resolve it relative to the path where the symlink file was
located
done
-bin=`dirname $this`
-script=`basename $this`
-bin=`cd $bin; pwd`
-this=$bin/$script
+bin=$( cd -P $( dirname $SOURCE ) pwd )
+script=$( basename $SOURCE )
+# Stop: Resolve Script Directory
-ACCUMULO_HOME=`dirname $this`/..
-export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
+ACCUMULO_HOME=$( cd -P ${bin}/.. pwd )
+export ACCUMULO_HOME
ACCUMULO_CONF_DIR=${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}
export ACCUMULO_CONF_DIR
git commit: ACCUMULO-1862 implement the desired truncate
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 81861db9c - b005a2411
ACCUMULO-1862 implement the desired truncate
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b005a241
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b005a241
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b005a241
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b005a24112affb011d15168963a76dac6434f491
Parents: 81861db
Author: Eric Newton eric.new...@gmail.com
Authored: Thu Nov 7 17:28:50 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Thu Nov 7 17:29:08 2013 -0500
--
.../accumulo/server/security/AuditedSecurityOperation.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b005a241/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
index ee337a5..7148556 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
@@ -130,7 +130,7 @@ public class AuditedSecurityOperation extends
SecurityOperation {
ListString result = new ArrayListString();
int i = 0;
for (Object obj : list) {
- if (i MAX_ELEMENTS_TO_LOG) {
+ if (i++ MAX_ELEMENTS_TO_LOG) {
result.add( and + (list.size() - MAX_ELEMENTS_TO_LOG) + more );
break;
}
@@ -179,11 +179,11 @@ public class AuditedSecurityOperation extends
SecurityOperation {
try {
boolean canScan = super.canScan(credentials, tableId);
-audit(credentials, canScan, CAN_SCAN_BATCH_AUDIT_TEMPLATE, tableName,
getAuthString(authorizations), convertedBatch, convertedColumns, ssiList, ssio);
+audit(credentials, canScan, CAN_SCAN_BATCH_AUDIT_TEMPLATE, tableName,
getAuthString(authorizations), truncated, convertedColumns, ssiList, ssio);
return canScan;
} catch (ThriftSecurityException ex) {
-audit(credentials, ex, CAN_SCAN_BATCH_AUDIT_TEMPLATE,
getAuthString(authorizations), tableId, convertedBatch, convertedColumns,
ssiList, ssio);
+audit(credentials, ex, CAN_SCAN_BATCH_AUDIT_TEMPLATE,
getAuthString(authorizations), tableId, truncated, convertedColumns, ssiList,
ssio);
throw ex;
}
} else {
git commit: ACCUMULO-1761 Remove warning introduced in prior commit
Updated Branches:
refs/heads/1.6.0-SNAPSHOT b005a2411 - c68a23167
ACCUMULO-1761 Remove warning introduced in prior commit
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c68a2316
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c68a2316
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c68a2316
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: c68a23167738f6de5cd1d929e617a7ee079d415e
Parents: b005a24
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Nov 7 17:38:46 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Nov 7 17:38:46 2013 -0500
--
.../accumulo/server/util/TableDiskUsage.java| 110 +--
1 file changed, 55 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c68a2316/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
index 6b80ccb..cb932d7 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
@@ -44,7 +44,6 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Da
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.NumUtil;
import org.apache.accumulo.core.util.StringUtil;
-import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
@@ -56,27 +55,27 @@ import org.apache.log4j.Logger;
import com.beust.jcommander.Parameter;
public class TableDiskUsage {
-
+
private static final Logger log = Logger.getLogger(Logger.class);
private int nextInternalId = 0;
private MapString,Integer internalIds = new HashMapString,Integer();
private MapInteger,String externalIds = new HashMapInteger,String();
private MapString,Integer[] tableFiles = new HashMapString,Integer[]();
private MapString,Long fileSizes = new HashMapString,Long();
-
+
void addTable(String tableId) {
if (internalIds.containsKey(tableId))
throw new IllegalArgumentException(Already added table + tableId);
-
+
int iid = nextInternalId++;
-
+
internalIds.put(tableId, iid);
externalIds.put(iid, tableId);
}
-
+
void linkFileAndTable(String tableId, String file) {
int internalId = internalIds.get(tableId);
-
+
Integer[] tables = tableFiles.get(file);
if (tables == null) {
tables = new Integer[internalIds.size()];
@@ -84,52 +83,52 @@ public class TableDiskUsage {
tables[i] = 0;
tableFiles.put(file, tables);
}
-
+
tables[internalId] = 1;
}
-
+
void addFileSize(String file, long size) {
fileSizes.put(file, size);
}
-
+
MapListString,Long calculateUsage() {
-
+
MapListInteger,Long usage = new HashMapListInteger,Long();
-
+
for (EntryString,Integer[] entry : tableFiles.entrySet()) {
log.info(fileSizes + fileSizes + key +
Arrays.asList(entry.getKey()));
ListInteger key = Arrays.asList(entry.getValue());
Long size = fileSizes.get(entry.getKey());
-
+
Long tablesUsage = usage.get(key);
if (tablesUsage == null)
tablesUsage = 0l;
-
+
tablesUsage += size;
-
+
usage.put(key, tablesUsage);
-
+
}
-
+
MapListString,Long externalUsage = new HashMapListString,Long();
-
+
for (EntryListInteger,Long entry : usage.entrySet()) {
ListString externalKey = new ArrayListString();
ListInteger key = entry.getKey();
for (int i = 0; i key.size(); i++)
if (key.get(i) != 0)
externalKey.add(externalIds.get(i));
-
+
externalUsage.put(externalKey, entry.getValue());
}
-
+
return externalUsage;
}
-
+
public interface Printer {
void print(String line);
}
-
+
public static void printDiskUsage(AccumuloConfiguration acuConf,
CollectionString tables, VolumeManager fs, Connector conn, boolean
humanReadable)
throws TableNotFoundException, IOException {
printDiskUsage(acuConf, tables, fs, conn, new Printer() {
@@ -139,17 +138,18 @@ public class TableDiskUsage {
}
}, humanReadable);
}
-
- public static MapTreeSetString,Long getDiskUsage(AccumuloConfiguration
acuConf, SetString tableIds, VolumeManager fs, Connector conn) throws
IOException {
+
+ public static
git commit: ACCUMULO-1614 fixed bug in conditional writer random walk config.
Updated Branches: refs/heads/1.6.0-SNAPSHOT c68a23167 - 65c75f3b1 ACCUMULO-1614 fixed bug in conditional writer random walk config. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65c75f3b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/65c75f3b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/65c75f3b Branch: refs/heads/1.6.0-SNAPSHOT Commit: 65c75f3b10fcf343bb3c849de239852d9944893f Parents: c68a231 Author: Keith Turner ktur...@apache.org Authored: Thu Nov 7 19:42:32 2013 -0500 Committer: Keith Turner ktur...@apache.org Committed: Thu Nov 7 19:42:52 2013 -0500 -- test/system/randomwalk/conf/modules/Conditional.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/65c75f3b/test/system/randomwalk/conf/modules/Conditional.xml -- diff --git a/test/system/randomwalk/conf/modules/Conditional.xml b/test/system/randomwalk/conf/modules/Conditional.xml index 42d6326..d33d36c 100644 --- a/test/system/randomwalk/conf/modules/Conditional.xml +++ b/test/system/randomwalk/conf/modules/Conditional.xml @@ -32,12 +32,12 @@ /node node id=ct.Setup + property key=numAccts value=1000/ + property key=numBanks value=10/ edge id=ct.Init weight=1/ /node node id=ct.Init - property key=numAccts value=10/ - property key=numBanks value=1000/ edge id=dummy.ToAll weight=1/ /node
[2/2] git commit: ACCUMULO-1833 Tests for expected functionality in the face of table operations.
ACCUMULO-1833 Tests for expected functionality in the face of table
operations.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3b6eade6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3b6eade6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3b6eade6
Branch: refs/heads/ACCUMULO-1833-caching
Commit: 3b6eade61e12fd35af293633c1c3cc5393252d86
Parents: cba8798
Author: Josh Elser josh.el...@gmail.com
Authored: Thu Nov 7 20:37:28 2013 -0500
Committer: Josh Elser josh.el...@gmail.com
Committed: Thu Nov 7 20:37:28 2013 -0500
--
.../client/impl/MultiTableBatchWriterImpl.java | 1 -
.../test/MultiTableBatchWriterTest.java | 401 +++
2 files changed, 401 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3b6eade6/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index 06b6f75..35f7c2f 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@ -158,7 +158,6 @@ public class MultiTableBatchWriterImpl implements
MultiTableBatchWriter {
}
if (cause instanceof TableNotFoundException) {
-
throw (TableNotFoundException) cause;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3b6eade6/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
new file mode 100644
index 000..836faa4
--- /dev/null
+++ b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
@@ -0,0 +1,401 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.BatchWriterConfig;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.TableOfflineException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.admin.TableOperations;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.MiniAccumuloConfig;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+
+public class MultiTableBatchWriterTest {
+ public static TemporaryFolder folder = new TemporaryFolder();
+ public static MiniAccumuloCluster cluster;
+ private static final String password = secret;
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+folder.create();
+MiniAccumuloConfig cfg = new
[3/3] git commit: ACCUMULO-1833 Ensure that we close the MTBW at the end of the test to avoid it getting GC'ed later and trying to flush when ZK and the instance is already gone.
ACCUMULO-1833 Ensure that we close the MTBW at the end of the test to
avoid it getting GC'ed later and trying to flush when ZK and the
instance is already gone.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0be6f0a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0be6f0a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0be6f0a7
Branch: refs/heads/ACCUMULO-1833-caching
Commit: 0be6f0a79ef404839ab64d60f16991c6031a93a3
Parents: fe8a33e
Author: Josh Elser josh.el...@gmail.com
Authored: Thu Nov 7 22:22:19 2013 -0500
Committer: Josh Elser josh.el...@gmail.com
Committed: Thu Nov 7 22:22:19 2013 -0500
--
.../test/MultiTableBatchWriterTest.java | 415 +++
1 file changed, 231 insertions(+), 184 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0be6f0a7/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
index 836faa4..2cb78ed 100644
--- a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
@@ -77,49 +77,55 @@ public class MultiTableBatchWriterTest {
MultiTableBatchWriter mtbw = connector.createMultiTableBatchWriter(config,
60, TimeUnit.SECONDS);
-final String table1 = testTableRenameSameWriters_table1, table2 =
testTableRenameSameWriters_table2;
-final String newTable1 = testTableRenameSameWriters_newTable1, newTable2
= testTableRenameSameWriters_newTable2;
-
-TableOperations tops = connector.tableOperations();
-tops.create(table1);
-tops.create(table2);
+try {
+ final String table1 = testTableRenameSameWriters_table1, table2 =
testTableRenameSameWriters_table2;
+ final String newTable1 = testTableRenameSameWriters_newTable1,
newTable2 = testTableRenameSameWriters_newTable2;
-BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 =
mtbw.getBatchWriter(table2);
+ TableOperations tops = connector.tableOperations();
+ tops.create(table1);
+ tops.create(table2);
-Mutation m1 = new Mutation(foo);
-m1.put(col1, , val1);
-m1.put(col2, , val2);
+ BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 =
mtbw.getBatchWriter(table2);
-bw1.addMutation(m1);
-bw2.addMutation(m1);
+ Mutation m1 = new Mutation(foo);
+ m1.put(col1, , val1);
+ m1.put(col2, , val2);
-tops.rename(table1, newTable1);
-tops.rename(table2, newTable2);
+ bw1.addMutation(m1);
+ bw2.addMutation(m1);
-Mutation m2 = new Mutation(bar);
-m2.put(col1, , val1);
-m2.put(col2, , val2);
+ tops.rename(table1, newTable1);
+ tops.rename(table2, newTable2);
-bw1.addMutation(m2);
-bw2.addMutation(m2);
+ Mutation m2 = new Mutation(bar);
+ m2.put(col1, , val1);
+ m2.put(col2, , val2);
-mtbw.close();
+ bw1.addMutation(m2);
+ bw2.addMutation(m2);
-MapEntryString,String,String expectations = new
HashMapEntryString,String,String();
-expectations.put(Maps.immutableEntry(foo, col1), val1);
-expectations.put(Maps.immutableEntry(foo, col2), val2);
-expectations.put(Maps.immutableEntry(bar, col1), val1);
-expectations.put(Maps.immutableEntry(bar, col2), val2);
+ mtbw.close();
-for (String table : Arrays.asList(newTable1, newTable2)) {
- Scanner s = connector.createScanner(table, new Authorizations());
- s.setRange(new Range());
- MapEntryString,String,String actual = new
HashMapEntryString,String,String();
- for (EntryKey,Value entry : s) {
-actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(),
entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
+ MapEntryString,String,String expectations = new
HashMapEntryString,String,String();
+ expectations.put(Maps.immutableEntry(foo, col1), val1);
+ expectations.put(Maps.immutableEntry(foo, col2), val2);
+ expectations.put(Maps.immutableEntry(bar, col1), val1);
+ expectations.put(Maps.immutableEntry(bar, col2), val2);
+
+ for (String table : Arrays.asList(newTable1, newTable2)) {
+Scanner s = connector.createScanner(table, new Authorizations());
+s.setRange(new Range());
+MapEntryString,String,String actual = new
HashMapEntryString,String,String();
+for (EntryKey,Value entry : s) {
+ actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(),
entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
+}
+
+
[2/3] git commit: ACCUMULO-1833 Update MTBW close method to match what TSBW is doing (update internal boolean then perform the close)
ACCUMULO-1833 Update MTBW close method to match what TSBW is doing
(update internal boolean then perform the close)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fe8a33e4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fe8a33e4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fe8a33e4
Branch: refs/heads/ACCUMULO-1833-caching
Commit: fe8a33e4e3c39457ea54b2728738c275c15392da
Parents: a5c83d6
Author: Josh Elser josh.el...@gmail.com
Authored: Thu Nov 7 22:21:29 2013 -0500
Committer: Josh Elser josh.el...@gmail.com
Committed: Thu Nov 7 22:21:29 2013 -0500
--
.../accumulo/core/client/impl/MultiTableBatchWriterImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fe8a33e4/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index ee11277..d292379 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@ -123,8 +123,8 @@ public class MultiTableBatchWriterImpl implements
MultiTableBatchWriter {
}
public void close() throws MutationsRejectedException {
-bw.close();
this.closed.set(true);
+bw.close();
}
/**
