This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 86b1bcd5e0 RANGER-5104: Ranger Upgrade is failing while executing the
PatchPreSql057_ForUpdateToUniqueGUID_J10052 (#511)
86b1bcd5e0 is described below
commit 86b1bcd5e083046eb9e6b48cb231d7acf7f01181
Author: PradeeP AgrawaL <[email protected]>
AuthorDate: Mon Jan 27 07:44:32 2025 +0530
RANGER-5104: Ranger Upgrade is failing while executing the
PatchPreSql057_ForUpdateToUniqueGUID_J10052 (#511)
* RANGER-5104: Ranger Upgrade is failing while executing the
PatchPreSql057_ForUpdateToUniqueGUID_J10052
* Fix typo in db_setup.py
---------
Co-authored-by: Abhishek Kumar <[email protected]>
---
security-admin/scripts/db_setup.py | 4 ++--
.../main/java/org/apache/ranger/db/XXSecurityZoneDao.java | 15 +++++++++++++++
.../PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java | 2 +-
.../src/main/resources/META-INF/jpa_named_queries.xml | 6 ++++++
4 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/security-admin/scripts/db_setup.py
b/security-admin/scripts/db_setup.py
index fcc57ef2f0..0f717ea5a1 100644
--- a/security-admin/scripts/db_setup.py
+++ b/security-admin/scripts/db_setup.py
@@ -203,13 +203,13 @@ def apply_patches(self, db_name, db_user, db_password,
PATCHES_PATH):
#getting Java patch which needs to be
run before this DB patch.
pre_dict =
self.get_pre_post_java_patches(prefix_for_preSql_patch)
if pre_dict:
- log ("[I] ruunig pre java
patch:[{}]".format(pre_dict),"info")
+ log ("[I] Running Pre Java
Patch:[{}]".format(pre_dict),"info")
self.execute_java_patches(xa_db_host, db_user, db_password, db_name, pre_dict)
self.import_db_patches(db_name,
db_user, db_password, currentPatch)
#getting Java patch which needs to be
run immediately after this DB patch.
post_dict =
self.get_pre_post_java_patches(prefix_for_postSql_patch)
if post_dict:
- log ("[I] ruunig post java
patch:[{}]".format(post_dict),"info")
+ log ("[I] Running Post Java
Patch:[{}]".format(post_dict),"info")
self.execute_java_patches(xa_db_host, db_user, db_password, db_name, post_dict)
self.update_applied_patches_status(db_name,
db_user, db_password, "DB_PATCHES")
else:
diff --git
a/security-admin/src/main/java/org/apache/ranger/db/XXSecurityZoneDao.java
b/security-admin/src/main/java/org/apache/ranger/db/XXSecurityZoneDao.java
index 51b4d1a1ec..4a872b702f 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXSecurityZoneDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXSecurityZoneDao.java
@@ -158,4 +158,19 @@ public List<RangerSecurityZoneHeaderInfo>
findAllZoneHeaderInfosByServiceId(Long
return securityZoneList;
}
+
+ public List<XXSecurityZone> getAllZoneIdNames() {
+ @SuppressWarnings("unchecked")
+ List<Object[]> results =
getEntityManager().createNamedQuery("XXSecurityZone.getAllZoneIdNames").getResultList();
+
+ List<XXSecurityZone> securityZoneList = new
ArrayList<XXSecurityZone>(results.size());
+ for (Object[] result : results) {
+ XXSecurityZone xXSecurityZone = new XXSecurityZone();
+ xXSecurityZone.setId((Long) result[0]);
+ xXSecurityZone.setName((String) result[1]);
+ securityZoneList.add(xXSecurityZone);
+ }
+
+ return securityZoneList;
+ }
}
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java
index 33c72f58ac..8282db56a6 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java
@@ -106,7 +106,7 @@ public void execLoad() {
private void updatePolicyGUIDToUniqueValue() {
logger.info("==> updatePolicyGUIDToUniqueValue() ");
- List<XXSecurityZone> allXXZones =
daoMgr.getXXSecurityZoneDao().getAll();
+ List<XXSecurityZone> allXXZones =
daoMgr.getXXSecurityZoneDao().getAllZoneIdNames();
List<XXService> allXXService = daoMgr.getXXService().getAll();
if (CollectionUtils.isNotEmpty(allXXZones) &&
CollectionUtils.isNotEmpty(allXXService)) {
diff --git a/security-admin/src/main/resources/META-INF/jpa_named_queries.xml
b/security-admin/src/main/resources/META-INF/jpa_named_queries.xml
index 855e27ae5b..56eefba407 100755
--- a/security-admin/src/main/resources/META-INF/jpa_named_queries.xml
+++ b/security-admin/src/main/resources/META-INF/jpa_named_queries.xml
@@ -1724,6 +1724,12 @@
</query>
</named-query>
+ <named-query name="XXSecurityZone.getAllZoneIdNames">
+ <query>
+ select obj.id, obj.name from XXSecurityZone obj
+ </query>
+ </named-query>
+
<named-query name="XXSecurityZoneRefGroup.findByZoneId">
<query>
select obj from XXSecurityZoneRefGroup obj where obj.zoneId =
:zoneId
