From d077e7f7bfefa7ea30fe15e2ff099e1ef4388293 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 16 Jun 2021 09:30:41 -0700 Subject: [PATCH] mon/MDSMonitor: check fscid exists for legacy case If a client does not have permission to see the legacy fs, the monitor will throw an exception when looking up the mdsmap later in the code. We need to check existence for both code paths. Fixes: https://tracker.ceph.com/issues/51077 Signed-off-by: Patrick Donnelly (cherry picked from commit 75ccd9d49c78bacf73b9e61d99a75fb455a8b85f) --- src/mon/MDSMonitor.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 40cb07127ac3..9b07ee1d1a02 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -1738,15 +1738,6 @@ void MDSMonitor::check_sub(Subscription *sub) << "'" << dendl; return; } - if (fsmap.filesystems.count(fscid) == 0) { - // Client asked for a non-existent namespace, send them nothing - // TODO: something more graceful for when a client has a filesystem - // mounted, and the fileysstem is deleted. Add a "shut down you fool" - // flag to MMDSMap? - dout(1) << "Client subscribed to non-existent namespace '" << - fscid << "'" << dendl; - return; - } } else { // Unqualified request for "mdsmap": give it the one marked // for use by legacy clients. @@ -1758,6 +1749,15 @@ void MDSMonitor::check_sub(Subscription *sub) return; } } + if (!fsmap.filesystem_exists(fscid)) { + // Client asked for a non-existent namespace, send them nothing + // TODO: something more graceful for when a client has a filesystem + // mounted, and the fileysstem is deleted. Add a "shut down you fool" + // flag to MMDSMap? + dout(1) << "Client subscribed to non-existent namespace '" << + fscid << "'" << dendl; + return; + } } dout(10) << __func__ << ": is_mds=" << is_mds << ", fscid= " << fscid << dendl; -- 2.47.3