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

bug 14535: fix multiple data disk; status 14535: resolved fixed; Reviewed-by: sheng

This commit is contained in:
Edison Su 2012-03-28 17:43:01 -07:00
parent 0e248bdbe1
commit 0d99538c4b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
View File

@ -34,7 +34,10 @@ import java.net.URL;
import java.net.URLConnection;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -2581,8 +2584,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements
protected void createVbd(Connect conn, VirtualMachineTO vmSpec,
String vmName, LibvirtVMDef vm) throws InternalErrorException,
LibvirtException, URISyntaxException {
List<DiskDef> disks = new ArrayList<DiskDef>();
for (VolumeTO volume : vmSpec.getDisks()) {
List<VolumeTO> disks = Arrays.asList(vmSpec.getDisks());
Collections.sort(disks, new Comparator<VolumeTO>() {
@Override
public int compare(VolumeTO arg0, VolumeTO arg1) {
return arg0.getDeviceId() > arg1.getDeviceId() ? 1 : -1;
}
});
for (VolumeTO volume : disks) {
KVMPhysicalDisk physicalDisk = null;
KVMStoragePool pool = null;
if (volume.getType() == Volume.Type.ISO && volume.getPath() != null) {
@ -2627,17 +2637,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements
diskBusType, DiskDef.diskFmtType.QCOW2);
}
}
disks.add(devId, disk);
continue;
}
vm.getDevices().addDevice(disk);
}
for (DiskDef disk : disks) {
vm.getDevices().addDevice(disk);
}
if (vmSpec.getType() != VirtualMachine.Type.User) {