accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Date Fri, 08 Nov 2013 15:54:28 GMT
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/422aaaa7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/422aaaa7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/422aaaa7

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 422aaaa7c35de07c280d496e489fbab541edeea3
Parents: 060188a 6648056
Author: John Vines <jvines@gmail.com>
Authored: Fri Nov 8 10:53:24 2013 -0500
Committer: John Vines <jvines@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/422aaaa7/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/422aaaa7/test/system/continuous/agitator.pl
----------------------------------------------------------------------
diff --cc test/system/continuous/agitator.pl
index d9c5395,e838bc6..c779983
--- a/test/system/continuous/agitator.pl
+++ b/test/system/continuous/agitator.pl
@@@ -24,34 -24,16 +24,40 @@@ if(scalar(@ARGV) != 4 && scalar(@ARGV) 
  }
  
  $ACCUMULO_HOME="../../..";
 +$HADOOP_PREFIX=$ENV{"HADOOP_PREFIX"};
 +
 +@sleeprange1 = split(/:/, $ARGV[0]);
 +$sleep1 = $sleeprange1[0];
 +
 +@sleeprange2 = split(/:/, $ARGV[1]);
 +$sleep2 = $sleeprange2[0];
 +
 +if(scalar(@sleeprange1) > 1){
 +    $sleep1max = $sleeprange1[1] + 1;
 +}else{
 +    $sleep1max = $sleep1;
 +}
 +
 +if($sleep1 > $sleep1max){
 +	die("sleep1 > sleep1max $sleep1 > $sleep1max");
 +}
 +
 +if(scalar(@sleeprange2) > 1){
 +    $sleep2max = $sleeprange2[1] + 1;
 +}else{
 +    $sleep2max = $sleep2;
 +}
 +
 +if($sleep2 > $sleep2max){
 +	die("sleep2 > sleep2max $sleep2 > $sleep2max");
 +}
  
+ if(defined $ENV{'ACCUMULO_CONF_DIR'}){
 -        $ACCUMULO_CONF_DIR = $ENV{'ACCUMULO_CONF_DIR'};
++  $ACCUMULO_CONF_DIR = $ENV{'ACCUMULO_CONF_DIR'};
+ }else{
+ 	$ACCUMULO_CONF_DIR = $ACCUMULO_HOME . '/conf';
+ }
+ 
 -$sleep1 = $ARGV[0];
 -$sleep2 = $ARGV[1];
 -
  if(scalar(@ARGV) == 4){
  	$minKill = $ARGV[2];
  	$maxKill = $ARGV[3];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/422aaaa7/test/system/continuous/continuous-env.sh.example
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/422aaaa7/test/system/continuous/mapred-setup.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/422aaaa7/test/system/continuous/start-stats.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/422aaaa7/test/system/randomwalk/bin/reset-cluster.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/422aaaa7/test/system/randomwalk/bin/start-all.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/422aaaa7/test/system/randomwalk/bin/start-local.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/422aaaa7/test/system/scalability/run.py
----------------------------------------------------------------------


Mime
View raw message