etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7970: fixing sp maintenance for 2 pools 

status 7970: resolved fixed
This commit is contained in:
abhishek 2011-01-19 14:32:06 -08:00
parent fdbd1c7e66
commit f97a5e78cb
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/cloud/storage/VolumeVO.java
View File

@ -245,6 +245,10 @@ public class VolumeVO implements Volume {
return recreatable;
}
public void setRecreatable(boolean recreatable) {
this.recreatable = recreatable;
}
public String getIscsiName() {
return iscsiName;
}

5
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -165,6 +165,7 @@ import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachine.Type;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.ConsoleProxyDao;
import com.cloud.vm.dao.UserVmDao;
@ -2194,7 +2195,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
}
else if(restart)
{
if(_routerMgr.stopRouter(vmInstance.getId()) == null)
if(_routerMgr.startRouter(vmInstance.getId()) == null)
{
String errorMsg = "There was an error starting the domain router id: "+vmInstance.getId()+" on another storage pool, cannot enable primary storage maintenance";
s_logger.warn(errorMsg);
@ -2519,6 +2520,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
if(type.equals(VolumeType.ROOT)) {
vol.setDeviceId(0l);
if(!vm.getType().equals(Type.User))
vol.setRecreatable(true);
} else {
vol.setDeviceId(1l);
}