From: Sage Weil <sage@inktank.com>
Date: Sat, 28 Dec 2013 01:17:19 +0000 (-0800)
Subject: ceph_test_rados: make flush clean correct snap in model
X-Git-Tag: v0.77~22^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b70c476ab4c25e053a72023e1813fdc566545bed;p=ceph.git

ceph_test_rados: make flush clean correct snap in model
---

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index b521569b7d2..0bc45863297 100644
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -418,12 +418,14 @@ public:
   }
 
   void update_object_version(const string &oid, uint64_t version,
-			     bool dirty = true)
+			     bool dirty = true, int snap = -1)
   {
     for (map<int, map<string,ObjectDesc> >::reverse_iterator i = 
 	   pool_obj_cont.rbegin();
 	 i != pool_obj_cont.rend();
 	 ++i) {
+      if (snap != -1 && snap < i->first)
+	continue;
       map<string,ObjectDesc>::iterator j = i->second.find(oid);
       if (j != i->second.end()) {
 	if (version)
@@ -1850,7 +1852,7 @@ public:
     int r = completion->get_return_value();
     cout << num << ":  got " << cpp_strerror(r) << std::endl;
     if (r == 0) {
-      context->update_object_version(oid, 0, false);
+      context->update_object_version(oid, 0, false, snap);
     } else if (r == -EBUSY) {
       assert(can_fail);
     } else if (r == -EINVAL) {