Merge pull request #4140 from ceph/wip-rbd-rebuild-object-map

rbd: add ability to rebuild corrupt/missing object maps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc src/librbd/ObjectMap.h
index 5f9266031224372e4cbe9009ad6d2be079cdd41a,0534bacbb392d2802ac00a2f7375cbf0281c5c24..8f1d16ee33ae5b616d7c5a4967f17ab61922642f
--- 1/src/librbd/ObjectMap.h
--- 2/src/librbd/ObjectMap.h
+++ b/src/librbd/ObjectMap.h
@@@ -58,13 -66,10 +66,14 @@@ private
      }
  
    protected:
+     const uint64_t m_snap_id;
+ 
      virtual bool should_complete(int r);
 +    virtual int filter_return_code(int r) {
 +      // never propagate an error back to the caller
 +      return 0;
 +    }
      virtual void finish(ObjectMap *object_map) = 0;
- 
    private:
      /**
       * <start> ---> STATE_REQUEST ---> <finish>

diff --cc src/rbd.cc
Simple merge

diff --cc src/test/librados_test_stub/LibradosTestStub.cc
Simple merge

diff --cc src/test/librbd/test_librbd.cc
Simple merge