]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MDSMonitor: fix fs reset map init
authorJohn Spray <john.spray@redhat.com>
Mon, 10 Aug 2015 11:58:52 +0000 (12:58 +0100)
committerJohn Spray <john.spray@redhat.com>
Thu, 13 Aug 2015 10:01:14 +0000 (11:01 +0100)
`fs reset` was failing to fully initialize the
mdsmap.  Especially, failing to initialize
session_timeout was breaking capabilities on
the newly initialized system.

Signed-off-by: John Spray <john.spray@redhat.com>
src/mon/MDSMonitor.cc

index 4a2392e17e6f044acd99dff6f37aca53865d1d30..70b1110bb09510c4f67c975f714aaee72416ee62 100644 (file)
@@ -1416,6 +1416,10 @@ int MDSMonitor::management_command(
     newmap.inc = mdsmap.inc;
     newmap.enabled = mdsmap.enabled;
     newmap.inline_data_enabled = mdsmap.inline_data_enabled;
+    newmap.compat = get_mdsmap_compat_set_default();
+    newmap.session_timeout = g_conf->mds_session_timeout;
+    newmap.session_autoclose = g_conf->mds_session_autoclose;
+    newmap.max_file_size = g_conf->mds_max_file_size;
 
     // Persist the new MDSMap
     pending_mdsmap = newmap;