RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16925 from gmayyyha/mgr-osd-metadata

Browse Source 
mgr: implement completion of osd MetadataUpdate

Reviewed-by: John Spray <john.spray@redhat.com>
This commit is contained in:
Sage Weil 2017-08-31 13:59:18 -05:00 committed by GitHub
commit 44d06eb64a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mgr/Mgr.cc
View File

@ -96,7 +96,7 @@ public:
{
daemon_state.clear_updating(key);
if (r == 0) {
if (key.first == "mds") {
if (key.first == "mds" || key.first == "osd") {
json_spirit::mValue json_result;
bool read_ok = json_spirit::read(
outbl.to_str(), json_result);
@ -105,6 +105,8 @@ public:
<< key.first << "." << key.second << dendl;
return;
}
dout(4) << "mon returned valid metadata JSON for "
<< key.first << "." << key.second << dendl;
json_spirit::mObject daemon_meta = json_result.get_obj();
@ -119,7 +121,11 @@ public:
if (daemon_state.exists(key)) {
state = daemon_state.get(key);
Mutex::Locker l(state->lock);
daemon_meta.erase("name");
if (key.first == "mds") {
daemon_meta.erase("name");
} else if (key.first == "osd") {
daemon_meta.erase("id");
}
daemon_meta.erase("hostname");
state->metadata.clear();
for (const auto &i : daemon_meta) {
@ -130,13 +136,19 @@ public:
state->key = key;
state->hostname = daemon_meta.at("hostname").get_str();
if (key.first == "mds") {
daemon_meta.erase("name");
} else if (key.first == "osd") {
daemon_meta.erase("id");
}
daemon_meta.erase("hostname");
for (const auto &i : daemon_meta) {
state->metadata[i.first] = i.second.get_str();
}
daemon_state.insert(state);
}
} else if (key.first == "osd") {
} else {
ceph_abort();
}