You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by av...@apache.org on 2024/12/30 08:26:07 UTC
(cloudberry) 04/10: Revert "Unify ic-proxy log level under GUC gp_log_interconnect's control, and remove macro IC_PROXY_LOG_LEVEL" (#14207)
This is an automated email from the ASF dual-hosted git repository.
avamingli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit eed5ab6827b3715225543e2468e21c34c76cbaa9
Author: David Kimura <dk...@vmware.com>
AuthorDate: Fri Sep 30 11:24:23 2022 -0700
Revert "Unify ic-proxy log level under GUC gp_log_interconnect's control, and remove macro IC_PROXY_LOG_LEVEL" (#14207)
This reverts commit 24140214f21df4276f239b061754eefe610c1d8a.
This change caused ICW proxy pipelines to go red [1][2][3][4][5][6] due
to extra logging. Reverting so that pipelines go back to green again.
[1] https://prod.ci.gpdb.pivotal.io/teams/main/pipelines/gpdb_master/jobs/icw_gporca_icproxy_rhel8/builds/568
[2] https://prod.ci.gpdb.pivotal.io/teams/main/pipelines/gpdb_master/jobs/icw_planner_icproxy_rhel8/builds/571
[3] https://prod.ci.gpdb.pivotal.io/teams/main/pipelines/gpdb_master/jobs/icw_gporca_icproxy_ubuntu18.04/builds/1324
[4] https://prod.ci.gpdb.pivotal.io/teams/main/pipelines/gpdb_master/jobs/icw_planner_icproxy_ubuntu18.04/builds/1322
[5] https://prod.ci.gpdb.pivotal.io/teams/main/pipelines/gpdb_master/jobs/icw_gporca_icproxy_centos7/builds/1342
[6] https://prod.ci.gpdb.pivotal.io/teams/main/pipelines/gpdb_master/jobs/icw_planner_icproxy_centos7/builds/1344
---
contrib/interconnect/proxy/ic_proxy.h | 7 ++++---
contrib/interconnect/proxy/ic_proxy_addr.c | 3 ++-
contrib/interconnect/proxy/ic_proxy_client.c | 2 +-
contrib/interconnect/proxy/ic_proxy_main.c | 3 ++-
contrib/interconnect/proxy/ic_proxy_pkt_cache.c | 1 +
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/contrib/interconnect/proxy/ic_proxy.h b/contrib/interconnect/proxy/ic_proxy.h
index 8afe4e8c32..e7da702caf 100644
--- a/contrib/interconnect/proxy/ic_proxy.h
+++ b/contrib/interconnect/proxy/ic_proxy.h
@@ -30,16 +30,17 @@
#define IC_PROXY_ACK_INTERVAL 10
+#ifndef IC_PROXY_LOG_LEVEL
+#define IC_PROXY_LOG_LEVEL WARNING
+#endif
#define ic_proxy_alloc(size) palloc(size)
#define ic_proxy_free(ptr) pfree(ptr)
#define ic_proxy_new(type) ((type *) ic_proxy_alloc(sizeof(type)))
#define ic_proxy_log(elevel, msg...) do { \
- if ((elevel) >= WARNING || gp_log_interconnect >= GPVARS_VERBOSITY_TERSE) \
+ if (elevel >= IC_PROXY_LOG_LEVEL) \
{ \
- if ((elevel) <= DEBUG1 && gp_log_interconnect < GPVARS_VERBOSITY_DEBUG) \
- break; \
elog(elevel, msg); \
} \
} while (0)
diff --git a/contrib/interconnect/proxy/ic_proxy_addr.c b/contrib/interconnect/proxy/ic_proxy_addr.c
index 6e86b6a380..4e1ef28f7b 100644
--- a/contrib/interconnect/proxy/ic_proxy_addr.c
+++ b/contrib/interconnect/proxy/ic_proxy_addr.c
@@ -186,7 +186,7 @@ ic_proxy_addr_on_getaddrinfo(uv_getaddrinfo_t *req,
if (iter->ai_family == AF_UNIX)
continue;
- if (gp_log_interconnect >= GPVARS_VERBOSITY_TERSE)
+#if IC_PROXY_LOG_LEVEL <= LOG
{
char name[HOST_NAME_MAX] = "unknown";
int port = 0;
@@ -209,6 +209,7 @@ ic_proxy_addr_on_getaddrinfo(uv_getaddrinfo_t *req,
name, port, family,
uv_strerror(ret));
}
+#endif /* IC_PROXY_LOG_LEVEL <= LOG */
memcpy(&addr->sockaddr, iter->ai_addr, iter->ai_addrlen);
ic_proxy_addrs = lappend(ic_proxy_addrs, addr);
diff --git a/contrib/interconnect/proxy/ic_proxy_client.c b/contrib/interconnect/proxy/ic_proxy_client.c
index 4a066316c0..017d85300e 100644
--- a/contrib/interconnect/proxy/ic_proxy_client.c
+++ b/contrib/interconnect/proxy/ic_proxy_client.c
@@ -468,7 +468,7 @@ ic_proxy_client_on_c2p_data_pkt(void *opaque, const void *data, uint16 size)
{
ICProxyClient *client = opaque;
- ic_proxy_log(DEBUG5, "%s: received B2C PKT [%d bytes] from the backend",
+ ic_proxy_log(LOG, "%s: received B2C PKT [%d bytes] from the backend",
ic_proxy_client_get_name(client), size);
/* increase the number of unack packets */
diff --git a/contrib/interconnect/proxy/ic_proxy_main.c b/contrib/interconnect/proxy/ic_proxy_main.c
index 3e02959242..ca77aabbf9 100644
--- a/contrib/interconnect/proxy/ic_proxy_main.c
+++ b/contrib/interconnect/proxy/ic_proxy_main.c
@@ -159,7 +159,7 @@ ic_proxy_server_peer_listener_init(uv_loop_t *loop)
/* Cannot get my addr, maybe the setting is invalid */
return;
- if (gp_log_interconnect >= GPVARS_VERBOSITY_TERSE)
+#if IC_PROXY_LOG_LEVEL <= LOG
{
char name[HOST_NAME_MAX] = "unknown";
int port = 0;
@@ -178,6 +178,7 @@ ic_proxy_server_peer_listener_init(uv_loop_t *loop)
addr->hostname, addr->service, name, port, family,
uv_strerror(ret));
}
+#endif /* IC_PROXY_LOG_LEVEL <= LOG */
/*
* It is important to set TCP_NODELAY, otherwise we will suffer from
diff --git a/contrib/interconnect/proxy/ic_proxy_pkt_cache.c b/contrib/interconnect/proxy/ic_proxy_pkt_cache.c
index eacb7a3819..4beceb409b 100644
--- a/contrib/interconnect/proxy/ic_proxy_pkt_cache.c
+++ b/contrib/interconnect/proxy/ic_proxy_pkt_cache.c
@@ -26,6 +26,7 @@
*-------------------------------------------------------------------------
*/
+#define IC_PROXY_LOG_LEVEL WARNING
#include "ic_proxy.h"
#include "ic_proxy_pkt_cache.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org