cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [2/2] git commit: updated refs/heads/4.3 to b6698f3
Date Mon, 13 Jan 2014 17:55:33 GMT
CLOUDSTACK-5849: Failed shutdown of the network causes network state to
be changed to 'Implemented'

Wrong network state transition

s_fsm.addTransition(State.Shutdown, Event.OperationFailed,State.Implemented

fix keeps state as Shutdown


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1a15ea1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1a15ea1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1a15ea1

Branch: refs/heads/4.3
Commit: e1a15ea15b16a4389df2fe6f46285a2979b28778
Parents: 6bb15a0
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Mon Jan 13 17:47:47 2014 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Mon Jan 13 23:24:12 2014 +0530

----------------------------------------------------------------------
 api/src/com/cloud/network/Network.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1a15ea1/api/src/com/cloud/network/Network.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java
index f83e6c3..a7701da 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -231,7 +231,7 @@ public interface Network extends ControlledEntity, StateObject<Network.State>,
I
             s_fsm.addTransition(State.Implementing, Event.OperationFailed, State.Shutdown);
             s_fsm.addTransition(State.Implemented, Event.DestroyNetwork, State.Shutdown);
             s_fsm.addTransition(State.Shutdown, Event.OperationSucceeded, State.Allocated);
-            s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Implemented);
+            s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Shutdown);
             s_fsm.addTransition(State.Setup, Event.DestroyNetwork, State.Destroy);
             s_fsm.addTransition(State.Allocated, Event.DestroyNetwork, State.Destroy);
         }


Mime
View raw message