ApiDispatcher: Fix uuid->id translation and throw better debug statement

yadvr · yadvr · commit a7fd74f94a29 · 2013-01-23T14:57:41.000-08:00
Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
@@ -158,8 +158,7 @@ public void dispatch(BaseCmd cmd, Map<String, String> params) throws Exception {
                 }
 
                 if (queueSizeLimit != null) {
-                    _asyncMgr
-                            .syncAsyncJobExecution(asyncCmd.getJob(), asyncCmd.getSyncObjType(), asyncCmd.getSyncObjId().longValue(), queueSizeLimit);
+                    _asyncMgr.syncAsyncJobExecution(asyncCmd.getJob(), asyncCmd.getSyncObjType(), asyncCmd.getSyncObjId().longValue(), queueSizeLimit);
                 } else {
                     s_logger.trace("The queue size is unlimited, skipping the synchronizing");
                 }
@@ -360,8 +359,9 @@ private static Long translateUuidToInternalId(String uuid, Parameter annotation)
         // Go through each entity which is an interface to a VO class and get a VO object
         // Try to getId() for the object using reflection, break on first non-null value
         for (Class<?> entity: entities) {
-            // findByUuid returns one VO object using uuid, use reflect to get the Id
-            Object objVO = s_instance._entityMgr.findByUuid(entity, uuid);
+            // For backward compatibility, we search within removed entities and let service layer deal
+            // with removed ones, return empty response or error
+            Object objVO = s_instance._entityMgr.findByUuidIncludingRemoved(entity, uuid);
             if (objVO == null) {
                 continue;
             }
@@ -377,11 +377,10 @@ private static Long translateUuidToInternalId(String uuid, Parameter annotation)
                 break;
         }
         if (internalId == null) {
-            if (s_logger.isDebugEnabled()) {
-                s_logger.debug("Object entity with uuid=" + uuid + " does not exist in the database.");
-            }
+            if (s_logger.isDebugEnabled())
+                s_logger.debug("Object entity uuid = " + uuid + " does not exist in the database.");
             throw new InvalidParameterValueException("Invalid parameter value=" + uuid
-                    + " due to incorrect long value, entity not found, or an annotation bug.");
+                + " due to incorrect long value format, or entity was not found as it may have been deleted, or due to incorrect parameter annotation for the field in api cmd.");
         }
         return internalId;
     }

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,7 @@ public void dispatch(BaseCmd cmd, Map<String, String> params) throws Exception {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`if (queueSizeLimit != null) {`
`161`		`- _asyncMgr`
`162`		`- .syncAsyncJobExecution(asyncCmd.getJob(), asyncCmd.getSyncObjType(), asyncCmd.getSyncObjId().longValue(), queueSizeLimit);`
	`161`	`+ _asyncMgr.syncAsyncJobExecution(asyncCmd.getJob(), asyncCmd.getSyncObjType(), asyncCmd.getSyncObjId().longValue(), queueSizeLimit);`
`163`	`162`	`} else {`
`164`	`163`	`s_logger.trace("The queue size is unlimited, skipping the synchronizing");`
`165`	`164`	`}`
`@@ -360,8 +359,9 @@ private static Long translateUuidToInternalId(String uuid, Parameter annotation)`
`360`	`359`	`// Go through each entity which is an interface to a VO class and get a VO object`
`361`	`360`	`// Try to getId() for the object using reflection, break on first non-null value`
`362`	`361`	`for (Class<?> entity: entities) {`
`363`		`- // findByUuid returns one VO object using uuid, use reflect to get the Id`
`364`		`- Object objVO = s_instance._entityMgr.findByUuid(entity, uuid);`
	`362`	`+ // For backward compatibility, we search within removed entities and let service layer deal`
	`363`	`+ // with removed ones, return empty response or error`
	`364`	`+ Object objVO = s_instance._entityMgr.findByUuidIncludingRemoved(entity, uuid);`
`365`	`365`	`if (objVO == null) {`
`366`	`366`	`continue;`
`367`	`367`	`}`
`@@ -377,11 +377,10 @@ private static Long translateUuidToInternalId(String uuid, Parameter annotation)`
`377`	`377`	`break;`
`378`	`378`	`}`
`379`	`379`	`if (internalId == null) {`
`380`		`- if (s_logger.isDebugEnabled()) {`
`381`		`- s_logger.debug("Object entity with uuid=" + uuid + " does not exist in the database.");`
`382`		`- }`
	`380`	`+ if (s_logger.isDebugEnabled())`
	`381`	`+ s_logger.debug("Object entity uuid = " + uuid + " does not exist in the database.");`
`383`	`382`	`throw new InvalidParameterValueException("Invalid parameter value=" + uuid`
`384`		`- + " due to incorrect long value, entity not found, or an annotation bug.");`
	`383`	`+ + " due to incorrect long value format, or entity was not found as it may have been deleted, or due to incorrect parameter annotation for the field in api cmd.");`
`385`	`384`	`}`
`386`	`385`	`return internalId;`
`387`	`386`	`}`