From efb3b181fd2e6ed529f6f861c98ee16bd50bd011 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 10 May 2017 16:29:02 -0400 Subject: [PATCH] qa/rgw: add log_level argument to rgwadmin() changes default level from info to debug Signed-off-by: Casey Bodley --- qa/tasks/util/rgw.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/tasks/util/rgw.py b/qa/tasks/util/rgw.py index d6780e82c0465..6dd08879c80ec 100644 --- a/qa/tasks/util/rgw.py +++ b/qa/tasks/util/rgw.py @@ -18,7 +18,7 @@ def multi_region_enabled(ctx): return 'radosgw_agent' in ctx def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False, - format='json', decode=True): + format='json', decode=True, log_level=logging.DEBUG): log.info('rgwadmin: {client} : {cmd}'.format(client=client,cmd=cmd)) testdir = teuthology.get_testdir(ctx) cluster_name, daemon_type, client_id = teuthology.split_role(client) @@ -34,7 +34,7 @@ def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False, '--cluster', cluster_name, ] pre.extend(cmd) - log.info('rgwadmin: cmd=%s' % pre) + log.log(log_level, 'rgwadmin: cmd=%s' % pre) (remote,) = ctx.cluster.only(client).remotes.iterkeys() proc = remote.run( args=pre, @@ -51,10 +51,10 @@ def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False, if not r and out != '': try: j = json.loads(out) - log.info(' json result: %s' % j) + log.log(log_level, ' json result: %s' % j) except ValueError: j = out - log.info(' raw result: %s' % j) + log.log(log_level, ' raw result: %s' % j) return (r, j) def get_user_summary(out, user): -- 2.39.5