From: Sage Weil Date: Tue, 30 Apr 2013 00:20:39 +0000 (-0700) Subject: mon: enable 'mon compact on trim' by default; trim in larger increments X-Git-Tag: v0.61~32^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd68b82bd6e9e119257ecf351b04c085ee4897db;p=ceph.git mon: enable 'mon compact on trim' by default; trim in larger increments This resolves the leveldb growth-without-bound problem observed by mikedawson, and all the badness that stems from it. Enable this by default until we figure out why leveldb is not behaving better. While we are at it, trim more states at a time. This will make compaction less frequent, which should help given that there is some overhead unrelated to the amount of deleted data. Fixes: #4815 Signed-off-by: Sage Weil --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index d78a7cc9d8ad..cb3322df124c 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -126,7 +126,7 @@ OPTION(mon_initial_members, OPT_STR, "") // list of initial cluster mon ids; OPTION(mon_sync_fs_threshold, OPT_INT, 5) // sync() when writing this many objects; 0 to disable. OPTION(mon_compact_on_start, OPT_BOOL, false) // compact leveldb on ceph-mon start OPTION(mon_compact_on_bootstrap, OPT_BOOL, false) // trigger leveldb compaction on bootstrap -OPTION(mon_compact_on_trim, OPT_BOOL, false) // compact (a prefix) when we trim old states +OPTION(mon_compact_on_trim, OPT_BOOL, true) // compact (a prefix) when we trim old states OPTION(mon_tick_interval, OPT_INT, 5) OPTION(mon_subscribe_interval, OPT_DOUBLE, 300) OPTION(mon_osd_laggy_halflife, OPT_INT, 60*60) // (seconds) how quickly our laggy estimations decay @@ -195,8 +195,8 @@ OPTION(paxos_propose_interval, OPT_DOUBLE, 1.0) // gather updates for this long OPTION(paxos_min_wait, OPT_DOUBLE, 0.05) // min time to gather updates for after period of inactivity OPTION(paxos_trim_tolerance, OPT_INT, 30) // number of extra proposals tolerated before trimming OPTION(paxos_trim_disabled_max_versions, OPT_INT, 100) // maximum amount of versions we shall allow passing by without trimming -OPTION(paxos_service_trim_max, OPT_INT, 50) // maximum amount of versions to trim during a single proposal (0 disables it) -OPTION(paxos_service_trim_min, OPT_INT, 30) // minimum amount of versions to trigger a trim (0 disables it) +OPTION(paxos_service_trim_max, OPT_INT, 500) // maximum amount of versions to trim during a single proposal (0 disables it) +OPTION(paxos_service_trim_min, OPT_INT, 250) // minimum amount of versions to trigger a trim (0 disables it) OPTION(clock_offset, OPT_DOUBLE, 0) // how much to offset the system clock in Clock.cc OPTION(auth_cluster_required, OPT_STR, "cephx") // required of mon, mds, osd daemons OPTION(auth_service_required, OPT_STR, "cephx") // required by daemons of clients