[#20406] yugabyted: Fix yugabyted-ui when given custom YSQL and YCQL …

…ports Summary: Fixes an issue where yugabyted-ui breaks when yugabyted is given custom values for `ysql_port` and `ycql_port`. This happens because the values aren't passed to yugabyted-ui. The fix involves adding a new flag to yugabyted-ui for the YCQL port number, and also changing yugabyted to pass the values to yugabyted-ui Jira: DB-9402 Test Plan: no test plan Reviewers: sgarg-yb, nikhil Reviewed By: nikhil Subscribers: yugabyted-dev, djiang Differential Revision: https://phorge.dev.yugabyte.com/D31585
yugabyte · Jan 16, 2024 · 85283b1 · 85283b1
1 parent c93ccda
commit 85283b1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/bin/yugabyted b/bin/yugabyted
@@ -1833,6 +1833,13 @@ class ControlScript(object):
                                 "-database_password={}".format(
                                 self.configs.saved_data.get("database_password"))])
 
+                        if self.configs.saved_data.get("ysql_port"):
+                            yugabyted_ui_cmd.append("-ysql_port={}".format(
+                                self.configs.saved_data.get("ysql_port")))
+                        if self.configs.saved_data.get("ycql_port"):
+                            yugabyted_ui_cmd.append("-ycql_port={}".format(
+                                self.configs.saved_data.get("ycql_port")))
+
                         self.processes["yugabyted-ui"] = ProcessManager(
                             "yugabyted-ui", yugabyted_ui_cmd,
                             self.configs.saved_data.get("log_dir"),

diff --git a/yugabyted-ui/apiserver/cmd/server/handlers/container.go b/yugabyted-ui/apiserver/cmd/server/handlers/container.go
@@ -58,7 +58,7 @@ func (c *Container) GetConnectionFromMap(host string, database ...string) (*pgxp
         User:     helpers.DbYsqlUser,
         Password: helpers.DbPassword,
         Host:     host,
-        Port:     helpers.PORT,
+        Port:     helpers.YsqlPort,
         Database: dbName,
     }
 

diff --git a/yugabyted-ui/apiserver/cmd/server/helpers/db_connections.go b/yugabyted-ui/apiserver/cmd/server/helpers/db_connections.go
@@ -21,7 +21,7 @@ type PgClientConnectionParams struct {
 func (h *HelperContainer) CreateGoCqlClient(log logger.Logger) *gocql.ClusterConfig {
 
     // Initialize gocql client
-    cluster := gocql.NewCluster(HOST)
+    cluster := gocql.NewCluster(fmt.Sprintf("%s:%d", HOST, YcqlPort))
 
     if Secure {
             cluster.Authenticator = gocql.PasswordAuthenticator{

diff --git a/yugabyted-ui/apiserver/cmd/server/helpers/parse_command_line_flags.go b/yugabyted-ui/apiserver/cmd/server/helpers/parse_command_line_flags.go
@@ -6,7 +6,8 @@ import (
 
 var (
     HOST          string
-    PORT          int
+    YsqlPort      int
+    YcqlPort      int
     Secure        bool
     DbName        string
     DbYsqlUser    string
@@ -22,7 +23,8 @@ var (
 func init() {
     flag.StringVar(&HOST, "database_host", "127.0.0.1",
         "Advertise address of the local YugabyteDB node.")
-    flag.IntVar(&PORT, "database_port", 5433, "YSQL port.")
+    flag.IntVar(&YsqlPort, "ysql_port", 5433, "YSQL port.")
+    flag.IntVar(&YcqlPort, "ycql_port", 9042, "YCQL port.")
     flag.BoolVar(&Secure, "secure", false, "API server use secure or insecure mode.")
     flag.StringVar(&DbName, "database_name", "yugabyte", "database for retrieving metrics.")
     flag.StringVar(&DbYsqlUser, "ysql_username", "yugabyte",