RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd, mgr, mds: make timeout of updating rotating keys configurable

Browse Source 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
xie xingguo 2019-01-08 13:30:11 +08:00
parent 4331a92ab7
commit 3ce61e40fa
6 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/options.cc
View File

@ -2014,7 +2014,15 @@ std::vector<Option> get_global_options() {
Option("max_rotating_auth_attempts", Option::TYPE_INT, Option::LEVEL_ADVANCED)
.set_default(10)
.set_description(""),
.set_description("number of attempts to initialize rotating keys before giving up"),
Option("rotating_keys_bootstrap_timeout", Option::TYPE_INT, Option::LEVEL_ADVANCED)
.set_default(30)
.set_description("timeout for obtaining rotating keys during bootstrap phase (seconds)"),
Option("rotating_keys_renewal_timeout", Option::TYPE_INT, Option::LEVEL_ADVANCED)
.set_default(10)
.set_description("timeout for updating rotating keys (seconds)"),
Option("cephx_require_signatures", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
.set_default(false)

7
src/mds/MDSDaemon.cc
View File

@ -507,7 +507,9 @@ int MDSDaemon::init()
}
int rotating_auth_attempts = 0;
while (monc->wait_auth_rotating(30.0) < 0) {
auto rotating_auth_timeout =
g_conf().get_val<int64_t>("rotating_keys_bootstrap_timeout");
while (monc->wait_auth_rotating(rotating_auth_timeout) < 0) {
if (++rotating_auth_attempts <= g_conf()->max_rotating_auth_attempts) {
derr << "unable to obtain rotating service keys; retrying" << dendl;
continue;
@ -1177,7 +1179,8 @@ bool MDSDaemon::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer, bo
return true;
if (force_new) {
if (monc->wait_auth_rotating(10) < 0)
auto timeout = g_conf().get_val<int64_t>("rotating_keys_renewal_timeout");
if (monc->wait_auth_rotating(timeout) < 0)
return false;
}

3
src/mgr/DaemonServer.cc
View File

@ -227,7 +227,8 @@ bool DaemonServer::ms_get_authorizer(int dest_type,
}
if (force_new) {
if (monc->wait_auth_rotating(10) < 0)
auto timeout = g_conf().get_val<int64_t>("rotating_keys_renewal_timeout");
if (monc->wait_auth_rotating(timeout) < 0)
return false;
}

3
src/mgr/MgrStandby.cc
View File

@ -436,7 +436,8 @@ bool MgrStandby::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer,
return true;
if (force_new) {
if (monc.wait_auth_rotating(10) < 0)
auto timeout = cct->_conf.get_val<int64_t>("rotating_keys_renewal_timeout");
if (monc.wait_auth_rotating(timeout) < 0)
return false;
}

7
src/osd/OSD.cc
View File

@ -2677,6 +2677,8 @@ int OSD::init()
}
int rotating_auth_attempts = 0;
auto rotating_auth_timeout =
g_conf().get_val<int64_t>("rotating_keys_bootstrap_timeout");
// sanity check long object name handling
{
@ -2923,7 +2925,7 @@ int OSD::init()
exit(1);
}
while (monc->wait_auth_rotating(30.0) < 0) {
while (monc->wait_auth_rotating(rotating_auth_timeout) < 0) {
derr << "unable to obtain rotating service keys; retrying" << dendl;
++rotating_auth_attempts;
if (rotating_auth_attempts > g_conf()->max_rotating_auth_attempts) {
@ -6935,7 +6937,8 @@ bool OSD::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer, bool for
if (force_new) {
/* the MonClient checks keys every tick(), so we should just wait for that cycle
to get through */
if (monc->wait_auth_rotating(10) < 0) {
auto timeout = g_conf().get_val<int64_t>("rotating_keys_renewal_timeout");
if (monc->wait_auth_rotating(timeout) < 0) {
derr << "OSD::ms_get_authorizer wait_auth_rotating failed" << dendl;
return false;
}

4
src/tools/cephfs/MDSUtility.cc
View File

@ -163,7 +163,9 @@ bool MDSUtility::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer,
return true;
if (force_new) {
if (monc->wait_auth_rotating(10) < 0)
auto timeout =
g_ceph_context->_conf.get_val<int64_t>("rotating_keys_renewal_timeout");
if (monc->wait_auth_rotating(timeout) < 0)
return false;
}