git commit: ACCUMULO-1853 updated poms with current dependencies
Updated Branches: refs/heads/1.6.0-SNAPSHOT 65c75f3b1 - 1aefb5359 ACCUMULO-1853 updated poms with current dependencies Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1aefb535 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1aefb535 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1aefb535 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 1aefb5359fe69a0d9c0d4c6ecb33fb3540b64b3a Parents: 65c75f3 Author: Billie Rinaldi billie.rina...@gmail.com Authored: Fri Nov 8 07:39:19 2013 -0800 Committer: Billie Rinaldi billie.rina...@gmail.com Committed: Fri Nov 8 07:39:19 2013 -0800 -- core/pom.xml| 14 ++--- examples/simple/pom.xml | 18 +++ maven-plugin/pom.xml| 58 - maven-plugin/src/it/plugin-test/pom.xml | 5 ++ minicluster/pom.xml | 34 ++-- pom.xml | 15 ++ proxy/pom.xml | 14 ++--- server/base/pom.xml | 22 +--- server/extras/pom.xml | 30 +-- server/gc/pom.xml | 39 ++ server/master/pom.xml | 44 server/monitor/pom.xml | 57 server/tracer/pom.xml | 36 +++-- server/tserver/pom.xml | 78 start/pom.xml | 10 test/pom.xml| 46 +++- trace/pom.xml | 5 -- 17 files changed, 363 insertions(+), 162 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 8b4706b..0f155be 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -74,8 +74,8 @@ scopeprovided/scope /dependency dependency - groupIdcommons-httpclient/groupId - artifactIdcommons-httpclient/artifactId + groupIdcommons-configuration/groupId + artifactIdcommons-configuration/artifactId scopeprovided/scope /dependency dependency @@ -114,11 +114,6 @@ scopeprovided/scope /dependency dependency - groupIdorg.slf4j/groupId - artifactIdslf4j-log4j12/artifactId - scopeprovided/scope -/dependency -dependency groupIdjunit/groupId artifactIdjunit/artifactId scopetest/scope @@ -135,6 +130,11 @@ /dependency dependency groupIdorg.powermock/groupId + artifactIdpowermock-core/artifactId + scopetest/scope +/dependency +dependency + groupIdorg.powermock/groupId artifactIdpowermock-module-junit4/artifactId scopetest/scope /dependency http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/examples/simple/pom.xml -- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index de60f8d..e3a01a1 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -36,8 +36,12 @@ artifactIdaccumulo-core/artifactId /dependency dependency - groupIdorg.apache.zookeeper/groupId - artifactIdzookeeper/artifactId + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-fate/artifactId +/dependency +dependency + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-trace/artifactId /dependency dependency groupIdcommons-cli/groupId @@ -50,16 +54,6 @@ scopeprovided/scope /dependency dependency - groupIdcommons-httpclient/groupId - artifactIdcommons-httpclient/artifactId - scopeprovided/scope -/dependency -dependency - groupIdcommons-io/groupId - artifactIdcommons-io/artifactId - scopeprovided/scope -/dependency -dependency groupIdlog4j/groupId artifactIdlog4j/artifactId scopeprovided/scope http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/maven-plugin/pom.xml -- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index f334795..a2d52f9 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,52 +28,24 @@ descriptionAn Apache Maven plugin for testing software against a test Apache Accumulo instance./description dependencies dependency - groupIdcommons-cli/groupId - artifactIdcommons-cli/artifactId -/dependency -dependency - groupIdcommons-codec/groupId - artifactIdcommons-codec/artifactId -/dependency -dependency - groupIdcommons-collections/groupId -
git commit: ACCUMULO-1658 System integration tests should default ACCUMULO_CONF_DIR to ACCUMULO_HOME/conf
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 579c274c2 - 6648056ca
ACCUMULO-1658 System integration tests should default ACCUMULO_CONF_DIR to
ACCUMULO_HOME/conf
Signed-off-by: John Vines jvi...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6648056c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6648056c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6648056c
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 6648056cac0a3d271744ab322e8fede221c1f792
Parents: 579c274
Author: ofishel ryan.fis...@cloudera.com
Authored: Wed Oct 30 08:57:32 2013 -0700
Committer: John Vines jvi...@gmail.com
Committed: Fri Nov 8 10:49:42 2013 -0500
--
test/system/auto/TestUtils.py | 20 +---
test/system/continuous/agitator.pl | 6 ++
.../system/continuous/continuous-env.sh.example | 1 +
test/system/continuous/magitator.pl | 7 ++-
test/system/continuous/mapred-setup.sh | 4
test/system/continuous/start-stats.sh | 4
test/system/randomwalk/bin/reset-cluster.sh | 4
test/system/randomwalk/bin/start-all.sh | 4
test/system/randomwalk/bin/start-local.sh | 4
test/system/scalability/run.py | 3 +++
10 files changed, 49 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index f953bca..c10c090 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -42,12 +42,18 @@ ACCUMULO_HOME = os.path.dirname(__file__)
ACCUMULO_HOME = os.path.join(ACCUMULO_HOME, *(os.path.pardir,)*3)
ACCUMULO_HOME = os.path.realpath(ACCUMULO_HOME)
ACCUMULO_DIR = /user/ + os.getenv('LOGNAME') + /accumulo- + ID
+if os.getenv('ACCUMULO_CONF_DIR'):
+ ACCUMULO_CONF_DIR = os.getenv('ACCUMULO_CONF_DIR')
+else:
+ ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
SITE = test- + ID
WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
-LOG_PROPERTIES= os.path.join(ACCUMULO_HOME, 'conf', 'log4j.properties')
-LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
-LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
+
+LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
+LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
+LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'conf', 'monitor_logger.xml')
+
General_CLASSPATH =
($ACCUMULO_CONF_DIR,$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
$ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar)
@@ -58,7 +64,8 @@ ROOT_PASSWORD = 'secret'
INSTANCE_NAME=ID
ZOOKEEPERS = socket.getfqdn()
-accumulo_site = os.path.join(ACCUMULO_HOME, 'conf', 'accumulo-site.xml')
+accumulo_site = os.path.join(ACCUMULO_CONF_DIR, 'accumulo-site.xml')
+
if os.path.exists(accumulo_site):
import config
ZOOKEEPERS = config.parse(accumulo_site).get('instance.zookeeper.host',
ZOOKEEPERS)
@@ -238,9 +245,8 @@ class TestUtilsMixin:
self.pkill(host, 'org.apache.accumulo.start', signal)
def create_config_file(self, settings):
-fp = open(os.path.join(ACCUMULO_HOME, 'conf', SITE),
- 'w')
-fp.write('configuration\n')
+fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp.write('configuration\n')
settings = self.settings.copy()
settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
'instance.dfs.dir': ACCUMULO_DIR,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/continuous/agitator.pl
--
diff --git a/test/system/continuous/agitator.pl
b/test/system/continuous/agitator.pl
index c074665..e838bc6 100755
--- a/test/system/continuous/agitator.pl
+++ b/test/system/continuous/agitator.pl
@@ -25,6 +25,12 @@ if(scalar(@ARGV) != 4 scalar(@ARGV) != 2){
$ACCUMULO_HOME=../../..;
+if(defined $ENV{'ACCUMULO_CONF_DIR'}){
+$ACCUMULO_CONF_DIR = $ENV{'ACCUMULO_CONF_DIR'};
+}else{
+ $ACCUMULO_CONF_DIR = $ACCUMULO_HOME . '/conf';
+}
+
$sleep1 = $ARGV[0];
$sleep2 = $ARGV[1];
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/continuous/continuous-env.sh.example
--
diff --git a/test/system/continuous/continuous-env.sh.example
b/test/system/continuous/continuous-env.sh.example
index 76f2632..830ae86 100644
---
[1/2] git commit: ACCUMULO-1658 System integration tests should default ACCUMULO_CONF_DIR to ACCUMULO_HOME/conf
Updated Branches:
refs/heads/1.5.1-SNAPSHOT 060188a74 - 4227c
ACCUMULO-1658 System integration tests should default ACCUMULO_CONF_DIR to
ACCUMULO_HOME/conf
Signed-off-by: John Vines jvi...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6648056c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6648056c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6648056c
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 6648056cac0a3d271744ab322e8fede221c1f792
Parents: 579c274
Author: ofishel ryan.fis...@cloudera.com
Authored: Wed Oct 30 08:57:32 2013 -0700
Committer: John Vines jvi...@gmail.com
Committed: Fri Nov 8 10:49:42 2013 -0500
--
test/system/auto/TestUtils.py | 20 +---
test/system/continuous/agitator.pl | 6 ++
.../system/continuous/continuous-env.sh.example | 1 +
test/system/continuous/magitator.pl | 7 ++-
test/system/continuous/mapred-setup.sh | 4
test/system/continuous/start-stats.sh | 4
test/system/randomwalk/bin/reset-cluster.sh | 4
test/system/randomwalk/bin/start-all.sh | 4
test/system/randomwalk/bin/start-local.sh | 4
test/system/scalability/run.py | 3 +++
10 files changed, 49 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index f953bca..c10c090 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -42,12 +42,18 @@ ACCUMULO_HOME = os.path.dirname(__file__)
ACCUMULO_HOME = os.path.join(ACCUMULO_HOME, *(os.path.pardir,)*3)
ACCUMULO_HOME = os.path.realpath(ACCUMULO_HOME)
ACCUMULO_DIR = /user/ + os.getenv('LOGNAME') + /accumulo- + ID
+if os.getenv('ACCUMULO_CONF_DIR'):
+ ACCUMULO_CONF_DIR = os.getenv('ACCUMULO_CONF_DIR')
+else:
+ ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
SITE = test- + ID
WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
-LOG_PROPERTIES= os.path.join(ACCUMULO_HOME, 'conf', 'log4j.properties')
-LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
-LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
+
+LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
+LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
+LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'conf', 'monitor_logger.xml')
+
General_CLASSPATH =
($ACCUMULO_CONF_DIR,$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
$ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar)
@@ -58,7 +64,8 @@ ROOT_PASSWORD = 'secret'
INSTANCE_NAME=ID
ZOOKEEPERS = socket.getfqdn()
-accumulo_site = os.path.join(ACCUMULO_HOME, 'conf', 'accumulo-site.xml')
+accumulo_site = os.path.join(ACCUMULO_CONF_DIR, 'accumulo-site.xml')
+
if os.path.exists(accumulo_site):
import config
ZOOKEEPERS = config.parse(accumulo_site).get('instance.zookeeper.host',
ZOOKEEPERS)
@@ -238,9 +245,8 @@ class TestUtilsMixin:
self.pkill(host, 'org.apache.accumulo.start', signal)
def create_config_file(self, settings):
-fp = open(os.path.join(ACCUMULO_HOME, 'conf', SITE),
- 'w')
-fp.write('configuration\n')
+fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp.write('configuration\n')
settings = self.settings.copy()
settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
'instance.dfs.dir': ACCUMULO_DIR,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/continuous/agitator.pl
--
diff --git a/test/system/continuous/agitator.pl
b/test/system/continuous/agitator.pl
index c074665..e838bc6 100755
--- a/test/system/continuous/agitator.pl
+++ b/test/system/continuous/agitator.pl
@@ -25,6 +25,12 @@ if(scalar(@ARGV) != 4 scalar(@ARGV) != 2){
$ACCUMULO_HOME=../../..;
+if(defined $ENV{'ACCUMULO_CONF_DIR'}){
+$ACCUMULO_CONF_DIR = $ENV{'ACCUMULO_CONF_DIR'};
+}else{
+ $ACCUMULO_CONF_DIR = $ACCUMULO_HOME . '/conf';
+}
+
$sleep1 = $ARGV[0];
$sleep2 = $ARGV[1];
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/continuous/continuous-env.sh.example
--
diff --git a/test/system/continuous/continuous-env.sh.example
b/test/system/continuous/continuous-env.sh.example
index 76f2632..830ae86 100644
---
[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/system/auto/TestUtils.py
test/system/continuous/agitator.pl
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4227
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4227
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4227
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 4227c35de07c280d496e489fbab541edeea3
Parents: 060188a 6648056
Author: John Vines jvi...@gmail.com
Authored: Fri Nov 8 10:53:24 2013 -0500
Committer: John Vines jvi...@gmail.com
Committed: Fri Nov 8 10:53:24 2013 -0500
--
test/system/auto/TestUtils.py | 20 +---
test/system/continuous/agitator.pl | 6 ++
.../system/continuous/continuous-env.sh.example | 1 +
test/system/continuous/magitator.pl | 7 ++-
test/system/continuous/mapred-setup.sh | 4
test/system/continuous/start-stats.sh | 4
test/system/randomwalk/bin/reset-cluster.sh | 4
test/system/randomwalk/bin/start-all.sh | 4
test/system/randomwalk/bin/start-local.sh | 4
test/system/scalability/run.py | 3 +++
10 files changed, 49 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4227/test/system/auto/TestUtils.py
--
diff --cc test/system/auto/TestUtils.py
index c70baf1,c10c090..df112c5
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@@ -42,33 -42,21 +42,39 @@@ ACCUMULO_HOME = os.path.dirname(__file_
ACCUMULO_HOME = os.path.join(ACCUMULO_HOME, *(os.path.pardir,)*3)
ACCUMULO_HOME = os.path.realpath(ACCUMULO_HOME)
ACCUMULO_DIR = /user/ + os.getenv('LOGNAME') + /accumulo- + ID
+ if os.getenv('ACCUMULO_CONF_DIR'):
+ACCUMULO_CONF_DIR = os.getenv('ACCUMULO_CONF_DIR')
+ else:
+ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
SITE = test- + ID
- LOG_PROPERTIES= os.path.join(ACCUMULO_HOME, 'conf', 'log4j.properties')
- LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
- LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
-WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
-
+ LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
+ LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
+ LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'conf', 'monitor_logger.xml')
+General_CLASSPATH =
++$ACCUMULO_CONF_DIR,
+$ACCUMULO_HOME/server/target/classes/,
+$ACCUMULO_HOME/core/target/classes/,
+$ACCUMULO_HOME/lib/accumulo-core.jar,
+$ACCUMULO_HOME/start/target/classes/,
+$ACCUMULO_HOME/lib/accumulo-start.jar,
+$ACCUMULO_HOME/fate/target/classes/,
+$ACCUMULO_HOME/lib/accumulo-fate.jar,
+$ACCUMULO_HOME/examples/simple/target/classes,
+$ACCUMULO_HOME/lib/accumulo-examples-simple.jar,
+$ACCUMULO_HOME/lib/[^.].*.jar,
+$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+$HADOOP_CONF_DIR,
+$HADOOP_PREFIX/[^.].*.jar,
+$HADOOP_PREFIX/lib/[^.].*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+
-General_CLASSPATH =
($ACCUMULO_CONF_DIR,$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
$ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar)
+
log = logging.getLogger('test.auto')
ROOT = 'root'
@@@ -245,12 -242,11 +252,11 @@@ class TestUtilsMixin
def stop_accumulo(self, signal=signal.SIGHUP):
log.info('killing accumulo processes everywhere')
for host in self.hosts:
-self.pkill(host, 'org.apache.accumulo.start', signal)
+self.pkill(host, 'accumulo.config.file', signal)
def create_config_file(self, settings):
- fp = open(os.path.join(ACCUMULO_HOME, 'conf', SITE),
- 'w')
- fp.write('configuration\n')
+ fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp.write('configuration\n')
settings = self.settings.copy()
settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
'instance.dfs.dir': ACCUMULO_DIR,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4227/test/system/continuous/agitator.pl
--
diff --cc test/system/continuous/agitator.pl
index d9c5395,e838bc6..c779983
--- a/test/system/continuous/agitator.pl
+++
[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/system/auto/TestUtils.py
test/system/continuous/agitator.pl
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4227
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4227
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4227
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4227c35de07c280d496e489fbab541edeea3
Parents: 060188a 6648056
Author: John Vines jvi...@gmail.com
Authored: Fri Nov 8 10:53:24 2013 -0500
Committer: John Vines jvi...@gmail.com
Committed: Fri Nov 8 10:53:24 2013 -0500
--
test/system/auto/TestUtils.py | 20 +---
test/system/continuous/agitator.pl | 6 ++
.../system/continuous/continuous-env.sh.example | 1 +
test/system/continuous/magitator.pl | 7 ++-
test/system/continuous/mapred-setup.sh | 4
test/system/continuous/start-stats.sh | 4
test/system/randomwalk/bin/reset-cluster.sh | 4
test/system/randomwalk/bin/start-all.sh | 4
test/system/randomwalk/bin/start-local.sh | 4
test/system/scalability/run.py | 3 +++
10 files changed, 49 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4227/test/system/auto/TestUtils.py
--
diff --cc test/system/auto/TestUtils.py
index c70baf1,c10c090..df112c5
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@@ -42,33 -42,21 +42,39 @@@ ACCUMULO_HOME = os.path.dirname(__file_
ACCUMULO_HOME = os.path.join(ACCUMULO_HOME, *(os.path.pardir,)*3)
ACCUMULO_HOME = os.path.realpath(ACCUMULO_HOME)
ACCUMULO_DIR = /user/ + os.getenv('LOGNAME') + /accumulo- + ID
+ if os.getenv('ACCUMULO_CONF_DIR'):
+ACCUMULO_CONF_DIR = os.getenv('ACCUMULO_CONF_DIR')
+ else:
+ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
SITE = test- + ID
- LOG_PROPERTIES= os.path.join(ACCUMULO_HOME, 'conf', 'log4j.properties')
- LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
- LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
-WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
-
+ LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
+ LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
+ LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'conf', 'monitor_logger.xml')
+General_CLASSPATH =
++$ACCUMULO_CONF_DIR,
+$ACCUMULO_HOME/server/target/classes/,
+$ACCUMULO_HOME/core/target/classes/,
+$ACCUMULO_HOME/lib/accumulo-core.jar,
+$ACCUMULO_HOME/start/target/classes/,
+$ACCUMULO_HOME/lib/accumulo-start.jar,
+$ACCUMULO_HOME/fate/target/classes/,
+$ACCUMULO_HOME/lib/accumulo-fate.jar,
+$ACCUMULO_HOME/examples/simple/target/classes,
+$ACCUMULO_HOME/lib/accumulo-examples-simple.jar,
+$ACCUMULO_HOME/lib/[^.].*.jar,
+$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+$HADOOP_CONF_DIR,
+$HADOOP_PREFIX/[^.].*.jar,
+$HADOOP_PREFIX/lib/[^.].*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+
-General_CLASSPATH =
($ACCUMULO_CONF_DIR,$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
$ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar)
+
log = logging.getLogger('test.auto')
ROOT = 'root'
@@@ -245,12 -242,11 +252,11 @@@ class TestUtilsMixin
def stop_accumulo(self, signal=signal.SIGHUP):
log.info('killing accumulo processes everywhere')
for host in self.hosts:
-self.pkill(host, 'org.apache.accumulo.start', signal)
+self.pkill(host, 'accumulo.config.file', signal)
def create_config_file(self, settings):
- fp = open(os.path.join(ACCUMULO_HOME, 'conf', SITE),
- 'w')
- fp.write('configuration\n')
+ fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp.write('configuration\n')
settings = self.settings.copy()
settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
'instance.dfs.dir': ACCUMULO_DIR,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4227/test/system/continuous/agitator.pl
--
diff --cc test/system/continuous/agitator.pl
index d9c5395,e838bc6..c779983
--- a/test/system/continuous/agitator.pl
+++
[3/3] 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/fdc6c624 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fdc6c624 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fdc6c624 Branch: refs/heads/1.6.0-SNAPSHOT Commit: fdc6c624c64aa3cd914ce6c81dd899662963850c Parents: 1aefb53 422 Author: John Vines jvi...@gmail.com Authored: Fri Nov 8 10:54:09 2013 -0500 Committer: John Vines jvi...@gmail.com Committed: Fri Nov 8 10:54:09 2013 -0500 -- --
[1/3] git commit: ACCUMULO-1658 System integration tests should default ACCUMULO_CONF_DIR to ACCUMULO_HOME/conf
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 1aefb5359 - fdc6c624c
ACCUMULO-1658 System integration tests should default ACCUMULO_CONF_DIR to
ACCUMULO_HOME/conf
Signed-off-by: John Vines jvi...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6648056c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6648056c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6648056c
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6648056cac0a3d271744ab322e8fede221c1f792
Parents: 579c274
Author: ofishel ryan.fis...@cloudera.com
Authored: Wed Oct 30 08:57:32 2013 -0700
Committer: John Vines jvi...@gmail.com
Committed: Fri Nov 8 10:49:42 2013 -0500
--
test/system/auto/TestUtils.py | 20 +---
test/system/continuous/agitator.pl | 6 ++
.../system/continuous/continuous-env.sh.example | 1 +
test/system/continuous/magitator.pl | 7 ++-
test/system/continuous/mapred-setup.sh | 4
test/system/continuous/start-stats.sh | 4
test/system/randomwalk/bin/reset-cluster.sh | 4
test/system/randomwalk/bin/start-all.sh | 4
test/system/randomwalk/bin/start-local.sh | 4
test/system/scalability/run.py | 3 +++
10 files changed, 49 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index f953bca..c10c090 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -42,12 +42,18 @@ ACCUMULO_HOME = os.path.dirname(__file__)
ACCUMULO_HOME = os.path.join(ACCUMULO_HOME, *(os.path.pardir,)*3)
ACCUMULO_HOME = os.path.realpath(ACCUMULO_HOME)
ACCUMULO_DIR = /user/ + os.getenv('LOGNAME') + /accumulo- + ID
+if os.getenv('ACCUMULO_CONF_DIR'):
+ ACCUMULO_CONF_DIR = os.getenv('ACCUMULO_CONF_DIR')
+else:
+ ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
SITE = test- + ID
WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
-LOG_PROPERTIES= os.path.join(ACCUMULO_HOME, 'conf', 'log4j.properties')
-LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
-LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
+
+LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
+LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
+LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'conf', 'monitor_logger.xml')
+
General_CLASSPATH =
($ACCUMULO_CONF_DIR,$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
$ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar)
@@ -58,7 +64,8 @@ ROOT_PASSWORD = 'secret'
INSTANCE_NAME=ID
ZOOKEEPERS = socket.getfqdn()
-accumulo_site = os.path.join(ACCUMULO_HOME, 'conf', 'accumulo-site.xml')
+accumulo_site = os.path.join(ACCUMULO_CONF_DIR, 'accumulo-site.xml')
+
if os.path.exists(accumulo_site):
import config
ZOOKEEPERS = config.parse(accumulo_site).get('instance.zookeeper.host',
ZOOKEEPERS)
@@ -238,9 +245,8 @@ class TestUtilsMixin:
self.pkill(host, 'org.apache.accumulo.start', signal)
def create_config_file(self, settings):
-fp = open(os.path.join(ACCUMULO_HOME, 'conf', SITE),
- 'w')
-fp.write('configuration\n')
+fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp.write('configuration\n')
settings = self.settings.copy()
settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
'instance.dfs.dir': ACCUMULO_DIR,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/continuous/agitator.pl
--
diff --git a/test/system/continuous/agitator.pl
b/test/system/continuous/agitator.pl
index c074665..e838bc6 100755
--- a/test/system/continuous/agitator.pl
+++ b/test/system/continuous/agitator.pl
@@ -25,6 +25,12 @@ if(scalar(@ARGV) != 4 scalar(@ARGV) != 2){
$ACCUMULO_HOME=../../..;
+if(defined $ENV{'ACCUMULO_CONF_DIR'}){
+$ACCUMULO_CONF_DIR = $ENV{'ACCUMULO_CONF_DIR'};
+}else{
+ $ACCUMULO_CONF_DIR = $ACCUMULO_HOME . '/conf';
+}
+
$sleep1 = $ARGV[0];
$sleep2 = $ARGV[1];
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/continuous/continuous-env.sh.example
--
diff --git a/test/system/continuous/continuous-env.sh.example
b/test/system/continuous/continuous-env.sh.example
index 76f2632..830ae86 100644
---
[3/8] git commit: ACCUMULO-1614 fixed bug in conditional writer random walk config.
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/master 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
[6/8] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/system/auto/TestUtils.py
test/system/continuous/agitator.pl
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4227
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4227
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4227
Branch: refs/heads/master
Commit: 4227c35de07c280d496e489fbab541edeea3
Parents: 060188a 6648056
Author: John Vines jvi...@gmail.com
Authored: Fri Nov 8 10:53:24 2013 -0500
Committer: John Vines jvi...@gmail.com
Committed: Fri Nov 8 10:53:24 2013 -0500
--
test/system/auto/TestUtils.py | 20 +---
test/system/continuous/agitator.pl | 6 ++
.../system/continuous/continuous-env.sh.example | 1 +
test/system/continuous/magitator.pl | 7 ++-
test/system/continuous/mapred-setup.sh | 4
test/system/continuous/start-stats.sh | 4
test/system/randomwalk/bin/reset-cluster.sh | 4
test/system/randomwalk/bin/start-all.sh | 4
test/system/randomwalk/bin/start-local.sh | 4
test/system/scalability/run.py | 3 +++
10 files changed, 49 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4227/test/system/auto/TestUtils.py
--
diff --cc test/system/auto/TestUtils.py
index c70baf1,c10c090..df112c5
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@@ -42,33 -42,21 +42,39 @@@ ACCUMULO_HOME = os.path.dirname(__file_
ACCUMULO_HOME = os.path.join(ACCUMULO_HOME, *(os.path.pardir,)*3)
ACCUMULO_HOME = os.path.realpath(ACCUMULO_HOME)
ACCUMULO_DIR = /user/ + os.getenv('LOGNAME') + /accumulo- + ID
+ if os.getenv('ACCUMULO_CONF_DIR'):
+ACCUMULO_CONF_DIR = os.getenv('ACCUMULO_CONF_DIR')
+ else:
+ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
SITE = test- + ID
- LOG_PROPERTIES= os.path.join(ACCUMULO_HOME, 'conf', 'log4j.properties')
- LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
- LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
-WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
-
+ LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
+ LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
+ LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'conf', 'monitor_logger.xml')
+General_CLASSPATH =
++$ACCUMULO_CONF_DIR,
+$ACCUMULO_HOME/server/target/classes/,
+$ACCUMULO_HOME/core/target/classes/,
+$ACCUMULO_HOME/lib/accumulo-core.jar,
+$ACCUMULO_HOME/start/target/classes/,
+$ACCUMULO_HOME/lib/accumulo-start.jar,
+$ACCUMULO_HOME/fate/target/classes/,
+$ACCUMULO_HOME/lib/accumulo-fate.jar,
+$ACCUMULO_HOME/examples/simple/target/classes,
+$ACCUMULO_HOME/lib/accumulo-examples-simple.jar,
+$ACCUMULO_HOME/lib/[^.].*.jar,
+$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+$HADOOP_CONF_DIR,
+$HADOOP_PREFIX/[^.].*.jar,
+$HADOOP_PREFIX/lib/[^.].*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+
-General_CLASSPATH =
($ACCUMULO_CONF_DIR,$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
$ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar)
+
log = logging.getLogger('test.auto')
ROOT = 'root'
@@@ -245,12 -242,11 +252,11 @@@ class TestUtilsMixin
def stop_accumulo(self, signal=signal.SIGHUP):
log.info('killing accumulo processes everywhere')
for host in self.hosts:
-self.pkill(host, 'org.apache.accumulo.start', signal)
+self.pkill(host, 'accumulo.config.file', signal)
def create_config_file(self, settings):
- fp = open(os.path.join(ACCUMULO_HOME, 'conf', SITE),
- 'w')
- fp.write('configuration\n')
+ fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp.write('configuration\n')
settings = self.settings.copy()
settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
'instance.dfs.dir': ACCUMULO_DIR,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4227/test/system/continuous/agitator.pl
--
diff --cc test/system/continuous/agitator.pl
index d9c5395,e838bc6..c779983
--- a/test/system/continuous/agitator.pl
+++
[4/8] git commit: ACCUMULO-1853 updated poms with current dependencies
ACCUMULO-1853 updated poms with current dependencies Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1aefb535 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1aefb535 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1aefb535 Branch: refs/heads/master Commit: 1aefb5359fe69a0d9c0d4c6ecb33fb3540b64b3a Parents: 65c75f3 Author: Billie Rinaldi billie.rina...@gmail.com Authored: Fri Nov 8 07:39:19 2013 -0800 Committer: Billie Rinaldi billie.rina...@gmail.com Committed: Fri Nov 8 07:39:19 2013 -0800 -- core/pom.xml| 14 ++--- examples/simple/pom.xml | 18 +++ maven-plugin/pom.xml| 58 - maven-plugin/src/it/plugin-test/pom.xml | 5 ++ minicluster/pom.xml | 34 ++-- pom.xml | 15 ++ proxy/pom.xml | 14 ++--- server/base/pom.xml | 22 +--- server/extras/pom.xml | 30 +-- server/gc/pom.xml | 39 ++ server/master/pom.xml | 44 server/monitor/pom.xml | 57 server/tracer/pom.xml | 36 +++-- server/tserver/pom.xml | 78 start/pom.xml | 10 test/pom.xml| 46 +++- trace/pom.xml | 5 -- 17 files changed, 363 insertions(+), 162 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index 8b4706b..0f155be 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -74,8 +74,8 @@ scopeprovided/scope /dependency dependency - groupIdcommons-httpclient/groupId - artifactIdcommons-httpclient/artifactId + groupIdcommons-configuration/groupId + artifactIdcommons-configuration/artifactId scopeprovided/scope /dependency dependency @@ -114,11 +114,6 @@ scopeprovided/scope /dependency dependency - groupIdorg.slf4j/groupId - artifactIdslf4j-log4j12/artifactId - scopeprovided/scope -/dependency -dependency groupIdjunit/groupId artifactIdjunit/artifactId scopetest/scope @@ -135,6 +130,11 @@ /dependency dependency groupIdorg.powermock/groupId + artifactIdpowermock-core/artifactId + scopetest/scope +/dependency +dependency + groupIdorg.powermock/groupId artifactIdpowermock-module-junit4/artifactId scopetest/scope /dependency http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/examples/simple/pom.xml -- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index de60f8d..e3a01a1 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -36,8 +36,12 @@ artifactIdaccumulo-core/artifactId /dependency dependency - groupIdorg.apache.zookeeper/groupId - artifactIdzookeeper/artifactId + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-fate/artifactId +/dependency +dependency + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-trace/artifactId /dependency dependency groupIdcommons-cli/groupId @@ -50,16 +54,6 @@ scopeprovided/scope /dependency dependency - groupIdcommons-httpclient/groupId - artifactIdcommons-httpclient/artifactId - scopeprovided/scope -/dependency -dependency - groupIdcommons-io/groupId - artifactIdcommons-io/artifactId - scopeprovided/scope -/dependency -dependency groupIdlog4j/groupId artifactIdlog4j/artifactId scopeprovided/scope http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/maven-plugin/pom.xml -- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index f334795..a2d52f9 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,52 +28,24 @@ descriptionAn Apache Maven plugin for testing software against a test Apache Accumulo instance./description dependencies dependency - groupIdcommons-cli/groupId - artifactIdcommons-cli/artifactId -/dependency -dependency - groupIdcommons-codec/groupId - artifactIdcommons-codec/artifactId -/dependency -dependency - groupIdcommons-collections/groupId - artifactIdcommons-collections/artifactId -/dependency -dependency -
[5/8] git commit: ACCUMULO-1658 System integration tests should default ACCUMULO_CONF_DIR to ACCUMULO_HOME/conf
ACCUMULO-1658 System integration tests should default ACCUMULO_CONF_DIR to
ACCUMULO_HOME/conf
Signed-off-by: John Vines jvi...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6648056c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6648056c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6648056c
Branch: refs/heads/master
Commit: 6648056cac0a3d271744ab322e8fede221c1f792
Parents: 579c274
Author: ofishel ryan.fis...@cloudera.com
Authored: Wed Oct 30 08:57:32 2013 -0700
Committer: John Vines jvi...@gmail.com
Committed: Fri Nov 8 10:49:42 2013 -0500
--
test/system/auto/TestUtils.py | 20 +---
test/system/continuous/agitator.pl | 6 ++
.../system/continuous/continuous-env.sh.example | 1 +
test/system/continuous/magitator.pl | 7 ++-
test/system/continuous/mapred-setup.sh | 4
test/system/continuous/start-stats.sh | 4
test/system/randomwalk/bin/reset-cluster.sh | 4
test/system/randomwalk/bin/start-all.sh | 4
test/system/randomwalk/bin/start-local.sh | 4
test/system/scalability/run.py | 3 +++
10 files changed, 49 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index f953bca..c10c090 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -42,12 +42,18 @@ ACCUMULO_HOME = os.path.dirname(__file__)
ACCUMULO_HOME = os.path.join(ACCUMULO_HOME, *(os.path.pardir,)*3)
ACCUMULO_HOME = os.path.realpath(ACCUMULO_HOME)
ACCUMULO_DIR = /user/ + os.getenv('LOGNAME') + /accumulo- + ID
+if os.getenv('ACCUMULO_CONF_DIR'):
+ ACCUMULO_CONF_DIR = os.getenv('ACCUMULO_CONF_DIR')
+else:
+ ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
SITE = test- + ID
WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
-LOG_PROPERTIES= os.path.join(ACCUMULO_HOME, 'conf', 'log4j.properties')
-LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
-LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
+
+LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
+LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
+LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'conf', 'monitor_logger.xml')
+
General_CLASSPATH =
($ACCUMULO_CONF_DIR,$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
$ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar)
@@ -58,7 +64,8 @@ ROOT_PASSWORD = 'secret'
INSTANCE_NAME=ID
ZOOKEEPERS = socket.getfqdn()
-accumulo_site = os.path.join(ACCUMULO_HOME, 'conf', 'accumulo-site.xml')
+accumulo_site = os.path.join(ACCUMULO_CONF_DIR, 'accumulo-site.xml')
+
if os.path.exists(accumulo_site):
import config
ZOOKEEPERS = config.parse(accumulo_site).get('instance.zookeeper.host',
ZOOKEEPERS)
@@ -238,9 +245,8 @@ class TestUtilsMixin:
self.pkill(host, 'org.apache.accumulo.start', signal)
def create_config_file(self, settings):
-fp = open(os.path.join(ACCUMULO_HOME, 'conf', SITE),
- 'w')
-fp.write('configuration\n')
+fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp.write('configuration\n')
settings = self.settings.copy()
settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
'instance.dfs.dir': ACCUMULO_DIR,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/continuous/agitator.pl
--
diff --git a/test/system/continuous/agitator.pl
b/test/system/continuous/agitator.pl
index c074665..e838bc6 100755
--- a/test/system/continuous/agitator.pl
+++ b/test/system/continuous/agitator.pl
@@ -25,6 +25,12 @@ if(scalar(@ARGV) != 4 scalar(@ARGV) != 2){
$ACCUMULO_HOME=../../..;
+if(defined $ENV{'ACCUMULO_CONF_DIR'}){
+$ACCUMULO_CONF_DIR = $ENV{'ACCUMULO_CONF_DIR'};
+}else{
+ $ACCUMULO_CONF_DIR = $ACCUMULO_HOME . '/conf';
+}
+
$sleep1 = $ARGV[0];
$sleep2 = $ARGV[1];
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6648056c/test/system/continuous/continuous-env.sh.example
--
diff --git a/test/system/continuous/continuous-env.sh.example
b/test/system/continuous/continuous-env.sh.example
index 76f2632..830ae86 100644
--- a/test/system/continuous/continuous-env.sh.example
+++ b/test/system/continuous/continuous-env.sh.example
@@ -18,6
[7/8] 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/fdc6c624 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fdc6c624 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fdc6c624 Branch: refs/heads/master Commit: fdc6c624c64aa3cd914ce6c81dd899662963850c Parents: 1aefb53 422 Author: John Vines jvi...@gmail.com Authored: Fri Nov 8 10:54:09 2013 -0500 Committer: John Vines jvi...@gmail.com Committed: Fri Nov 8 10:54:09 2013 -0500 -- --
[8/8] 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/c00ac628 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c00ac628 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c00ac628 Branch: refs/heads/master Commit: c00ac6287593e06a6998f4f62b287be197baacdf Parents: ddde450 fdc6c62 Author: John Vines jvi...@gmail.com Authored: Fri Nov 8 10:54:38 2013 -0500 Committer: John Vines jvi...@gmail.com Committed: Fri Nov 8 10:54:38 2013 -0500 -- core/pom.xml| 14 +-- examples/simple/pom.xml | 18 +-- maven-plugin/pom.xml| 58 ++ maven-plugin/src/it/plugin-test/pom.xml | 5 + minicluster/pom.xml | 34 +++--- pom.xml | 15 +++ proxy/pom.xml | 14 +-- server/base/pom.xml | 22 +--- .../security/AuditedSecurityOperation.java | 6 +- .../accumulo/server/util/TableDiskUsage.java| 110 +-- server/extras/pom.xml | 30 - server/gc/pom.xml | 39 +++ server/master/pom.xml | 44 server/monitor/pom.xml | 57 ++ server/tracer/pom.xml | 36 +- server/tserver/pom.xml | 78 + start/pom.xml | 10 -- test/pom.xml| 46 .../randomwalk/conf/modules/Conditional.xml | 4 +- trace/pom.xml | 5 - 20 files changed, 423 insertions(+), 222 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/core/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/examples/simple/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/maven-plugin/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/minicluster/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/proxy/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/base/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/extras/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/gc/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/master/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/monitor/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/tracer/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/tserver/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/start/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/test/pom.xml -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/trace/pom.xml --
svn commit: r1540108 - /accumulo/site/trunk/content/git.mdtext
Author: billie Date: Fri Nov 8 16:28:07 2013 New Revision: 1540108 URL: http://svn.apache.org/r1540108 Log: added documentation on committer responsibilities Modified: accumulo/site/trunk/content/git.mdtext Modified: accumulo/site/trunk/content/git.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/git.mdtext?rev=1540108r1=1540107r2=1540108view=diff == --- accumulo/site/trunk/content/git.mdtext (original) +++ accumulo/site/trunk/content/git.mdtext Fri Nov 8 16:28:07 2013 @@ -199,6 +199,20 @@ named `1.4.4-snapshot` or similar. ### Reviewing contributor changes +It is always the responsibility of committers to determine that a patch is +intended and able to be contributed. From the +[new committer's guide](http://www.apache.org/dev/new-committers-guide.html#cla): +Please take care to ensure that patches are original works which have been +clearly contributed to the ASF in public. In the case of any doubt (or when a +contribution with a more complex history is presented) please consult your +project PMC before committing it. + +Extra diligence may be necessary when code is contributed via a pull request. +Committers should verify that the contributor intended to submit the code as a +Contribution under the [Apache License](http://www.apache.org/licenses/LICENSE-2.0.txt). +When pulling the code, committers should also verify that the commits pulled match the +list of commits sent to the Accumulo dev list in the pull request. + **Patches** -- Developers should use the following steps to apply patches from contributors:
svn commit: r885895 - in /websites/staging/accumulo/trunk/content: ./ git.html
Author: buildbot Date: Fri Nov 8 16:28:39 2013 New Revision: 885895 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/git.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Nov 8 16:28:39 2013 @@ -1 +1 @@ -1539515 +1540108 Modified: websites/staging/accumulo/trunk/content/git.html == --- websites/staging/accumulo/trunk/content/git.html (original) +++ websites/staging/accumulo/trunk/content/git.html Fri Nov 8 16:28:39 2013 @@ -257,6 +257,18 @@ name. It has been suggested to name the Maven releases are named. In other words, the branch just created would be named code1.4.4-snapshot/code or similar./p h3 id=reviewing-contributor-changesReviewing contributor changes/h3 +pIt is always the responsibility of committers to determine that a patch is +intended and able to be contributed. From the +a href=http://www.apache.org/dev/new-committers-guide.html#cla;new committer's guide/a: +Please take care to ensure that patches are original works which have been +clearly contributed to the ASF in public. In the case of any doubt (or when a +contribution with a more complex history is presented) please consult your +project PMC before committing it./p +pExtra diligence may be necessary when code is contributed via a pull request. +Committers should verify that the contributor intended to submit the code as a +Contribution under the a href=http://www.apache.org/licenses/LICENSE-2.0.txt;Apache License/a. +When pulling the code, committers should also verify that the commits pulled match the +list of commits sent to the Accumulo dev list in the pull request./p pstrongPatches/strong -- Developers should use the following steps to apply patches from contributors:/p ol
svn commit: r885896 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/
Author: billie Date: Fri Nov 8 16:29:53 2013 New Revision: 885896 Log: Publishing svnmucc operation to accumulo site by billie Added: websites/production/accumulo/content/ - copied from r885895, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r885895, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r885895, websites/production/accumulo/content/1.5/apidocs/
[1/2] git commit: ACCUMULO-1833 Remove Connector client methods, but leave constructor on MTBW in place for testing purposes.
Updated Branches:
refs/heads/ACCUMULO-1833-caching 0be6f0a79 - 29efac97c
ACCUMULO-1833 Remove Connector client methods, but leave constructor on
MTBW in place for testing purposes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8e607fe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8e607fe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8e607fe
Branch: refs/heads/ACCUMULO-1833-caching
Commit: c8e607fe381242492fc7e8c84b4fb0f1e000d3aa
Parents: 0be6f0a
Author: Josh Elser josh.el...@gmail.com
Authored: Fri Nov 8 10:55:01 2013 -0500
Committer: Josh Elser josh.el...@gmail.com
Committed: Fri Nov 8 10:56:24 2013 -0500
--
.../apache/accumulo/core/client/Connector.java | 44 +--
.../core/client/impl/ConnectorImpl.java | 12 -
.../client/impl/MultiTableBatchWriterImpl.java | 4 +-
.../core/client/mock/MockConnector.java | 11 -
.../test/MultiTableBatchWriterTest.java | 46
5 files changed, 31 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8e607fe/core/src/main/java/org/apache/accumulo/core/client/Connector.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Connector.java
b/core/src/main/java/org/apache/accumulo/core/client/Connector.java
index 68dc881..d2e7321 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Connector.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Connector.java
@@ -16,8 +16,6 @@
*/
package org.apache.accumulo.core.client;
-import java.util.concurrent.TimeUnit;
-
import org.apache.accumulo.core.client.admin.InstanceOperations;
import org.apache.accumulo.core.client.admin.SecurityOperations;
import org.apache.accumulo.core.client.admin.TableOperations;
@@ -148,32 +146,8 @@ public abstract class Connector {
public abstract MultiTableBatchWriter createMultiTableBatchWriter(long
maxMemory, long maxLatency, int maxWriteThreads);
/**
- * Factory method to create a Multi-Table BatchWriter connected to Accumulo.
Multi-table batch writers can queue data for multiple tables, which is good for
- * ingesting data into multiple tables from the same source. Caching of
ZooKeeper table information defaults to {@link
MultiTableBatchWriterImpl#DEFAULT_CACHE_TIME}
- * and {@link MultiTableBatchWriterImpl#DEFAULT_CACHE_TIME_UNIT}
- *
- * @param maxMemory
- * size in bytes of the maximum memory to batch before writing
- * @param maxLatency
- * size in milliseconds; set to 0 or Long.MAX_VALUE to allow the
maximum time to hold a batch before writing
- * @param maxWriteThreads
- * the maximum number of threads to use for writing data to the
tablet servers
- * @param cacheTime
- * Duration of time to cache ZooKeeper table information
- * @param cacheTimeUnit
- * Unit of time to apply to {@link cacheTime}
- *
- * @return MultiTableBatchWriter object for configuring and writing data to
- * @deprecated since 1.5.0; Use {@link
#createMultiTableBatchWriter(BatchWriterConfig)} instead.
- * @since 1.5.1
- */
- @Deprecated
- public abstract MultiTableBatchWriter createMultiTableBatchWriter(long
maxMemory, long maxLatency, int maxWriteThreads, long cacheTime, TimeUnit
cacheTimeUnit);
-
- /**
* Factory method to create a Multi-Table BatchWriter connected to Accumulo.
Multi-table batch writers can queue data for multiple tables. Also data for
- * multiple tables can be sent to a server in a single batch. Its an
efficient way to ingest data into multiple tables from a single process. Caching
- * of ZooKeeper table information defaults to {@link
MultiTableBatchWriterImpl#DEFAULT_CACHE_TIME} and {@link
MultiTableBatchWriterImpl#DEFAULT_CACHE_TIME_UNIT}
+ * multiple tables can be sent to a server in a single batch. Its an
efficient way to ingest data into multiple tables from a single process.
*
* @param config
* configuration used to create multi-table batch writer
@@ -184,22 +158,6 @@ public abstract class Connector {
public abstract MultiTableBatchWriter
createMultiTableBatchWriter(BatchWriterConfig config);
/**
- * Factory method to create a Multi-Table BatchWriter connected to Accumulo.
Multi-table batch writers can queue data for multiple tables. Also data for
- * multiple tables can be sent to a server in a single batch. Its an
efficient way to ingest data into multiple tables from a single process. This
method
- * also allows the user to provide parameters as to how long table
information from ZooKeeper is cached.
- * @param config
- * configuration used to create the
[2/2] git commit: ACCUMULO-1833 Simple usage of AtomicInteger to catch table cache invalidations and propagate them through MTBW's cache.
ACCUMULO-1833 Simple usage of AtomicInteger to catch table cache
invalidations and propagate them through MTBW's cache.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/29efac97
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29efac97
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29efac97
Branch: refs/heads/ACCUMULO-1833-caching
Commit: 29efac97c82edd9fc08d37a83676cfdc18503103
Parents: c8e607f
Author: Josh Elser josh.el...@gmail.com
Authored: Fri Nov 8 11:36:06 2013 -0500
Committer: Josh Elser josh.el...@gmail.com
Committed: Fri Nov 8 11:36:06 2013 -0500
--
.../client/impl/MultiTableBatchWriterImpl.java | 29 ++-
.../accumulo/core/client/impl/Tables.java | 7 ++
.../test/MultiTableBatchWriterTest.java | 88
3 files changed, 86 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/29efac97/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 34318d1..b99c42b 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
@@ -20,6 +20,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -39,6 +40,7 @@ import org.apache.log4j.Logger;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
+import com.google.common.util.concurrent.UncheckedExecutionException;
public class MultiTableBatchWriterImpl implements MultiTableBatchWriter {
public static final long DEFAULT_CACHE_TIME = 200;
@@ -46,6 +48,7 @@ public class MultiTableBatchWriterImpl implements
MultiTableBatchWriter {
static final Logger log = Logger.getLogger(MultiTableBatchWriterImpl.class);
private AtomicBoolean closed;
+ private AtomicInteger cacheLastState;
private class TableBatchWriter implements BatchWriter {
@@ -84,7 +87,7 @@ public class MultiTableBatchWriterImpl implements
MultiTableBatchWriter {
private class TableNameToIdLoader extends CacheLoaderString,String {
@Override
-public String load(String tableName) throws Exception {
+public String load(String tableName) throws Exception {
String tableId = Tables.getNameToIdMap(instance).get(tableName);
if (tableId == null)
@@ -113,6 +116,7 @@ public class MultiTableBatchWriterImpl implements
MultiTableBatchWriter {
this.bw = new TabletServerBatchWriter(instance, credentials, config);
tableWriters = new ConcurrentHashMapString,BatchWriter();
this.closed = new AtomicBoolean(false);
+this.cacheLastState = new AtomicInteger(0);
nameToIdCache = CacheBuilder.newBuilder().expireAfterWrite(cacheTime,
cacheTimeUnit).concurrencyLevel(8).maximumSize(64).initialCapacity(16)
.build(new TableNameToIdLoader());
@@ -151,6 +155,20 @@ public class MultiTableBatchWriterImpl implements
MultiTableBatchWriter {
private String getId(String tableName) throws TableNotFoundException {
try {
return nameToIdCache.get(tableName);
+} catch (UncheckedExecutionException e) {
+ Throwable cause = e.getCause();
+
+ log.error(Unexpected exception when fetching table id for +
tableName);
+
+ if (null == cause) {
+throw new RuntimeException(e);
+ } else if (cause instanceof TableNotFoundException) {
+throw (TableNotFoundException) cause;
+ } else if (cause instanceof TableOfflineException) {
+throw (TableOfflineException) cause;
+ }
+
+ throw e;
} catch (ExecutionException e) {
Throwable cause = e.getCause();
@@ -171,6 +189,15 @@ public class MultiTableBatchWriterImpl implements
MultiTableBatchWriter {
@Override
public BatchWriter getBatchWriter(String tableName) throws
AccumuloException, AccumuloSecurityException, TableNotFoundException {
ArgumentChecker.notNull(tableName);
+
+int cacheResetCount = Tables.getCacheResetCount();
+int internalResetCount = cacheLastState.get();
+
+if (cacheResetCount internalResetCount) {
+
[3/4] 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/c68066db Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c68066db Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c68066db Branch: refs/heads/master Commit: c68066db46540e9b6d92c77e3a1edcae5349cdc6 Parents: fdc6c62 7f403df Author: Christopher Tubbs ctubb...@apache.org Authored: Fri Nov 8 17:25:55 2013 -0500 Committer: Christopher Tubbs ctubb...@apache.org Committed: Fri Nov 8 17:25:55 2013 -0500 -- --
[4/4] 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/4d690b1e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d690b1e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d690b1e Branch: refs/heads/master Commit: 4d690b1e0beaec2aeaa1e1c22f8861a68fa8fe39 Parents: c00ac62 c68066d Author: Christopher Tubbs ctubb...@apache.org Authored: Fri Nov 8 17:26:08 2013 -0500 Committer: Christopher Tubbs ctubb...@apache.org Committed: Fri Nov 8 17:26:08 2013 -0500 -- --
[2/3] git commit: ACCUMULO-1854 Clean up constructors. Add a test.
ACCUMULO-1854 Clean up constructors. Add a test.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c549ab0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c549ab0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c549ab0
Branch: refs/heads/ACCUMULO-1854-info-in-splits
Commit: 7c549ab0d5a05a1f5daa36be21ece2e9e291aa3c
Parents: cdbed43
Author: Josh Elser els...@apache.org
Authored: Fri Nov 8 16:23:49 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Nov 8 16:23:49 2013 -0500
--
.../core/client/mapreduce/RangeInputSplit.java | 10 +-
.../client/mapreduce/RangeInputSplitTest.java | 97
2 files changed, 102 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c549ab0/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index bba7cf0..4cd16b2 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@ -52,6 +52,11 @@ public class RangeInputSplit extends InputSplit implements
Writable {
locations = new String[0];
}
+ public RangeInputSplit(Range range, String[] locations) {
+this.range = range;
+this.locations = locations;
+ }
+
public Range getRange() {
return range;
}
@@ -95,11 +100,6 @@ public class RangeInputSplit extends InputSplit implements
Writable {
return 0f;
}
- public RangeInputSplit(Range range, String[] locations) {
-this.range = range;
-this.locations = locations;
- }
-
/**
* This implementation of length is only an estimate, it does not provide
exact values. Do not have your code rely on this return value.
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c549ab0/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
--
diff --git
a/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
b/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
new file mode 100644
index 000..abcbde0
--- /dev/null
+++
b/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
@@ -0,0 +1,97 @@
+package org.apache.accumulo.core.client.mapreduce;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.util.Pair;
+import org.apache.hadoop.io.Text;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class RangeInputSplitTest {
+
+ @Test
+ public void testSimpleWritable() throws IOException {
+RangeInputSplit split = new RangeInputSplit(new Range(new Key(a), new
Key(b)), new String[]{localhost});
+
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+DataOutputStream dos = new DataOutputStream(baos);
+split.write(dos);
+
+RangeInputSplit newSplit = new RangeInputSplit();
+
+ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+DataInputStream dis = new DataInputStream(bais);
+newSplit.readFields(dis);
+
+Assert.assertEquals(split.getRange(), newSplit.getRange());
+Assert.assertTrue(Arrays.equals(split.getLocations(),
newSplit.getLocations()));
+ }
+
+
+
+ @Test
+ public void testAllFieldsWritable() throws IOException {
+RangeInputSplit split = new RangeInputSplit(new Range(new Key(a), new
Key(b)), new String[]{localhost});
+
+SetPairText,Text fetchedColumns = new HashSetPairText,Text();
+
+fetchedColumns.add(new PairText,Text(new Text(colf1), new
Text(colq1)));
+fetchedColumns.add(new PairText,Text(new Text(colf2), new
Text(colq2)));
+
+split.setAuths(new Authorizations(foo));
+split.setOffline(true);
+split.setIsolatedScan(true);
+split.setUsesLocalIterators(true);
+split.setMaxVersions(5);
+split.setRowRegex(row);
+split.setColfamRegex(colf);
+split.setColqualRegex(colq);
+split.setValueRegex(value);
+split.setFetchedColumns(fetchedColumns);
+
[3/3] git commit: ACCUMULO-1854 Fix up InputFormatBase to use the information stored on RangeInputSplit and fall back onto the Configuration.
ACCUMULO-1854 Fix up InputFormatBase to use the information stored on
RangeInputSplit and fall back onto the Configuration.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9644f5b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9644f5b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9644f5b
Branch: refs/heads/ACCUMULO-1854-info-in-splits
Commit: a9644f5b94d74466db624fb06bd3d70fb5bf9cf9
Parents: 7c549ab
Author: Josh Elser els...@apache.org
Authored: Fri Nov 8 17:47:57 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Nov 8 17:47:57 2013 -0500
--
.../core/client/mapreduce/InputFormatBase.java | 140 +++
.../core/client/mapreduce/RangeInputSplit.java | 116 ---
.../simple/filedata/ChunkInputFormatTest.java | 4 +-
3 files changed, 204 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9644f5b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
index d3ebd21..0fd2630 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
@@ -826,17 +826,17 @@ public abstract class InputFormatBaseK,V extends
InputFormatK,V {
*/
protected static SetPairText,Text getFetchedColumns(Configuration conf) {
ArgumentChecker.notNull(conf);
-
+
return deserializeFetchedColumns(conf.getStrings(COLUMNS));
}
public static SetPairText,Text deserializeFetchedColumns(String[]
serialized) {
SetPairText,Text columns = new HashSetPairText,Text();
-
+
if (null == serialized) {
return columns;
}
-
+
for (String col : serialized) {
int idx = col.indexOf(:);
Text cf = new Text(idx 0 ? Base64.decodeBase64(col.getBytes()) :
Base64.decodeBase64(col.substring(0, idx).getBytes()));
@@ -1061,8 +1061,9 @@ public abstract class InputFormatBaseK,V extends
InputFormatK,V {
/**
* @deprecated Use {@link #setupIterators(Configuration,Scanner)} instead
*/
-protected void setupIterators(TaskAttemptContext attempt, Scanner scanner)
throws AccumuloException {
- setupIterators(attempt.getConfiguration(), scanner);
+protected void setupIterators(TaskAttemptContext attempt, Scanner scanner,
ListAccumuloIterator iterators, ListAccumuloIteratorOption options)
+throws AccumuloException {
+ setupIterators(attempt.getConfiguration(), scanner, iterators, options);
}
/**
@@ -1074,9 +1075,8 @@ public abstract class InputFormatBaseK,V extends
InputFormatK,V {
* the scanner to configure
* @throws AccumuloException
*/
-protected void setupIterators(Configuration conf, Scanner scanner) throws
AccumuloException {
- ListAccumuloIterator iterators = getIterators(conf);
- ListAccumuloIteratorOption options = getIteratorOptions(conf);
+protected void setupIterators(Configuration conf, Scanner scanner,
ListAccumuloIterator iterators, ListAccumuloIteratorOption options)
+throws AccumuloException {
MapString,IteratorSetting scanIterators = new
HashMapString,IteratorSetting();
for (AccumuloIterator iterator : iterators) {
@@ -1093,8 +1093,8 @@ public abstract class InputFormatBaseK,V extends
InputFormatK,V {
/**
* @deprecated Use {@link #setupMaxVersions(Configuration,Scanner)} instead
*/
-protected void setupMaxVersions(TaskAttemptContext attempt, Scanner
scanner) {
- setupMaxVersions(attempt.getConfiguration(), scanner);
+protected void setupMaxVersions(TaskAttemptContext attempt, Scanner
scanner, int maxVersions) {
+ setupMaxVersions(attempt.getConfiguration(), scanner, maxVersions);
}
/**
@@ -1105,8 +1105,7 @@ public abstract class InputFormatBaseK,V extends
InputFormatK,V {
* @param scanner
* the scanner to configure
*/
-protected void setupMaxVersions(Configuration conf, Scanner scanner) {
- int maxVersions = getMaxVersions(conf);
+protected void setupMaxVersions(Configuration conf, Scanner scanner, int
maxVersions) {
// Check to make sure its a legit value
if (maxVersions = 1) {
IteratorSetting vers = new IteratorSetting(0, vers,
VersioningIterator.class);
@@ -1123,43 +1122,119 @@ public abstract class InputFormatBaseK,V extends
InputFormatK,V {
split = (RangeInputSplit) inSplit;
Git Push Summary
Updated Branches: refs/heads/ACCUMULO-1854-multi-aif [deleted] c50a22296
[2/2] git commit: ACCUMULO-1783 Clean up now dead or unnecessary code.
ACCUMULO-1783 Clean up now dead or unnecessary code.
Project: http://git-wip-us.apache.org/repos/asf/accumulo-pig/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-pig/commit/4160c161
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-pig/tree/4160c161
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-pig/diff/4160c161
Branch: refs/heads/ACCUMULO-1783
Commit: 4160c1615010a626beedc318fcaaaef06a258068
Parents: 63d29d4
Author: Josh Elser els...@apache.org
Authored: Fri Nov 8 21:27:41 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Nov 8 21:27:41 2013 -0500
--
.../accumulo/pig/AbstractAccumuloStorage.java | 398 ---
1 file changed, 84 insertions(+), 314 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo-pig/blob/4160c161/src/main/java/org/apache/accumulo/pig/AbstractAccumuloStorage.java
--
diff --git a/src/main/java/org/apache/accumulo/pig/AbstractAccumuloStorage.java
b/src/main/java/org/apache/accumulo/pig/AbstractAccumuloStorage.java
index 5faf6c6..a829d4a 100644
--- a/src/main/java/org/apache/accumulo/pig/AbstractAccumuloStorage.java
+++ b/src/main/java/org/apache/accumulo/pig/AbstractAccumuloStorage.java
@@ -73,14 +73,14 @@ import org.joda.time.DateTime;
*/
public abstract class AbstractAccumuloStorage extends LoadFunc implements
StoreFuncInterface {
private static final Log LOG =
LogFactory.getLog(AbstractAccumuloStorage.class);
-
- private static final String COLON = :, COMMA = ,, PERIOD = .;
- private static final String INPUT_PREFIX =
AccumuloInputFormat.class.getSimpleName(), OUTPUT_PREFIX =
AccumuloOutputFormat.class.getSimpleName();
-
+
+ private static final String COLON = :, COMMA = ,;
+ private static final String INPUT_PREFIX =
AccumuloInputFormat.class.getSimpleName();
+
private Configuration conf;
private RecordReaderKey,Value reader;
private RecordWriterText,Mutation writer;
-
+
String inst;
String zookeepers;
String user;
@@ -90,27 +90,27 @@ public abstract class AbstractAccumuloStorage extends
LoadFunc implements StoreF
String auths;
Authorizations authorizations;
ListPairText,Text columnFamilyColumnQualifierPairs = new
LinkedListPairText,Text();
-
+
String start = null;
String end = null;
-
+
int maxWriteThreads = 10;
long maxMutationBufferSize = 10 * 1000 * 1000;
int maxLatency = 10 * 1000;
-
+
protected LoadStoreCaster caster;
protected ResourceSchema schema;
protected String contextSignature = null;
-
+
public AbstractAccumuloStorage() {}
-
+
@Override
public Tuple getNext() throws IOException {
try {
// load the next pair
if (!reader.nextKeyValue())
return null;
-
+
Key key = (Key) reader.getCurrentKey();
Value value = (Value) reader.getCurrentValue();
assert key != null value != null;
@@ -119,21 +119,21 @@ public abstract class AbstractAccumuloStorage extends
LoadFunc implements StoreF
throw new IOException(e.getMessage());
}
}
-
+
protected abstract Tuple getTuple(Key key, Value value) throws IOException;
-
+
@Override
@SuppressWarnings(rawtypes)
public InputFormat getInputFormat() {
return new AccumuloInputFormat();
}
-
+
@Override
@SuppressWarnings({unchecked, rawtypes})
public void prepareToRead(RecordReader reader, PigSplit split) {
this.reader = reader;
}
-
+
private void setLocationFromUri(String location) throws IOException {
// ex:
//
accumulo://table1?instance=myinstanceuser=rootpassword=secretzookeepers=127.0.0.1:2181auths=PRIVATE,PUBLICfetch_columns=col1:cq1,col2:cq2start=abcend=z
@@ -172,13 +172,13 @@ public abstract class AbstractAccumuloStorage extends
LoadFunc implements StoreF
String[] parts = urlParts[0].split(/+);
table = parts[1];
tableName = new Text(table);
-
+
if (auths == null || auths.equals()) {
authorizations = new Authorizations();
} else {
authorizations = new Authorizations(auths.split(COMMA));
}
-
+
if (!StringUtils.isEmpty(columns)) {
for (String cfCq : columns.split(COMMA)) {
if (cfCq.contains(COLON)) {
@@ -189,7 +189,7 @@ public abstract class AbstractAccumuloStorage extends
LoadFunc implements StoreF
}
}
}
-
+
} catch (Exception e) {
throw new IOException(
Expected
'accumulo://table[?instance=instanceNameuser=userpassword=passwordzookeepers=zookeepersauths=authorizations
@@ -197,356 +197,126 @@ public abstract class AbstractAccumuloStorage extends
LoadFunc implements StoreF
+ e.getMessage());
}
}
-
+
protected RecordWriterText,Mutation getWriter() {
return writer;
