aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2014-03-21 13:05:29 -0400
committerSage Weil <sage@inktank.com>2014-04-05 00:07:58 -0400
commit9686f94c8cfc06e8afb7b2233ab8f1f6ac01957f (patch)
tree3564192f1d42c7ac6caeafa0becd3bac88704538 /include
parent35a935d75d51abe58d3427a8b4ae3745a5a14e1c (diff)
libceph: primary_temp infrastructure
Add primary_temp mappings infrastructure. struct ceph_pg_mapping is overloaded, primary_temp mappings are stored in an rb-tree, rooted at ceph_osdmap, in a manner similar to pg_temp mappings. Dump primary_temp mappings to /sys/kernel/debug/ceph/<client>/osdmap, one 'primary_temp <pgid> <osd>' per line, e.g: primary_temp 2.6 4 Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ceph/osdmap.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index 4837e58e3203..db4fb6322aae 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -66,6 +66,9 @@ struct ceph_pg_mapping {
66 int len; 66 int len;
67 int osds[]; 67 int osds[];
68 } pg_temp; 68 } pg_temp;
69 struct {
70 int osd;
71 } primary_temp;
69 }; 72 };
70}; 73};
71 74
@@ -83,6 +86,8 @@ struct ceph_osdmap {
83 struct ceph_entity_addr *osd_addr; 86 struct ceph_entity_addr *osd_addr;
84 87
85 struct rb_root pg_temp; 88 struct rb_root pg_temp;
89 struct rb_root primary_temp;
90
86 struct rb_root pg_pools; 91 struct rb_root pg_pools;
87 u32 pool_max; 92 u32 pool_max;
88 93