You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/04/22 20:32:53 UTC
[4/4] git commit: updated refs/heads/vmsync to f640a41
Revert back a previous change that was trying to carry more info in state machine listeners
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f640a416
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f640a416
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f640a416
Branch: refs/heads/vmsync
Commit: f640a416d19c57a085ba28b8e8063c3b1f526d30
Parents: f969ec3
Author: Kelven Yang <ke...@gmail.com>
Authored: Mon Apr 22 11:29:07 2013 -0700
Committer: Kelven Yang <ke...@gmail.com>
Committed: Mon Apr 22 11:29:07 2013 -0700
----------------------------------------------------------------------
.../framework/client/ClientEventBus.java | 31 ---------------
.../framework/client/ClientMessageBus.java | 31 +++++++++++++++
.../com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
.../src/com/cloud/async/AsyncJobManagerImpl.java | 1 -
.../com/cloud/capacity/CapacityManagerImpl.java | 4 +-
server/src/com/cloud/host/dao/HostDaoImpl.java | 2 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 2 +-
.../com/cloud/network/NetworkStateListener.java | 4 +-
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 2 +-
.../network/security/SecurityGroupManagerImpl.java | 4 +-
.../src/com/cloud/storage/VolumeManagerImpl.java | 2 +-
.../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 2 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 2 +-
.../cloud/storage/dao/VMTemplateHostDaoImpl.java | 2 +-
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 2 +-
.../src/com/cloud/storage/dao/VolumeDaoImpl.java | 2 +-
.../com/cloud/storage/dao/VolumeHostDaoImpl.java | 2 +-
.../storage/listener/SnapshotStateListener.java | 4 +-
.../storage/listener/VolumeStateListener.java | 4 +-
server/src/com/cloud/vm/UserVmStateListener.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 5 +-
server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 3 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 2 +-
.../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 2 +-
.../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 2 +-
utils/src/com/cloud/utils/fsm/StateDao.java | 2 +-
utils/src/com/cloud/utils/fsm/StateListener.java | 4 +-
utils/src/com/cloud/utils/fsm/StateMachine2.java | 8 ++--
28 files changed, 67 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java
deleted file mode 100644
index d876b01..0000000
--- a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.framework.client;
-
-import org.apache.cloudstack.framework.messagebus.MessageBusBase;
-import org.apache.cloudstack.framework.transport.TransportMultiplexier;
-
-public class ClientEventBus extends MessageBusBase implements TransportMultiplexier {
-
- @Override
- public void onTransportMessage(String senderEndpointAddress,
- String targetEndpointAddress, String multiplexer, String message) {
- // TODO Auto-generated method stub
- }
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/framework/ipc/src/org/apache/cloudstack/framework/client/ClientMessageBus.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientMessageBus.java b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientMessageBus.java
new file mode 100644
index 0000000..6a510dd
--- /dev/null
+++ b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientMessageBus.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.framework.client;
+
+import org.apache.cloudstack.framework.messagebus.MessageBusBase;
+import org.apache.cloudstack.framework.transport.TransportMultiplexier;
+
+public class ClientMessageBus extends MessageBusBase implements TransportMultiplexier {
+
+ @Override
+ public void onTransportMessage(String senderEndpointAddress,
+ String targetEndpointAddress, String multiplexer, String message) {
+ // TODO Auto-generated method stub
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 3b69738..6baeecf 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1429,7 +1429,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
host.setManagementServerId(msId);
try {
- return _statusStateMachine.transitTo(host, e, null, host.getId(), _hostDao);
+ return _statusStateMachine.transitTo(host, e, host.getId(), _hostDao);
} catch (NoTransitionException e1) {
status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName()
+ ", mangement server id is " + msId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/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 1406566..3fbad86 100644
--- a/server/src/com/cloud/async/AsyncJobManagerImpl.java
+++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java
@@ -453,7 +453,6 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
s_logger.debug("Schedule queued job-" + job.getId());
}
- job.setFromPreviousSession(fromPreviousSession);
job.setSyncSource(item);
job.setCompleteMsid(getMsid());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 1e80a8e..292ef0a 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -629,12 +629,12 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
}
@Override
- public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vm, boolean transitionStatus, String eventArgs, Object opaque) {
+ public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vm, boolean transitionStatus, Object opaque) {
return true;
}
@Override
- public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vm, boolean status, String eventArgs, Object opaque) {
+ public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vm, boolean status, Object opaque) {
if (!status) {
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/host/dao/HostDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/host/dao/HostDaoImpl.java b/server/src/com/cloud/host/dao/HostDaoImpl.java
index de7a2bb..07a4232 100755
--- a/server/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/server/src/com/cloud/host/dao/HostDaoImpl.java
@@ -781,7 +781,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
@Override
- public boolean updateState(Status oldStatus, Event event, Status newStatus, Host vo, String eventArgs, Object data) {
+ public boolean updateState(Status oldStatus, Event event, Status newStatus, Host vo, Object data) {
HostVO host = findById(vo.getId());
long oldPingTime = host.getLastPinged();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index bd0e847..6296011 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -3648,7 +3648,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
protected boolean stateTransitTo(NetworkVO network, Network.Event e) throws NoTransitionException {
- return _stateMachine.transitTo(network, e, null, null, _networksDao);
+ return _stateMachine.transitTo(network, e, null, _networksDao);
}
private void setStateMachine() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/network/NetworkStateListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkStateListener.java b/server/src/com/cloud/network/NetworkStateListener.java
index cc875b4..038e769 100644
--- a/server/src/com/cloud/network/NetworkStateListener.java
+++ b/server/src/com/cloud/network/NetworkStateListener.java
@@ -49,13 +49,13 @@ public class NetworkStateListener implements StateListener<State, Event, Network
}
@Override
- public boolean preStateTransitionEvent(State oldState, Event event, State newState, Network vo, boolean status, String eventArgs, Object opaque) {
+ public boolean preStateTransitionEvent(State oldState, Event event, State newState, Network vo, boolean status, Object opaque) {
pubishOnEventBus(event.name(), "preStateTransitionEvent", vo, oldState, newState);
return true;
}
@Override
- public boolean postStateTransitionEvent(State oldState, Event event, State newState, Network vo, boolean status, String eventArgs, Object opaque) {
+ public boolean postStateTransitionEvent(State oldState, Event event, State newState, Network vo, boolean status, Object opaque) {
pubishOnEventBus(event.name(), "postStateTransitionEvent", vo, oldState, newState);
return true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/network/dao/NetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/NetworkDaoImpl.java b/server/src/com/cloud/network/dao/NetworkDaoImpl.java
index 13e5193..1bc8973 100644
--- a/server/src/com/cloud/network/dao/NetworkDaoImpl.java
+++ b/server/src/com/cloud/network/dao/NetworkDaoImpl.java
@@ -587,7 +587,7 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements N
}
@Override
- public boolean updateState(State currentState, Event event, State nextState, Network vo, String eventArgs, Object data) {
+ public boolean updateState(State currentState, Event event, State nextState, Network vo, Object data) {
// TODO: ensure this update is correct
Transaction txn = Transaction.currentTxn();
txn.start();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index cbf9f79..1c189c4 100755
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -1217,12 +1217,12 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
}
@Override
- public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, String eventArgs, Object opaque) {
+ public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, Object opaque) {
return true;
}
@Override
- public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vm, boolean status, String eventArgs, Object opaque) {
+ public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vm, boolean status, Object opaque) {
if (!status) {
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/storage/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java
index 5160c26..b63fb72 100644
--- a/server/src/com/cloud/storage/VolumeManagerImpl.java
+++ b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@ -2364,7 +2364,7 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager {
private boolean stateTransitTo(Volume vol, Volume.Event event)
throws NoTransitionException {
- return _volStateMachine.transitTo(vol, event, null, null, _volsDao);
+ return _volStateMachine.transitTo(vol, event, null, _volsDao);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
index c7558f3..f55663f 100644
--- a/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
@@ -333,7 +333,7 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
}
@Override
- public boolean updateState(State currentState, Event event, State nextState, SnapshotVO snapshot, String eventArgs, Object data) {
+ public boolean updateState(State currentState, Event event, State nextState, SnapshotVO snapshot, Object data) {
Transaction txn = Transaction.currentTxn();
txn.start();
SnapshotVO snapshotVO = (SnapshotVO)snapshot;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
index 7261894..d9a26d3 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
@@ -1086,7 +1086,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
@Override
public boolean updateState(TemplateState currentState, TemplateEvent event,
- TemplateState nextState, VMTemplateVO vo, String eventArgs, Object data) {
+ TemplateState nextState, VMTemplateVO vo, Object data) {
Long oldUpdated = vo.getUpdatedCount();
Date oldUpdatedTime = vo.getUpdated();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
index b8365fb..7f35eab 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
@@ -389,7 +389,7 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
@Override
public boolean updateState(State currentState, Event event,
- State nextState, DataObjectInStore vo, String eventArgs, Object data) {
+ State nextState, DataObjectInStore vo, Object data) {
VMTemplateHostVO templateHost = (VMTemplateHostVO)vo;
Long oldUpdated = templateHost.getUpdatedCount();
Date oldUpdatedTime = templateHost.getUpdated();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
index 43d537d..5f212eb 100644
--- a/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
@@ -267,7 +267,7 @@ public class VMTemplatePoolDaoImpl extends GenericDaoBase<VMTemplateStoragePoolV
@Override
public boolean updateState(State currentState, Event event,
- State nextState, DataObjectInStore vo, String eventArgs, Object data) {
+ State nextState, DataObjectInStore vo, Object data) {
VMTemplateStoragePoolVO templatePool = (VMTemplateStoragePoolVO)vo;
Long oldUpdated = templatePool.getUpdatedCount();
Date oldUpdatedTime = templatePool.getUpdated();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VolumeDaoImpl.java b/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
index c96b48b..12ca3c7 100755
--- a/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -377,7 +377,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
@Override
public boolean updateState(com.cloud.storage.Volume.State currentState,
Event event, com.cloud.storage.Volume.State nextState, Volume vo,
- String eventArgs, Object data) {
+ Object data) {
Long oldUpdated = vo.getUpdatedCount();
Date oldUpdatedTime = vo.getUpdated();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
index 063ae98..2fd39e6 100755
--- a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
@@ -127,7 +127,7 @@ public class VolumeHostDaoImpl extends GenericDaoBase<VolumeHostVO, Long> implem
@Override
public boolean updateState(State currentState, Event event,
- State nextState, DataObjectInStore vo, String eventArgs, Object data) {
+ State nextState, DataObjectInStore vo, Object data) {
VolumeHostVO volHost = (VolumeHostVO) vo;
Long oldUpdated = volHost.getUpdatedCount();
Date oldUpdatedTime = volHost.getUpdated();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/storage/listener/SnapshotStateListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/listener/SnapshotStateListener.java b/server/src/com/cloud/storage/listener/SnapshotStateListener.java
index ccae9dd..21fcf11 100644
--- a/server/src/com/cloud/storage/listener/SnapshotStateListener.java
+++ b/server/src/com/cloud/storage/listener/SnapshotStateListener.java
@@ -48,13 +48,13 @@ public class SnapshotStateListener implements StateListener<State, Event, Snapsh
}
@Override
- public boolean preStateTransitionEvent(State oldState, Event event, State newState, SnapshotVO vo, boolean status, String eventArgs, Object opaque) {
+ public boolean preStateTransitionEvent(State oldState, Event event, State newState, SnapshotVO vo, boolean status, Object opaque) {
pubishOnEventBus(event.name(), "preStateTransitionEvent", vo, oldState, newState);
return true;
}
@Override
- public boolean postStateTransitionEvent(State oldState, Event event, State newState, SnapshotVO vo, boolean status, String eventArgs, Object opaque) {
+ public boolean postStateTransitionEvent(State oldState, Event event, State newState, SnapshotVO vo, boolean status, Object opaque) {
pubishOnEventBus(event.name(), "postStateTransitionEvent", vo, oldState, newState);
return true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/storage/listener/VolumeStateListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/listener/VolumeStateListener.java b/server/src/com/cloud/storage/listener/VolumeStateListener.java
index fa6d6fd..6fa56a5 100644
--- a/server/src/com/cloud/storage/listener/VolumeStateListener.java
+++ b/server/src/com/cloud/storage/listener/VolumeStateListener.java
@@ -43,13 +43,13 @@ public class VolumeStateListener implements StateListener<State, Event, Volume>
}
@Override
- public boolean preStateTransitionEvent(State oldState, Event event, State newState, Volume vo, boolean status, String eventArgs, Object opaque) {
+ public boolean preStateTransitionEvent(State oldState, Event event, State newState, Volume vo, boolean status, Object opaque) {
pubishOnEventBus(event.name(), "preStateTransitionEvent", vo, oldState, newState);
return true;
}
@Override
- public boolean postStateTransitionEvent(State oldState, Event event, State newState, Volume vo, boolean status, String eventArgs, Object opaque) {
+ public boolean postStateTransitionEvent(State oldState, Event event, State newState, Volume vo, boolean status, Object opaque) {
pubishOnEventBus(event.name(), "postStateTransitionEvent", vo, oldState, newState);
return true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/vm/UserVmStateListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmStateListener.java b/server/src/com/cloud/vm/UserVmStateListener.java
index 92aa6ad..04aa818 100644
--- a/server/src/com/cloud/vm/UserVmStateListener.java
+++ b/server/src/com/cloud/vm/UserVmStateListener.java
@@ -54,13 +54,13 @@ public class UserVmStateListener implements StateListener<State, VirtualMachine.
}
@Override
- public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, String eventArgs, Object opaque) {
+ public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, Object opaque) {
pubishOnEventBus(event.name(), "preStateTransitionEvent", vo, oldState, newState);
return true;
}
@Override
- public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, String eventArgs, Object opaque) {
+ public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, Object opaque) {
if(!status){
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index a07297b..07d25e0 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -60,7 +60,6 @@ import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
-import com.cloud.consoleproxy.ConsoleProxyManager;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
import com.cloud.deploy.DataCenterDeployment;
@@ -1134,7 +1133,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
protected boolean stateTransitTo(VMInstanceVO vm, VirtualMachine.Event e, Long hostId, String reservationId) throws NoTransitionException {
vm.setReservationId(reservationId);
- return _stateMachine.transitTo(vm, e, null, new Pair<Long, Long>(vm.getHostId(), hostId), _vmDao);
+ return _stateMachine.transitTo(vm, e, new Pair<Long, Long>(vm.getHostId(), hostId), _vmDao);
}
@Override
@@ -1155,7 +1154,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
vm.setLastHostId(vm.getHostId());
}
}
- return _stateMachine.transitTo(vm, e, null, new Pair<Long, Long>(vm.getHostId(), hostId), _vmDao);
+ return _stateMachine.transitTo(vm, e, new Pair<Long, Long>(vm.getHostId(), hostId), _vmDao);
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
index 7a9ddba..a7d33cf 100644
--- a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -358,7 +358,7 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
}
@Override
- public boolean updateState(State oldState, Event event, State newState, VirtualMachine vm, String eventArgs, Object opaque) {
+ public boolean updateState(State oldState, Event event, State newState, VirtualMachine vm, Object opaque) {
if (newState == null) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("There's no way to transition from old state: " + oldState.toString() + " event: " + event.toString());
@@ -389,7 +389,6 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
ub.set(vmi, "podIdToDeployIn", vmi.getPodIdToDeployIn());
ub.set(vmi, _updateTimeAttr, new Date());
ub.set(vmi, "lastEvent", event);
- ub.set(vmi, "lastEventArgs", eventArgs);
int result = update(vmi, sc);
if (result == 0 && s_logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index d30490a..638be6c 100644
--- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -433,7 +433,7 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana
}
protected boolean vmSnapshotStateTransitTo(VMSnapshotVO vsnp, VMSnapshot.Event event) throws NoTransitionException {
- return _vmSnapshottateMachine.transitTo(vsnp, event, null, null, _vmSnapshotDao);
+ return _vmSnapshottateMachine.transitTo(vsnp, event, null, _vmSnapshotDao);
}
@DB
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java b/server/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
index b027a38..7d8ace7 100644
--- a/server/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
+++ b/server/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
@@ -127,7 +127,7 @@ public class VMSnapshotDaoImpl extends GenericDaoBase<VMSnapshotVO, Long>
}
@Override
- public boolean updateState(State currentState, Event event, State nextState, VMSnapshot vo, String eventArgs, Object data) {
+ public boolean updateState(State currentState, Event event, State nextState, VMSnapshot vo, Object data) {
Long oldUpdated = vo.getUpdatedCount();
Date oldUpdatedTime = vo.getUpdated();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
index 1088a66..a483291 100644
--- a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
@@ -343,7 +343,7 @@ public class MockNetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implemen
}
@Override
- public boolean updateState(Network.State currentState, Network.Event event, Network.State nextState, Network vo, String eventArgs, Object data) {
+ public boolean updateState(Network.State currentState, Network.Event event, Network.State nextState, Network vo, Object data) {
return true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/utils/src/com/cloud/utils/fsm/StateDao.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/fsm/StateDao.java b/utils/src/com/cloud/utils/fsm/StateDao.java
index 4f42346..5c4cc41 100644
--- a/utils/src/com/cloud/utils/fsm/StateDao.java
+++ b/utils/src/com/cloud/utils/fsm/StateDao.java
@@ -18,6 +18,6 @@ package com.cloud.utils.fsm;
public interface StateDao <S,E,V> {
- boolean updateState(S currentState, E event, S nextState, V vo, String eventArgs, Object data);
+ boolean updateState(S currentState, E event, S nextState, V vo, Object data);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/utils/src/com/cloud/utils/fsm/StateListener.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/fsm/StateListener.java b/utils/src/com/cloud/utils/fsm/StateListener.java
index 37c0a92..7d4a85e 100644
--- a/utils/src/com/cloud/utils/fsm/StateListener.java
+++ b/utils/src/com/cloud/utils/fsm/StateListener.java
@@ -28,7 +28,7 @@ public interface StateListener <S,E,V> {
* @param vmDao VM dao
* @return
*/
- public boolean preStateTransitionEvent(S oldState, E event, S newState, V vo, boolean status, String eventArgs, Object opaque);
+ public boolean preStateTransitionEvent(S oldState, E event, S newState, V vo, boolean status, Object opaque);
/**
* Event is triggered after state machine transition finished
@@ -39,5 +39,5 @@ public interface StateListener <S,E,V> {
* @param status the state transition is allowed or not
* @return
*/
- public boolean postStateTransitionEvent(S oldState, E event, S newState, V vo, boolean status, String eventArgs, Object opaque);
+ public boolean postStateTransitionEvent(S oldState, E event, S newState, V vo, boolean status, Object opaque);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f640a416/utils/src/com/cloud/utils/fsm/StateMachine2.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/fsm/StateMachine2.java b/utils/src/com/cloud/utils/fsm/StateMachine2.java
index 653696c..741c58c 100644
--- a/utils/src/com/cloud/utils/fsm/StateMachine2.java
+++ b/utils/src/com/cloud/utils/fsm/StateMachine2.java
@@ -95,7 +95,7 @@ public class StateMachine2<S, E, V extends StateObject<S>> {
}
- public boolean transitTo(V vo, E e, String eventArgs, Object opaque, StateDao<S,E,V> dao) throws NoTransitionException {
+ public boolean transitTo(V vo, E e, Object opaque, StateDao<S,E,V> dao) throws NoTransitionException {
S currentState = vo.getState();
S nextState = getNextState(currentState, e);
@@ -105,16 +105,16 @@ public class StateMachine2<S, E, V extends StateObject<S>> {
}
for (StateListener<S,E, V> listener : _listeners) {
- listener.preStateTransitionEvent(currentState, e, nextState, vo, transitionStatus, eventArgs, opaque);
+ listener.preStateTransitionEvent(currentState, e, nextState, vo, transitionStatus, opaque);
}
- transitionStatus = dao.updateState(currentState, e, nextState, vo, eventArgs, opaque);
+ transitionStatus = dao.updateState(currentState, e, nextState, vo, opaque);
if (!transitionStatus) {
return false;
}
for (StateListener<S,E, V> listener : _listeners) {
- listener.postStateTransitionEvent(currentState, e, nextState, vo, transitionStatus, eventArgs, opaque);
+ listener.postStateTransitionEvent(currentState, e, nextState, vo, transitionStatus, opaque);
}
return true;