From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Oct 2017 21:47:22 +0000 (-0500)
Subject: mds/SnapServer: fix reset()
X-Git-Tag: v13.0.2~844^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e89649dca590266de4e31ac50627052fabe9e658;p=ceph.git

mds/SnapServer: fix reset()

pg_pool_t's snap_seq is an upper bound on any allocated (or removed)
snapids.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc
index ea78bff1d08..291fc822f25 100644
--- a/src/mds/SnapServer.cc
+++ b/src/mds/SnapServer.cc
@@ -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)