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

some improvements in checkSR

This commit is contained in:
Alex Huang 2011-01-31 17:48:10 -08:00
parent 9b8d251afd
commit c38238c614
4 changed files with 54 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/com/cloud/vm/NicProfile.java
View File

@ -95,10 +95,6 @@ public class NicProfile {
this.mode = mode;
}
public void setVmId(long vmId) {
this.vmId = vmId;
}
public void setDeviceId(int deviceId) {
this.deviceId = deviceId;
}
@ -260,4 +256,9 @@ public class NicProfile {
this.dns1 = null;
this.dns2 = null;
}
@Override
public String toString() {
return new StringBuilder("NicProfile[").append(id).append("-").append(vmId).append("-").append(reservationId).toString();
}
}

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

@ -342,7 +342,7 @@ public abstract class CitrixResourceBase implements ServerResource {
host.enable(conn);
return true;
} catch (Exception e) {
String msg = "Catch Exception " + e.getClass().getName() + " : Enable host(" + _host.uuid + ") in pool(" + conn.getPoolUuid() + ") failed due to "
String msg = "Catch Exception " + e.getClass().getName() + " : Enable " + _host + " in pool(" + _host.pool + ") failed due to "
+ e.toString();
s_logger.warn(msg);
}
@ -1950,104 +1950,6 @@ public abstract class CitrixResourceBase implements ServerResource {
s_logger.warn("Unable to prepare for migration ", e);
return new PrepareForMigrationAnswer(cmd, e);
}
/*
*
* String result = null;
*
* List<VolumeVO> vols = cmd.getVolumes(); result = mountwithoutvdi(vols, cmd.getMappings()); if (result !=
* null) { return new PrepareForMigrationAnswer(cmd, false, result); }
*/
// final String vmName = cmd.getVmName();
// try {
// Set<Host> hosts = Host.getAll(conn);
// // workaround before implementing xenserver pool
// // no migration
// if (hosts.size() <= 1) {
// return new PrepareForMigrationAnswer(cmd, false, "not in a same xenserver pool");
// }
// // if the vm have CD
// // 1. make iosSR shared
// // 2. create pbd in target xenserver
// SR sr = getISOSRbyVmName(conn, cmd.getVmName());
// if (sr != null) {
// Set<PBD> pbds = sr.getPBDs(conn);
// boolean found = false;
// for (PBD pbd : pbds) {
// if (Host.getByUuid(conn, _host.uuid).equals(pbd.getHost(conn))) {
// found = true;
// break;
// }
// }
// if (!found) {
// sr.setShared(conn, true);
// PBD pbd = pbds.iterator().next();
// PBD.Record pbdr = new PBD.Record();
// pbdr.deviceConfig = pbd.getDeviceConfig(conn);
// pbdr.host = Host.getByUuid(conn, _host.uuid);
// pbdr.SR = sr;
// PBD newpbd = PBD.create(conn, pbdr);
// newpbd.plug(conn);
// }
// }
// Set<VM> vms = VM.getByNameLabel(conn, vmName);
// if (vms.size() != 1) {
// String msg = "There are " + vms.size() + " " + vmName;
// s_logger.warn(msg);
// return new PrepareForMigrationAnswer(cmd, false, msg);
// }
//
// VM vm = vms.iterator().next();
//
// // check network
// Set<VIF> vifs = vm.getVIFs(conn);
// for (VIF vif : vifs) {
// Network network = vif.getNetwork(conn);
// Set<PIF> pifs = network.getPIFs(conn);
// long vlan = -1;
// PIF npif = null;
// for (PIF pif : pifs) {
// try {
// vlan = pif.getVLAN(conn);
// if (vlan != -1 ) {
// VLAN vland = pif.getVLANMasterOf(conn);
// npif = vland.getTaggedPIF(conn);
// }
// break;
// }catch (Exception e) {
// continue;
// }
// }
// if (npif == null) {
// continue;
// }
// network = npif.getNetwork(conn);
// String nwuuid = network.getUuid(conn);
//
// String pifuuid = null;
// if(nwuuid.equalsIgnoreCase(_host.privateNetwork)) {
// pifuuid = _host.privatePif;
// } else if(nwuuid.equalsIgnoreCase(_host.publicNetwork)) {
// pifuuid = _host.publicPif;
// } else {
// continue;
// }
// Network vlanNetwork = enableVlanNetwork(conn, vlan, pifuuid);
//
// if (vlanNetwork == null) {
// throw new InternalErrorException("Failed to enable VLAN network with tag: " + vlan);
// }
// }
//
// synchronized (_vms) {
// _vms.put(cmd.getVmName(), State.Migrating);
// }
// return new PrepareForMigrationAnswer(cmd, true, null);
// } catch (Exception e) {
// String msg = "catch exception " + e.getMessage();
// s_logger.warn(msg, e);
// return new PrepareForMigrationAnswer(cmd, false, msg);
// }
}
public PrimaryStorageDownloadAnswer execute(final PrimaryStorageDownloadCommand cmd) {
@ -3929,17 +3831,17 @@ public abstract class CitrixResourceBase implements ServerResource {
}
private void pbdPlug(Connection conn, PBD pbd) {
String pbdUuid = "";
String hostAddr = "";
private void pbdPlug(Connection conn, PBD pbd, String uuid) {
try {
pbdUuid = pbd.getUuid(conn);
hostAddr = pbd.getHost(conn).getAddress(conn);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Plugging in PBD " + uuid + " for " + _host);
}
pbd.plug(conn);
} catch (Exception e) {
String msg = "PBD " + pbdUuid + " is not attached! and PBD plug failed due to "
+ e.toString() + ". Please check this PBD in host : " + hostAddr;
String msg = "PBD " + uuid + " is not attached! and PBD plug failed due to "
+ e.toString() + ". Please check this PBD in " + _host;
s_logger.warn(msg, e);
throw new CloudRuntimeException(msg);
}
}
@ -3952,42 +3854,42 @@ public abstract class CitrixResourceBase implements ServerResource {
s_logger.warn(msg);
return false;
}
Set<Host> hosts = null;
if (s_logger.isDebugEnabled()) {
s_logger.debug("Checking " + srr.nameLabel + " or SR " + srr.uuid + " on " + _host);
}
if (srr.shared) {
hosts = Host.getAll(conn);
Host host = Host.getByUuid(conn, _host.uuid);
for (Host host : hosts) {
boolean found = false;
for (PBD pbd : pbds) {
if (host.equals(pbd.getHost(conn))) {
PBD.Record pbdr = pbd.getRecord(conn);
if (!pbdr.currentlyAttached) {
pbdPlug(conn, pbd);
}
pbds.remove(pbd);
found = true;
break;
boolean found = false;
for (PBD pbd : pbds) {
if (host.equals(pbd.getHost(conn))) {
PBD.Record pbdr = pbd.getRecord(conn);
if (!pbdr.currentlyAttached) {
pbdPlug(conn, pbd, pbdr.uuid);
}
pbds.remove(pbd);
found = true;
break;
}
if (!found) {
PBD.Record pbdr = srr.PBDs.iterator().next().getRecord(conn);
pbdr.host = host;
pbdr.uuid = "";
PBD pbd = PBD.create(conn, pbdr);
pbdPlug(conn, pbd);
}
}
if (!found) {
PBD.Record pbdr = srr.PBDs.iterator().next().getRecord(conn);
pbdr.host = host;
pbdr.uuid = "";
PBD pbd = PBD.create(conn, pbdr);
pbdPlug(conn, pbd, pbd.getUuid(conn));
}
} else {
for (PBD pbd : pbds) {
PBD.Record pbdr = pbd.getRecord(conn);
if (!pbdr.currentlyAttached) {
pbdPlug(conn, pbd);
pbdPlug(conn, pbd, pbdr.uuid);
}
}
}
} catch (Exception e) {
String msg = "checkSR failed host:" + _host.uuid + " due to " + e.toString();
String msg = "checkSR failed host:" + _host + " due to " + e.toString();
s_logger.warn(msg, e);
return false;
}
@ -5607,7 +5509,7 @@ public abstract class CitrixResourceBase implements ServerResource {
} else if (srs.size() == 1) {
SR sr = srs.iterator().next();
if (s_logger.isDebugEnabled()) {
s_logger.debug("SR retrieved for " + pool.getId() + " is mapped to " + sr.toString());
s_logger.debug("SR retrieved for " + pool.getId());
}
if (checkSR(conn, sr)) {
@ -5907,6 +5809,11 @@ public abstract class CitrixResourceBase implements ServerResource {
public String pool;
public int speed;
public int cpus;
@Override
public String toString() {
return new StringBuilder("XS[").append(uuid).append("-").append(ip).append("]").toString();
}
}
/*Override by subclass*/

17
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -89,18 +89,18 @@ import com.cloud.network.IPAddressVO;
import com.cloud.network.IpAddress;
import com.cloud.network.LoadBalancerVO;
import com.cloud.network.Network;
import com.cloud.network.Network.GuestIpType;
import com.cloud.network.NetworkManager;
import com.cloud.network.NetworkVO;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.IsolationType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.PublicIpAddress;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.network.SshKeysDistriMonitor;
import com.cloud.network.VirtualNetworkApplianceService;
import com.cloud.network.VpnUser;
import com.cloud.network.VpnUserVO;
import com.cloud.network.Network.GuestIpType;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.IsolationType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.addr.PublicIp;
import com.cloud.network.dao.FirewallRulesDao;
import com.cloud.network.dao.IPAddressDao;
@ -111,8 +111,8 @@ import com.cloud.network.dao.NetworkRuleConfigDao;
import com.cloud.network.dao.RemoteAccessVpnDao;
import com.cloud.network.dao.VpnUserDao;
import com.cloud.network.lb.LoadBalancingRule;
import com.cloud.network.lb.LoadBalancingRulesManager;
import com.cloud.network.lb.LoadBalancingRule.LbDestination;
import com.cloud.network.lb.LoadBalancingRulesManager;
import com.cloud.network.ovs.OvsNetworkManager;
import com.cloud.network.ovs.OvsTunnelManager;
import com.cloud.network.router.VirtualRouter.Role;
@ -160,11 +160,11 @@ import com.cloud.vm.ReservationContext;
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.VirtualMachineGuru;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.VirtualMachineName;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineProfile.Param;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
@ -907,19 +907,18 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
List<Pair<NetworkVO, NicProfile>> networks = new ArrayList<Pair<NetworkVO, NicProfile>>(3);
NetworkOfferingVO publicOffering = _networkMgr.getSystemAccountNetworkOfferings(NetworkOfferingVO.SystemPublicNetwork).get(0);
List<NetworkVO> publicConfigs = _networkMgr.setupNetwork(_systemAcct, publicOffering, plan, null, null, false, false);
List<NetworkVO> publicNetworks = _networkMgr.setupNetwork(_systemAcct, publicOffering, plan, null, null, false, false);
NicProfile defaultNic = new NicProfile();
defaultNic.setDefaultNic(true);
defaultNic.setIp4Address(sourceNatIp.getAddress().addr());
defaultNic.setGateway(sourceNatIp.getGateway());
defaultNic.setNetmask(sourceNatIp.getNetmask());
defaultNic.setTrafficType(TrafficType.Public);
defaultNic.setMacAddress(sourceNatIp.getMacAddress());
defaultNic.setBroadcastType(BroadcastDomainType.Vlan);
defaultNic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(sourceNatIp.getVlanTag()));
defaultNic.setIsolationUri(IsolationType.Vlan.toUri(sourceNatIp.getVlanTag()));
defaultNic.setDeviceId(2);
networks.add(new Pair<NetworkVO, NicProfile>(publicConfigs.get(0), defaultNic));
networks.add(new Pair<NetworkVO, NicProfile>(publicNetworks.get(0), defaultNic));
NicProfile gatewayNic = new NicProfile();
gatewayNic.setIp4Address(guestNetwork.getGateway());
gatewayNic.setBroadcastUri(guestNetwork.getBroadcastUri());

5
server/src/com/cloud/vm/NicVO.java
View File

@ -295,4 +295,9 @@ public class NicVO implements Nic {
public void setCreated(Date created) {
this.created = created;
}
@Override
public String toString() {
return new StringBuilder("Nic[").append(id).append("-").append(instanceId).append("-").append(reservationId).append("-").append(ip4Address).append("]").toString();
}
}