mirror of https://github.com/apache/cloudstack.git
bug 8768 : async-job result can now only be of ResponseObjects, update places where a String object is used
This commit is contained in:
Kelven Yang
parent
297bae697d
commit
c5a29ec1f5
|
|
@ -1,54 +1,53 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="XenServerJava"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-apache-log4j-extras-1.0.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-axis.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-backport-util-concurrent-3.0.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-bcprov-jdk16-1.45.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-cglib.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-codec-1.4.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-collections-3.2.1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-dbcp-1.2.2.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-discovery.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-httpclient-3.1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-logging-1.1.1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-pool-1.4.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-ehcache.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-email.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-gson.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-httpcore-4.0.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-iControl.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-jna.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-jsch-0.1.42.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-jstl-1.2.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-libvirt-0.4.5.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-log4j.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-mysql-connector-java-5.1.7-bin.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-servlet-api.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-trilead-ssh2-build213.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-ws-commons-util-1.0.2.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-wsdl4j.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-xenserver-5.6.100-1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-xmlrpc-client-3.1.3.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-xmlrpc-common-3.1.3.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-xstream-1.3.1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-apputils.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-credstore.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-activation.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-jaxen-core.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-jaxen-jdom.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-jaxrpc.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-jdom.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-mailapi.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-saxpath.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-smtp.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-wbem.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-xalan.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-xerces.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-xml-apis.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-vim.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-vim25.jar"/>
|
||||
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry exported="true" kind="lib" path="/home/dev/tools/junit/junit-4.8.1.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="XenServerJava"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-apache-log4j-extras-1.0.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-axis.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-backport-util-concurrent-3.0.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-bcprov-jdk16-1.45.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-cglib.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-codec-1.4.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-collections-3.2.1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-dbcp-1.2.2.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-discovery.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-httpclient-3.1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-logging-1.1.1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-commons-pool-1.4.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-ehcache.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-email.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-gson.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-httpcore-4.0.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-iControl.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-jna.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-jsch-0.1.42.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-jstl-1.2.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-libvirt-0.4.5.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-log4j.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-mysql-connector-java-5.1.7-bin.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-servlet-api.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-trilead-ssh2-build213.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-ws-commons-util-1.0.2.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-wsdl4j.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-xenserver-5.6.100-1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-xmlrpc-client-3.1.3.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-xmlrpc-common-3.1.3.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="cloud-xstream-1.3.1.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-apputils.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-credstore.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-activation.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-jaxen-core.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-jaxen-jdom.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-jaxrpc.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-jdom.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-mailapi.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-saxpath.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-smtp.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-wbem.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-xalan.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-xerces.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-lib-xml-apis.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-vim.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="vmware-vim25.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
|
|
|||
|
|
@ -559,7 +559,7 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
|
|||
if(blockItems != null && blockItems.size() > 0) {
|
||||
for(SyncQueueItemVO item : blockItems) {
|
||||
if(item.getContentType().equalsIgnoreCase("AsyncJob"))
|
||||
completeAsyncJob(item.getContentId(), 2, 0, "Job is cancelled as it has been blocking others for too long");
|
||||
completeAsyncJob(item.getContentId(), 2, 0, getResetResultMessage("Job is cancelled as it has been blocking others for too long"));
|
||||
|
||||
// purge the item and resume queue processing
|
||||
_queueMgr.purgeItem(item.getId());
|
||||
|
|
@ -594,7 +594,8 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
|
|||
Long jobId = item.getContentId();
|
||||
if(jobId != null) {
|
||||
s_logger.warn("Mark job as failed as its correspoding queue-item has been discarded. job id: " + jobId);
|
||||
completeAsyncJob(jobId, AsyncJobResult.STATUS_FAILED, 0, "Execution was cancelled because of server shutdown");
|
||||
completeAsyncJob(jobId, AsyncJobResult.STATUS_FAILED, 0,
|
||||
getResetResultMessage("Execution was cancelled because of server shutdown"));
|
||||
}
|
||||
}
|
||||
_queueMgr.purgeItem(item.getId());
|
||||
|
|
@ -663,7 +664,8 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
|
|||
List<SyncQueueItemVO> items = _queueMgr.getActiveQueueItems(msHost.getId(), true);
|
||||
cleanupPendingJobs(items);
|
||||
_queueMgr.resetQueueProcess(msHost.getId());
|
||||
_jobDao.resetJobProcess(msHost.getId(), BaseCmd.INTERNAL_ERROR, getResetResultMessage());
|
||||
_jobDao.resetJobProcess(msHost.getId(), BaseCmd.INTERNAL_ERROR,
|
||||
getResetResultMessage("job cancelled because of management server restart"));
|
||||
txn.commit();
|
||||
} catch(Throwable e) {
|
||||
s_logger.warn("Unexpected exception ", e);
|
||||
|
|
@ -680,7 +682,8 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
|
|||
List<SyncQueueItemVO> l = _queueMgr.getActiveQueueItems(getMsid(), false);
|
||||
cleanupPendingJobs(l);
|
||||
_queueMgr.resetQueueProcess(getMsid());
|
||||
_jobDao.resetJobProcess(getMsid(), BaseCmd.INTERNAL_ERROR, getResetResultMessage());
|
||||
_jobDao.resetJobProcess(getMsid(), BaseCmd.INTERNAL_ERROR,
|
||||
getResetResultMessage("job cancelled because of management server restart"));
|
||||
} catch(Throwable e) {
|
||||
s_logger.error("Unexpected exception " + e.getMessage(), e);
|
||||
}
|
||||
|
|
@ -693,10 +696,10 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
|
|||
return true;
|
||||
}
|
||||
|
||||
private static String getResetResultMessage() {
|
||||
private static String getResetResultMessage(String messageText) {
|
||||
ExceptionResponse resultObject = new ExceptionResponse();
|
||||
resultObject.setErrorCode(BaseCmd.INTERNAL_ERROR);
|
||||
resultObject.setErrorText("job cancelled because of management server restart");
|
||||
resultObject.setErrorText(messageText);
|
||||
return ApiSerializerHelper.toSerializedStringOld(resultObject);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue