From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 10 Mar 2016 16:50:16 +0000 (-0500)
Subject: test: periodic failure in TestJournalReplay.SnapRename
X-Git-Tag: v10.1.0~133^2~1^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fdeb125581132dcd363cbf71693ba798500fd739;p=ceph.git

test: periodic failure in TestJournalReplay.SnapRename

Force the refresh of the image to pick up the new snapshot
name before testing that it successfully was renamed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/test/librbd/journal/test_Replay.cc b/src/test/librbd/journal/test_Replay.cc
index 49fd479a2501..1f822d617bad 100644
--- a/src/test/librbd/journal/test_Replay.cc
+++ b/src/test/librbd/journal/test_Replay.cc
@@ -11,6 +11,7 @@
 #include "librbd/AioImageRequestWQ.h"
 #include "librbd/ExclusiveLock.h"
 #include "librbd/ImageCtx.h"
+#include "librbd/ImageState.h"
 #include "librbd/ImageWatcher.h"
 #include "librbd/internal.h"
 #include "librbd/Journal.h"
@@ -444,6 +445,7 @@ TEST_F(TestJournalReplay, SnapRename) {
   get_journal_commit_position(ictx, &current_tag, &current_entry);
   ASSERT_EQ(initial_tag, current_tag);
   ASSERT_EQ(initial_entry + 2, current_entry);
+  ASSERT_EQ(0, ictx->state->refresh());
 
   {
     RWLock::RLocker snap_locker(ictx->snap_lock);