]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
use stringsream::str(), not rdbuf()
authorSage Weil <sage@redhat.com>
Wed, 17 Jan 2018 17:22:55 +0000 (11:22 -0600)
committerSage Weil <sage@redhat.com>
Thu, 18 Jan 2018 17:46:14 +0000 (11:46 -0600)
Fixes: http://tracker.ceph.com/issues/22715
Signed-off-by: Sage Weil <sage@redhat.com>
src/common/admin_socket.cc
src/common/cmdparse.cc
src/mon/OSDMonitor.cc
src/osd/PG.cc

index f62286e24cd25d973e88895b331ea8bd5148d2ee..19397e578f5c2da8724fd62d65cc9450568c8cad 100644 (file)
@@ -365,7 +365,7 @@ bool AdminSocket::do_accept()
   stringstream errss;
   cmdvec.push_back(cmd);
   if (!cmdmap_from_json(cmdvec, &cmdmap, errss)) {
-    ldout(m_cct, 0) << "AdminSocket: " << errss.rdbuf() << dendl;
+    ldout(m_cct, 0) << "AdminSocket: " << errss.str() << dendl;
     VOID_TEMP_FAILURE_RETRY(close(connection_fd));
     return false;
   }
index 9ce9ff6a54075f4a0af020a05335954bb6cd37bc..7047a25a26e75a5478ee5edebfbe360d46b5e8c4 100644 (file)
@@ -342,7 +342,8 @@ handle_bad_get(CephContext *cct, const string& k, const char *tname)
 
   ostringstream oss;
   oss << BackTrace(1);
-  lderr(cct) << oss.rdbuf() << dendl;
+  lderr(cct) << oss.str() << dendl;
+
   if (status == 0)
     free((char *)typestr);
 }
index 87ab8c03afea9d1da9db3b01fec639b744f8ff9b..1d9cef39e6db981e89cbaadadfdfe0b20fbc5acd 100644 (file)
@@ -5981,7 +5981,7 @@ int OSDMonitor::prepare_command_pool_set(map<string,cmd_vartype> &cmdmap,
        if (err == 0) {
         k = erasure_code->get_data_chunk_count();
        } else {
-        ss << __func__ << " get_erasure_code failed: " << tmp.rdbuf();
+        ss << __func__ << " get_erasure_code failed: " << tmp.str();
         return err;
        }
 
index 17932eb3a1966cbcba247b77ca3d9d35dbbc591f..8e794ff23aa4cc0e08a0b3a8de1a3619091be00c 100644 (file)
@@ -3488,7 +3488,7 @@ void PG::read_state(ObjectStore *store)
     cct->_conf->osd_ignore_stale_divergent_priors,
     cct->_conf->osd_debug_verify_missing_on_start);
   if (oss.tellp())
-    osd->clog->error() << oss.rdbuf();
+    osd->clog->error() << oss.str();
 
   // log any weirdness
   log_weirdness();