]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
use shardid as a key of the shardinfo when "dump_op_pq_state". 3454/head
authorhuangjun <hjwsm1989@gmail.com>
Thu, 22 Jan 2015 10:57:02 +0000 (18:57 +0800)
committerhuangjun <hjwsm1989@gmail.com>
Thu, 22 Jan 2015 10:57:02 +0000 (18:57 +0800)
Signed-off-by: huangjun <hjwsm1989@gmail.com>
src/osd/OSD.h

index fe281ea04a03da7dbb806d11ccc8263f2cc7d22e..3f62072047b051098b26ffce746afea15b097fd1 100644 (file)
@@ -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();
         }
       }