You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/06/10 01:39:31 UTC
[1/2] git commit: updated refs/heads/vmsync to 186e62a
Updated Branches:
refs/heads/vmsync 59c211fca -> 186e62a86
Fixed problem with serializer
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f3d1238
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f3d1238
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f3d1238
Branch: refs/heads/vmsync
Commit: 1f3d1238663fc447f2f160002e6106edb0107aac
Parents: 59c211f
Author: Alex Huang <al...@gmail.com>
Authored: Sun Jun 9 04:38:09 2013 -0700
Committer: Alex Huang <al...@gmail.com>
Committed: Sun Jun 9 04:38:09 2013 -0700
----------------------------------------------------------------------
.../apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java | 1 +
server/src/com/cloud/vm/VmWorkJobDispatcher.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f3d1238/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java
index 33a1df7..6acc933 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java
@@ -55,6 +55,7 @@ public class JobSerializerHelper {
gsonBuilder.setVersion(1.5);
s_logger.debug("Job GSON Builder initialized.");
gsonBuilder.registerTypeAdapter(Class.class, new ClassTypeAdapter());
+ gsonBuilder.registerTypeAdapter(Throwable.class, new ThrowableTypeAdapter());
s_gson = gsonBuilder.create();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f3d1238/server/src/com/cloud/vm/VmWorkJobDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VmWorkJobDispatcher.java b/server/src/com/cloud/vm/VmWorkJobDispatcher.java
index dcb91d2..8b04e91 100644
--- a/server/src/com/cloud/vm/VmWorkJobDispatcher.java
+++ b/server/src/com/cloud/vm/VmWorkJobDispatcher.java
@@ -77,7 +77,7 @@ public class VmWorkJobDispatcher extends AdapterBase implements AsyncJobDispatch
_asyncJobMgr.completeAsyncJob(job.getId(), AsyncJobConstants.STATUS_SUCCEEDED, 0, null);
} catch(Throwable e) {
s_logger.error("Unable to complete " + job, e);
- _asyncJobMgr.completeAsyncJob(job.getId(), AsyncJobConstants.STATUS_FAILED, 0, e);
+ _asyncJobMgr.completeAsyncJob(job.getId(), AsyncJobConstants.STATUS_FAILED, 0, e.getMessage());
} finally {
CallContext.unregister();
}
[2/2] git commit: updated refs/heads/vmsync to 186e62a
Posted by ah...@apache.org.
asyncmanager is too tightly integrated with api. Can't break them apart at this point. Reverting previous change
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/186e62a8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/186e62a8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/186e62a8
Branch: refs/heads/vmsync
Commit: 186e62a868a40e9a7a1f1134c75946faa953544e
Parents: 1f3d123
Author: Alex Huang <al...@gmail.com>
Authored: Sun Jun 9 16:00:47 2013 -0700
Committer: Alex Huang <al...@gmail.com>
Committed: Sun Jun 9 16:00:47 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/async/AsyncJobManagerImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/186e62a8/server/src/com/cloud/async/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java
index 7951a70..359d47b 100644
--- a/server/src/com/cloud/async/AsyncJobManagerImpl.java
+++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java
@@ -51,7 +51,6 @@ import org.apache.cloudstack.framework.jobs.impl.AsyncJobJournalVO;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobMBeanImpl;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobMonitor;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
-import org.apache.cloudstack.framework.jobs.impl.JobSerializerHelper;
import org.apache.cloudstack.framework.jobs.impl.SyncQueueItem;
import org.apache.cloudstack.framework.jobs.impl.SyncQueueItemVO;
import org.apache.cloudstack.framework.jobs.impl.SyncQueueManager;
@@ -61,6 +60,7 @@ import org.apache.cloudstack.framework.messagebus.MessageDetector;
import org.apache.cloudstack.framework.messagebus.PublishScope;
import org.apache.cloudstack.messagebus.TopicConstants;
+import com.cloud.api.ApiSerializerHelper;
import com.cloud.cluster.ClusterManager;
import com.cloud.cluster.ClusterManagerListener;
import com.cloud.cluster.ManagementServerHostVO;
@@ -234,7 +234,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
job.setInstanceId(null);
if (resultObject != null) {
- job.setResult(JobSerializerHelper.toSerializedString(resultObject));
+ job.setResult(ApiSerializerHelper.toSerializedString(resultObject));
}
job.setLastUpdated(DateUtil.currentGMTTime());
@@ -281,7 +281,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
job.setProcessStatus(processStatus);
if(resultObject != null) {
- job.setResult(JobSerializerHelper.toSerializedString(resultObject));
+ job.setResult(ApiSerializerHelper.toSerializedString(resultObject));
}
job.setLastUpdated(DateUtil.currentGMTTime());
_jobDao.update(jobId, job);
@@ -913,7 +913,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
}
private static String getSerializedErrorMessage(String errorMessage) {
- return JobSerializerHelper.toSerializedString(getResetResultResponse(errorMessage));
+ return ApiSerializerHelper.toSerializedString(getResetResultResponse(errorMessage));
}
@Override