Updated Branches: refs/heads/events-framework 0c26a728b -> a4b3365ae
- fix snapshot state transition bug - removing the Publish call back handler from default interceptor library Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a4b3365a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a4b3365a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a4b3365a Branch: refs/heads/events-framework Commit: a4b3365ae5db904d8aab558e64b8c678aa9a2b3e Parents: b30f1b1 Author: Murali Reddy <[email protected]> Authored: Thu Jan 31 16:57:55 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Thu Jan 31 19:37:52 2013 +0530 ---------------------------------------------------------------------- api/src/com/cloud/storage/Snapshot.java | 6 +++--- .../configuration/DefaultInterceptorLibrary.java | 2 -- .../storage/snapshot/SnapshotManagerImpl.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a4b3365a/api/src/com/cloud/storage/Snapshot.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/storage/Snapshot.java b/api/src/com/cloud/storage/Snapshot.java index 97fa9b9..2e2965a 100644 --- a/api/src/com/cloud/storage/Snapshot.java +++ b/api/src/com/cloud/storage/Snapshot.java @@ -67,11 +67,11 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity, } static { - s_fsm.addTransition(Creating, Event.CreateRequested, Creating); + s_fsm.addTransition(null, Event.CreateRequested, Creating); s_fsm.addTransition(Creating, Event.OperationSucceeded, CreatedOnPrimary); + s_fsm.addTransition(Creating, Event.OperationNotPerformed, BackedUp); s_fsm.addTransition(Creating, Event.OperationFailed, Error); s_fsm.addTransition(CreatedOnPrimary, Event.BackupToSecondary, BackingUp); - s_fsm.addTransition(CreatedOnPrimary, Event.OperationFailed, Error); s_fsm.addTransition(BackingUp, Event.OperationSucceeded, BackedUp); s_fsm.addTransition(BackingUp, Event.OperationFailed, Error); } @@ -87,7 +87,7 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity, enum Event { CreateRequested, - CreatedOnPrimary, + OperationNotPerformed, BackupToSecondary, BackedupToSecondary, OperationSucceeded, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a4b3365a/server/src/com/cloud/configuration/DefaultInterceptorLibrary.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/DefaultInterceptorLibrary.java b/server/src/com/cloud/configuration/DefaultInterceptorLibrary.java index 6feff4c..13a22db 100644 --- a/server/src/com/cloud/configuration/DefaultInterceptorLibrary.java +++ b/server/src/com/cloud/configuration/DefaultInterceptorLibrary.java @@ -20,7 +20,6 @@ import com.cloud.event.ActionEventUtils; import com.cloud.utils.component.AnnotationInterceptor; import com.cloud.utils.component.InterceptorLibrary; import com.cloud.utils.db.DatabaseCallback; -import org.apache.cloudstack.framework.events.EventPublishCallback; import java.util.List; @@ -30,6 +29,5 @@ public class DefaultInterceptorLibrary implements InterceptorLibrary { public void addInterceptors(List<AnnotationInterceptor<?>> interceptors) { interceptors.add(new DatabaseCallback()); interceptors.add(new ActionEventUtils.ActionEventCallback()); - interceptors.add(new EventPublishCallback()); } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a4b3365a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 5a150a8..fd28632 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -258,7 +258,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma snapshot.setSwiftId(preSnapshotVO.getSwiftId()); snapshot.setPrevSnapshotId(preId); snapshot.setSecHostId(preSnapshotVO.getSecHostId()); - stateTransitTo(snapshot, Snapshot.Event.OperationSucceeded); + stateTransitTo(snapshot, Snapshot.Event.OperationNotPerformed); } catch (NoTransitionException nte) { s_logger.debug("CreateSnapshot: failed to update state of snapshot due to " + nte.getMessage()); }
