]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds/SnapServer: fix reset()
authorSage Weil <sage@redhat.com>
Tue, 17 Oct 2017 21:47:22 +0000 (16:47 -0500)
committerSage Weil <sage@redhat.com>
Sat, 2 Dec 2017 03:16:22 +0000 (21:16 -0600)
pg_pool_t's snap_seq is an upper bound on any allocated (or removed)
snapids.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mds/SnapServer.cc

index ea78bff1d087457b9fab90292b86f08c4e5cb809..291fc822f25026d9bac4ae939223f52ac4851690 100644 (file)
@@ -50,9 +50,9 @@ void SnapServer::reset_state()
            // needing removal, skip.
            continue;
          }
-         if (!pi->removed_snaps.empty() &&
-             pi->removed_snaps.range_end() > first_free)
-           first_free = pi->removed_snaps.range_end();
+         if (pi->snap_seq > first_free) {
+           first_free = pi->snap_seq;
+         }
        }
       });
     if (first_free > last_snap)