You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/12/07 08:14:28 UTC
[01/17] git commit: updated refs/heads/master to f30fbe9
Repository: cloudstack
Updated Branches:
refs/heads/master fbc8f5d7e -> f30fbe9a5
[UI] fix bug: Cannot delete SSH keypairs in projects
Before change:
error message: ProjectId and account/domainId can't be specified together
After change:
SSH keypairs can be removed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e9cc5551
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9cc5551
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9cc5551
Branch: refs/heads/master
Commit: e9cc5551d310c288a4b5ff748eee00951020f9a2
Parents: 5b7d935
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Thu Dec 3 09:07:48 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Thu Dec 3 09:11:00 2015 +0100
----------------------------------------------------------------------
ui/scripts/accounts.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9cc5551/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index f0c0bff..be620a4 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -1876,10 +1876,14 @@
},
action: function(args) {
var data = {
- domainid: args.context.sshkeypairs[0].domainid,
- account: args.context.sshkeypairs[0].account,
name: args.context.sshkeypairs[0].name
};
+ if (!args.context.projects) {
+ $.extend(data, {
+ domainid: args.context.sshkeypairs[0].domainid,
+ account: args.context.sshkeypairs[0].account,
+ });
+ }
$.ajax({
url: createURL('deleteSSHKeyPair'),
data: data,
[17/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
Merge branch '4.6'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f30fbe9a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f30fbe9a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f30fbe9a
Branch: refs/heads/master
Commit: f30fbe9a5c7eee1c5f260316f887d9d7881272b3
Parents: fbc8f5d 9ce1334
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Dec 7 12:44:07 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Dec 7 12:44:07 2015 +0530
----------------------------------------------------------------------
.../snapshot/StorageSystemSnapshotStrategy.java | 13 ++++-----
plugins/api/rate-limit/pom.xml | 3 +-
.../ovm3/resources/Ovm3HypervisorGuru.java | 17 ++++--------
.../src/com/cloud/hypervisor/XenServerGuru.java | 11 ++++++--
scripts/storage/qcow2/resizevolume.sh | 22 +++++++++++----
.../hypervisor/HypervisorGuruManagerImpl.java | 5 +---
.../com/cloud/storage/VolumeApiServiceImpl.java | 3 ++
ui/scripts/accounts.js | 8 ++++--
ui/scripts/storage.js | 29 +++++++++++++++-----
9 files changed, 70 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f30fbe9a/plugins/api/rate-limit/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f30fbe9a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f30fbe9a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f30fbe9a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f30fbe9a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f30fbe9a/ui/scripts/accounts.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f30fbe9a/ui/scripts/storage.js
----------------------------------------------------------------------
[16/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
Merge pull request #1154 from ustcweizhou/fix-ui-delete-sshkey-projects
[UI] fix bug: Cannot delete SSH keypairs in projectsBefore change:
error message: ProjectId and account/domainId can't be specified together
After change:
SSH keypairs can be removed
* pr/1154:
[UI] fix bug: Cannot delete SSH keypairs in projects
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ce13340
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ce13340
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ce13340
Branch: refs/heads/master
Commit: 9ce133401cd0dc87575f33cabad3f5fb2a51458a
Parents: 0d61941 e9cc555
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Dec 7 11:08:11 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Dec 7 11:08:11 2015 +0530
----------------------------------------------------------------------
ui/scripts/accounts.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[08/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
Revert "CLOUDSTACK-8964 side effect isolation"
This reverts commit fc18d1e8b11c82a18854234b0c8c827896a5b78d.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e0501be8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0501be8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0501be8
Branch: refs/heads/master
Commit: e0501be87ea3a171afba03086139355bb3dc6051
Parents: 4f6ff6c
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Dec 4 18:18:15 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 4 18:18:15 2015 +0100
----------------------------------------------------------------------
.../hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0501be8/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
index 3711bbf..5a2e39b 100755
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
@@ -87,15 +87,6 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
*/
public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
LOGGER.debug("getCommandHostDelegation: " + cmd.getClass());
- performSideEffectsForDelegationOnCommand(hostId, cmd);
- return new Pair<Boolean, Long>(Boolean.FALSE, Long.valueOf(hostId));
- }
-
- /**
- * @param hostId
- * @param cmd
- */
- void performSideEffectsForDelegationOnCommand(long hostId, Command cmd) {
if (cmd instanceof StorageSubSystemCommand) {
StorageSubSystemCommand c = (StorageSubSystemCommand)cmd;
c.setExecuteInSequence(true);
@@ -117,5 +108,6 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
}
}
}
+ return new Pair<Boolean, Long>(Boolean.FALSE, Long.valueOf(hostId));
}
}
[09/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
Revert "simple change to prevent failure and keep OVM3 snapshots working"
This reverts commit 66fed462b64c8e3fe9e7ee39c7a1c07ff33108f9.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/69e031d9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/69e031d9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/69e031d9
Branch: refs/heads/master
Commit: 69e031d9beb662f28d0c5ca46ac19a6280ee2d4e
Parents: e0501be
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Dec 4 18:18:28 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 4 18:18:28 2015 +0100
----------------------------------------------------------------------
.../com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69e031d9/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
index 5a2e39b..6ec7741 100755
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
@@ -105,6 +105,9 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
EndPoint ep = endPointSelector.selectHypervisorHost(new ZoneScope(host.getDataCenterId()));
host = hostDao.findById(ep.getId());
hostDao.loadDetails(host);
+ // String snapshotHotFixVersion = host.getDetail(XenserverConfigs.XS620HotFix);
+ // if (snapshotHotFixVersion != null && snapshotHotFixVersion.equalsIgnoreCase(XenserverConfigs.XSHotFix62ESP1004)) {
+ return new Pair<Boolean, Long>(Boolean.TRUE, Long.valueOf(ep.getId()));
}
}
}
[02/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
CLOUDSTACK-9101: update volume size after resizevolume
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/119b27b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/119b27b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/119b27b2
Branch: refs/heads/master
Commit: 119b27b2c6c366949b574fbca1574f15d67a3af3
Parents: 5b7d935
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Thu Dec 3 11:54:20 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Thu Dec 3 14:54:45 2015 +0100
----------------------------------------------------------------------
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/119b27b2/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 6fe0a14..4313bfc 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1158,6 +1158,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
if (newDiskOfferingId != null) {
volume.setDiskOfferingId(newDiskOfferingId);
}
+ if (currentSize != newSize) {
+ volume.setSize(newSize);
+ }
_volsDao.update(volume.getId(), volume);
[03/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
CLOUDSTACK-9101: add UI support for root volume resize
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d6e21f74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6e21f74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6e21f74
Branch: refs/heads/master
Commit: d6e21f74163212b198731ddf23dd48bc4c787b84
Parents: 119b27b
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Thu Dec 3 11:53:42 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Thu Dec 3 14:54:47 2015 +0100
----------------------------------------------------------------------
ui/scripts/storage.js | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6e21f74/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 77bd002..599802a 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1536,14 +1536,27 @@
},
createForm: {
title: 'label.action.resize.volume',
+ preFilter: function(args) {
+ if (args.context.volumes != null && args.context.volumes[0].type == 'ROOT') {
+ args.$form.find('.form-item[rel=newdiskoffering]').hide();
+ } else {
+ args.$form.find('.form-item[rel=newsize]').hide();
+ }
+ },
fields: {
newdiskoffering: {
label: 'label.resize.new.offering.id',
select: function(args) {
+ if (args.context.volumes != null && args.context.volumes[0].type == 'ROOT') {
+ args.response.success({
+ data: []
+ });
+ return;
+ }
+
$.ajax({
url: createURL("listDiskOfferings"),
dataType: "json",
- async: false,
success: function(json) {
diskofferingObjs = json.listdiskofferingsresponse.diskoffering;
var items = [];
@@ -1605,8 +1618,7 @@
validation: {
required: true,
number: true
- },
- isHidden: true
+ }
},
shrinkok: {
label: 'label.resize.shrink.ok',
@@ -1640,7 +1652,7 @@
var newDiskOffering = args.data.newdiskoffering;
var newSize;
- if (selectedDiskOfferingObj.iscustomized == true) {
+ if (selectedDiskOfferingObj == null || selectedDiskOfferingObj.iscustomized == true) {
newSize = args.data.newsize;
}
if (newDiskOffering != null && newDiskOffering.length > 0) {
@@ -1651,9 +1663,9 @@
}
var minIops;
- var maxIops
+ var maxIops;
- if (selectedDiskOfferingObj.iscustomizediops == true) {
+ if (selectedDiskOfferingObj != null && selectedDiskOfferingObj.iscustomizediops == true) {
minIops = args.data.minIops;
maxIops = args.data.maxIops;
}
@@ -2338,11 +2350,14 @@
allowedActions.push("takeSnapshot");
allowedActions.push("recurringSnapshot");
}
+ }
- if (jsonObj.type == "DATADISK") {
+ if (jsonObj.hypervisor == "KVM" || jsonObj.hypervisor == "XenServer" || jsonObj.hypervisor == "VMware") {
+ if (jsonObj.state == "Ready" || jsonObj.state == "Allocated") {
allowedActions.push("resize");
}
}
+
if (jsonObj.state != "Allocated") {
if ((jsonObj.vmstate == "Stopped" || jsonObj.virtualmachineid == null) && jsonObj.state == "Ready") {
allowedActions.push("downloadVolume");
[12/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
Merge pull request #1168 from ustcweizhou/listSnapshots-Exception
CLOUDSTACK-8845: set isRevertable of snapshot to false if the volume is removedSome users encounter an exception when listSnapshots.
We should set the isRevertable of snapshot to false if the original volume is removed, without checking if the snapshot is stored in primary store (the exception was thowned during the checking).
* pr/1168:
CLOUDSTACK-8845: set isRevertable of snapshot to false if the volume is removed
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24113e42
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24113e42
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24113e42
Branch: refs/heads/master
Commit: 24113e425e6cd213ffac568abc9fb7a55ae8d7e8
Parents: 998b1ba 5241228
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 6 19:48:45 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 6 19:48:45 2015 +0100
----------------------------------------------------------------------
.../snapshot/StorageSystemSnapshotStrategy.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[07/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
CLOUDSTACK-9025: Fixed can't create usable template from snapshot in Xenserver and Vmware
Fix also reverts below commit as below solution making assumption about hypervisor which are not applicable
in case of XenServer and VmWare
Revert "CLOUDSTACK-8964: Can't create template or volume from snapshot"
This reverts commit ccf5d75cfbe769b34c021ab3653ed318cae25933.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f8790c3b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f8790c3b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f8790c3b
Branch: refs/heads/master
Commit: f8790c3b9e8220666662bcdce88f62f57884bfc4
Parents: 9a21873
Author: Anshul Gangwar <an...@citrix.com>
Authored: Fri Dec 4 14:50:01 2015 +0530
Committer: Anshul Gangwar <an...@citrix.com>
Committed: Fri Dec 4 14:56:40 2015 +0530
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/XenServerGuru.java | 11 ++++++++---
.../com/cloud/hypervisor/HypervisorGuruManagerImpl.java | 5 +----
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f8790c3b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
index 9567f31..28bcf0d 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
@@ -185,7 +185,8 @@ public class XenServerGuru extends HypervisorGuruBase implements HypervisorGuru,
DataTO srcData = cpyCommand.getSrcTO();
DataTO destData = cpyCommand.getDestTO();
- if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.TEMPLATE) {
+ if (srcData.getHypervisorType() == HypervisorType.XenServer && srcData.getObjectType() == DataObjectType.SNAPSHOT &&
+ destData.getObjectType() == DataObjectType.TEMPLATE) {
DataStoreTO srcStore = srcData.getDataStore();
DataStoreTO destStore = destData.getDataStore();
if (srcStore instanceof NfsTO && destStore instanceof NfsTO) {
@@ -193,9 +194,13 @@ public class XenServerGuru extends HypervisorGuruBase implements HypervisorGuru,
EndPoint ep = endPointSelector.selectHypervisorHost(new ZoneScope(host.getDataCenterId()));
host = hostDao.findById(ep.getId());
hostDao.loadDetails(host);
+ String hypervisorVersion = host.getHypervisorVersion();
String snapshotHotFixVersion = host.getDetail(XenserverConfigs.XS620HotFix);
- if (snapshotHotFixVersion != null && snapshotHotFixVersion.equalsIgnoreCase(XenserverConfigs.XSHotFix62ESP1004)) {
- return new Pair<Boolean, Long>(Boolean.TRUE, new Long(ep.getId()));
+ if (hypervisorVersion != null && !hypervisorVersion.equalsIgnoreCase("6.1.0")) {
+ if (!(hypervisorVersion.equalsIgnoreCase("6.2.0") &&
+ !(snapshotHotFixVersion != null && snapshotHotFixVersion.equalsIgnoreCase(XenserverConfigs.XSHotFix62ESP1004)))) {
+ return new Pair<Boolean, Long>(Boolean.TRUE, new Long(ep.getId()));
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f8790c3b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
index 4dcd703..ade1b96 100644
--- a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
+++ b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
@@ -28,7 +28,6 @@ import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.agent.api.Command;
-import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.Pair;
@@ -75,9 +74,7 @@ public class HypervisorGuruManagerImpl extends ManagerBase implements Hypervisor
@Override
public long getGuruProcessedCommandTargetHost(long hostId, Command cmd) {
- HostVO host = _hostDao.findById(hostId);
- HypervisorGuru guru = getGuru(host.getHypervisorType());
- if (guru != null) {
+ for (HypervisorGuru guru : _hvGuruList) {
Pair<Boolean, Long> result = guru.getCommandHostDelegation(hostId, cmd);
if (result.first()) {
return result.second();
[05/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
CLOUDSTACK-8845: set isRevertable of snapshot to false if the volume is removed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52412286
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52412286
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52412286
Branch: refs/heads/master
Commit: 52412286c657d384f86441095f5cbef510dd8763
Parents: 9a21873
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Dec 4 08:18:09 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 4 08:21:11 2015 +0100
----------------------------------------------------------------------
.../snapshot/StorageSystemSnapshotStrategy.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52412286/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java
index 2c71525..d1470e4 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java
@@ -442,6 +442,12 @@ public class StorageSystemSnapshotStrategy extends SnapshotStrategyBase {
public StrategyPriority canHandle(Snapshot snapshot, SnapshotOperation op) {
long volumeId = snapshot.getVolumeId();
VolumeVO volumeVO = _volumeDao.findById(volumeId);
+ if (SnapshotOperation.REVERT.equals(op)) {
+ if (volumeVO != null && ImageFormat.QCOW2.equals(volumeVO.getFormat()))
+ return StrategyPriority.DEFAULT;
+ else
+ return StrategyPriority.CANT_HANDLE;
+ }
long storagePoolId;
@@ -459,13 +465,6 @@ public class StorageSystemSnapshotStrategy extends SnapshotStrategyBase {
storagePoolId = volumeVO.getPoolId();
}
- if (SnapshotOperation.REVERT.equals(op)) {
- if (volumeVO != null && ImageFormat.QCOW2.equals(volumeVO.getFormat()))
- return StrategyPriority.DEFAULT;
- else
- return StrategyPriority.CANT_HANDLE;
- }
-
DataStore dataStore = _dataStoreMgr.getDataStore(storagePoolId, DataStoreRole.Primary);
Map<String, String> mapCapabilities = dataStore.getDriver().getCapabilities();
[14/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
Merge pull request #1176 from anshul1886/CLOUDSTACK-9025-4.6
CLOUDSTACK-9025: Fixed can't create usable template from snapshot in Xenserver and Vmwarehttps://issues.apache.org/jira/browse/CLOUDSTACK-9025
Fix also reverts below commit as below solution making assumption about hypervisor which are not applicable in case of XenServer and VmWare
Revert "CLOUDSTACK-8964: Can't create template or volume from snapshot"
This reverts commit ccf5d75cfbe769b34c021ab3653ed318cae25933.
Testing:
Able to deploy VM successfully from template created from linked clone snapshot on XenServer.
* pr/1176:
CLOUDSTACK-9025: Fixed can't create usable template from snapshot in Xenserver and Vmware
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2c4ea503
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2c4ea503
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2c4ea503
Branch: refs/heads/master
Commit: 2c4ea503f92bcf9c611f409d5cdecb42b0115b69
Parents: f66e782 f8790c3
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 6 20:34:34 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 6 20:34:34 2015 +0100
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/XenServerGuru.java | 11 ++++++++---
.../com/cloud/hypervisor/HypervisorGuruManagerImpl.java | 5 +----
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[13/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
Merge pull request #1177 from ustcweizhou/Ovm3-CopyCommand
CLOUDSTACK-8964: Ovm3HypervisorGuru handle only srcData with HypervisorType is Ovm3This PR can only be applied after PR #1176
The CopyCommand on Ovm3 should be handled by Ovm3StorageProcessor, not SSVM.
Hence, I revert two commits on Ovm3HypervisorGuru, and add the hypervisorType check so that only the this guru will only handle Ovm3 (not KVM)
* pr/1177:
CLOUDSTACK-8964: Ovm3HypervisorGuru handle only srcData with HypervisorType is Ovm3
Revert "simple change to prevent failure and keep OVM3 snapshots working"
Revert "CLOUDSTACK-8964 side effect isolation"
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f66e7827
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f66e7827
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f66e7827
Branch: refs/heads/master
Commit: f66e78279571dcc339bf18e37b5b7f22c4711b9b
Parents: 24113e4 a90b953
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 6 20:02:17 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 6 20:02:17 2015 +0100
----------------------------------------------------------------------
.../ovm3/resources/Ovm3HypervisorGuru.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[10/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
CLOUDSTACK-8964: Ovm3HypervisorGuru handle only srcData with HypervisorType is Ovm3
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a90b953d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a90b953d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a90b953d
Branch: refs/heads/master
Commit: a90b953dbcb80cba09e03f34f96a7a52c0521d4f
Parents: 69e031d
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Dec 4 18:26:12 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 4 19:19:04 2015 +0100
----------------------------------------------------------------------
.../hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a90b953d/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
index 6ec7741..4d222bb 100755
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java
@@ -96,18 +96,16 @@ public class Ovm3HypervisorGuru extends HypervisorGuruBase implements Hypervisor
DataTO srcData = cpyCommand.getSrcTO();
DataTO destData = cpyCommand.getDestTO();
- if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.TEMPLATE) {
+ if (HypervisorType.Ovm3.equals(srcData.getHypervisorType()) && srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.TEMPLATE) {
LOGGER.debug("Snapshot to Template: " + cmd);
DataStoreTO srcStore = srcData.getDataStore();
DataStoreTO destStore = destData.getDataStore();
if (srcStore instanceof NfsTO && destStore instanceof NfsTO) {
HostVO host = hostDao.findById(hostId);
EndPoint ep = endPointSelector.selectHypervisorHost(new ZoneScope(host.getDataCenterId()));
- host = hostDao.findById(ep.getId());
- hostDao.loadDetails(host);
- // String snapshotHotFixVersion = host.getDetail(XenserverConfigs.XS620HotFix);
- // if (snapshotHotFixVersion != null && snapshotHotFixVersion.equalsIgnoreCase(XenserverConfigs.XSHotFix62ESP1004)) {
- return new Pair<Boolean, Long>(Boolean.TRUE, Long.valueOf(ep.getId()));
+ if (ep != null) {
+ return new Pair<Boolean, Long>(Boolean.TRUE, Long.valueOf(ep.getId()));
+ }
}
}
}
[06/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
rate-limit: increase JVM memory and enable fork mode for unit tests
Enables forkmode for surefire plugin and increases memory opts for JVM
for rate-limit tests. This tries to fix intermittent Jenkins failures
which look like:
multipleClientsCanAccessWithoutBlocking(org.apache.cloudstack.ratelimit.ApiRateLimitTest):
unable to create new native thread
(cherry picked from commit 421bc00cd6005d9e8484c6df46a3b84ff466afd2)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dcc66651
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dcc66651
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dcc66651
Branch: refs/heads/master
Commit: dcc66651c0a5f53fcd9395139dad147b4ac1ea09
Parents: 9a21873
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Dec 4 13:47:03 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Dec 4 13:51:36 2015 +0530
----------------------------------------------------------------------
plugins/api/rate-limit/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dcc66651/plugins/api/rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/api/rate-limit/pom.xml b/plugins/api/rate-limit/pom.xml
index 43e0848..faa73c3 100644
--- a/plugins/api/rate-limit/pom.xml
+++ b/plugins/api/rate-limit/pom.xml
@@ -32,7 +32,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Xmx1024m</argLine>
+ <forkMode>always</forkMode>
+ <argLine>-Xmx2048m -XX:MaxPermSize=1024m</argLine>
<excludes>
<exclude>org/apache/cloudstack/ratelimit/integration/*</exclude>
</excludes>
[04/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
CLOUDSTACK-9101: resize root volume of stopped vm on KVM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9221cb3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9221cb3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9221cb3e
Branch: refs/heads/master
Commit: 9221cb3e0d0e5a0ea374f10e889f7e32c2a3eda1
Parents: d6e21f7
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Thu Dec 3 14:31:55 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Thu Dec 3 14:54:49 2015 +0100
----------------------------------------------------------------------
scripts/storage/qcow2/resizevolume.sh | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9221cb3e/scripts/storage/qcow2/resizevolume.sh
----------------------------------------------------------------------
diff --git a/scripts/storage/qcow2/resizevolume.sh b/scripts/storage/qcow2/resizevolume.sh
index 1e6ffd6..da77cb1 100755
--- a/scripts/storage/qcow2/resizevolume.sh
+++ b/scripts/storage/qcow2/resizevolume.sh
@@ -187,6 +187,22 @@ resizeqcow2() {
# if this is a shrink operation, fail if commands will shrink the volume and we haven't signed of on shrinking
failshrink
+ #move this back into cloudstack libvirt calls once the libvirt java bindings support block resize
+ #we try to inform hypervisor of new size, but don't fail if we can't
+ if `virsh help 2>/dev/null | grep -q blockresize`
+ then
+ if `virsh domstate $vmname >/dev/null 2>&1`
+ then
+ log "vm $vmname is running, use 'virsh blockresize' to resize the volume"
+ notifyqemu
+ if [ $? -eq 0 ]
+ then
+ log "performed successful resize - currentsize:$currentsize newsize:$newsize path:$path type:$ptype vmname:$vmname live:$liveresize shrink:$shrink"
+ exit 0
+ fi
+ fi
+ fi
+
output=`qemu-img resize $path $newsize 2>&1`
retval=$?
@@ -196,10 +212,6 @@ resizeqcow2() {
exit 1
fi
- #move this back into cloudstack libvirt calls once the libvirt java bindings support block resize
- #we try to inform hypervisor of new size, but don't fail if we can't
- notifyqemu
-
log "performed successful resize - currentsize:$currentsize newsize:$newsize path:$path type:$ptype vmname:$vmname live:$liveresize shrink:$shrink"
}
@@ -244,7 +256,7 @@ then
resizelvm
elif [ "$ptype" == "QCOW2" ]
then
- notifyqemu
+ resizeqcow2
elif [ "$ptype" == "NOTIFYONLY" ]
then
notifyqemu
[11/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
Merge pull request #1161 from ustcweizhou/resize-volume-issues
CLOUDSTACK-9101: fix some issues in resize volume(1) fix issue: volume size is not updated even if the operation succeed
(2) Add ui support for root volume resize
(3) resize on qcow2 type ROOT volume of stopped vm does not really work
see https://issues.apache.org/jira/browse/CLOUDSTACK-9101
* pr/1161:
CLOUDSTACK-9101: resize root volume of stopped vm on KVM
CLOUDSTACK-9101: add UI support for root volume resize
CLOUDSTACK-9101: update volume size after resizevolume
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/998b1ba6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/998b1ba6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/998b1ba6
Branch: refs/heads/master
Commit: 998b1ba629bfdf3ea26fd515ad62f26260dee060
Parents: 4f6ff6c 9221cb3
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 6 19:44:16 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 6 19:44:16 2015 +0100
----------------------------------------------------------------------
scripts/storage/qcow2/resizevolume.sh | 22 +++++++++++----
.../com/cloud/storage/VolumeApiServiceImpl.java | 3 ++
ui/scripts/storage.js | 29 +++++++++++++++-----
3 files changed, 42 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[15/17] git commit: updated refs/heads/master to f30fbe9
Posted by bh...@apache.org.
Merge pull request #1175 from shapeblue/4.6-rate-limit-testfix
[4.6/master] rate-limit: increase JVM memory and enable fork mode for unit testsEnables forkmode for surefire plugin and increases memory opts for JVM
for rate-limit tests. This tries to fix intermittent Jenkins failures
which look like:
multipleClientsCanAccessWithoutBlocking(org.apache.cloudstack.ratelimit.ApiRateLimitTest):
unable to create new native thread
Previous PR (again master by mistake) -- #1171
* pr/1175:
rate-limit: increase JVM memory and enable fork mode for unit tests
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d619411
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d619411
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d619411
Branch: refs/heads/master
Commit: 0d619411015b6e0cee4687616d24e8e93235776f
Parents: 2c4ea50 dcc6665
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 6 20:36:43 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 6 20:36:44 2015 +0100
----------------------------------------------------------------------
plugins/api/rate-limit/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------