From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Jul 2018 12:10:28 +0000 (-0500)
Subject: qa/standalone/osd/repro_long_log.sh: fix test
X-Git-Tag: v12.2.7~7^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93ecb582bf49862c20113177da24df30abdd25f9;p=ceph.git

qa/standalone/osd/repro_long_log.sh: fix test

The log trimming case wasn't quite right.  Before HEAD^ we were
rolling forward too aggressively and miscalculating the can_rollforward_to,
which affected the trim_to calculation.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4f9fdd98e2dde3979ec88a3f761d76f7b297415c)
---

diff --git a/qa/standalone/osd/repro_long_log.sh b/qa/standalone/osd/repro_long_log.sh
index 1f4ba29bdfbc..93201a2a50c6 100755
--- a/qa/standalone/osd/repro_long_log.sh
+++ b/qa/standalone/osd/repro_long_log.sh
@@ -138,10 +138,11 @@ function TEST_trim_max_entries()
     rados -p test rm foo
     test_log_size $PGID 3
     rados -p test rm foo
-    test_log_size $PGID 4
-
+    test_log_size $PGID 3
     rados -p test rm foo
-    test_log_size $PGID 2
+    test_log_size $PGID 3
+    rados -p test rm foo
+    test_log_size $PGID 3
 }
 
 main repro-long-log "$@"