diff options
| author | Sage Weil <sage.weil@dreamhost.com> | 2012-04-28 14:48:51 -0700 |
|---|---|---|
| committer | Sage Weil <sage.weil@dreamhost.com> | 2012-04-28 14:48:51 -0700 |
| commit | c97c20de0ecd435c769926d957ecd07391c20cc4 (patch) | |
| tree | ac234f1525f57988e513c98c4fe051bc7f6f450b /src/osd/OSDMap.h | |
| parent | c661e66cc2b808aeb47672b129f51bbef9f76523 (diff) | |
| parent | e205e11c5acccdf87f85e6d12f25cb1e376ad056 (diff) | |
| download | ceph-c97c20de0ecd435c769926d957ecd07391c20cc4.tar.gz | |
Merge branch 'wip-mon'
Reviewed-by: Gregory Farnum <gregory.farnum@dreamhost.com>
Diffstat (limited to 'src/osd/OSDMap.h')
| -rw-r--r-- | src/osd/OSDMap.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index f533e524931..ed3795c5fa3 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -137,6 +137,9 @@ public: string cluster_snapshot; + int get_net_marked_out(const OSDMap *previous) const; + int get_net_marked_down(const OSDMap *previous) const; + void encode_client_old(bufferlist& bl) const; void encode(bufferlist& bl, uint64_t features=-1) const; void decode(bufferlist::iterator &p); @@ -691,6 +694,7 @@ public: void print_tree(ostream& out) const; string get_flag_string() const; + static string get_flag_string(unsigned flags); void dump_json(ostream& out) const; void dump(Formatter *f) const; static void generate_test_instances(list<OSDMap*>& o); |