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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a1c01d
tools/rebuild_mondb: avoid unnecessary result code cast
xiexingguo Sep 18, 2016
ac7c1dc
tools/rebuild_mondb: return error if ondisk version of pg_info is inc…
xiexingguo Sep 18, 2016
a6cf4a4
tools/ceph_objectstore_tool: set error code if path of mon-db does no…
xiexingguo Sep 18, 2016
f16a314
tools/rebuild_mondb: kill compiling warning
xiexingguo Sep 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/tools/ceph_objectstore_tool.cc
View file
Open in desktop
Expand Up @@ -2874,6 +2874,7 @@ int main(int argc, char **argv)
} else if (op == "update-mon-db") {
if (!vm.count("mon-store-path")) {
cerr << "Please specify the path to monitor db to update" << std::endl;
ret = -EINVAL;
} else {
ret = update_mon_db(*fs, superblock, dpath + "/keyring", mon_store_path);
}
Expand Down
6 changes: 3 additions & 3 deletions src/tools/rebuild_mondb.cc
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ int update_mon_db(ObjectStore& fs, OSDSuperblock& sb,
int r = ms.create_and_open(cerr);
if (r < 0) {
cerr << "unable to open mon store: " << store_path << std::endl;
return EINVAL;
return r;
}
if ((r = update_auth(keyring, sb, ms)) < 0) {
goto out;
Expand Down Expand Up @@ -235,7 +235,7 @@ int update_osdmap(ObjectStore& fs, OSDSuperblock& sb, MonitorDBStore& ms)
for (auto e = max(last_committed+1, sb.oldest_map);
e <= sb.newest_map; e++) {
bool have_crc = false;
uint32_t crc;
uint32_t crc = -1;
uint64_t features = 0;
// add inc maps
{
Expand Down Expand Up @@ -410,7 +410,7 @@ int update_pgmap_pg(ObjectStore& fs, MonitorDBStore& ms)
}
if (struct_v < PG::cur_struct_v) {
cerr << "incompatible pg_info: v" << struct_v << std::endl;
return r;
return -EINVAL;
}
version_t latest_epoch = 0;
r = ms.get(prefix, stringify(pgid.pgid), bl);
Expand Down