From: huangjun <hjwsm1989@gmail.com>
Date: Thu, 22 Jan 2015 10:57:02 +0000 (+0800)
Subject:   use shardid as a key of the shardinfo when "dump_op_pq_state".
X-Git-Tag: v0.93~174^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3454%2Fhead;p=ceph.git

  use shardid as a key of the shardinfo when "dump_op_pq_state".
  Signed-off-by: huangjun <hjwsm1989@gmail.com>
---

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index fe281ea04a03..3f62072047b0 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1490,9 +1490,13 @@ private:
       void dump(Formatter *f) {
         for(uint32_t i = 0; i < num_shards; i++) {
           ShardData* sdata = shard_list[i];
+	  char lock_name[32] = {0};
+          snprintf(lock_name, sizeof(lock_name), "%s%d", "OSD:ShardedOpWQ:", i);
           assert (NULL != sdata);
           sdata->sdata_op_ordering_lock.Lock();
-          sdata->pqueue.dump(f);
+	  f->open_object_section(lock_name);
+	  sdata->pqueue.dump(f);
+	  f->close_section();
           sdata->sdata_op_ordering_lock.Unlock();
         }
       }