From: Sage Weil <sage@redhat.com>
Date: Fri, 26 May 2017 03:12:26 +0000 (-0400)
Subject: test/osd/osd-config.sh: fix test to isolate cases
X-Git-Tag: v12.1.0~378^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c1b92cdcbb944fef538a841c246c7d95939a265e;p=ceph-ci.git

test/osd/osd-config.sh: fix test to isolate cases

The third test (increasing osd_map_max_advance)
was triggering a warning from the 4th case (which
it didn't before).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/osd/osd-config.sh b/src/test/osd/osd-config.sh
index 2a924042a13..6cb5eb2fd30 100755
--- a/src/test/osd/osd-config.sh
+++ b/src/test/osd/osd-config.sh
@@ -86,6 +86,8 @@ function TEST_config_track() {
     ceph tell osd.0 injectargs "--osd-map-cache-size $cache" || return 1
     CEPH_ARGS='' ceph --admin-daemon $dir/ceph-osd.0.asok log flush || return 1
     ! grep 'is not > osd_map_max_advance' $dir/osd.0.log || return 1
+    rm $dir/osd.0.log
+    CEPH_ARGS='' ceph --admin-daemon $dir/ceph-osd.0.asok log reopen || return 1
 
     #
     # increase the osd_map_max_advance above the default cache_size
@@ -95,6 +97,8 @@ function TEST_config_track() {
     ceph tell osd.0 injectargs "--osd-map-max-advance $advance" || return 1
     CEPH_ARGS='' ceph --admin-daemon $dir/ceph-osd.0.asok log flush || return 1
     grep 'is not > osd_map_max_advance' $dir/osd.0.log || return 1
+    rm $dir/osd.0.log
+    CEPH_ARGS='' ceph --admin-daemon $dir/ceph-osd.0.asok log reopen || return 1
 
     #
     # increase the osd_pg_epoch_persisted_max_stale above the default cache_size
@@ -104,6 +108,8 @@ function TEST_config_track() {
     ceph tell osd.0 injectargs "--osd-pg-epoch-persisted-max-stale $stale" || return 1
     CEPH_ARGS='' ceph --admin-daemon $dir/ceph-osd.0.asok log flush || return 1
     grep 'is not > osd_pg_epoch_persisted_max_stale' $dir/osd.0.log || return 1
+    rm $dir/osd.0.log
+    CEPH_ARGS='' ceph --admin-daemon $dir/ceph-osd.0.asok log reopen || return 1
 }
 
 main osd-config "$@"