RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #39679 into master

Browse Source 
* refs/pull/39679/head:
	Revert "mon/MDSMonitor: add missing frozen checks"

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
This commit is contained in:
Patrick Donnelly 2021-03-02 06:40:50 -08:00
commit 150868a489
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mon/MDSMonitor.cc
View File

@ -1233,11 +1233,6 @@ bool MDSMonitor::fail_mds_gid(FSMap &fsmap, mds_gid_t gid)
const auto& info = fsmap.get_info_gid(gid);
dout(1) << "fail_mds_gid " << gid << " mds." << info.name << " role " << info.rank << dendl;
if (info.is_frozen()) {
dout(1) << "mds is frozen" << dendl;
return false;
}
ceph_assert(mon.osdmon()->is_writeable());
epoch_t blocklist_epoch = 0;
@ -2000,10 +1995,7 @@ bool MDSMonitor::maybe_resize_cluster(FSMap &fsmap, fs_cluster_id_t fscid)
} else if (in > max) {
mds_rank_t target = in - 1;
const auto &info = mds_map.get_info(target);
if (info.is_frozen()) {
dout(1) << "highest rank is frozen" << dendl;
return false;
} else if (mds_map.is_active(target)) {
if (mds_map.is_active(target)) {
dout(1) << "stopping " << target << dendl;
mon.clog->info() << "stopping " << info.human_name();
auto f = [](auto& info) {