Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jewel: tools: add a tool to rebuild mon store from OSD #11126

Merged
9 commits merged into from Oct 20, 2016

Commits on Oct 18, 2016

  1. mon/AuthMonitor: make AuthMonitor::IncType public

    so ceph-objectstore-tool is able to use it when rebuilding monitor
    db.
    
    Fixes: http://tracker.ceph.com/issues/17179
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    (cherry picked from commit 19ef4f1)
    tchaikov committed Oct 18, 2016
    Copy the full SHA
    4167502 View commit details
    Browse the repository at this point in the history
  2. tools/ceph-objectstore-tool: add "update-mon-db" command

    Fixes: http://tracker.ceph.com/issues/17179
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    Conflicts:
    	src/tools/CMakeLists.txt: this file was added in master, so
    		update src/CMakeLists.txt instead
    	src/tools/Makefile-server.am: jewel is still using autotools,
    		so update this file also.
            src/tools/rebuild_mondb.cc: move the code spilled into
                    doc/rados/troubleshooting/troubleshooting-mon.rst
                    by accident back to this commit.
    (cherry picked from commit 24faea7)
    tchaikov committed Oct 18, 2016
    Copy the full SHA
    1fcb0bb View commit details
    Browse the repository at this point in the history
  3. tools/ceph_monstore_tool: add "rebuild" command

    Fixes: http://tracker.ceph.com/issues/17179
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    (cherry picked from commit d909fa0)
    tchaikov committed Oct 18, 2016
    Copy the full SHA
    8c8d5ce View commit details
    Browse the repository at this point in the history
  4. doc: add rados/operations/disaster-recovery.rst

    document the process to recover from leveldb corruption.
    
    Fixes: http://tracker.ceph.com/issues/17179
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    (cherry picked from commit 79a9f29)
    Conflicts:
            src/tools/rebuild_mondb.cc:
    		remove the code change in this file from this commit.
    		and the code gets removed is added in anther commit.
    tchaikov committed Oct 18, 2016
    Copy the full SHA
    5191b06 View commit details
    Browse the repository at this point in the history
  5. tools/rebuild_mondb: avoid unnecessary result code cast

    In general we return negative codes for error cases, so there is
    no need perform the cast here.
    
    Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    (cherry picked from commit 6a1c01d)
    xiexingguo authored and tchaikov committed Oct 18, 2016
    Copy the full SHA
    0970126 View commit details
    Browse the repository at this point in the history
  6. tools/rebuild_mondb: kill compiling warning

    As follow:
    
    [ 72%] Building CXX object src/tools/CMakeFiles/ceph-objectstore-tool.dir/RadosDump.cc.o
    /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc: In function ‘int update_mon_db(ObjectStore&, OSDSuperblock&, const string&, const string&)’:
    /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:289:22: warning: ‘crc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
             if (have_crc && osdmap.get_crc() != crc) {
                          ^
    /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:238:14: note: ‘crc’ was declared here
         uint32_t crc;
    
    Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    (cherry picked from commit f16a314)
    xiexingguo authored and tchaikov committed Oct 18, 2016
    Copy the full SHA
    d2deed6 View commit details
    Browse the repository at this point in the history
  7. tools/ceph_monstore_tool: update pgmap_meta also when rebuilding stor…

    …e.db
    
    we should rebuild pgmap_meta table from the collected osdmaps
    
    Fixes: http://tracker.ceph.com/issues/17400
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    (cherry picked from commit cdfa7a6)
    tchaikov committed Oct 18, 2016
    Copy the full SHA
    4ebf87b View commit details
    Browse the repository at this point in the history
  8. tools/ceph_monstore_tool: bail out if no caps found for a key

    we take it as an error if no caps is granted to an entity in the
    specified keyring file when rebuilding the monitor db.
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    (cherry picked from commit b4bd400)
    tchaikov committed Oct 18, 2016
    Copy the full SHA
    73ea926 View commit details
    Browse the repository at this point in the history
  9. doc: fill keyring with caps before passing it to ceph-monstore-tool

    to make sure the recovered monitor store is ready for use.
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    (cherry picked from commit af8e211)
    tchaikov committed Oct 18, 2016
    Copy the full SHA
    25a35d4 View commit details
    Browse the repository at this point in the history