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

Issue :# 5922 

Status 5922: Resolved Fixed
Fix for 5922
This commit is contained in:
abhishek 2010-08-13 13:55:33 -07:00
parent 59912c09c9
commit 7d14dd7576
4 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -763,7 +763,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
Map<Host, Host.Record> hostMap = Host.getAllRecords(conn);
if (hostMap.size() == 1) {
s_logger.debug("There's no one to take over as master");
return new MaintainAnswer(cmd, "Only master in the pool");
return new MaintainAnswer(cmd,false, "Only master in the pool");
}
Host newMaster = null;
Host.Record newMasterRecord = null;

4
core/src/com/cloud/server/ManagementServer.java
View File

@ -72,6 +72,7 @@ import com.cloud.storage.Snapshot;
import com.cloud.storage.SnapshotPolicyVO;
import com.cloud.storage.SnapshotScheduleVO;
import com.cloud.storage.SnapshotVO;
import com.cloud.storage.StoragePoolHostVO;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.StorageStats;
import com.cloud.storage.VMTemplateHostVO;
@ -2184,4 +2185,7 @@ public interface ManagementServer {
boolean addConfig(String instance, String component, String category, String name, String value, String description);
boolean validateCustomVolumeSizeRange(long size) throws InvalidParameterValueException;
boolean checkIfMaintenable(long hostId);
}

12
server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java
View File

@ -28,6 +28,7 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.ServerApiException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.host.HostVO;
import com.cloud.storage.dao.StoragePoolHostDao;
import com.cloud.utils.Pair;
public class PrepareForMaintenanceCmd extends BaseCmd {
@ -62,6 +63,15 @@ public class PrepareForMaintenanceCmd extends BaseCmd {
throw new ServerApiException(BaseCmd.PARAM_ERROR, "Host with id " + hostId.toString() + " doesn't exist");
}
//if this is the only host in the pool, you cannot enable maintenance on this host
boolean maintenable = getManagementServer().checkIfMaintenable(host.getId());
if(!maintenable)
{
s_logger.warn("Unable to schedule host maintenance -- there is no host to take over as master in the pool");
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Unable to schedule host maintenance -- there is no host to take over as master in the pool");
}
long jobId = 0;
try {
jobId = getManagementServer().prepareForMaintenanceAsync(hostId);
@ -70,7 +80,7 @@ public class PrepareForMaintenanceCmd extends BaseCmd {
}
if(jobId == 0) {
s_logger.warn("Unable to schedule async-job for PrepareForMaintenance comamnd");
s_logger.warn("Unable to schedule async-job for PrepareForMaintenance command");
} else {
if(s_logger.isDebugEnabled())
s_logger.debug("PrepareForMaintenance command has been accepted, job id: " + jobId);

28
server/src/com/cloud/server/ManagementServerImpl.java Executable file → Normal file
View File

@ -191,6 +191,7 @@ import com.cloud.storage.SnapshotScheduleVO;
import com.cloud.storage.SnapshotVO;
import com.cloud.storage.Storage;
import com.cloud.storage.StorageManager;
import com.cloud.storage.StoragePoolHostVO;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.StorageStats;
import com.cloud.storage.VMTemplateHostVO;
@ -210,6 +211,7 @@ import com.cloud.storage.dao.LaunchPermissionDao;
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.storage.dao.SnapshotPolicyDao;
import com.cloud.storage.dao.StoragePoolDao;
import com.cloud.storage.dao.StoragePoolHostDao;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VMTemplateHostDao;
import com.cloud.storage.dao.VolumeDao;
@ -319,6 +321,7 @@ public class ManagementServerImpl implements ManagementServer {
private final GuestOSDao _guestOSDao;
private final GuestOSCategoryDao _guestOSCategoryDao;
private final StoragePoolDao _poolDao;
private final StoragePoolHostDao _poolHostDao;
private final StorageManager _storageMgr;
private final UserVmDao _vmDao;
@ -415,6 +418,7 @@ public class ManagementServerImpl implements ManagementServer {
_guestOSDao = locator.getDao(GuestOSDao.class);
_guestOSCategoryDao = locator.getDao(GuestOSCategoryDao.class);
_poolDao = locator.getDao(StoragePoolDao.class);
_poolHostDao = locator.getDao(StoragePoolHostDao.class);
_vmDao = locator.getDao(UserVmDao.class);
_configs = _configDao.getConfiguration();
@ -8544,5 +8548,29 @@ public class ManagementServerImpl implements ManagementServer {
return true;
}
@Override
public boolean checkIfMaintenable(long hostId) {
//get the poolhostref record
List<StoragePoolHostVO> poolHostRecordSet = _poolHostDao.listByHostId(hostId);
if(poolHostRecordSet!=null)
{
//the above list has only 1 record
StoragePoolHostVO poolHostRecord = poolHostRecordSet.get(0);
//get the poolId and get hosts associated in that pool
List<StoragePoolHostVO> hostsInPool = _poolHostDao.listByPoolId(poolHostRecord.getPoolId());
if(hostsInPool!=null && hostsInPool.size()>1)
{
return true; //since there are other hosts to take over as master in this pool
}
}
return false;
}
}