bubble exception up to caller, refactor deleteAclsForStore

Author: misyel

services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceParentHelixAdmin.java

@@ -1042,8 +1042,10 @@ public void deleteStore(
           clusterName,
           timeoutException);
       deleteAclsForStore(store, storeName);
+      throw timeoutException;
     } catch (Exception e) {
       LOGGER.info("Caught an exception when deleting store {} in cluster {}", storeName, clusterName, e);
+      throw e;
     } finally {
       releaseAdminMessageLock(clusterName, storeName);
     }
@@ -1055,14 +1057,15 @@ public void deleteStore(
    * @param storeName
    */
   protected void deleteAclsForStore(Store store, String storeName) {
-    if (store != null) {
-      if (!store.isMigrating()) {
-        cleanUpAclsForStore(store.getName(), VeniceSystemStoreType.getEnabledSystemStoreTypes(store));
-      } else {
-        LOGGER.info("Store: {} is migrating! Skipping acl deletion!", storeName);
-      }
-    } else {
+    if (store == null) {
       LOGGER.warn("Store object for {} is missing! Skipping acl deletion!", storeName);
+      return;
+    }
+
+    if (!store.isMigrating()) {
+      cleanUpAclsForStore(store.getName(), VeniceSystemStoreType.getEnabledSystemStoreTypes(store));
+    } else {
+      LOGGER.info("Store: {} is migrating! Skipping acl deletion!", storeName);
     }
   }