summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhishek Lekshmanan <abhishek@suse.com>2017-11-17 14:48:17 +0100
committerAbhishek Lekshmanan <abhishek@suse.com>2017-11-17 15:31:19 +0100
commit347c5148a57de9007d6c1293add6bf27004fce41 (patch)
treecd6bf78167f0cfd09196099f669ff8b473c89694
parentMerge pull request #18950 from sknorr/fix-rn-typos (diff)
downloadceph-347c5148a57de9007d6c1293add6bf27004fce41.tar.xz
ceph-347c5148a57de9007d6c1293add6bf27004fce41.zip
rgw: keystone: bump up logging when error is received
When keystone engine is used and there is an error (often due to misconfigured urls etc) these do not show up at the final logs as we just return -1 at the final stage. Adding logs at level 5 for these cases, as they can help identify a possible misconfigured url or admin token. Eg: ``` 5 Failed keystone auth from http://localhost:5000/v3/v3/auth/tokens with 404 ``` Fixes: http://tracker.ceph.com/issues/22151 Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
-rw-r--r--src/rgw/rgw_auth_keystone.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rgw/rgw_auth_keystone.cc b/src/rgw/rgw_auth_keystone.cc
index 5602025d42c..607a611f778 100644
--- a/src/rgw/rgw_auth_keystone.cc
+++ b/src/rgw/rgw_auth_keystone.cc
@@ -101,8 +101,6 @@ TokenEngine::get_from_keystone(const std::string& token) const
/* NULL terminate for debug output. */
token_body_bl.append(static_cast<char>(0));
- ldout(cct, 20) << "received response status=" << validate.get_http_status()
- << ", body=" << token_body_bl.c_str() << dendl;
/* Detect Keystone rejection earlier than during the token parsing.
* Although failure at the parsing phase doesn't impose a threat,
@@ -114,9 +112,14 @@ TokenEngine::get_from_keystone(const std::string& token) const
validate.get_http_status() ==
/* Most likely: non-existent token supplied by the client. */
RGWValidateKeystoneToken::HTTP_STATUS_NOTFOUND) {
+ ldout(cct, 5) << "Failed keystone auth from " << url << " with "
+ << validate.get_http_status() << dendl;
return boost::none;
}
+ ldout(cct, 20) << "received response status=" << validate.get_http_status()
+ << ", body=" << token_body_bl.c_str() << dendl;
+
TokenEngine::token_envelope_t token_body;
ret = token_body.parse(cct, token, token_body_bl, config.get_api_version());
if (ret < 0) {