]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: don't warn unconnected snaplrealms in cluster log
authorYan, Zheng <zyan@redhat.com>
Wed, 7 Feb 2018 09:29:00 +0000 (17:29 +0800)
committerYan, Zheng <zyan@redhat.com>
Tue, 6 Mar 2018 02:34:48 +0000 (10:34 +0800)
When mds recovers, clients add all snaprealms they have to reconnect
message. In multimds setup, it's common that the recovering mds only
have a portion of these snaprealms

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
src/mds/MDCache.cc

index 7992fa98abd381a63e0dd0e229d09d45c64993c6..e989fc7412c2d5e48fd6fe562418687cccee8016 100644 (file)
@@ -5883,18 +5883,19 @@ void MDCache::open_snaprealms()
     gather.activate();
   } else {
     if (!reconnected_snaprealms.empty()) {
-      stringstream warn_str;
-      for (map<inodeno_t,map<client_t,snapid_t> >::iterator p = reconnected_snaprealms.begin();
-          p != reconnected_snaprealms.end();
-          ++p) {
-       warn_str << " unconnected snaprealm " << p->first << "\n";
-       for (map<client_t,snapid_t>::iterator q = p->second.begin();
-            q != p->second.end();
-            ++q)
-         warn_str << "  client." << q->first << " snapid " << q->second << "\n";
-      }
-      mds->clog->warn() << "open_snaprealms has:";
-      mds->clog->warn(warn_str);
+      dout(5) << "open_snaprealms has unconnected snaprealm:" << dendl;
+      for (auto& p : reconnected_snaprealms) {
+       stringstream warn_str;
+       warn_str << " " << p.first << " {";
+       bool first = true;
+       for (auto& q : p.second) {
+         if (!first)
+           warn_str << ", ";
+         warn_str << "client." << q.first << "/" << q.second;
+       }
+       warn_str << "}";
+       dout(5) << warn_str.str() << dendl;
+      }
     }
     assert(rejoin_waiters.empty());
     assert(rejoin_pending_snaprealms.empty());