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

Bug 11863 - OVM - attempt to add host which is already added to same or different cluster does not generate UI error

Browse Source 
status 11863: resolved fixed
This commit is contained in:
frank 2011-10-28 17:41:15 -07:00
parent 3f630ebe08
commit 3e5f63f08b
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
View File

@ -32,6 +32,8 @@ import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
import com.cloud.utils.component.Inject;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria2;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.ssh.SSHCmdHelper;
@ -64,6 +66,14 @@ public class OvmDiscoverer extends DiscovererBase implements Discoverer, Resourc
return super.stop();
}
private boolean checkIfExisted(String guid) {
SearchCriteria2<HostVO, Long> sc = SearchCriteria2.create(HostVO.class, Long.class);
sc.addAnd(sc.getEntity().getGuid(), SearchCriteria.Op.EQ, guid);
sc.addAnd(sc.getEntity().getHypervisorType(), SearchCriteria.Op.EQ, HypervisorType.Ovm);
List<Long> hosts = sc.list();
return !hosts.isEmpty();
}
@Override
public Map<? extends ServerResource, Map<String, String>> find(long dcId,
Long podId, Long clusterId, URI url, String username,
@ -110,6 +120,11 @@ public class OvmDiscoverer extends DiscovererBase implements Discoverer, Resourc
String hostIp = ia.getHostAddress();
String guid = UUID.nameUUIDFromBytes(hostIp.getBytes()).toString();
if (checkIfExisted(guid)) {
throw new CloudRuntimeException("The host " + hostIp + " has been added before");
}
s_logger.debug("Ovm discover is going to disover host having guid " + guid);
ClusterVO clu = _clusterDao.findById(clusterId);
if (clu.getGuid() == null) {