ysql: Pass Postgres port to yb_servers function

Summary:
Currently the port output column is hardcoded as 5433.

This revision passes the port via new field, pg_port, in the ServerRegistrationPB object.

Test Plan:
Verify on local cluster that the port is 5433 where tserver uses default proxy address:
```
yugabyte=# select * from yb_servers();
   host    | port | num_connections | node_type | cloud  |   region    | zone  | public_ip
-----------+------+-----------------+-----------+--------+-------------+-------+-----------
 127.0.0.1 | 5433 |               0 | primary   | cloud1 | datacenter1 | rack1 |
```

Reviewers: mihnea, nkumar, dmitry

Reviewed By: dmitry

Subscribers: bogdan, yql

Differential Revision: https://phabricator.dev.yugabyte.com/D12122

java/yb-pgsql/src/test/java/org/yb/pgsql/TestLoadBalance.java

@@ -53,7 +53,18 @@ public void testYBServersFunction() throws Exception {
       String publicIp = rs.getString(8);
       Integer portInMap = hostPorts.get(host);
       AssertionWrappers.assertNotNull(portInMap);
-      AssertionWrappers.assertEquals("port should be equal", 5433, port);
+      HostAndPort hp = HostAndPort.fromParts(host, portInMap);
+      MiniYBDaemon daemon = hostPortsDaemonMap.get(hp);
+      String[] cmds = daemon.getCommandLine();
+      int pg_port = 5433;
+      for (String cmd : cmds) {
+        if (cmd.contains("pgsql_proxy_bind_address")) {
+          int idx = cmd.indexOf(":");
+          pg_port = Integer.parseInt(cmd.substring(idx+1));
+          break;
+        }
+      }
+      AssertionWrappers.assertEquals("port should be equal", pg_port, port);
       AssertionWrappers.assertEquals("primary", node_type);
       AssertionWrappers.assertEquals("connections has been hardcoded to 0", 0, connections);
       AssertionWrappers.assertEquals("cloud1", cloud);

src/postgres/src/backend/utils/misc/pg_yb_utils.c

@@ -1368,7 +1368,7 @@ yb_servers(PG_FUNCTION_ARGS)
     const char *node_type = is_primary ? "primary" : "read_replica";
     // TODO: Remove hard coding of port and num_connections
     values[0] = CStringGetTextDatum(server->host);
-    values[1] = Int64GetDatum(5433);
+    values[1] = Int64GetDatum(server->pgPort);
     values[2] = Int64GetDatum(0);
     values[3] = CStringGetTextDatum(node_type);
     values[4] = CStringGetTextDatum(server->cloud);

src/yb/client/client.cc

@@ -1524,7 +1524,8 @@ Status YBClient::ListLiveTabletServers(
     auto ts = std::make_unique<YBTabletServerPlacementInfo>(
         entry.instance_id().permanent_uuid(),
         DesiredHostPort(entry.registration().common(), data_->cloud_info_pb_).host(),
-        entry.registration().common().placement_uuid(), cloud, region, zone, isPrimary, publicIp);
+        entry.registration().common().placement_uuid(), cloud, region, zone, isPrimary,
+        publicIp, entry.registration().common().pg_port());
     tablet_servers->push_back(std::move(ts));
   }
   return Status::OK();

src/yb/client/tablet_server.h

@@ -57,10 +57,12 @@ class YBTabletServerPlacementInfo : public YBTabletServer {
   YBTabletServerPlacementInfo(std::string uuid, std::string hostname,
       std::string placement_uuid = "",
       std::string cloud = "", std::string region = "",
-      std::string zone = "", bool primary = true, std::string publicIp = "")
+      std::string zone = "", bool primary = true, std::string publicIp = "",
+      uint16_t pg_port = 0)
       : YBTabletServer(uuid, hostname, placement_uuid),
      cloud_(std::move(cloud)), region_(std::move(region)),
-     zone_(std::move(zone)), is_primary_(primary), public_ip_(std::move(publicIp)) {}
+     zone_(std::move(zone)), is_primary_(primary), public_ip_(std::move(publicIp)),
+     pg_port_(pg_port) {}
 
   const std::string& publicIp() const {
     return public_ip_;
@@ -82,13 +84,18 @@ class YBTabletServerPlacementInfo : public YBTabletServer {
     return is_primary_;
   }
 
+  uint16_t pg_port() const {
+    return pg_port_;
+  }
+
  private:
 
   const std::string cloud_;
   const std::string region_;
   const std::string zone_;
   const bool is_primary_;
   const std::string public_ip_;
+  const uint16_t pg_port_;
 };
 } // namespace client
 } // namespace yb

src/yb/common/wire_protocol.proto

@@ -126,6 +126,7 @@ message ServerRegistrationPB {
   repeated HostPortPB private_rpc_addresses = 1;
   repeated HostPortPB broadcast_addresses = 5;
   repeated HostPortPB http_addresses = 2;
+  optional uint32 pg_port = 6 [default = 5433];
 
   optional CloudInfoPB cloud_info = 3;
   // Placement uuid of the tserver's cluster.

src/yb/server/server_base.h

@@ -170,7 +170,7 @@ class RpcAndWebServerBase : public RpcServerBase {
   void GetStatusPB(ServerStatusPB* status) const override;
 
   // Centralized method to get the Registration information for either the Master or Tserver.
-  CHECKED_STATUS GetRegistration(
+  virtual CHECKED_STATUS GetRegistration(
       ServerRegistrationPB* reg, RpcOnly rpc_only = RpcOnly::kFalse) const;
 
  protected:

src/yb/tserver/tablet_server.cc

@@ -267,6 +267,12 @@ Status TabletServer::Init() {
   return Status::OK();
 }
 
+Status TabletServer::GetRegistration(ServerRegistrationPB* reg, server::RpcOnly rpc_only) const {
+  RETURN_NOT_OK(RpcAndWebServerBase::GetRegistration(reg, rpc_only));
+  reg->set_pg_port(pgsql_proxy_bind_address().port());
+  return Status::OK();
+}
+
 Status TabletServer::WaitInited() {
   return tablet_manager_->WaitForAllBootstrapsToFinish();
 }

src/yb/tserver/tablet_server.h

@@ -88,6 +88,9 @@ class TabletServer : public server::RpcAndWebServerBase, public TabletServerIf {
   // complete by calling WaitInited().
   CHECKED_STATUS Init();
 
+  CHECKED_STATUS GetRegistration(ServerRegistrationPB* reg,
+    server::RpcOnly rpc_only = server::RpcOnly::kFalse) const override;
+
   // Waits for the tablet server to complete the initialization.
   CHECKED_STATUS WaitInited();
 

src/yb/yql/pggate/pg_session.cc

@@ -1243,6 +1243,7 @@ Status PgSession::ListTabletServers(YBCServerDescriptor **servers, int *numofser
       const char *zoneC = YBCPAllocStdString(zone);
       const char *publicIpC = YBCPAllocStdString(publicIp);
       servers[i] = reinterpret_cast<YBCServerDescriptor *>(YBCPAlloc(sizeof(YBCServerDescriptor)));
+      servers[i]->pgPort = tablet_servers[i]->pg_port();
       servers[i]->host = hostC;
       servers[i]->cloud = cloudC;
       servers[i]->region = regionC;

src/yb/yql/pggate/ybc_pg_typedefs.h

@@ -276,6 +276,7 @@ typedef struct PgServerDescriptor {
   const char *zone;
   bool isPrimary;
   const char *publicIp;
+  uint16_t pgPort;
 } YBCServerDescriptor;
 
 #ifdef __cplusplus