Skip to content

Commit dff2130

Browse files
committed
[#25499]yugabyted: Fix the failing test org.yb.yugabyted.TestYugabytedPgParity#testPgParity
Summary: `org.yb.yugabyted.TestYugabytedPgParity#testPgParity` Test started failing in the [[ e1d5952 | commit ]] Since the coredb itself adds `local all yugabyte trust` to `ysql_hba_conf`, removing the code in yugabyted to add it. Jira: DB-14758 Test Plan: ./yb_build.sh --java-test 'org.yb.yugabyted.*' Reviewers: nikhil Reviewed By: nikhil Subscribers: svc_phabricator, yugabyted-dev, sgarg-yb Differential Revision: https://phorge.dev.yugabyte.com/D41057
1 parent 56ba1c4 commit dff2130

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

bin/yugabyted

+1-19
Original file line numberDiff line numberDiff line change
@@ -3804,7 +3804,7 @@ class ControlScript(object):
38043804
key, value = item.split('=')
38053805
tserver_pg_parity_flag_values_dict[key] = value
38063806

3807-
# Parse the PG_PARITY_FLAGS_DICT values into a dictionary
3807+
# Parse the PG_PARITY_FLAGS_DICT values into dictionary
38083808
pg_parity_flag_values_dict = {}
38093809
for item in pg_parity_flag_values.split(','):
38103810
if '=' in item:
@@ -3867,24 +3867,6 @@ class ControlScript(object):
38673867
# Handle simple flags
38683868
yb_tserver_cmd.append("--{}".format(tserver_flag))
38693869

3870-
hba_conf_updated = False
3871-
for i, flag in enumerate(yb_tserver_cmd):
3872-
if flag.startswith("--ysql_hba_conf_csv="):
3873-
pattern = re.compile(r'--ysql_hba_conf_csv=(["\']?)(.*)\1$')
3874-
match = pattern.match(flag)
3875-
# Extract the original ysql_hba_conf
3876-
quote_char = match.group(1) # This will be '' if there are no quotes
3877-
original_hba_conf = match.group(2)
3878-
# Append 'local all yugabyte trust' to the original_hba_conf
3879-
updated_hba_conf = original_hba_conf + ',local all yugabyte trust'
3880-
3881-
yb_tserver_cmd[i] = f'--ysql_hba_conf_csv={quote_char}' +\
3882-
f'{updated_hba_conf}{quote_char}'
3883-
hba_conf_updated = True
3884-
3885-
if not hba_conf_updated:
3886-
yb_tserver_cmd.extend(["--ysql_hba_conf_csv=local all yugabyte trust",])
3887-
38883870
if self.configs.saved_data.get("ysql_enable_auth"):
38893871
yb_tserver_cmd.extend(["--ysql_enable_auth=true"])
38903872

0 commit comments

Comments
 (0)