bug 13860: Added async job types to Account/User Async api commands and more logging.

Alena Prokharchyk · Alena Prokharchyk · commit 856418e700e4 · 2012-02-27T10:36:17.000-08:00
Reviewed-by: Kelven Yang
diff --git a/api/src/com/cloud/api/commands/DeleteAccountCmd.java b/api/src/com/cloud/api/commands/DeleteAccountCmd.java
@@ -28,6 +28,7 @@
 import com.cloud.api.Parameter;
 import com.cloud.api.ServerApiException;
 import com.cloud.api.response.SuccessResponse;
+import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.user.Account;
 import com.cloud.user.User;
@@ -102,4 +103,9 @@ public void execute(){
             throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete user account and all corresponding users");
         }
     }
+    
+    @Override
+    public AsyncJob.Type getInstanceType() {
+        return AsyncJob.Type.Account;
+    }
 }
diff --git a/api/src/com/cloud/api/commands/DisableAccountCmd.java b/api/src/com/cloud/api/commands/DisableAccountCmd.java
@@ -27,6 +27,7 @@
 import com.cloud.api.Parameter;
 import com.cloud.api.ServerApiException;
 import com.cloud.api.response.AccountResponse;
+import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.ResourceUnavailableException;
@@ -120,5 +121,10 @@ public void execute() throws ConcurrentOperationException, ResourceUnavailableEx
         } else {
             throw new ServerApiException(BaseCmd.INTERNAL_ERROR, lockRequested == true ? "Failed to lock account" : "Failed to disable account" );
         }
+    }
+    
+    @Override
+    public AsyncJob.Type getInstanceType() {
+        return AsyncJob.Type.Account;
     }
 }
diff --git a/api/src/com/cloud/api/commands/DisableUserCmd.java b/api/src/com/cloud/api/commands/DisableUserCmd.java
@@ -27,6 +27,7 @@
 import com.cloud.api.Parameter;
 import com.cloud.api.ServerApiException;
 import com.cloud.api.response.UserResponse;
+import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.user.Account;
 import com.cloud.user.User;
@@ -95,5 +96,10 @@ public void execute(){
         } else {
             throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to disable user");
         }
+    }
+    
+    @Override
+    public AsyncJob.Type getInstanceType() {
+        return AsyncJob.Type.User;
     }
 }
diff --git a/api/src/com/cloud/api/response/AsyncJobResponse.java b/api/src/com/cloud/api/response/AsyncJobResponse.java
@@ -19,6 +19,8 @@
 
 import java.util.Date;
 
+import org.apache.log4j.Logger;
+
 import com.cloud.api.ApiConstants;
 import com.cloud.api.IdentityProxy;
 import com.cloud.api.ResponseObject;
@@ -28,6 +30,8 @@
 
 @SuppressWarnings("unused")
 public class AsyncJobResponse extends BaseResponse {
+    private static final Logger s_logger = Logger.getLogger(AsyncJobResponse.class.getName());
+
     @SerializedName("accountid") @Param(description="the account that executed the async command")
     private IdentityProxy accountId = new IdentityProxy("account");
 
@@ -123,7 +127,12 @@ public void setJobInstanceType(String jobInstanceType) {
                 this.jobInstanceId.setTableName("physical_network_service_providers");
         	} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.FirewallRule.toString())) {
         	    this.jobInstanceId.setTableName("firewall_rules");
-        	} else if (!jobInstanceType.equalsIgnoreCase(AsyncJob.Type.None.toString())){
+        	} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Account.toString())) {
+                this.jobInstanceId.setTableName("account");
+            } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.User.toString())) {
+                this.jobInstanceId.setTableName("user");
+            } else if (!jobInstanceType.equalsIgnoreCase(AsyncJob.Type.None.toString())){
+                s_logger.warn("Failed to get async job instanceId for job instance type " + jobInstanceType);
         		// TODO : when we hit here, we need to add instanceType -> UUID entity table mapping
         		assert(false);
         	}
diff --git a/api/src/com/cloud/async/AsyncJob.java b/api/src/com/cloud/async/AsyncJob.java
@@ -39,7 +39,9 @@ public enum Type {
         PhysicalNetwork,
         TrafficType,
         PhysicalNetworkServiceProvider,
-        FirewallRule
+        FirewallRule,
+        Account,
+        User
     }
 
     Long getId();

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`import com.cloud.api.Parameter;`
`29`	`29`	`import com.cloud.api.ServerApiException;`
`30`	`30`	`import com.cloud.api.response.SuccessResponse;`
	`31`	`+import com.cloud.async.AsyncJob;`
`31`	`32`	`import com.cloud.event.EventTypes;`
`32`	`33`	`import com.cloud.user.Account;`
`33`	`34`	`import com.cloud.user.User;`
`@@ -102,4 +103,9 @@ public void execute(){`
`102`	`103`	`throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete user account and all corresponding users");`
`103`	`104`	`}`
`104`	`105`	`}`
	`106`	`+`
	`107`	`+ @Override`
	`108`	`+ public AsyncJob.Type getInstanceType() {`
	`109`	`+ return AsyncJob.Type.Account;`
	`110`	`+ }`
`105`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`import com.cloud.api.Parameter;`
`28`	`28`	`import com.cloud.api.ServerApiException;`
`29`	`29`	`import com.cloud.api.response.AccountResponse;`
	`30`	`+import com.cloud.async.AsyncJob;`
`30`	`31`	`import com.cloud.event.EventTypes;`
`31`	`32`	`import com.cloud.exception.ConcurrentOperationException;`
`32`	`33`	`import com.cloud.exception.ResourceUnavailableException;`
`@@ -120,5 +121,10 @@ public void execute() throws ConcurrentOperationException, ResourceUnavailableEx`
`120`	`121`	`} else {`
`121`	`122`	`throw new ServerApiException(BaseCmd.INTERNAL_ERROR, lockRequested == true ? "Failed to lock account" : "Failed to disable account" );`
`122`	`123`	`}`
	`124`	`+ }`
	`125`	`+`
	`126`	`+ @Override`
	`127`	`+ public AsyncJob.Type getInstanceType() {`
	`128`	`+ return AsyncJob.Type.Account;`
`123`	`129`	`}`
`124`	`130`	`}`