Merge commit '769e2a5bb1e574a6fe96cd5d001cf686d8d2a7a7' into pg15-merge

Merge YB master commit 769e2a5 titled Update thirdparty_archives.yml and committed 2023-11-07T14:54:51-08:00. pg15 initial merge is 55782d5. - pgcrypto tests: take ours instead of YB master's older imports. - pgcrypto/openssl.c: take ours, which has more up-to-date upstream PG f5576a21b0778f275d7418f6f7a44d9400ee90aa instead of YB master's older import. - pgcrypto/px.c: (same). - src/postgres/doc/src/sgml/pgcrypto.sgml: (same). - catalog.c: - GetNewOid function was removed by upstream PG 578b229718e8f15fa779e20f086c4b6bb3776106. YB master 8a3278d adds logic into that function. Since that upstream PG commit replaces the calls of GetNewOid with GetNewOidWithIndex, which the YB master commit already handles with the same logic, removing that function is fine. - YB master 8a3278d adds usage of TemplateDbOid, upstream PG 2cb1272445d2a6616991fc6ede274d9f1f62ff73 renames to Template1DbOid, so apply the rename. - heap.c: upstream PG moves StoreAttrDefault from heap.c to pg_attrdef.c. See pg_attrdef.c section below for more details. - pg_attrdef.c: conflict between pg15 71dc8d0 and YB master bd44731. But even there, it's a nontrivial resolution. Follow the same changes that YB master makes. - yb_system_views.sql: pg15 branch split yb_system_views into PG views in system_views and YB views in yb_system_views. YB master 7e22b28 modifies a PG view. Apply the change to system_views.sql. It is a nontrivial conflict due to extra columns added to that view between PG 11 and PG 15. Add the new YB column introduced by that YB commit to the end of the view. - postmaster.c: YB master 466d510 moves some lines that pg15 initial merge touches. Do the move accordingly. - repl_gram.y: YB master d0d0e74 imports older PG commit, so take ours. - repl_scanner.l: (same). - replication/slot.c: trivial resolution. - replication/slotfuncs.c: - trivial resolution at includes. - pg_create_physical_replication_slot: YB master 7e22b28 adds YB if check, but a context Assert line was moved by upstream PG 9f06d79ef831ffa333f908f6d3debdb654292414 to new function create_physical_replication_slot, causing conflict. Straightforward resolution. - pg_create_logical_replication_slot: similar to above, upstream PG 9f06d79ef831ffa333f908f6d3debdb654292414 moves some code to new function create_logical_replication_slot. YB master 7e22b28 touches this code: it avoids CreateInitDecodingContext for YB. Translate the same to the new location. - Switch some CStringGetTextDatum (introduced by YB master 7e22b28) to NameGetDatum like in upstream PG ce89ad0fa07d98e20380867811a5269ee36d45c7. - pg_get_replication_slots: - upstream PG 9e98583898c347e007958c8a09911be2ea4acfb9 lets some if checks get removed. - significant conflicts with upstream PG f88bd3139f3e2a557c086215c6b15d7f66bee845: rather than using multiple local variables, use a single local variable slot_contents which contains all that information. - Also some conflict with YB master 1a6e9d6. - Add an Assert(i == (PG_GET_REPLICATION_SLOTS_COLS + YB_PG_GET_REPLICATION_SLOTS_COLS)) similar to the one introduced by upstream PG f88bd3139f3e2a557c086215c6b15d7f66bee845. - walsender.c: - CreateReplicationSlot: - adjacent lines conflict between upstream PG 902a2c280012557b85c7e0fce3f6f0e355cb2d69 and YB master 7e22b28. - adjacent lines + indentation conflict between upstream PG 19890a064ebf53dedcefed0d8339ed3d449b06e6 and YB master 7e22b28. - adjacent lines + indentation conflict between upstream PG c2dc19342e05e081dc13b296787baa38352681ef and YB master 7e22b28. - adjacent lines + indentation conflict between upstream PG 6f6f284c7ee44264eb3e128e2bf54d9276711d11 and YB master 7e22b28. - conflict due to YB master f5a49ff importing upstream PG c39983600b284466692f39355536158770527e2f ~= f560209c6e99e000f3f6c972f34f1d9dc3857f25. Take ours (upstream PG) over theirs (master). - Upstream PG has only two calls to ReplicationSlotCreate while YB has three. This is because YB master 7e22b28 adds an additional call. Since upstream PG adds an additional argument bool two_phase to that function, that needs to be populated for this new call. Follow the existing examples: for REPLICATION_KIND_PHYSICAL, false was passed; for REPLICATION_KIND_LOGICAL, local variable two_phase was passed. Since this third call is in the REPLICATION_KIND_LOGICAL codepath, pass two_phase. - postgres.c: pg15 initial merge changes yb_parse_command_tag to return CommandTag instead of string. Adjacent lines are modified by YB master 65e2686. Trivial resolution. - lockfuncs.c: trivial resolution of adjacent modifications between YB master 809199f and upstream PG da9456d22a7697ef2c5ba9dd1402d948b2ec7f09. - relcache.c: adjacent lines conflict between YB master bd44731 and upstream PG 091e22b2e673e3e8480abd68fbb827c5d6979615. - pg_proc.dat: YB master 7e22b28 adds extra column to function pg_get_replication_slots. Upstream PG adds multiple columns to that same function across multiple commits. Combine the columns. - yb_ysql_dump.data.sql: - pg15 branch d04b43e removes some lines that YB master 8a3278d modifies. Go with the removal. - pg15 branch d04b43e modifies some values in a line that YB master f22eda8 adds NONCONCURRENTLY to. Apply both changes. - pg15 branch d04b43e conflicts with bad trailing whitespace addition by YB master 8a3278d. Discard YB master's change. - pg_regress.c: YB master 9f17cb8 adjacent lines change with upstream PG f45dc59a38cab1d2af6baaedb79559fe2e9b3781. - pg_wrapper.cc: YB master f1f252a conflicts with initial merge ifdef'ing out extension loading. Extend the ifdef boundary to cover the new extension introduced by YB master. - pg_stat.c: YB master 466d510 touches two functions: - pgstat_report_query_termination: pg15 initial merge disables this under ifdef YB_TODO and removes the definition. Don't do anything about the changes to that function. - pgstat_get_crashed_backend_activity: this moved to utils/activity/backend_status.c, but the patch is a noop because pg15 initial merge seems to already have removed the same line. Original git merge output: Auto-merging .arclint Auto-merging src/postgres/contrib/Makefile Auto-merging src/postgres/contrib/pg_stat_monitor/pg_stat_monitor.c Auto-merging src/postgres/contrib/pgcrypto/expected/blowfish_1.out CONFLICT (add/add): Merge conflict in src/postgres/contrib/pgcrypto/expected/blowfish_1.out Auto-merging src/postgres/contrib/pgcrypto/expected/cast5_1.out CONFLICT (add/add): Merge conflict in src/postgres/contrib/pgcrypto/expected/cast5_1.out Auto-merging src/postgres/contrib/pgcrypto/expected/des_1.out CONFLICT (add/add): Merge conflict in src/postgres/contrib/pgcrypto/expected/des_1.out Auto-merging src/postgres/contrib/pgcrypto/openssl.c CONFLICT (content): Merge conflict in src/postgres/contrib/pgcrypto/openssl.c Auto-merging src/postgres/contrib/pgcrypto/px.c CONFLICT (content): Merge conflict in src/postgres/contrib/pgcrypto/px.c Auto-merging src/postgres/doc/src/sgml/pgcrypto.sgml CONFLICT (content): Merge conflict in src/postgres/doc/src/sgml/pgcrypto.sgml Auto-merging src/postgres/src/backend/access/transam/varsup.c Auto-merging src/postgres/src/backend/access/transam/xact.c Auto-merging src/postgres/src/backend/catalog/catalog.c CONFLICT (content): Merge conflict in src/postgres/src/backend/catalog/catalog.c Auto-merging src/postgres/src/backend/catalog/heap.c CONFLICT (content): Merge conflict in src/postgres/src/backend/catalog/heap.c Auto-merging src/postgres/src/backend/catalog/yb_system_views.sql CONFLICT (content): Merge conflict in src/postgres/src/backend/catalog/yb_system_views.sql Auto-merging src/postgres/src/backend/commands/ybccmds.c Auto-merging src/postgres/src/backend/optimizer/path/indxpath.c Auto-merging src/postgres/src/backend/optimizer/plan/subselect.c CONFLICT (modify/delete): src/postgres/src/backend/postmaster/pgstat.c deleted in HEAD and modified in 769e2a5. Version 769e2a5 of src/postgres/src/backend/postmaster/pgstat.c left in tree. Auto-merging src/postgres/src/backend/postmaster/postmaster.c CONFLICT (content): Merge conflict in src/postgres/src/backend/postmaster/postmaster.c Auto-merging src/postgres/src/backend/replication/logical/logical.c Auto-merging src/postgres/src/backend/replication/repl_gram.y CONFLICT (content): Merge conflict in src/postgres/src/backend/replication/repl_gram.y Auto-merging src/postgres/src/backend/replication/repl_scanner.l CONFLICT (content): Merge conflict in src/postgres/src/backend/replication/repl_scanner.l Auto-merging src/postgres/src/backend/replication/slot.c CONFLICT (content): Merge conflict in src/postgres/src/backend/replication/slot.c Auto-merging src/postgres/src/backend/replication/slotfuncs.c CONFLICT (content): Merge conflict in src/postgres/src/backend/replication/slotfuncs.c Auto-merging src/postgres/src/backend/replication/walsender.c CONFLICT (content): Merge conflict in src/postgres/src/backend/replication/walsender.c Auto-merging src/postgres/src/backend/tcop/postgres.c CONFLICT (content): Merge conflict in src/postgres/src/backend/tcop/postgres.c Auto-merging src/postgres/src/backend/utils/adt/lockfuncs.c CONFLICT (content): Merge conflict in src/postgres/src/backend/utils/adt/lockfuncs.c Auto-merging src/postgres/src/backend/utils/adt/ruleutils.c Auto-merging src/postgres/src/backend/utils/cache/relcache.c CONFLICT (content): Merge conflict in src/postgres/src/backend/utils/cache/relcache.c Auto-merging src/postgres/src/backend/utils/init/globals.c Auto-merging src/postgres/src/backend/utils/misc/guc.c Auto-merging src/postgres/src/backend/utils/misc/pg_yb_utils.c Auto-merging src/postgres/src/bin/pg_dump/pg_dump.c Auto-merging src/postgres/src/include/catalog/pg_proc.dat CONFLICT (content): Merge conflict in src/postgres/src/include/catalog/pg_proc.dat Auto-merging src/postgres/src/include/commands/ybccmds.h Auto-merging src/postgres/src/include/miscadmin.h Auto-merging src/postgres/src/include/pg_yb_utils.h Auto-merging src/postgres/src/include/replication/slot.h Auto-merging src/postgres/src/include/replication/walsender_private.h Auto-merging src/postgres/src/test/regress/data/yb_ysql_dump.data.sql CONFLICT (content): Merge conflict in src/postgres/src/test/regress/data/yb_ysql_dump.data.sql Auto-merging src/postgres/src/test/regress/data/yb_ysql_dump_colocated_database.data.sql Auto-merging src/postgres/src/test/regress/data/yb_ysql_dump_legacy_colocated_database.data.sql Auto-merging src/postgres/src/test/regress/data/yb_ysql_dumpall.data.sql Auto-merging src/postgres/src/test/regress/expected/yb_pg_rules.out Auto-merging src/postgres/src/test/regress/pg_regress.c CONFLICT (content): Merge conflict in src/postgres/src/test/regress/pg_regress.c Auto-merging src/postgres/third-party-extensions/pg_hint_plan/pg_stat_statements.c Auto-merging src/yb/docdb/pgsql_operation.cc Auto-merging src/yb/yql/pggate/pg_dml.h Auto-merging src/yb/yql/pggate/pggate.cc Auto-merging src/yb/yql/pggate/pggate.h Auto-merging src/yb/yql/pggate/ybc_pg_typedefs.h Auto-merging src/yb/yql/pggate/ybc_pggate.cc Auto-merging src/yb/yql/pggate/ybc_pggate.h Auto-merging src/yb/yql/pgwrapper/libpq_utils.cc Auto-merging src/yb/yql/pgwrapper/pg_libpq-test.cc Auto-merging src/yb/yql/pgwrapper/pg_wrapper.cc CONFLICT (content): Merge conflict in src/yb/yql/pgwrapper/pg_wrapper.cc
yugabyte · Feb 1, 2024 · ed96733 · ed96733
2 parents 29d735d + 769e2a5
commit ed96733
Show file tree

