RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 09:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14711 from jcsp/wip-19738

Browse Source 
mon: don't call propose_pending in prepare_update()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-04-24 12:20:42 +08:00 committed by GitHub
commit a952f84bd1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mon/MgrMonitor.cc
View File

@ -510,8 +510,8 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op)
}
}
if (changed) {
tick();
if (changed && pending_map.active_gid == 0) {
promote_standby();
}
} else {
r = -ENOSYS;