[ranger] branch master updated: RANGER-2543: Delete service def request is failing

[pradeep]

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 17a97fa  RANGER-2543: Delete service def request is failing
17a97fa is described below

commit 17a97fab5c72cc7dff19c2cd688c21b15bd3a71b
Author: Pradeep <prad...@apache.org>
AuthorDate: Tue Aug 20 18:57:51 2019 +0530

    RANGER-2543: Delete service def request is failing
---
 .../src/main/java/org/apache/ranger/biz/ServiceDBStore.java  | 12 ++++++------
 .../src/main/java/org/apache/ranger/rest/ServiceREST.java    |  3 ---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java 
b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 113e727..cdda7bd 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -1214,6 +1214,12 @@ public class ServiceDBStore extends AbstractServiceStore 
{
                        }
                }
 
+               if(CollectionUtils.isNotEmpty(serviceList)) {
+                       for(XXService service : serviceList) {
+                               deleteService(service.getId());
+                       }
+               }
+
                XXDataMaskTypeDefDao dataMaskDao = 
daoMgr.getXXDataMaskTypeDef();
                List<XXDataMaskTypeDef> dataMaskDefs = 
dataMaskDao.findByServiceDefId(serviceDefId);
                for(XXDataMaskTypeDef dataMaskDef : dataMaskDefs) {
@@ -1263,12 +1269,6 @@ public class ServiceDBStore extends AbstractServiceStore 
{
                        configDefDao.remove(configDef);
                }
 
-               if(CollectionUtils.isNotEmpty(serviceList)) {
-                       for(XXService service : serviceList) {
-                               deleteService(service.getId());
-                       }
-               }
-
                Long version = serviceDef.getVersion();
                if(version == null) {
                        version = Long.valueOf(1);
diff --git 
a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java 
b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
index e7b3172..bae04fe 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
@@ -337,9 +337,6 @@ public class ServiceREST {
                if(LOG.isDebugEnabled()) {
                        LOG.debug("==> ServiceREST.deleteServiceDef(" + id + 
")");
                }
-               RangerAdminOpContext opContext = new RangerAdminOpContext();
-               opContext.setBulkModeContext(true);
-               RangerContextHolder.setOpContext(opContext);
                RangerPerfTracer perf = null;
 
                try {