Updated Branches: refs/heads/master fad0cfcc1 -> 6227ba635
CLOUDSTACK-5246:Xenserver - Hourly Snapshots - Creating snapshot from ROOT volume fails with NullPointer Exception due to new jobs framework merge. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6227ba63 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6227ba63 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6227ba63 Branch: refs/heads/master Commit: 6227ba6356cf9e68b2c62dc3e96d83b2719f4218 Parents: fad0cfc Author: Min Chen <[email protected]> Authored: Fri Nov 22 10:56:27 2013 -0800 Committer: Min Chen <[email protected]> Committed: Fri Nov 22 10:56:27 2013 -0800 ---------------------------------------------------------------------- server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6227ba63/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java index 2b9e1e2..8cb76d2 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java @@ -34,6 +34,7 @@ import org.springframework.stereotype.Component; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotCmd; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher; import org.apache.cloudstack.framework.jobs.AsyncJobManager; import org.apache.cloudstack.framework.jobs.dao.AsyncJobDao; import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO; @@ -82,6 +83,8 @@ public class SnapshotSchedulerImpl extends ManagerBase implements SnapshotSchedu protected VolumeDao _volsDao; @Inject protected ConfigurationDao _configDao; + @Inject + protected AsyncJobDispatcher _asyncDispatcher; private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5; // 5 seconds private int _snapshotPollInterval; @@ -254,6 +257,7 @@ public class SnapshotSchedulerImpl extends ManagerBase implements SnapshotSchedu new AsyncJobVO(UUID.randomUUID().toString(), User.UID_SYSTEM, volume.getAccountId(), CreateSnapshotCmd.class.getName(), ApiGsonHelper.getBuilder() .create() .toJson(params), cmd.getEntityId(), cmd.getInstanceType() != null ? cmd.getInstanceType().toString() : null); + job.setDispatcher(_asyncDispatcher.getName()); long jobId = _asyncMgr.submitAsyncJob(job);
