Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d07dff9

Browse files
committed
Change severity for trace of assigned RDMA port
1 parent 1df8a0b commit d07dff9

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

src/backend/tcop/postgres.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3601,10 +3601,10 @@ RsocketInitialize(Port *port)
36013601
struct addrinfo *addr = NULL,
36023602
hint;
36033603
union {
3604-
struct sockaddr addr;
3605-
struct sockaddr_in addr_in;
3606-
struct sockaddr_in6 addr_in6;
3607-
} sa;
3604+
struct sockaddr addr;
3605+
struct sockaddr_in addr_in;
3606+
struct sockaddr_in6 addr_in6;
3607+
} sa;
36083608
socklen_t saddrlen;
36093609

36103610
struct sockaddr_in *addr_in;
@@ -3623,7 +3623,7 @@ RsocketInitialize(Port *port)
36233623
/* It is necessary to dynamically load librdmacm at first call */
36243624
initialize_rsocket();
36253625

3626-
retry2:
3626+
retry2:
36273627
switch (port->laddr.addr.ss_family)
36283628
{
36293629
case AF_INET:
@@ -3643,20 +3643,20 @@ RsocketInitialize(Port *port)
36433643
(errmsg("unrecognized address family %d",
36443644
port->laddr.addr.ss_family)));
36453645
}
3646-
3646+
36473647
MemSet(&hint, 0, sizeof(hint));
36483648
hint.ai_family = port->laddr.addr.ss_family;
36493649
hint.ai_flags = AI_NUMERICHOST;
36503650
hint.ai_socktype = SOCK_STREAM;
3651-
3651+
36523652
ret = pg_getaddrinfo_all(local_host, NULL, &hint, &addr);
36533653
if (ret || !addr)
36543654
{
36553655
if (addr)
36563656
pg_freeaddrinfo_all(hint.ai_family, addr);
36573657
ereport(FATAL,
3658-
(errmsg("could not translate host name \"%s\", service \"%s\" to address: %s",
3659-
local_host, local_port, gai_strerror(ret))));
3658+
(errmsg("could not get address info for service \"%s\": %s",
3659+
local_host, gai_strerror(ret))));
36603660
}
36613661

36623662
if ((fd = pg_socket(addr->ai_family, SOCK_STREAM, 0, true))
@@ -3720,11 +3720,10 @@ RsocketInitialize(Port *port)
37203720

37213721
ereport(FATAL,
37223722
(errcode_for_socket_access(),
3723-
errmsg("could not bind socket: %m"),
3724-
errhint("Is another postmaster already running on port %s?"
3725-
" If not, wait a few seconds and retry.",
3726-
local_port)));
3723+
errmsg("could not bind RDMA socket: %m")));
37273724
}
3725+
pg_freeaddrinfo_all(hint.ai_family, addr);
3726+
37283727
saddrlen = sizeof(sa);
37293728
ret = pg_getsockname(fd, &sa.addr, &saddrlen, true);
37303729
if (ret < 0)
@@ -3737,7 +3736,6 @@ RsocketInitialize(Port *port)
37373736
ereport(FATAL,
37383737
(errcode_for_socket_access(),
37393738
errmsg("could not get name info: %m")));
3740-
pg_freeaddrinfo_all(hint.ai_family, addr);
37413739

37423740
elog(DEBUG1, "Assign port %s to RDMA socket", local_port);
37433741

0 commit comments

Comments
 (0)