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 ac532fcef81660fe87d5424b972b544b3f0612e0..26c438c05f20b1b0a80620984137a663d59d5af1 100644 (file)
--- 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 e0b25f4e0a3123a1e6ad333d70df964f745f8188..867c168f1ab72a1f8858ab7155d449d377a5dded 100644 (file)
--- 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();