Merge branch 'wip-1477'

src/cfuse.cc

@@ -68,7 +68,8 @@ int main(int argc, const char **argv, const char *envp[]) {
   vec_to_argv(args, argc, argv);
 
   // FUSE will chdir("/"); be ready.
-  g_conf->chdir = "/";
+  g_ceph_context->_conf->set_val("chdir", "/");
+  g_ceph_context->_conf->apply_changes(NULL);
 
   // check for 32-bit arch
   if (sizeof(long) == 4) {

src/cmds.cc

@@ -170,7 +170,10 @@ int main(int argc, const char **argv)
       }
       dout(0) << "requesting oneshot_replay for mds" << r << dendl;
       shadow = MDSMap::STATE_ONESHOT_REPLAY;
-      g_conf->mds_standby_for_rank = r;
+      char rb[32];
+      snprintf(rb, sizeof(rb), "%d", r);
+      g_conf->set_val("mds_standby_for_rank", rb);
+      g_conf->apply_changes(NULL);
     }
     else if (ceph_argparse_witharg(args, i, &val, "--hot-standby", (char*)NULL)) {
       int r = parse_rank("hot-standby", val);
@@ -180,7 +183,10 @@ int main(int argc, const char **argv)
       }
       dout(0) << "requesting standby_replay for mds" << r << dendl;
       shadow = MDSMap::STATE_STANDBY_REPLAY;
-      g_conf->mds_standby_for_rank = r;
+      char rb[32];
+      snprintf(rb, sizeof(rb), "%d", r);
+      g_conf->set_val("mds_standby_for_rank", rb);
+      g_conf->apply_changes(NULL);
     }
     else {
       derr << "Error: can't understand argument: " << *i << "\n" << dendl;

src/common/common_init.cc

@@ -49,7 +49,7 @@ CephContext *common_preinit(const CephInitParameters &iparams,
   // Set some defaults based on code type
   switch (code_env) {
     case CODE_ENVIRONMENT_DAEMON:
-      conf->daemonize = true;
+      conf->set_val_or_die("daemonize", "true");
       if (!(flags & CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS)) {
 	conf->set_val_or_die("pid_file", "/var/run/ceph/$type.$id.pid");
 	conf->set_val_or_die("admin_socket", "/var/run/ceph/$name.asok");