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 d20bbab9de394c657dff1c9b5895cc0725cd3be4 Author: Aegeaner <[email protected]> AuthorDate: Thu Sep 29 16:51:07 2022 +0800 Unify ic-proxy log level under GUC gp_log_interconnect's control, and remove macro IC_PROXY_LOG_LEVEL Currently ic_proxy_log(LOG would never log anything as IC_PROXY_LOG_LEVEL is hard-coded to WARNING. This should be under a GUC's control. This commit unified ic-proxy log level under GUC gp_log_interconnect's control, and remove macro IC_PROXY_LOG_LEVEL. --- 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, 6 insertions(+), 10 deletions(-) diff --git a/contrib/interconnect/proxy/ic_proxy.h b/contrib/interconnect/proxy/ic_proxy.h index e7da702caf..8afe4e8c32 100644 --- a/contrib/interconnect/proxy/ic_proxy.h +++ b/contrib/interconnect/proxy/ic_proxy.h @@ -30,17 +30,16 @@ #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 >= IC_PROXY_LOG_LEVEL) \ + if ((elevel) >= WARNING || gp_log_interconnect >= GPVARS_VERBOSITY_TERSE) \ { \ + 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 4e1ef28f7b..6e86b6a380 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 IC_PROXY_LOG_LEVEL <= LOG + if (gp_log_interconnect >= GPVARS_VERBOSITY_TERSE) { char name[HOST_NAME_MAX] = "unknown"; int port = 0; @@ -209,7 +209,6 @@ 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 017d85300e..4a066316c0 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(LOG, "%s: received B2C PKT [%d bytes] from the backend", + ic_proxy_log(DEBUG5, "%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 ca77aabbf9..3e02959242 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 IC_PROXY_LOG_LEVEL <= LOG + if (gp_log_interconnect >= GPVARS_VERBOSITY_TERSE) { char name[HOST_NAME_MAX] = "unknown"; int port = 0; @@ -178,7 +178,6 @@ 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 4beceb409b..eacb7a3819 100644 --- a/contrib/interconnect/proxy/ic_proxy_pkt_cache.c +++ b/contrib/interconnect/proxy/ic_proxy_pkt_cache.c @@ -26,7 +26,6 @@ *------------------------------------------------------------------------- */ -#define IC_PROXY_LOG_LEVEL WARNING #include "ic_proxy.h" #include "ic_proxy_pkt_cache.h" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
