This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6a9458e2b0 AMBARI-25783: Fix CI tests failure on Jenkins (#3548)
6a9458e2b0 is described below
commit 6a9458e2b09ba78254d0b07c8d6d30201f5ca888
Author: Yu Hou <[email protected]>
AuthorDate: Sat Nov 19 21:36:20 2022 +0800
AMBARI-25783: Fix CI tests failure on Jenkins (#3548)
---
ambari-server/src/main/python/ambari_server/dbConfiguration_linux.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/python/ambari_server/dbConfiguration_linux.py
b/ambari-server/src/main/python/ambari_server/dbConfiguration_linux.py
index 4790f5d9d8..6bcc779da3 100644
--- a/ambari-server/src/main/python/ambari_server/dbConfiguration_linux.py
+++ b/ambari-server/src/main/python/ambari_server/dbConfiguration_linux.py
@@ -386,14 +386,14 @@ class PGConfig(LinuxDBMSConfig):
else:
SERVICE_CMD = "/usr/bin/env service"
if os.path.isfile("/usr/bin/postgresql-setup"):
- PG_INITDB_CMD = "/usr/bin/postgresql-setup initdb"
+ PG_INITDB_CMD = "/usr/bin/postgresql-setup initdb"
else:
PG_INITDB_CMD = "%s %s initdb" % (SERVICE_CMD, PG_SERVICE_NAME)
if OSCheck.is_suse_family() and not is_service_exist(PG_SERVICE_NAME):
versioned_script_paths =
glob.glob("/usr/pgsql-*/bin/postgresql*-setup")
if versioned_script_paths:
- versioned_script_path_tps = map(lambda path:
(re.search(r'pgsql-([0-9]+\.?[0-9]*)', path).group(1), path),
versioned_script_paths)
+ versioned_script_path_tps = map(lambda path:
(re.search(r'postgresql-([0-9]+\.?[0-9]*)', path).group(1), path),
versioned_script_paths)
versioned_script_path_tps.sort(key = lambda t: float(t[0]), reverse
= True)
for versioned_script_path_tp in versioned_script_path_tps:
pgsql_service_file_name = "postgresql-%s" %
versioned_script_path_tp[0]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
