From: Joe Buck <jbbuck@gmail.com>
Date: Mon, 9 Sep 2013 19:07:29 +0000 (-0700)
Subject: Adding in erroneously removed args
X-Git-Tag: 1.1.0~1886^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d47ae37e93863836a75a46ebc4c8843b2c009ff6;p=teuthology.git

Adding in erroneously removed args

The 'kill' argument was accidentially removed
as part of patch
53b8e27da996f2efdcc4eb687f3bda0791a8d947

Signed-off-by: Joe Buck <jbbuck@gmail.com>
---

diff --git a/teuthology/task/radosgw-agent.py b/teuthology/task/radosgw-agent.py
index d50e94e6..014a1b14 100644
--- a/teuthology/task/radosgw-agent.py
+++ b/teuthology/task/radosgw-agent.py
@@ -75,6 +75,7 @@ def run_radosgw_agent(ctx, config):
         daemon_name = '{host}.{port}.syncdaemon'.format(host=remote.name, port=port)
         in_args=[
 		        'daemon-helper',
+		        'kill',
 		        '{tdir}/radosgw-agent.{client}/radosgw-agent'.format(tdir=testdir,
 		                                                             client=client),
 		        '-v',
diff --git a/teuthology/task/watch_notify_stress.py b/teuthology/task/watch_notify_stress.py
index 78c5c85c..129ac1e5 100644
--- a/teuthology/task/watch_notify_stress.py
+++ b/teuthology/task/watch_notify_stress.py
@@ -45,6 +45,7 @@ def task(ctx, config):
         args =['CEPH_CLIENT_ID={id_}'.format(id_=id_),
                'CEPH_ARGS="{flags}"'.format(flags=config.get('flags', '')),
                'daemon-helper',
+               'kill',
                'multi_stress_watch foo foo'
                ]