summaryrefslogtreecommitdiff
path: root/src/common/config_opts.h
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-22 18:28:54 -0700
committerSage Weil <sage@inktank.com>2013-07-22 18:28:54 -0700
commit9626f77f095eb4c3aa38e56b5fc82a9aa931efa5 (patch)
treef83b3bf92e340cc32c16dfac90b20e926b8233ca /src/common/config_opts.h
parent093182b79680994a0ccb7942aff6722e62905181 (diff)
parentcfe1395f479f152867e94371756a358a6fe4fe3d (diff)
downloadceph-9626f77f095eb4c3aa38e56b5fc82a9aa931efa5.tar.gz
Merge pull request #457 from ceph/wip-paxos
paxos fixes Reviewed-by: Greg Farnum <greg@inktank.com> Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Diffstat (limited to 'src/common/config_opts.h')
-rw-r--r--src/common/config_opts.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index d16dfe0061a..b43808e211c 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -209,6 +209,7 @@ OPTION(paxos_trim_min, OPT_INT, 250) // number of extra proposals tolerated bef
OPTION(paxos_trim_max, OPT_INT, 500) // max number of extra proposals to trim at a time
OPTION(paxos_service_trim_min, OPT_INT, 250) // 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_kill_at, OPT_INT, 0)
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