This is an automated email from the ASF dual-hosted git repository.
jialiang 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 1222f31c36 AMBARI-26533: Ranger Admin Restart Deletes JDBC JAR When
Installed on Same Host as Ambari Server (#4043)
1222f31c36 is described below
commit 1222f31c3649ac1cc534bf69487fefc2574dcbe8
Author: Yubi Lee <[email protected]>
AuthorDate: Mon Nov 10 10:45:58 2025 +0900
AMBARI-26533: Ranger Admin Restart Deletes JDBC JAR When Installed on Same
Host as Ambari Server (#4043)
---
.../services/RANGER/package/scripts/params.py | 7 +--
.../RANGER/package/scripts/setup_ranger_xml.py | 50 +++++++++++-----------
2 files changed, 27 insertions(+), 30 deletions(-)
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/package/scripts/params.py
index 9f33f47254..f470ab87eb 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/package/scripts/params.py
@@ -297,11 +297,8 @@ else:
downloaded_custom_connector = format("{tmp_dir}/{jdbc_jar_name}")
driver_curl_source = format("{jdk_location}/{jdbc_jar_name}")
-driver_curl_target = format("{java_share_dir}/{jdbc_jar_name}")
-previous_jdbc_jar = format("{java_share_dir}/{previous_jdbc_jar_name}")
-if stack_supports_config_versioning:
- driver_curl_target = format("{ranger_home}/ews/lib/{jdbc_jar_name}")
- previous_jdbc_jar = format("{ranger_home}/ews/lib/{previous_jdbc_jar_name}")
+driver_curl_target = format("{ranger_home}/ews/lib/{jdbc_jar_name}")
+previous_jdbc_jar = format("{ranger_home}/ews/lib/{previous_jdbc_jar_name}")
if db_flavor.lower() == "sqla":
downloaded_custom_connector = format("{tmp_dir}/sqla-client-jdbc.tar.gz")
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/package/scripts/setup_ranger_xml.py
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/package/scripts/setup_ranger_xml.py
index 95f0772bba..1bf6a145eb 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/package/scripts/setup_ranger_xml.py
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/package/scripts/setup_ranger_xml.py
@@ -465,15 +465,36 @@ def password_validation(password):
def copy_jdbc_connector(ranger_home):
import params
- if params.jdbc_jar_name is None and
params.driver_curl_source.endswith("/None"):
+ if params.jdbc_jar_name is None or
params.driver_curl_source.endswith("/None"):
error_message = format(
"{db_flavor} jdbc driver cannot be downloaded from
{jdk_location}\nPlease run 'ambari-server setup --jdbc-db={db_flavor}
--jdbc-driver={{path_to_jdbc}}' on ambari-server host."
)
raise Fail(error_message)
- if params.driver_curl_source and not
params.driver_curl_source.endswith("/None"):
- if params.previous_jdbc_jar and os.path.isfile(params.previous_jdbc_jar):
- File(params.previous_jdbc_jar, action="delete")
+ ModifyPropertiesFile(
+ format("{ranger_home}/install.properties"),
+ properties=params.config["configurations"]["admin-properties"],
+ owner=params.unix_user,
+ )
+
+ if params.db_flavor.lower() == "sqla":
+ ModifyPropertiesFile(
+ format("{ranger_home}/install.properties"),
+ properties={"SQL_CONNECTOR_JAR":
format("{ranger_home}/ews/lib/sajdbc4.jar")},
+ owner=params.unix_user,
+ )
+ else:
+ ModifyPropertiesFile(
+ format("{ranger_home}/install.properties"),
+ properties={"SQL_CONNECTOR_JAR": format("{driver_curl_target}")},
+ owner=params.unix_user,
+ )
+
+ if params.previous_jdbc_jar and os.path.isfile(params.previous_jdbc_jar):
+ if params.previous_jdbc_jar_name == params.jdbc_jar_name:
+ Logger.info(format("{params.previous_jdbc_jar} already exists. Skip to
download it."))
+ return
+ File(params.previous_jdbc_jar, action="delete")
File(
params.downloaded_custom_connector,
@@ -481,8 +502,6 @@ def copy_jdbc_connector(ranger_home):
mode=0o644,
)
- driver_curl_target = format("{ranger_home}/ews/lib/{jdbc_jar_name}")
-
if params.db_flavor.lower() == "sqla":
Execute(
("tar", "-xvf", params.downloaded_custom_connector, "-C",
params.tmp_dir),
@@ -525,25 +544,6 @@ def copy_jdbc_connector(ranger_home):
File(os.path.join(ranger_home, "ews", "lib", params.jdbc_jar_name),
mode=0o644)
- ModifyPropertiesFile(
- format("{ranger_home}/install.properties"),
- properties=params.config["configurations"]["admin-properties"],
- owner=params.unix_user,
- )
-
- if params.db_flavor.lower() == "sqla":
- ModifyPropertiesFile(
- format("{ranger_home}/install.properties"),
- properties={"SQL_CONNECTOR_JAR":
format("{ranger_home}/ews/lib/sajdbc4.jar")},
- owner=params.unix_user,
- )
- else:
- ModifyPropertiesFile(
- format("{ranger_home}/install.properties"),
- properties={"SQL_CONNECTOR_JAR": format("{driver_curl_target}")},
- owner=params.unix_user,
- )
-
def setup_usersync(upgrade_type=None):
import params
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
