[AMORO-4139] Delete resource and optimizer atomically when releasing optimizer

amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java

@@ -70,8 +70,7 @@ public void releaseOptimizer(Context ctx) {
         resource.getContainerName());
     ((AbstractOptimizerContainer) rc).releaseResource(resource);
 
-    optimizerManager.deleteResource(resourceId);
-    optimizerManager.deleteOptimizer(resource.getGroupName(), resourceId);
+    optimizerManager.deleteOptimizerAndResource(resource.getGroupName(), resourceId);
     ctx.json(OkResponse.of("Success to release optimizer"));
   }
 

amoro-ams/src/main/java/org/apache/amoro/server/resource/DefaultOptimizerManager.java

@@ -74,13 +74,17 @@ public List<OptimizerInstance> listOptimizers(String group) {
   }
 
   @Override
-  public void deleteOptimizer(String group, String resourceId) {
-    List<OptimizerInstance> deleteOptimizers =
-        getAs(OptimizerMapper.class, mapper -> mapper.selectByResourceId(resourceId));
-    deleteOptimizers.forEach(
-        optimizer -> {
-          String token = optimizer.getToken();
-          unregisterOptimizer(token);
+  public void deleteOptimizerAndResource(String group, String resourceId) {
+    doAsTransaction(
+        () -> deleteResource(resourceId),
+        () -> {
+          List<OptimizerInstance> deleteOptimizers =
+              getAs(OptimizerMapper.class, mapper -> mapper.selectByResourceId(resourceId));
+          deleteOptimizers.forEach(
+              optimizer -> {
+                String token = optimizer.getToken();
+                unregisterOptimizer(token);
+              });
         });
   }
 

amoro-ams/src/main/java/org/apache/amoro/server/resource/OptimizerManager.java

@@ -27,7 +27,7 @@ public interface OptimizerManager extends ResourceManager {
 
   List<OptimizerInstance> listOptimizers(String groupName);
 
-  void deleteOptimizer(String groupName, String resourceId);
+  void deleteOptimizerAndResource(String groupName, String resourceId);
 
   boolean canDeleteResourceGroup(String name);
 }