Hide file tree

Showing 867 changed files with 29,213 additions and 8,083 deletions.
diff --git a/.arclint b/.arclint
@@ -28,6 +28,10 @@
      "(^managed/devops/roles/.*$)",
      "(^python/yb/py[.]typed$)",
      "(^managed/RUNTIME-FLAGS[.]md$)",
+     "(^managed/yba-cli/docs/.*)",
+     "(^managed/yba-cli/.*/LICENSE$)",
+     "(^managed/yba-cli/internal/formatter/tabwriter/*)",
+     "(^managed/yba-cli/internal/formatter/templates/*)",
      "(^[.]clang-tidy)",
      "(.*/py.typed)"
   ],
@@ -64,6 +68,7 @@
         "(^managed/.*[.]go$)",
         "(^managed/.*/go[.]mod)",
         "(^managed/.*/go[.]sum)",
+        "(^managed/yba-cli/GNUmakefile)",
         "(^managed/ui/)",
         "(^yugabyted-ui/.*/go[.]mod)",
         "(^yugabyted-ui/.*/go[.]sum)",

diff --git a/README.md b/README.md
@@ -106,11 +106,11 @@ Review detailed architecture in our [Docs](https://docs.yugabyte.com/preview/arc
 
 * Please use [GitHub issues](https://github.com/yugabyte/yugabyte-db/issues) to report issues or request new features.
 
-* To Troubleshoot YugabyteDB, cluser/node level isssues, Please refer to [Troubleshooting documentation](https://docs.yugabyte.com/preview/troubleshoot/)
+* To Troubleshoot YugabyteDB, cluser/node level issues, Please refer to [Troubleshooting documentation](https://docs.yugabyte.com/preview/troubleshoot/)
 
 # Contribute
 
-As an an open-source project with a strong focus on the user community, we welcome contributions as GitHub pull requests. See our [Contributor Guides](https://docs.yugabyte.com/preview/contribute/) to get going. Discussions and RFCs for features happen on the design discussions section of our [Forum](https://forum.yugabyte.com).
+As an open-source project with a strong focus on the user community, we welcome contributions as GitHub pull requests. See our [Contributor Guides](https://docs.yugabyte.com/preview/contribute/) to get going. Discussions and RFCs for features happen on the design discussions section of our [Forum](https://forum.yugabyte.com).
 
 # License
 

diff --git a/bin/yugabyted b/bin/yugabyted
@@ -538,7 +538,16 @@ class ControlScript(object):
             Output.log_error_and_exit(
                 "{} is not running. Cannot connect to YSQL.".format(SCRIPT_NAME))
         ysql_proxy = YsqlProxy(self.advertise_ip(), self.configs.saved_data.get("ysql_port"))
-        ysql_proxy.connect()
+        is_password_passed=False
+        for arg in sys.argv[1:]:
+            if arg.startswith("--password"):
+                is_password_passed = True
+                break
+
+        if self.configs.saved_data.get("secure") and is_password_passed:
+            ysql_proxy.connect_with_password()
+        else:
+            ysql_proxy.connect_without_password()
 
     # Starts an interactive YCQL shell.
     def connect_ycql(self):
@@ -551,7 +560,16 @@ class ControlScript(object):
         ycql_proxy = YcqlProxy(ip=self.advertise_ip(),
                         port=self.configs.saved_data.get("ycql_port"),
                         secure=self.configs.saved_data.get("secure"))
-        ycql_proxy.connect()
+        is_password_passed=False
+        for arg in sys.argv[1:]:
+            if arg.startswith("--password"):
+                is_password_passed = True
+                break
+
+        if self.configs.saved_data.get("secure") and is_password_passed:
+            ycql_proxy.connect_with_password()
+        else:
+            ycql_proxy.connect_without_password()
 
     # Creates demo database and starts an interactive shell into it. Destroys the sample database
     # after shell quits.
@@ -641,7 +659,7 @@ class ControlScript(object):
         Output.print_out(
             "For more, go to {}\n".format(website)
         )
-        ysql_proxy.connect(db=db_name)
+        ysql_proxy.connect_with_password(db=db_name)
 
     # Destroy target demo database if it exists.
     def destroy_demo(self, signum=None, frame=None):
@@ -1985,6 +2003,12 @@ class ControlScript(object):
             master_addresses  = "{}:{},{}".format(join_ip, master_rpc_port, master_addresses)
         certs_dir = self.configs.saved_data.get("certs_dir")
 
+        # Check if connection manager is enabled
+        tserver_flags = self.configs.saved_data.get("tserver_flags")
+
+        if tserver_flags.find("enable_ysql_conn_mgr") != -1:
+            METRICS_SNAPSHOT_LIST.append("ysql_conn_mgr")
+
         common_gflags = [
             "--stop_on_parent_termination",
             "--undefok=stop_on_parent_termination",
@@ -4125,6 +4149,9 @@ class ControlScript(object):
 
         has_errors = False
 
+        if self.configs.saved_data.get("database_password") is not None:
+            self.setup_env_init.update_passwords(self.configs.saved_data.get("database_password"))
+
         if args.parser == "collect_logs":
             self.configs.temp_data["collect_logs_stdout"] = args.stdout
             if args.collect_at_dir is not None:
@@ -4293,6 +4320,22 @@ class ControlScript(object):
                     Output.print_out(Output.make_red("ERROR") + ": Please provide a valid " +
                                  "--rf flag. Replication factor cannot be less than 1.")
 
+        if args.parser == "ysql":
+            if args.username is not None:
+                self.setup_env_init.set_ysql_user(args.username)
+            if args.password is not None:
+                self.setup_env_init.set_ysql_password(args.password)
+            if args.database is not None:
+                self.setup_env_init.set_ysql_db(args.database)
+
+        if args.parser == "ycql":
+            if args.username is not None:
+                self.setup_env_init.set_ycql_user(args.username)
+            if args.password is not None:
+                self.setup_env_init.set_ycql_password(args.password)
+            if args.keyspace is not None:
+                self.setup_env_init.set_ycql_keyspace(args.keyspace)
+
         if args.parser == "start":
             if args.read_replica and not args.join:
                 Output.print_out(Output.make_red("ERROR") + ": read_replica neds to be " +
@@ -4501,9 +4544,6 @@ class ControlScript(object):
             self.configs.saved_data["ui"] = args.ui
             self.configs.temp_data["initial_scripts_dir"] = args.initial_scripts_dir
 
-        if self.configs.saved_data.get("database_password") is not None:
-            self.setup_env_init.update_passwords(self.configs.saved_data.get("database_password"))
-
         if has_errors:
             sys.exit(1)
 
@@ -4575,6 +4615,32 @@ class ControlScript(object):
             cur_parser.set_defaults(func=func)
             all_parsers[api] = cur_parser
 
+        # Flags for sub command: ysql
+        for cmd in ("ysql",):
+            cur_parser = all_parsers[cmd]
+            cur_parser.add_argument(
+                "--username", help="YSQL username to connect to" \
+                " the YugabyteDB", metavar="")
+            cur_parser.add_argument(
+                "--password", help="The password for YSQL username to connect" \
+                " to the YugabyteDB", metavar="")
+            cur_parser.add_argument(
+                "--database", help="Name of the YSQL database to connect" \
+                " to the YugabyteDB", metavar="")
+
+        # Flags for sub command: ycql
+        for cmd in ("ycql",):
+            cur_parser = all_parsers[cmd]
+            cur_parser.add_argument(
+                "--username", help="YCQL username to connect to" \
+                " the YugabyteDB", metavar="")
+            cur_parser.add_argument(
+                "--password", help="The password for YCQL username to connect" \
+                " to the YugabyteDB", metavar="")
+            cur_parser.add_argument(
+                "--keyspace", help="Name of the YCQL keyspace to connect" \
+                " to the YugabyteDB", metavar="")
+
         # Top Level command: demo
         demo_parser = subparsers.add_parser("demo", help="Load and interact with preset demo data.")
         all_parsers["demo"] = demo_parser
@@ -5577,12 +5643,11 @@ class YsqlProxy(object):
         self.env = env_var
 
     # Starts interactive YSQL shell.
-    def connect(self, db=None):
-        if db is None:
-            db = self.db
-        cmd = self.cmd_without_password + ["-d", db]
+    def connect(self, cmd):
         env_var = os.environ.copy()
         env_var["PGUSER"] = self.username
+        Output.log("Connecting to the YSQL database using command: {}" \
+                             .format(cmd))
         shell = subprocess.Popen(cmd, env=env_var)
         while True:
             try:
@@ -5591,6 +5656,21 @@ class YsqlProxy(object):
                 continue
             break
 
+    def connect_without_password(self, db=None):
+        if db is None:
+            db = self.db
+
+        cmd = self.cmd_without_password + ["-d", db]
+        self.connect(cmd)
+
+    def connect_with_password(self, db=None):
+        if db is None:
+            db = self.db
+
+        cmd=list(self.cmd_with_password)
+        cmd[1] +="/"+db
+        self.connect(cmd)
+
     # Checks if db exists.
     # Note that this will return false if ysqlsh can't connect, even if db exists.
     def db_exists(self, db):
@@ -5610,7 +5690,7 @@ class YsqlProxy(object):
 
     # Runs ysqlsh with specified files.
     def load_files(self, filepaths, db=None):
-        cmd = self.cmd_with_password
+        cmd = list(self.cmd_with_password)
         env = self.env
         if db:
             env['PGDATABASE'] = db
@@ -5696,12 +5776,9 @@ class YcqlProxy(object):
             self.cmd.append("--ssl")
 
     # Starts interactive YCQL shell.
-    def connect(self):
-        cmd = self.cmd
-        if self.password_authentication:
-            cmd.extend(["-u", self.username])
-        if self.keyspace is not None:
-            cmd.extend(["-k", self.keyspace])
+    def connect(self, cmd):
+        Output.log("Connecting to the YCQL keyspace using command: {}" \
+                             .format(cmd))
         shell = subprocess.Popen(cmd)
         while True:
             try:
@@ -5710,6 +5787,23 @@ class YcqlProxy(object):
                 continue
             break
 
+    def connect_without_password(self):
+        cmd = list(self.cmd)
+        if self.password_authentication:
+            cmd.extend(["-u", self.username])
+        if self.keyspace is not None:
+            cmd.extend(["-k", self.keyspace])
+        self.connect(cmd)
+
+    def connect_with_password(self):
+        cmd = list(self.cmd)
+        if self.username:
+            cmd.extend(["-u", self.username])
+        if self.keyspace is not None:
+            cmd.extend(["-k", self.keyspace])
+        cmd.extend(["-p", self.password])
+        self.connect(cmd)
+
     # Check user exists
     # Note that this will return false if ycqlsh can't connect, even if user exists.
     def user_exists(self, ycql_username):
@@ -6394,19 +6488,19 @@ class EnvBasedCredentials(object):
         return self.ysql_user or DEFAULT_YSQL_USER
 
     def get_ysql_password(self):
-        return self.ysql_password or (self.ysql_user or DEFAULT_YSQL_PASSWORD)
+        return self.ysql_password or DEFAULT_YSQL_PASSWORD
 
     def get_ysql_db(self):
-        return self.ysql_db or (self.ysql_user or DEFAULT_YSQL_DB)
+        return self.ysql_db or DEFAULT_YSQL_DB
 
     def get_ycql_user(self):
         return self.ycql_user or DEFAULT_YCQL_USER
 
     def get_ycql_password(self):
-        return self.ycql_password or (self.ycql_user or DEFAULT_YCQL_PASSWORD)
+        return self.ycql_password or DEFAULT_YCQL_PASSWORD
 
     def get_ycql_keyspace(self):
-        return self.ycql_keyspace or (self.ycql_user or DEFAULT_YCQL_KEYSPACE)
+        return self.ycql_keyspace or DEFAULT_YCQL_KEYSPACE
 
     def get_cert_file_path(self):
         return self.cert_file_path
@@ -6426,15 +6520,27 @@ class EnvBasedCredentials(object):
     def is_exists(self, var_to_check):
         return True if var_to_check in os.environ and os.environ.get(var_to_check) else False
 
-    def update_ysql_password(self, new_password):
-        self.ysql_password = new_password
+    def set_ysql_password(self, password):
+        self.ysql_password = password
 
-    def update_ycql_password(self, new_password):
-        self.ycql_password = new_password
+    def set_ycql_password(self, password):
+        self.ycql_password = password
 
     def update_passwords(self, new_password):
-        self.update_ysql_password(new_password)
-        self.update_ycql_password(new_password)
+        self.set_ysql_password(new_password)
+        self.set_ycql_password(new_password)
+
+    def set_ysql_user(self, user):
+        self.ysql_user = user
+
+    def set_ysql_db(self, db):
+        self.ysql_db = db
+
+    def set_ycql_user(self, user):
+        self.ycql_user = user
+
+    def set_ycql_keyspace(self, keyspace):
+        self.ycql_keyspace = keyspace
 
     def setup_ysql_credentials(self, proxy_class):