From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 10 Feb 2016 22:39:36 +0000 (-0500)
Subject: test: possible librbd journal replay flush race
X-Git-Tag: v10.1.0~395^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1cc409b45e4f1eb9c88ff9c1bdf02652b24e3ef1;p=ceph.git

test: possible librbd journal replay flush race

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 c144cbf2d354..6534900a173f 100644
--- a/src/test/librbd/journal/test_Replay.cc
+++ b/src/test/librbd/journal/test_Replay.cc
@@ -125,12 +125,13 @@ TEST_F(TestJournalReplay, AioFlushEvent) {
   ASSERT_EQ(0, when_acquired_lock(ictx));
 
   librbd::journal::AioFlushEvent aio_flush_event;
-  librbd::journal::EventEntry event_entry(aio_flush_event);
   librbd::Journal<>::AioObjectRequests requests;
   {
     RWLock::RLocker owner_locker(ictx->owner_lock);
-    ictx->journal->append_io_event(NULL, std::move(event_entry), requests, 0, 0,
-                                   true);
+    ictx->journal->append_io_event(NULL, std::move(librbd::journal::EventEntry(aio_flush_event)),
+                                   requests, 0, 0, true);
+    ictx->journal->append_io_event(NULL, std::move(librbd::journal::EventEntry(aio_flush_event)),
+                                   requests, 0, 0, true);
   }
 
   // start an AIO write op