You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by wl...@apache.org on 2017/05/18 03:06:52 UTC
incubator-hawq git commit: HAWQ-1469. Don't expose warning messages
to command line when switch between master and standby RPS.
Repository: incubator-hawq
Updated Branches:
refs/heads/master 2153c6d0e -> 1b116a65d
HAWQ-1469. Don't expose warning messages to command line when switch between master and standby RPS.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/1b116a65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/1b116a65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/1b116a65
Branch: refs/heads/master
Commit: 1b116a65d984e451c715bb441240925df8f93e11
Parents: 2153c6d
Author: Wen Lin <wl...@pivotal.io>
Authored: Thu May 18 11:05:20 2017 +0800
Committer: Wen Lin <wl...@pivotal.io>
Committed: Thu May 18 11:05:20 2017 +0800
----------------------------------------------------------------------
src/backend/libpq/rangerrest.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b116a65/src/backend/libpq/rangerrest.c
----------------------------------------------------------------------
diff --git a/src/backend/libpq/rangerrest.c b/src/backend/libpq/rangerrest.c
index 1210ed5..c5724af 100644
--- a/src/backend/libpq/rangerrest.c
+++ b/src/backend/libpq/rangerrest.c
@@ -453,15 +453,23 @@ static int call_ranger_rest(CURL_HANDLE curl_handle, const char* request)
{
if (retry > 1)
{
- elog(WARNING, "ranger plugin service from http://%s:%d/rps is unavailable : %s, try another http://%s:%d/rps\n",
+ /* Don't expose this warning message to client, just record in log.
+ * The value of whereToSendOutput is DestRemote, so set it to DestNone
+ * and set back after write a warning message in log file.
+ */
+ CommandDest commandDest = whereToSendOutput;
+ whereToSendOutput = DestNone;
+ elog(WARNING, "ranger plugin service from http://%s:%d/rps is unavailable : %s, "
+ "trying ranger plugin service at http://%s:%d/rps\n",
curl_handle->talkingWithStandby?standby_addr_host:master_addr_host, rps_addr_port, curl_easy_strerror(res),
curl_handle->talkingWithStandby?master_addr_host:standby_addr_host, rps_addr_port);
curl_handle->talkingWithStandby = !curl_handle->talkingWithStandby;
+ whereToSendOutput = commandDest;
}
else
{
- elog(ERROR, "ranger plugin service from http://%s:%d/rps is unavailable : %s.\n",
- curl_handle->talkingWithStandby?standby_addr_host:master_addr_host, rps_addr_port, curl_easy_strerror(res));
+ elog(ERROR, "permission is unknown due to authorization failure, "
+ "ranger plugin service is unavailable : %s.\n", curl_easy_strerror(res));
}
}
else
@@ -469,7 +477,7 @@ static int call_ranger_rest(CURL_HANDLE curl_handle, const char* request)
if (switchToMaster && !curl_handle->talkingWithStandby)
{
/* master's RPS has recovered, switch from standby's RPS to master's RPS */
- elog(NOTICE, "switch from standby's RPS to master's RPS");
+ elog(LOG, "switched from standby's ranger plugin service to master's.");
}
if (curl_handle->talkingWithStandby && curl_handle->lastCheckTimestamp == 0)
{