From: Dan Mick <dan.mick@inktank.com>
Date: Thu, 11 Jul 2013 00:24:40 +0000 (-0700)
Subject: CompatSet, MDSMap: formatted dumps must avoid numeric tags
X-Git-Tag: v0.67-rc1~94
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c87f55b5a8b3e003726e1be22b9cb6894ef2f37d;p=ceph.git

CompatSet, MDSMap: formatted dumps must avoid numeric tags

Tags made of numbers only confuse XML parsers.  Avoid them.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/src/include/CompatSet.h b/src/include/CompatSet.h
index ac532fcef816..26c438c05f20 100644
--- a/src/include/CompatSet.h
+++ b/src/include/CompatSet.h
@@ -96,7 +96,7 @@ struct CompatSet {
 	   p != names.end();
 	   ++p) {
 	char s[10];
-	snprintf(s, sizeof(s), "%lld", (unsigned long long)p->first);
+	snprintf(s, sizeof(s), "feature_%lld", (unsigned long long)p->first);
 	f->dump_string(s, p->second);
       }
     }
diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index e0b25f4e0a31..867c168f1ab7 100644
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -100,7 +100,7 @@ void MDSMap::dump(Formatter *f) const
   f->open_object_section("up");
   for (map<int32_t,uint64_t>::const_iterator p = up.begin(); p != up.end(); ++p) {
     char s[10];
-    sprintf(s, "%d", p->first);
+    sprintf(s, "mds_%d", p->first);
     f->dump_int(s, p->second);
   }
   f->close_section();
@@ -115,7 +115,7 @@ void MDSMap::dump(Formatter *f) const
   f->open_object_section("info");
   for (map<uint64_t,mds_info_t>::const_iterator p = mds_info.begin(); p != mds_info.end(); ++p) {
     char s[10];
-    sprintf(s, "%llu", (long long unsigned)p->first);
+    sprintf(s, "gid_%llu", (long long unsigned)p->first);
     f->open_object_section(s);
     p->second.dump(f);
     f->close_section();