You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/28 00:20:50 UTC
[10/10] git commit: updated refs/heads/master to fa85151
Merge release branch 4.9 to master
* 4.9:
CLOUDSTACK-9746 system-vm: logrotate config causes critical failures
CLOUDSTACK-9788: Fix exception listNetworks with pagesize=0
CLOUDSTACK-8663: Fixed various issues to allow VM snapshots and volume snapshots to exist together
Fix HVM VM restart bug in XenServer
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa85151b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa85151b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa85151b
Branch: refs/heads/master
Commit: fa85151be962824cc88776a0264e1ac6ef90560c
Parents: f9ef6ca b95bf8f
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Tue Feb 28 05:47:06 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Tue Feb 28 05:47:06 2017 +0530
----------------------------------------------------------------------
.../xenserver/resource/CitrixResourceBase.java | 34 ++++++++++++++++++--
.../resource/XenServerStorageProcessor.java | 2 +-
.../resource/Xenserver625StorageProcessor.java | 2 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 7 ----
.../vm/snapshot/VMSnapshotManagerImpl.java | 4 ---
.../debian/config/etc/logrotate.d/apache2 | 2 +-
.../patches/debian/config/etc/logrotate.d/cloud | 4 +--
.../debian/config/etc/logrotate.d/conntrackd | 2 +-
.../debian/config/etc/logrotate.d/dnsmasq | 2 +-
.../debian/config/etc/logrotate.d/haproxy | 2 +-
.../patches/debian/config/etc/logrotate.d/ppp | 2 +-
.../debian/config/etc/logrotate.d/rsyslog | 6 ++--
.../main/java/com/cloud/utils/StringUtils.java | 4 +--
13 files changed, 45 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa85151b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --cc plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 1ebe515,ca8a645..160b77c
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@@ -16,6 -16,53 +16,8 @@@
// under the License.
package com.cloud.hypervisor.xenserver.resource;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.Charset;
+
+ import org.apache.commons.collections.MapUtils;
-import org.joda.time.Duration;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.Queue;
-import java.util.Random;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeoutException;
-
-import javax.naming.ConfigurationException;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.cloudstack.storage.to.TemplateObjectTO;
-import org.apache.cloudstack.storage.to.VolumeObjectTO;
-import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
-import org.apache.xmlrpc.XmlRpcException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
import com.cloud.agent.IAgentControl;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa85151b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa85151b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
----------------------------------------------------------------------
diff --cc plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
index 1e7b143,b70057d..fba3660
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
@@@ -788,13 -738,8 +788,13 @@@ public class Xenserver625StorageProcess
s_logger.warn(details, e);
} finally {
if (srcSr != null) {
- hypervisorResource.removeSR(conn, srcSr);
+ hypervisorResource.skipOrRemoveSR(conn, srcSr);
}
+
+ if (pool.isManaged()) {
+ hypervisorResource.removeSR(conn, primaryStorageSR);
+ }
+
if (!result && destVdi != null) {
try {
destVdi.destroy(conn);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa85151b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa85151b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index 2a16aaa,5e6ec1c..8a1a18f
--- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@@ -291,11 -263,6 +291,7 @@@ public class VMSnapshotManagerImpl exte
throw new InvalidParameterValueException("Creating VM snapshot failed due to VM:" + vmId + " is a system VM or does not exist");
}
+ if (_snapshotDao.listByInstanceId(vmId, Snapshot.State.BackedUp).size() > 0 && ! HypervisorType.KVM.equals(userVmVo.getHypervisorType())) {
- throw new InvalidParameterValueException(
- "VM snapshot for this VM is not allowed. This VM has volumes attached which has snapshots, please remove all snapshots before taking VM snapshot");
- }
-
// VM snapshot with memory is not supported for VGPU Vms
if (snapshotMemory && _serviceOfferingDetailsDao.findDetail(userVmVo.getServiceOfferingId(), GPU.Keys.vgpuType.toString()) != null) {
throw new InvalidParameterValueException("VM snapshot with MEMORY is not supported for vGPU enabled VMs.");