]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/osd_types: SnapSet::get_ssc_as_of: use clone_snaps
authorSage Weil <sage@redhat.com>
Tue, 11 Jun 2019 21:39:51 +0000 (16:39 -0500)
committerSage Weil <sage@redhat.com>
Tue, 2 Jul 2019 13:37:48 +0000 (08:37 -0500)
Fabricate a SnapContext from the clone_snaps instead of snaps (which we
are trying to kill).

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/osd_types.h

index ed486f43b12c723d4b30fb5c1831e90415f43ac4..d22cab3f824945fe83c63fec11e82f504dec4732 100644 (file)
@@ -5057,11 +5057,14 @@ struct SnapSet {
   SnapContext get_ssc_as_of(snapid_t as_of) const {
     SnapContext out;
     out.seq = as_of;
-    for (std::vector<snapid_t>::const_iterator i = snaps.begin();
-        i != snaps.end();
-        ++i) {
-      if (*i <= as_of)
-       out.snaps.push_back(*i);
+    for (auto p = clone_snaps.rbegin();
+        p != clone_snaps.rend();
+        ++p) {
+      for (auto snap : p->second) {
+       if (snap <= as_of) {
+         out.snaps.push_back(snap);
+       }
+      }
     }
     return out;
   }