From fed28311222ea08edd3934467f55eded547c5cd8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 9 Nov 2009 14:31:55 -0800 Subject: [PATCH] mon: use g_conf.mon_globalid_prealloc --- src/config.cc | 1 + src/config.h | 1 + src/mon/AuthMonitor.cc | 17 ++++------------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/config.cc b/src/config.cc index 465570591c317..e6344ed4e6c6a 100644 --- a/src/config.cc +++ b/src/config.cc @@ -364,6 +364,7 @@ static struct config_option config_optionsp[] = { OPTION(mon_allow_mds_bully, 0, OPT_BOOL, false), // allow a booting mds to (forcibly) claim an mds # .. FIXME OPTION(mon_pg_create_interval, 0, OPT_FLOAT, 30.0), // no more than every 30s OPTION(mon_clientid_prealloc, 0, OPT_INT, 100), // how many clientids to prealloc + OPTION(mon_globalid_prealloc, 0, OPT_INT, 100), // how many globalids to prealloc OPTION(paxos_propose_interval, 0, OPT_DOUBLE, 1.0), // gather updates for this long before proposing a map update OPTION(paxos_observer_timeout, 0, OPT_DOUBLE, 5*60), // gather updates for this long before proposing a map update OPTION(auth_mon_ticket_ttl, 0, OPT_DOUBLE, 60*60*12), diff --git a/src/config.h b/src/config.h index aa2293d36d985..3ea48f49ab05c 100644 --- a/src/config.h +++ b/src/config.h @@ -145,6 +145,7 @@ struct md_config_t { bool mon_allow_mds_bully; float mon_pg_create_interval; int mon_clientid_prealloc; + int mon_globalid_prealloc; double paxos_propose_interval; double paxos_observer_timeout; diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 65743c5a5a72c..f3392f13572f5 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -140,12 +140,6 @@ void AuthMonitor::create_initial(bufferlist& bl) inc.inc_type = GLOBAL_ID; inc.max_global_id = max_global_id; pending_auth.push_back(inc); - -#if 0 - KeyServerData::Incremental auth_inc; - auth_inc.op = KeyServerData::AUTH_INC_NOP; - push_cephx_inc(auth_inc); -#endif } bool AuthMonitor::update_from_paxos() @@ -180,10 +174,9 @@ bool AuthMonitor::update_from_paxos() ::decode(inc, p); switch (inc.inc_type) { case GLOBAL_ID: - { - max_global_id = inc.max_global_id; - break; - } + max_global_id = inc.max_global_id; + break; + case AUTH_DATA: { KeyServerData::Incremental auth_inc; @@ -215,10 +208,9 @@ bool AuthMonitor::update_from_paxos() void AuthMonitor::increase_max_global_id() { -#define GLOBAL_ID_DELTA 100 assert(mon->is_leader()); - max_global_id += GLOBAL_ID_DELTA; + max_global_id += g_conf.mon_globalid_prealloc; dout(0) << "increasing max_global_id to " << max_global_id << dendl; Incremental inc; inc.inc_type = GLOBAL_ID; @@ -284,7 +276,6 @@ bool AuthMonitor::preprocess_query(PaxosServiceMessage *m) case MSG_MON_GLOBAL_ID: return false; - default: assert(0); delete m; -- 2.39.5