diff options
| author | Sage Weil <sage.weil@dreamhost.com> | 2012-01-30 11:07:12 -0800 |
|---|---|---|
| committer | Sage Weil <sage.weil@dreamhost.com> | 2012-01-30 11:07:12 -0800 |
| commit | 04497a51007ecf3c6d741b31f76fc4c757ee43b6 (patch) | |
| tree | cb104d14ab32257240f35ffa6b46304225321cf8 /src/mds | |
| parent | dabf1e483a38e44530d2ffe400515ae46621f77e (diff) | |
| download | ceph-04497a51007ecf3c6d741b31f76fc4c757ee43b6.tar.gz | |
mdsmap: move member initialization to monitor create_initial()
The dependence on cct/conf here was totally wrong.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Diffstat (limited to 'src/mds')
| -rw-r--r-- | src/mds/MDS.cc | 4 | ||||
| -rw-r--r-- | src/mds/MDSMap.cc | 1 | ||||
| -rw-r--r-- | src/mds/MDSMap.h | 7 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index a8c38a90e47..86890d3beee 100644 --- a/src/mds/MDS.cc +++ b/src/mds/MDS.cc @@ -105,7 +105,7 @@ MDS::MDS(const std::string &n, Messenger *m, MonClient *mc) : monc->set_messenger(messenger); - mdsmap = new MDSMap(g_ceph_context); + mdsmap = new MDSMap; osdmap = new OSDMap; objecter = new Objecter(m->cct, messenger, monc, osdmap, mds_lock, timer); @@ -806,7 +806,7 @@ void MDS::handle_mds_map(MMDSMap *m) entity_addr_t addr; // decode and process - mdsmap = new MDSMap(g_ceph_context); + mdsmap = new MDSMap; mdsmap->decode(m->get_encoded()); monc->sub_got("mdsmap", mdsmap->get_epoch()); diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc index 41f8b28a3b5..df44a291b00 100644 --- a/src/mds/MDSMap.cc +++ b/src/mds/MDSMap.cc @@ -74,6 +74,7 @@ void MDSMap::dump(Formatter *f) const f->dump_int("root", root); f->dump_int("session_timeout", session_timeout); f->dump_int("session_autoclose", session_autoclose); + f->dump_int("max_file_size", max_file_size); f->dump_int("last_failure", last_failure); f->dump_int("last_failure_osd_epoch", last_failure_osd_epoch); f->open_object_section("compat"); diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h index e4fdd7a8b75..fdb7f2cd66b 100644 --- a/src/mds/MDSMap.h +++ b/src/mds/MDSMap.h @@ -202,14 +202,9 @@ public: friend class MDSMonitor; public: - MDSMap(CephContext *cct_) + MDSMap() : epoch(0), flags(0), last_failure(0), last_failure_osd_epoch(0), tableserver(0), root(0), cas_pg_pool(-1), metadata_pg_pool(0) { - // hack.. this doesn't really belong here - const md_config_t *conf = cct_->_conf; - session_timeout = (int)conf->mds_session_timeout; - session_autoclose = (int)conf->mds_session_autoclose; - max_file_size = conf->mds_max_file_size; } utime_t get_session_timeout() { |