RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 10:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/tasks/cephadm: fix log whitelist when there is no whitelist

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2020-01-17 22:59:43 +00:00
parent a09eb10220
commit 2681985983
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qa/tasks/cephadm.py
View File

@ -159,8 +159,9 @@ def ceph_log(ctx, config):
'/var/log/ceph/{fsid}/ceph.log'.format(
fsid=fsid),
]
for exclude in excludes:
args.extend([run.Raw('|'), 'egrep', '-v', exclude])
if excludes:
for exclude in excludes:
args.extend([run.Raw('|'), 'egrep', '-v', exclude])
args.extend([
run.Raw('|'), 'head', '-n', '1',
])
@ -174,7 +175,7 @@ def ceph_log(ctx, config):
return None
if first_in_ceph_log('\[ERR\]|\[WRN\]|\[SEC\]',
config['log-whitelist']) is not None:
config.get('log-whitelist')) is not None:
log.warning('Found errors (ERR|WRN|SEC) in cluster log')
ctx.summary['success'] = False
# use the most severe problem as the failure reason