]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: fix trailing + in pg state string rendering
authorSage Weil <sage@newdream.net>
Tue, 16 Nov 2010 18:32:19 +0000 (10:32 -0800)
committerSage Weil <sage@newdream.net>
Tue, 16 Nov 2010 18:32:19 +0000 (10:32 -0800)
Signed-off-by: Sage Weil <sage@newdream.net>
src/osd/osd_types.h

index 39de3a2b12f37ff22204f79656b6ae4630a597b7..f251cd579c1d2889d3729b3ad2f2a5ccb2121c59 100644 (file)
@@ -585,7 +585,11 @@ static inline std::string pg_state_string(int state)
   if (state & PG_STATE_SCANNING)
     oss << "scanning+";
   string ret(oss.str());
-  return (ret.length() == 0) ? "inactive" : ret;
+  if (ret.length() > 0)
+    ret.resize(ret.length() - 1);
+  else
+    ret = "inactive";
+  return ret;
 }