Merge pull request #1105 from athanatos/wip-ec-pg-log

update diverge priors tests - this is handled by persisting the missing set now

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Josh Durgin 2016-07-28 14:40:19 -07:00 committed by GitHub
commit e49218b8ef
4 changed files with 2 additions and 26 deletions

View File

@ -4,3 +4,4 @@ overrides:
osd:
osd op queue: debug_random
osd op queue cut off: debug_random
osd debug verify missing on start: true

View File

@ -159,13 +159,4 @@ def task(ctx, config):
'/tmp/existing'])
assert exit_status is 0
(remote,) = ctx.\
cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
msg = "dirty_divergent_priors: true, divergent_priors: %d" \
% (DIVERGENT_WRITE + DIVERGENT_REMOVE)
cmd = 'grep "{msg}" /var/log/ceph/ceph-osd.{osd}.log'\
.format(msg=msg, osd=divergent)
proc = remote.run(args=cmd, wait=True, check_status=False)
assert proc.exitstatus == 0
log.info("success")

View File

@ -193,15 +193,6 @@ def task(ctx, config):
'/tmp/existing'])
assert exit_status is 0
(remote,) = ctx.\
cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
msg = "dirty_divergent_priors: true, divergent_priors: %d" \
% (DIVERGENT_WRITE + DIVERGENT_REMOVE)
cmd = 'grep "{msg}" /var/log/ceph/ceph-osd.{osd}.log'\
.format(msg=msg, osd=divergent)
proc = remote.run(args=cmd, wait=True, check_status=False)
assert proc.exitstatus == 0
cmd = 'rm {file}'.format(file=expfile)
remote.run(args=cmd, wait=True)
exp_remote.run(args=cmd, wait=True)
log.info("success")

View File

@ -230,13 +230,6 @@ def task(ctx, config):
(remote,) = ctx.\
cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
msg = "dirty_divergent_priors: true, divergent_priors: %d" \
% (DIVERGENT_WRITE + DIVERGENT_REMOVE)
cmd = 'grep "{msg}" /var/log/ceph/ceph-osd.{osd}.log'\
.format(msg=msg, osd=divergent)
proc = remote.run(args=cmd, wait=True, check_status=False)
assert proc.exitstatus == 0
cmd = 'rm {file}'.format(file=expfile)
remote.run(args=cmd, wait=True)
log.info("success")