Skip to content

Commit

Permalink
RANGER-4689: Fix Ranger Javapatch failure even if service-defs do not…
Browse files Browse the repository at this point in the history 
… exist in ranger DB

Change-Id: If3169baaeefe10e4cfd283031763286c320e1e27
  • Loading branch information
@pradeepagrawal8184
pradeepagrawal8184 committed Feb 21, 2024
1 parent f47db0c commit 4280c51
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 34 deletions.
4 changes: 2 additions & 2 deletions ...ity-admin/src/main/java/org/apache/ranger/patch/PatchForHBaseServiceDefUpdate_J10035.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ private boolean updateHBaseServiceDef() throws Exception {
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);

Expand Down
4 changes: 2 additions & 2 deletions ...rity-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10027.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ private boolean updateHiveServiceDef() throws Exception {
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);

Expand Down
28 changes: 16 additions & 12 deletions ...in/src/main/java/org/apache/ranger/patch/PatchForMigratingOldRegimePolicyJson_J10046.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,10 @@ private void addResourceDefRef(String serviceType, RangerPolicy policy) throws E
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());
}
}
}

Expand Down Expand Up @@ -423,9 +424,10 @@ private void addAccessDefRef(String serviceType, Long policyId, Set<String> acce
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());
}
}
}

Expand Down Expand Up @@ -462,9 +464,10 @@ private void addPolicyConditionDefRef(String serviceType, Long policyId, Set<Str
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());
}
}
}

Expand Down Expand Up @@ -502,9 +505,10 @@ private void addDataMaskDefRef(String serviceType, Long policyId, Set<String> da
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());
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...min/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ private boolean updateOzoneServiceDef() throws Exception {
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);

Expand Down
4 changes: 2 additions & 2 deletions ...ity-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefUpdate_J10041.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ private boolean updateOzoneServiceDef() throws Exception {
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);

Expand Down
4 changes: 2 additions & 2 deletions security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10028.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ private boolean updateTagServiceDef() throws Exception {
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);

Expand Down
28 changes: 16 additions & 12 deletions security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingPolicyJson_J10019.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,10 @@ private void addResourceDefRef(String serviceType, RangerPolicy policy) throws E
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());
}
}
}

Expand Down Expand Up @@ -446,9 +447,10 @@ private void addAccessDefRef(String serviceType, Long policyId, Set<String> acce
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());
}
}
}

Expand Down Expand Up @@ -485,9 +487,10 @@ private void addPolicyConditionDefRef(String serviceType, Long policyId, Set<Str
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());
}
}
}

Expand Down Expand Up @@ -525,9 +528,10 @@ private void addDataMaskDefRef(String serviceType, Long policyId, Set<String> da
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());
}
}
}

Expand Down

0 comments on commit 4280c51

Please sign in to comment.