Merge PR ceph#38836 into master

* refs/pull/38836/head: client: add debug messages for osdmap wait Reviewed-by: Xiubo Li <[email protected]>
amincheloh · Jan 11, 2021 · ed34006 · ed34006
2 parents 1783f43 + 14b4787
commit ed34006
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/qa/suites/fs/volumes/tasks/volumes/overrides.yaml b/qa/suites/fs/volumes/tasks/volumes/overrides.yaml
@@ -2,7 +2,7 @@ overrides:
   ceph:
     conf:
       mgr:
-        debug client: 10
+        debug client: 20
     log-ignorelist:
       - OSD full dropping all updates
       - OSD near full

diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -12163,6 +12163,7 @@ void Client::_setxattr_maybe_wait_for_osdmap(const char *name, const void *value
   // For setting pool of layout, MetaRequest need osdmap epoch.
   // There is a race which create a new data pool but client and mds both don't have.
   // Make client got the latest osdmap which make mds quickly judge whether get newer osdmap.
+  ldout(cct, 15) << __func__ << ": name = " << name << dendl;
   if (strcmp(name, "ceph.file.layout.pool") == 0 || strcmp(name, "ceph.dir.layout.pool") == 0 ||
       strcmp(name, "ceph.file.layout") == 0 || strcmp(name, "ceph.dir.layout") == 0) {
     string rest(strstr(name, "layout"));
@@ -12173,7 +12174,9 @@ void Client::_setxattr_maybe_wait_for_osdmap(const char *name, const void *value
 
     if (r == -ENOENT) {
       bs::error_code ec;
+      ldout(cct, 20) << __func__ << ": waiting for latest osdmap" << dendl;
       objecter->wait_for_latest_osdmap(ca::use_blocked[ec]);
+      ldout(cct, 20) << __func__ << ": got latest osdmap: " << ec << dendl;
     }
   }
 }