apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

create is now complete

Browse Source
This commit is contained in:
Alex Huang 2010-09-27 15:14:13 -07:00
parent c443867f28
commit dcea43ba0f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/storage/Volume.java
View File

@ -85,7 +85,6 @@ public interface Volume extends PartOf, OwnedBy, BasedOn {
s_fsm.addTransition(Destroy, Event.Recover, Ready); s_fsm.addTransition(Destroy, Event.Recover, Ready);
s_fsm.addTransition(Expunging, Event.OperationSucceeded, Destroyed); s_fsm.addTransition(Expunging, Event.OperationSucceeded, Destroyed);
s_fsm.addTransition(Expunging, Event.OperationFailed, Destroy); s_fsm.addTransition(Expunging, Event.OperationFailed, Destroy);
s_fsm.addTransition(Allocated, Event.Destroy, Destroyed);
} }
} }

2
core/src/com/cloud/storage/dao/VolumeDaoImpl.java
View File

@ -299,7 +299,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
SearchCriteria<VolumeVO> sc = IdStateSearch.create(); SearchCriteria<VolumeVO> sc = IdStateSearch.create();
sc.setParameters("id", vol.getId()); sc.setParameters("id", vol.getId());
sc.setParameters("state", vol.getState()); sc.setParameters("state", oldState);
int rows = update(builder, sc, null); int rows = update(builder, sc, null);
if (rows != 1) { if (rows != 1) {

8
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View File

@ -516,7 +516,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
@Override @Override
public ConsoleProxyVO startProxy(long proxyVmId, long startEventId) { public ConsoleProxyVO startProxy(long proxyVmId, long startEventId) {
try { try {
return start2(proxyVmId, startEventId); return start(proxyVmId, startEventId);
} catch (StorageUnavailableException e) { } catch (StorageUnavailableException e) {
s_logger.warn("Exception while trying to start console proxy", e); s_logger.warn("Exception while trying to start console proxy", e);
return null; return null;
@ -852,7 +852,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
if (s_logger.isDebugEnabled()) if (s_logger.isDebugEnabled())
s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId); s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
Map<String, Object> context = createProxyInstance2(dataCenterId); Map<String, Object> context = createProxyInstance(dataCenterId);
long proxyVmId = (Long) context.get("proxyVmId"); long proxyVmId = (Long) context.get("proxyVmId");
if (proxyVmId == 0) { if (proxyVmId == 0) {
@ -892,7 +892,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
if (s_logger.isDebugEnabled()) if (s_logger.isDebugEnabled())
s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId); s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
Map<String, Object> context = createProxyInstance2(dataCenterId); Map<String, Object> context = createProxyInstance(dataCenterId);
long proxyVmId = (Long) context.get("proxyVmId"); long proxyVmId = (Long) context.get("proxyVmId");
if (proxyVmId == 0) { if (proxyVmId == 0) {
@ -1417,7 +1417,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
try { try {
if (proxyLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_SYNC)) { if (proxyLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_SYNC)) {
try { try {
readyProxy = start2(readyProxy.getId(), 0); readyProxy = start(readyProxy.getId(), 0);
} finally { } finally {
proxyLock.unlock(); proxyLock.unlock();
} }