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 4280c517c RANGER-4689: Fix Ranger Javapatch failure even if
service-defs do not exist in ranger DB
4280c517c is described below
commit 4280c517c1e26009a01e30acc55a7de54cf5f7c1
Author: Pradeep Agrawal <[email protected]>
AuthorDate: Tue Feb 6 15:12:28 2024 +0530
RANGER-4689: Fix Ranger Javapatch failure even if service-defs do not exist
in ranger DB
Change-Id: If3169baaeefe10e4cfd283031763286c320e1e27
---
.../PatchForHBaseServiceDefUpdate_J10035.java | 4 ++--
.../patch/PatchForHiveServiceDefUpdate_J10027.java | 4 ++--
...atchForMigratingOldRegimePolicyJson_J10046.java | 28 ++++++++++++----------
...PatchForOzoneServiceDefConfigUpdate_J10051.java | 4 ++--
.../PatchForOzoneServiceDefUpdate_J10041.java | 4 ++--
.../patch/PatchForTagServiceDefUpdate_J10028.java | 4 ++--
.../patch/PatchForUpdatingPolicyJson_J10019.java | 28 ++++++++++++----------
7 files changed, 42 insertions(+), 34 deletions(-)
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseServiceDefUpdate_J10035.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseServiceDefUpdate_J10035.java
index 75fa78ad9..ecda77a4e 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseServiceDefUpdate_J10035.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseServiceDefUpdate_J10035.java
@@ -137,8 +137,8 @@ public class PatchForHBaseServiceDefUpdate_J10035 extends
BaseLoader {
jsonPreUpdate = xXServiceDefObj.getDefOptions();
serviceDefOptionsPreUpdate = jsonStringToMap(jsonPreUpdate);
} else {
- logger.error("HBase service-definition does not exist in the
Ranger DAO.");
- return false;
+ logger.error("HBase service-definition does not exist in the
Ranger DAO. No patching is needed!!");
+ return true;
}
dbHBaseServiceDef =
svcDBStore.getServiceDefByName(SERVICEDBSTORE_SERVICEDEFBYNAME_HBASE_NAME);
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10027.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10027.java
index fa319bdb8..24cf14fa1 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10027.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10027.java
@@ -137,8 +137,8 @@ public class PatchForHiveServiceDefUpdate_J10027 extends
BaseLoader {
jsonPreUpdate = xXServiceDefObj.getDefOptions();
serviceDefOptionsPreUpdate =
jsonStringToMap(jsonPreUpdate);
} else {
- logger.error("Hive service-definition does not
exist in the Ranger DAO.");
- return false;
+ logger.error("Hive service-definition does not
exist in the Ranger DAO. No patching is needed!!");
+ return true;
}
dbHiveServiceDef =
svcDBStore.getServiceDefByName(SERVICEDBSTORE_SERVICEDEFBYNAME_HIVE_NAME);
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForMigratingOldRegimePolicyJson_J10046.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForMigratingOldRegimePolicyJson_J10046.java
index dbffc5663..4dfe72aed 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForMigratingOldRegimePolicyJson_J10046.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForMigratingOldRegimePolicyJson_J10046.java
@@ -291,9 +291,10 @@ public class PatchForMigratingOldRegimePolicyJson_J10046
extends BaseLoader {
resourceNameIdMap.put(serviceType,
serviceDefResourceNameIDMap);
XXServiceDef dbServiceDef =
daoMgr.getXXServiceDef().findByName(serviceType);
-
- for (XXResourceDef resourceDef :
daoMgr.getXXResourceDef().findByServiceDefId(dbServiceDef.getId())) {
-
serviceDefResourceNameIDMap.put(resourceDef.getName(), resourceDef.getId());
+ if (dbServiceDef != null) {
+ for (XXResourceDef resourceDef :
daoMgr.getXXResourceDef().findByServiceDefId(dbServiceDef.getId())) {
+
serviceDefResourceNameIDMap.put(resourceDef.getName(), resourceDef.getId());
+ }
}
}
@@ -423,9 +424,10 @@ public class PatchForMigratingOldRegimePolicyJson_J10046
extends BaseLoader {
accessTypeIdMap.put(serviceType,
serviceDefAccessTypeIDMap);
XXServiceDef dbServiceDef =
daoMgr.getXXServiceDef().findByName(serviceType);
-
- for (XXAccessTypeDef accessTypeDef :
daoMgr.getXXAccessTypeDef().findByServiceDefId(dbServiceDef.getId())) {
-
serviceDefAccessTypeIDMap.put(accessTypeDef.getName(), accessTypeDef.getId());
+ if (dbServiceDef != null) {
+ for (XXAccessTypeDef accessTypeDef :
daoMgr.getXXAccessTypeDef().findByServiceDefId(dbServiceDef.getId())) {
+
serviceDefAccessTypeIDMap.put(accessTypeDef.getName(), accessTypeDef.getId());
+ }
}
}
@@ -462,9 +464,10 @@ public class PatchForMigratingOldRegimePolicyJson_J10046
extends BaseLoader {
conditionNameIdMap.put(serviceType,
serviceDefConditionNameIDMap);
XXServiceDef dbServiceDef =
daoMgr.getXXServiceDef().findByName(serviceType);
-
- for (XXPolicyConditionDef conditionDef :
daoMgr.getXXPolicyConditionDef().findByServiceDefId(dbServiceDef.getId())) {
-
serviceDefConditionNameIDMap.put(conditionDef.getName(), conditionDef.getId());
+ if (dbServiceDef != null) {
+ for (XXPolicyConditionDef conditionDef :
daoMgr.getXXPolicyConditionDef().findByServiceDefId(dbServiceDef.getId())) {
+
serviceDefConditionNameIDMap.put(conditionDef.getName(), conditionDef.getId());
+ }
}
}
@@ -502,9 +505,10 @@ public class PatchForMigratingOldRegimePolicyJson_J10046
extends BaseLoader {
dataMaskTypeIdMap.put(serviceType,
serviceDefDataMaskTypeIDMap);
XXServiceDef dbServiceDef =
daoMgr.getXXServiceDef().findByName(serviceType);
-
- for (XXDataMaskTypeDef dataMaskTypeDef :
daoMgr.getXXDataMaskTypeDef().findByServiceDefId(dbServiceDef.getId())) {
-
serviceDefDataMaskTypeIDMap.put(dataMaskTypeDef.getName(),
dataMaskTypeDef.getId());
+ if (dbServiceDef != null) {
+ for (XXDataMaskTypeDef dataMaskTypeDef :
daoMgr.getXXDataMaskTypeDef().findByServiceDefId(dbServiceDef.getId())) {
+
serviceDefDataMaskTypeIDMap.put(dataMaskTypeDef.getName(),
dataMaskTypeDef.getId());
+ }
}
}
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
index 8d3cfd3de..3f08bc761 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
@@ -132,8 +132,8 @@ public class PatchForOzoneServiceDefConfigUpdate_J10051
extends BaseLoader {
jsonPreUpdate = xXServiceDefObj.getDefOptions();
serviceDefOptionsPreUpdate =
jsonStringToMap(jsonPreUpdate);
} else {
- logger.error("Ozone service-definition does not
exist in the Ranger DAO.");
- return false;
+ logger.error("Ozone service-definition does not
exist in the Ranger DAO. No patching is needed!!");
+ return true;
}
dbOzoneServiceDef =
svcDBStore.getServiceDefByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_OZONE_NAME);
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefUpdate_J10041.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefUpdate_J10041.java
index 538093a98..0a085f659 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefUpdate_J10041.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefUpdate_J10041.java
@@ -147,8 +147,8 @@ public class PatchForOzoneServiceDefUpdate_J10041 extends
BaseLoader {
jsonPreUpdate = xXServiceDefObj.getDefOptions();
serviceDefOptionsPreUpdate =
jsonStringToMap(jsonPreUpdate);
} else {
- logger.error("Ozone service-definition does not
exist in the Ranger DAO.");
- return false;
+ logger.error("Ozone service-definition does not
exist in the Ranger DAO. No patching is needed!!");
+ return true;
}
dbOzoneServiceDef =
svcDBStore.getServiceDefByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_OZONE_NAME);
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10028.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10028.java
index 785e871f2..072831bf8 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10028.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10028.java
@@ -136,8 +136,8 @@ public class PatchForTagServiceDefUpdate_J10028 extends
BaseLoader {
jsonPreUpdate = xXServiceDefObj.getDefOptions();
serviceDefOptionsPreUpdate =
jsonStringToMap(jsonPreUpdate);
} else {
- logger.error("Tag service-definition does not
exist in the Ranger DAO.");
- return false;
+ logger.error("Tag service-definition does not
exist in the Ranger DAO. No patching is needed");
+ return true;
}
dbTagServiceDef =
svcDBStore.getServiceDefByName(SERVICEDBSTORE_SERVICEDEFBYNAME_TAG_NAME);
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingPolicyJson_J10019.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingPolicyJson_J10019.java
index 9b99b942c..e7d10883d 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingPolicyJson_J10019.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingPolicyJson_J10019.java
@@ -314,9 +314,10 @@ public class PatchForUpdatingPolicyJson_J10019 extends
BaseLoader {
resourceNameIdMap.put(serviceType,
serviceDefResourceNameIDMap);
XXServiceDef dbServiceDef =
daoMgr.getXXServiceDef().findByName(serviceType);
-
- for (XXResourceDef resourceDef :
daoMgr.getXXResourceDef().findByServiceDefId(dbServiceDef.getId())) {
-
serviceDefResourceNameIDMap.put(resourceDef.getName(), resourceDef.getId());
+ if (dbServiceDef != null) {
+ for (XXResourceDef resourceDef :
daoMgr.getXXResourceDef().findByServiceDefId(dbServiceDef.getId())) {
+
serviceDefResourceNameIDMap.put(resourceDef.getName(), resourceDef.getId());
+ }
}
}
@@ -446,9 +447,10 @@ public class PatchForUpdatingPolicyJson_J10019 extends
BaseLoader {
accessTypeIdMap.put(serviceType,
serviceDefAccessTypeIDMap);
XXServiceDef dbServiceDef =
daoMgr.getXXServiceDef().findByName(serviceType);
-
- for (XXAccessTypeDef accessTypeDef :
daoMgr.getXXAccessTypeDef().findByServiceDefId(dbServiceDef.getId())) {
-
serviceDefAccessTypeIDMap.put(accessTypeDef.getName(), accessTypeDef.getId());
+ if (dbServiceDef != null) {
+ for (XXAccessTypeDef accessTypeDef :
daoMgr.getXXAccessTypeDef().findByServiceDefId(dbServiceDef.getId())) {
+
serviceDefAccessTypeIDMap.put(accessTypeDef.getName(), accessTypeDef.getId());
+ }
}
}
@@ -485,9 +487,10 @@ public class PatchForUpdatingPolicyJson_J10019 extends
BaseLoader {
conditionNameIdMap.put(serviceType,
serviceDefConditionNameIDMap);
XXServiceDef dbServiceDef =
daoMgr.getXXServiceDef().findByName(serviceType);
-
- for (XXPolicyConditionDef conditionDef :
daoMgr.getXXPolicyConditionDef().findByServiceDefId(dbServiceDef.getId())) {
-
serviceDefConditionNameIDMap.put(conditionDef.getName(), conditionDef.getId());
+ if (dbServiceDef != null) {
+ for (XXPolicyConditionDef conditionDef :
daoMgr.getXXPolicyConditionDef().findByServiceDefId(dbServiceDef.getId())) {
+
serviceDefConditionNameIDMap.put(conditionDef.getName(), conditionDef.getId());
+ }
}
}
@@ -525,9 +528,10 @@ public class PatchForUpdatingPolicyJson_J10019 extends
BaseLoader {
dataMaskTypeIdMap.put(serviceType,
serviceDefDataMaskTypeIDMap);
XXServiceDef dbServiceDef =
daoMgr.getXXServiceDef().findByName(serviceType);
-
- for (XXDataMaskTypeDef dataMaskTypeDef :
daoMgr.getXXDataMaskTypeDef().findByServiceDefId(dbServiceDef.getId())) {
-
serviceDefDataMaskTypeIDMap.put(dataMaskTypeDef.getName(),
dataMaskTypeDef.getId());
+ if (dbServiceDef != null) {
+ for (XXDataMaskTypeDef dataMaskTypeDef :
daoMgr.getXXDataMaskTypeDef().findByServiceDefId(dbServiceDef.getId())) {
+
serviceDefDataMaskTypeIDMap.put(dataMaskTypeDef.getName(),
dataMaskTypeDef.getId());
+ }
}
}
