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.

Sign up for GitHub

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

Jump to bottom

tools/rebuild_mondb: kill comipling warning and other fixes #11117

Merged
merged 4 commits into from Sep 18, 2016
Merged

tools/rebuild_mondb: kill comipling warning and other fixes #11117

merged 4 commits into from Sep 18, 2016

Commits on Sep 18, 2016

  1. 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>
    @xiexingguo
    xiexingguo committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    6a1c01d View commit details
    Browse the repository at this point in the history

  2. tools/rebuild_mondb: return error if ondisk version of pg_info is inc… 

    …ompatible

In this case "r" will be >= 0 and caller will be able to catch
this kind of error.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    ac7c1dc View commit details
    Browse the repository at this point in the history

  3. tools/ceph_objectstore_tool: set error code if path of mon-db does no… 

    …t exist

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
    @xiexingguo
    xiexingguo committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    a6cf4a4 View commit details
    Browse the repository at this point in the history

  4. 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>
    @xiexingguo
    xiexingguo committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    f16a314 View commit details
    Browse the repository at this point in the history