diff options
| author | Sage Weil <sage@inktank.com> | 2013-03-07 09:29:44 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-03-07 09:29:44 -0800 |
| commit | e19b8f5fb04c7ea931c4ba1d38d930b1652d9dd8 (patch) | |
| tree | 7fd27535dbb7584d98ac5593b69321b57a81e6b7 | |
| parent | a58eec90caf3a3d04c9e7bd4e6b9c160b6b69175 (diff) | |
| parent | e6caf69cf41674d00bf05ac63152274a65974c7a (diff) | |
| download | ceph-e19b8f5fb04c7ea931c4ba1d38d930b1652d9dd8.tar.gz | |
Merge remote-tracking branch 'gh/wip-log-max' into next
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/common/common_init.cc | 3 | ||||
| -rw-r--r-- | src/common/config_opts.h | 20 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/common/common_init.cc b/src/common/common_init.cc index 3f7d501eb26..ef8cf010072 100644 --- a/src/common/common_init.cc +++ b/src/common/common_init.cc @@ -79,6 +79,8 @@ CephContext *common_preinit(const CephInitParameters &iparams, conf->set_val_or_die("pid_file", ""); conf->set_val_or_die("admin_socket", ""); conf->set_val_or_die("log_file", ""); + // use less memory for logs + conf->set_val_or_die("log_max_recent", "500"); } return cct; @@ -118,4 +120,3 @@ void common_init_finish(CephContext *cct) lockdep_register_ceph_context(cct); } } - 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 |