diff options
| author | Josh Durgin <josh.durgin@inktank.com> | 2013-03-06 17:49:51 -0800 |
|---|---|---|
| committer | Josh Durgin <josh.durgin@inktank.com> | 2013-03-06 17:49:57 -0800 |
| commit | e6caf69cf41674d00bf05ac63152274a65974c7a (patch) | |
| tree | cc9f9c58a3e7787d64089446a6902de7d1dbc740 | |
| parent | 7c208d2f8e3f28f4055a4ae51eceae892dcef1dc (diff) | |
| download | ceph-e6caf69cf41674d00bf05ac63152274a65974c7a.tar.gz | |
config: note which options are overridden by common_preinit()
Defaults for these differ based on the context in which they're used.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
| -rw-r--r-- | src/common/config_opts.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h index c72530e0aa8..ef5d05a9733 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -23,22 +23,22 @@ OPTION(num_client, OPT_INT, 1) OPTION(monmap, OPT_STR, "") OPTION(mon_host, OPT_STR, "") OPTION(lockdep, OPT_BOOL, false) -OPTION(admin_socket, OPT_STR, "/var/run/ceph/$cluster-$name.asok") +OPTION(admin_socket, OPT_STR, "/var/run/ceph/$cluster-$name.asok") // default changed by common_preinit() -OPTION(daemonize, OPT_BOOL, false) -OPTION(pid_file, OPT_STR, "") +OPTION(daemonize, OPT_BOOL, false) // default changed by common_preinit() +OPTION(pid_file, OPT_STR, "") // default changed by common_preinit() OPTION(chdir, OPT_STR, "/") OPTION(max_open_files, OPT_LONGLONG, 0) OPTION(fatal_signal_handlers, OPT_BOOL, true) -OPTION(log_file, OPT_STR, "/var/log/ceph/$cluster-$name.log") -OPTION(log_max_new, OPT_INT, 1000) -OPTION(log_max_recent, OPT_INT, 100000) -OPTION(log_to_stderr, OPT_BOOL, true) -OPTION(err_to_stderr, OPT_BOOL, true) +OPTION(log_file, OPT_STR, "/var/log/ceph/$cluster-$name.log") // default changed by common_preinit() +OPTION(log_max_new, OPT_INT, 1000) // default changed by common_preinit() +OPTION(log_max_recent, OPT_INT, 100000) // default changed by common_preinit() +OPTION(log_to_stderr, OPT_BOOL, true) // default changed by common_preinit() +OPTION(err_to_stderr, OPT_BOOL, true) // default changed by common_preinit() OPTION(log_to_syslog, OPT_BOOL, false) OPTION(err_to_syslog, OPT_BOOL, false) -OPTION(log_flush_on_exit, OPT_BOOL, true) +OPTION(log_flush_on_exit, OPT_BOOL, true) // default changed by common_preinit() OPTION(log_stop_at_utilization, OPT_FLOAT, .97) // stop logging at (near) full OPTION(clog_to_monitors, OPT_BOOL, true) @@ -94,7 +94,7 @@ SUBSYS(throttle, 1, 1) OPTION(key, OPT_STR, "") OPTION(keyfile, OPT_STR, "") -OPTION(keyring, OPT_STR, "/etc/ceph/$cluster.$name.keyring,/etc/ceph/$cluster.keyring,/etc/ceph/keyring,/etc/ceph/keyring.bin") +OPTION(keyring, OPT_STR, "/etc/ceph/$cluster.$name.keyring,/etc/ceph/$cluster.keyring,/etc/ceph/keyring,/etc/ceph/keyring.bin") // default changed by common_preinit() for mds and osd OPTION(heartbeat_interval, OPT_INT, 5) OPTION(heartbeat_file, OPT_STR, "") OPTION(heartbeat_inject_failure, OPT_INT, 0) // force an unhealthy heartbeat for N seconds |