From d719f9ddc8f948d00bd6d8ca687ce1f0d5ee4345 Mon Sep 17 00:00:00 2001 From: Wen Lin Date: Wed, 17 May 2017 17:57:45 +0800 Subject: [PATCH 1/3] HAWQ-1469. Don't expose warning messages to command line when switch between master and standby RPS. --- src/backend/libpq/rangerrest.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/backend/libpq/rangerrest.c b/src/backend/libpq/rangerrest.c index 1210ed5a14..32f01d21a9 100644 --- a/src/backend/libpq/rangerrest.c +++ b/src/backend/libpq/rangerrest.c @@ -453,15 +453,22 @@ 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, "ranger plugin service is unavailable : %s.\n", curl_easy_strerror(res)); } } else @@ -469,7 +476,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, "switch from standby's RPS to master's RPS"); } if (curl_handle->talkingWithStandby && curl_handle->lastCheckTimestamp == 0) { From d2bb5d20a0f5c10f4e39f3e75c0bf4858733d72b Mon Sep 17 00:00:00 2001 From: Wen Lin Date: Thu, 18 May 2017 10:51:55 +0800 Subject: [PATCH 2/3] fix comments --- src/backend/libpq/rangerrest.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/backend/libpq/rangerrest.c b/src/backend/libpq/rangerrest.c index 32f01d21a9..8b2bb23e3d 100644 --- a/src/backend/libpq/rangerrest.c +++ b/src/backend/libpq/rangerrest.c @@ -468,7 +468,8 @@ static int call_ranger_rest(CURL_HANDLE curl_handle, const char* request) } else { - elog(ERROR, "ranger plugin service is unavailable : %s.\n", 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 @@ -476,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(LOG, "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) { From c5c453cc03fe7be109b274448b889807f81732f6 Mon Sep 17 00:00:00 2001 From: Wen Lin Date: Thu, 18 May 2017 11:03:46 +0800 Subject: [PATCH 3/3] fix space --- src/backend/libpq/rangerrest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/libpq/rangerrest.c b/src/backend/libpq/rangerrest.c index 8b2bb23e3d..c5724afd8a 100644 --- a/src/backend/libpq/rangerrest.c +++ b/src/backend/libpq/rangerrest.c @@ -468,7 +468,7 @@ static int call_ranger_rest(CURL_HANDLE curl_handle, const char* request) } else { - elog(ERROR, "permission is unknown due to authorization failure," + elog(ERROR, "permission is unknown due to authorization failure, " "ranger plugin service is unavailable : %s.\n", curl_easy_strerror(res)); } }