]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/SnapMapper: allow split_bits to decrease (merge)
authorSage Weil <sage@redhat.com>
Tue, 3 Apr 2018 21:09:17 +0000 (16:09 -0500)
committerSage Weil <sage@redhat.com>
Fri, 7 Sep 2018 17:07:56 +0000 (12:07 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/SnapMapper.h

index 26e90d60c063904620ade7372680c43256b72644..21157ef2ae1469bcd70a3ee8fd14c386ca59bae8 100644 (file)
@@ -180,11 +180,10 @@ public:
   }
 
   set<string> prefixes;
-  /// Update bits in case of pg split
+  /// Update bits in case of pg split or merge
   void update_bits(
     uint32_t new_bits  ///< [in] new split bits
     ) {
-    ceph_assert(new_bits >= mask_bits);
     mask_bits = new_bits;
     set<string> _prefixes = hobject_t::get_prefixes(
       mask_bits,