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

Merge pull request #1872 from sateesh-chodapuneedi/pr-cloudstack-3223

Browse Source 
CLOUDSTACK-3223 Exception observed while creating CPVM in VMware Setup with DVS
This commit is contained in:
Rajani Karuturi 2017-05-17 10:40:31 +05:30 committed by GitHub
commit 3c3cdbe54d
1 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
vmware-base/src/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java
View File

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -36,24 +37,67 @@ import com.cloud.hypervisor.vmware.util.VmwareContext;
public class DistributedVirtualSwitchMO extends BaseMO { public class DistributedVirtualSwitchMO extends BaseMO {
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static final Logger s_logger = Logger.getLogger(DistributedVirtualSwitchMO.class); private static final Logger s_logger = Logger.getLogger(DistributedVirtualSwitchMO.class);
private static ConcurrentHashMap<String, List<String>> s_dvPortGroupCacheMap = null;
public DistributedVirtualSwitchMO(VmwareContext context, ManagedObjectReference morDvs) { public DistributedVirtualSwitchMO(VmwareContext context, ManagedObjectReference morDvs) {
super(context, morDvs); super(context, morDvs);
s_dvPortGroupCacheMap = new ConcurrentHashMap<String, List<String>>();
} }
public DistributedVirtualSwitchMO(VmwareContext context, String morType, String morValue) { public DistributedVirtualSwitchMO(VmwareContext context, String morType, String morValue) {
super(context, morType, morValue); super(context, morType, morValue);
s_dvPortGroupCacheMap = new ConcurrentHashMap<String, List<String>>();
} }
public void createDVPortGroup(DVPortgroupConfigSpec dvPortGroupSpec) throws Exception { public void createDVPortGroup(DVPortgroupConfigSpec dvPortGroupSpec) throws Exception {
List<DVPortgroupConfigSpec> dvPortGroupSpecArray = new ArrayList<DVPortgroupConfigSpec>(); List<DVPortgroupConfigSpec> dvPortGroupSpecArray = new ArrayList<DVPortgroupConfigSpec>();
dvPortGroupSpecArray.add(dvPortGroupSpec); dvPortGroupSpecArray.add(dvPortGroupSpec);
_context.getService().addDVPortgroupTask(_mor, dvPortGroupSpecArray); boolean dvPortGroupExists = false;
String dvSwitchInstance = _mor.getValue();
String dvPortGroupName = dvPortGroupSpec.getName();
String uniquedvPortGroupPerDvs = dvSwitchInstance + dvPortGroupName;
List<String> dvPortGroupList = null;
synchronized (uniquedvPortGroupPerDvs.intern()) {
// Looking up local cache rather than firing another API call to see if dvPortGroup exists already.
if (s_dvPortGroupCacheMap.containsKey(dvSwitchInstance)) {
dvPortGroupList = s_dvPortGroupCacheMap.get(dvSwitchInstance);
if (dvPortGroupList != null && dvPortGroupList.contains(dvPortGroupName)) {
dvPortGroupExists = true;
}
}
if (!dvPortGroupExists) {
ManagedObjectReference task = _context.getService().addDVPortgroupTask(_mor, dvPortGroupSpecArray);
if (!_context.getVimClient().waitForTask(task)) {
throw new Exception("Failed to create dvPortGroup " + dvPortGroupSpec.getName());
} else {
if (s_dvPortGroupCacheMap.containsKey(dvSwitchInstance)) {
dvPortGroupList = s_dvPortGroupCacheMap.get(dvSwitchInstance);
if (dvPortGroupList == null) {
dvPortGroupList = new ArrayList<String>();
}
dvPortGroupList.add(dvPortGroupName); //does this update map?
} else {
dvPortGroupList = new ArrayList<String>();
dvPortGroupList.add(dvPortGroupName);
s_dvPortGroupCacheMap.put(dvSwitchInstance, dvPortGroupList);
}
}
if (s_logger.isTraceEnabled()) {
s_logger.trace("Created dvPortGroup. dvPortGroup cache is :" + s_dvPortGroupCacheMap);
}
} else if (s_logger.isDebugEnabled()) {
s_logger.debug("Detected dvPortGroup [" + dvPortGroupName + "] already present. Not attempting to create again.");
}
}
} }
public void updateDvPortGroup(ManagedObjectReference dvPortGroupMor, DVPortgroupConfigSpec dvPortGroupSpec) throws Exception { public void updateDvPortGroup(ManagedObjectReference dvPortGroupMor, DVPortgroupConfigSpec dvPortGroupSpec) throws Exception {
// TODO(sateesh): Update numPorts synchronized (dvPortGroupMor.getValue().intern()) {
_context.getService().reconfigureDVPortgroupTask(dvPortGroupMor, dvPortGroupSpec); ManagedObjectReference task = _context.getService().reconfigureDVPortgroupTask(dvPortGroupMor, dvPortGroupSpec);
if (!_context.getVimClient().waitForTask(task)) {
throw new Exception("Failed to update dvPortGroup " + dvPortGroupMor.getValue());
}
}
} }
public void updateVMWareDVSwitch(ManagedObjectReference dvSwitchMor, VMwareDVSConfigSpec dvsSpec) throws Exception { public void updateVMWareDVSwitch(ManagedObjectReference dvSwitchMor, VMwareDVSConfigSpec dvsSpec) throws Exception {