Meta server: fix null pointer de-reference in chunk server hibernatio…

…n. Change hibernation message log level in replay to debug. Fix message in retire RPC show method, and retire error message by adding missing spaces. Display remaining to evacuate chunks count in trace message.
quantcast · Nov 11, 2017 · 67f0ee6 · 67f0ee6
1 parent 066465b
commit 67f0ee6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/cc/meta/LayoutManager.cc b/src/cc/meta/LayoutManager.cc
@@ -6177,7 +6177,7 @@ LayoutManager::Validate(MetaRetireChunkserver& req)
     }
     req.status    = -EPERM;
     req.statusMsg = "chunk server retire is deprecated,"
-        "please use chunk directory evacuation ";
+        " please use chunk directory evacuation ";
     KFS_LOG_STREAM_INFO << req.statusMsg <<
     KFS_LOG_EOM;
     return false;
@@ -6208,15 +6208,19 @@ LayoutManager::RetireServer(MetaRetireChunkserver& req)
     server->SetRetiring(req.startTime, req.nSecsDown);
     if (server->IsHibernating()) {
         HibernatedServerInfos::iterator it;
-        HibernatingServerInfo* const    hs =
+        HibernatingServerInfo*          hs =
             FindHibernatingCSInfo(req.location, &it);
         if (hs) {
             hs->sleepEndTime = req.startTime + req.nSecsDown;
         } else {
-            mHibernatingServers.insert(it, HibernatingServerInfo(
+            it = mHibernatingServers.insert(it, HibernatingServerInfo(
                 req.location, req.startTime, req.nSecsDown, req.replayFlag));
+            hs = &*it;
         }
-        KFS_LOG_STREAM_INFO << "hibernating server: " << req.location <<
+        KFS_LOG_STREAM(req.replayFlag ?
+                MsgLogger::kLogLevelDEBUG :
+                MsgLogger::kLogLevelINFO) <<
+            "hibernating server: " << req.location <<
             " down time: " << req.nSecsDown <<
         KFS_LOG_EOM;
         hs->retiredFlag = true;
@@ -12085,6 +12089,7 @@ LayoutManager::RemoveRetiring(
                     (server->IsReplay() ? " replay" : "") <<
                     " removed: "  << retFlag <<
                     " retiring: " << server->IsRetiring() <<
+                    " chunks: "   << server->GetChunkCount() <<
                 KFS_LOG_EOM;
             }
             if (server->GetChunkCount() <= 0) {

diff --git a/src/cc/meta/MetaRequest.h b/src/cc/meta/MetaRequest.h
@@ -1892,7 +1892,7 @@ struct MetaRetireChunkserver : public MetaRequest, public ServerLocation {
         return os <<
             (nSecsDown > 0 ? "hibernating server: " : "retiring server: ") <<
             location <<
-            "down time: " << nSecsDown
+            " down time: " << nSecsDown
         ;
     }
     bool Validate()