Repository: accumulo Updated Branches: refs/heads/master a81b966a7 -> 93e7a04bd
ACCUMULO-4034 fixes from testing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7086bd2b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7086bd2b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7086bd2b Branch: refs/heads/master Commit: 7086bd2b8ad09f6493e1ebc53ca1affd8c2ba997 Parents: 43f4464 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Oct 23 12:48:28 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Oct 23 12:48:28 2015 -0400 ---------------------------------------------------------------------- test/system/agitator/agitator.ini.example | 2 +- test/system/agitator/agitator.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7086bd2b/test/system/agitator/agitator.ini.example ---------------------------------------------------------------------- diff --git a/test/system/agitator/agitator.ini.example b/test/system/agitator/agitator.ini.example index 825f0ed..c6f16c7 100644 --- a/test/system/agitator/agitator.ini.example +++ b/test/system/agitator/agitator.ini.example @@ -19,7 +19,7 @@ user=%(env.user)s [agitator] kill=kill -9 -ssh=ssh -q -t -A -o StrictHostKeyChecking=no +ssh=ssh -q -A -o StrictHostKeyChecking=no sleep=300 sleep.restart=30 sleep.jitter=30 http://git-wip-us.apache.org/repos/asf/accumulo/blob/7086bd2b/test/system/agitator/agitator.py ---------------------------------------------------------------------- diff --git a/test/system/agitator/agitator.py b/test/system/agitator/agitator.py index 92b0b28..e458016 100755 --- a/test/system/agitator/agitator.py +++ b/test/system/agitator/agitator.py @@ -74,7 +74,7 @@ class Proc: class Zookeeper(Proc): program = 'zookeeper' def __init__(self): - _frequencyToKill = config.get(self.program, 'frequency') + self._frequencyToKill = config.getfloat(self.program, 'frequency') def start(self, host): self.runOn(host, [config.get(self.program, 'home') + '/bin/zkServer.sh start']) @@ -93,7 +93,7 @@ class Hadoop(Proc): def start(self, host): binDir = config.get(self.section, 'bin') - self.runOn(host, ['nohup', binDir + "/hdfs", self.program, '&']) + self.runOn(host, ['nohup %s/hdfs %s < /dev/null >/dev/null 2>&1 &' %(binDir, self.program)]) def find(self, host): code, stdout, stderr = self.runOn(host, ["pgrep -f 'proc[_]%s' || true" % (self.program,)]) @@ -109,7 +109,7 @@ class Accumulo(Hadoop): section = 'accumulo' def start(self, host): home = config.get(self.section, 'home') - self.runOn(host, ['nohup', home + '/bin/accumulo', self.program, '&']) + self.runOn(host, ['nohup %s/bin/accumulo %s </dev/null >/dev/null 2>&1 & ' %(home, self.program)]) def find(self, host): code, stdout, stderr = self.runOn(host, ["pgrep -f 'app[=]%s' || true" % self.program]) @@ -180,7 +180,7 @@ def agitate(hosts, procs): logging.error("Unable to kill any %s on %s: no processes of that type are running", p, doomedHost) else: pid = random.choice(pids) - logging.info("Killing %s (%d) on %s", p, pid, host) + logging.debug("Killing %s (%d) on %s", p, pid, doomedHost) p.kill(doomedHost, pid) # remember to restart them later starters.append((doomedHost, p))
