You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/11/28 10:57:08 UTC
[1/4] git commit: updated refs/heads/master to 81c07f1
Updated Branches:
refs/heads/master ab39b658a -> 81c07f179
CLOUDSTACK-5299: set hypervisor_type of volumes from image format if not set.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/221aea57
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/221aea57
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/221aea57
Branch: refs/heads/master
Commit: 221aea573008a0b13d115f4949ea3eed2d574ac0
Parents: ab39b65
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Nov 28 10:47:21 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Thu Nov 28 10:47:21 2013 +0100
----------------------------------------------------------------------
server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/221aea57/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index 36f6740..a8631f7 100644
--- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -171,8 +171,12 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
// return hypervisor and storage pool info for ROOT and Resource domain only
if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) {
- if (volume.getState() != Volume.State.UploadOp && volume.getHypervisorType() != null) {
- volResponse.setHypervisor(volume.getHypervisorType().toString());
+ if (volume.getState() != Volume.State.UploadOp) {
+ if (volume.getHypervisorType() != null) {
+ volResponse.setHypervisor(volume.getHypervisorType().toString());
+ } else {
+ volResponse.setHypervisor(ApiDBUtils.getHypervisorTypeFromFormat(volume.getFormat()).toString());
+ }
}
Long poolId = volume.getPoolId();
String poolName = (poolId == null) ? "none" : volume.getPoolName();
[3/4] git commit: updated refs/heads/master to 81c07f1
Posted by we...@apache.org.
CLOUDSTACK-5293: get vm disk statistics only from DISK (not for ISO/FLOPPY)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d473d5a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d473d5a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d473d5a3
Branch: refs/heads/master
Commit: d473d5a36a4c50793988081a52b602d58d95f302
Parents: 64c03db
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Nov 28 10:47:51 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Thu Nov 28 10:47:51 2013 +0100
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d473d5a3/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index c88a279..b951b212 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -207,6 +207,7 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuModeDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuTuneDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DevicesDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.deviceType;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.diskProtocol;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.FeaturesDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.FilesystemDef;
@@ -4603,6 +4604,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
List<DiskDef> disks = getDisks(conn, vmName);
for (DiskDef disk : disks) {
+ if (disk.getDeviceType() != deviceType.DISK)
+ break;
DomainBlockStats blockStats = dm.blockStats(disk.getDiskLabel());
String path = disk.getDiskPath(); // for example, path = /mnt/pool_uuid/disk_path/
String diskPath = null;
[2/4] git commit: updated refs/heads/master to 81c07f1
Posted by we...@apache.org.
[UI] kvm vm snapshot not shown if kvm.snapshot.enabled is set to false
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/64c03dbc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/64c03dbc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/64c03dbc
Branch: refs/heads/master
Commit: 64c03dbc3129fe7b2c613f2981b3f645d88b449b
Parents: 221aea5
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Nov 28 10:47:37 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Thu Nov 28 10:47:37 2013 +0100
----------------------------------------------------------------------
ui/scripts/instances.js | 6 ++++--
ui/scripts/storage.js | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/64c03dbc/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 06acc16..27e0e4f 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2106,7 +2106,8 @@
} else if (jsonObj.state == 'Running') {
allowedActions.push("stop");
allowedActions.push("restart");
- allowedActions.push("snapshot");
+ if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
+ allowedActions.push("snapshot");
allowedActions.push("destroy");
allowedActions.push("reset");
@@ -2135,7 +2136,8 @@
allowedActions.push("start");
allowedActions.push("destroy");
allowedActions.push("reset");
- allowedActions.push("snapshot");
+ if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
+ allowedActions.push("snapshot");
allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("changeAffinity");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/64c03dbc/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 03b88f8..4875662 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1896,7 +1896,7 @@
if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {
if (jsonObj.hypervisor == 'KVM') {
- if (json.vmstate == 'Running') {
+ if (jsonObj.vmstate == 'Running') {
if (g_KVMsnapshotenabled == true) { //"kvm.snapshot.enabled" flag should be taken to account only when snapshot is being created for Running vm (CLOUDSTACK-4428)
allowedActions.push("takeSnapshot");
allowedActions.push("recurringSnapshot");
[4/4] git commit: updated refs/heads/master to 81c07f1
Posted by we...@apache.org.
allow delete snapshot with ERROR state
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/81c07f17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/81c07f17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/81c07f17
Branch: refs/heads/master
Commit: 81c07f179103e19a0607a6d1a718f28ffc1874ae
Parents: d473d5a
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Nov 28 10:48:07 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Thu Nov 28 10:48:07 2013 +0100
----------------------------------------------------------------------
.../cloudstack/storage/snapshot/XenserverSnapshotStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81c07f17/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
index 22182b1..14fb618 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
@@ -201,7 +201,7 @@ public class XenserverSnapshotStrategy extends SnapshotStrategyBase {
return true;
}
- if (!Snapshot.State.BackedUp.equals(snapshotVO.getState())) {
+ if (!Snapshot.State.BackedUp.equals(snapshotVO.getState()) && !Snapshot.State.Error.equals(snapshotVO.getState())) {
throw new InvalidParameterValueException("Can't delete snapshotshot " + snapshotId + " due to it is in " + snapshotVO.getState() + " Status");
}