You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/03/28 01:39:10 UTC
[01/28] git commit: updated refs/heads/4.4 to 392dc81
Repository: cloudstack
Updated Branches:
refs/heads/4.4 eacc1d7ff -> 392dc817a
CLOUDSTACK-5737: isExternalSnapshot should return true for CLVM and RBD only
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9900ae70
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9900ae70
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9900ae70
Branch: refs/heads/4.4
Commit: 9900ae7002fe17e26074d27bd46067dea8cde7b8
Parents: 0bbb843
Author: Edison Su <su...@gmail.com>
Authored: Wed Nov 6 15:32:19 2013 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:35 2014 -0700
----------------------------------------------------------------------
.../com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9900ae70/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
index 550bd01..54edffc 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
@@ -178,11 +178,10 @@ public class LibvirtStoragePool implements KVMStoragePool {
@Override
public boolean isExternalSnapshot() {
- if (this.type == StoragePoolType.Filesystem) {
- return false;
+ if (this.type == StoragePoolType.CLVM || type == StoragePoolType.RBD) {
+ return true;
}
-
- return true;
+ return false;
}
@Override
[05/28] fix devcloud: get back whatever we have before
Posted by ed...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f84fc12d/scripts/vm/hypervisor/xenserver/xcposs/vmopsSnapshot
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/vmopsSnapshot b/scripts/vm/hypervisor/xenserver/xcposs/vmopsSnapshot
new file mode 100644
index 0000000..53f31a9
--- /dev/null
+++ b/scripts/vm/hypervisor/xenserver/xcposs/vmopsSnapshot
@@ -0,0 +1,601 @@
+#!/usr/bin/python
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Version @VERSION@
+#
+# A plugin for executing script needed by vmops cloud
+
+import os, sys, time
+import XenAPIPlugin
+sys.path.append("/usr/lib/xcp/sm/")
+import SR, VDI, SRCommand, util, lvutil
+from util import CommandException
+import vhdutil
+import shutil
+import lvhdutil
+import errno
+import subprocess
+import xs_errors
+import cleanup
+import stat
+import random
+
+VHD_UTIL = 'vhd-util'
+VHD_PREFIX = 'VHD-'
+CLOUD_DIR = '/run/cloud_mount'
+
+def echo(fn):
+ def wrapped(*v, **k):
+ name = fn.__name__
+ util.SMlog("#### VMOPS enter %s ####" % name )
+ res = fn(*v, **k)
+ util.SMlog("#### VMOPS exit %s ####" % name )
+ return res
+ return wrapped
+
+
+@echo
+def create_secondary_storage_folder(session, args):
+ local_mount_path = None
+
+ util.SMlog("create_secondary_storage_folder, args: " + str(args))
+
+ try:
+ try:
+ # Mount the remote resource folder locally
+ remote_mount_path = args["remoteMountPath"]
+ local_mount_path = os.path.join(CLOUD_DIR, util.gen_uuid())
+ mount(remote_mount_path, local_mount_path)
+
+ # Create the new folder
+ new_folder = local_mount_path + "/" + args["newFolder"]
+ if not os.path.isdir(new_folder):
+ current_umask = os.umask(0)
+ os.makedirs(new_folder)
+ os.umask(current_umask)
+ except OSError, (errno, strerror):
+ errMsg = "create_secondary_storage_folder failed: errno: " + str(errno) + ", strerr: " + strerror
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ except:
+ errMsg = "create_secondary_storage_folder failed."
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ finally:
+ if local_mount_path != None:
+ # Unmount the local folder
+ umount(local_mount_path)
+ # Remove the local folder
+ os.system("rmdir " + local_mount_path)
+
+ return "1"
+
+@echo
+def delete_secondary_storage_folder(session, args):
+ local_mount_path = None
+
+ util.SMlog("delete_secondary_storage_folder, args: " + str(args))
+
+ try:
+ try:
+ # Mount the remote resource folder locally
+ remote_mount_path = args["remoteMountPath"]
+ local_mount_path = os.path.join(CLOUD_DIR, util.gen_uuid())
+ mount(remote_mount_path, local_mount_path)
+
+ # Delete the specified folder
+ folder = local_mount_path + "/" + args["folder"]
+ if os.path.isdir(folder):
+ os.system("rm -f " + folder + "/*")
+ os.system("rmdir " + folder)
+ except OSError, (errno, strerror):
+ errMsg = "delete_secondary_storage_folder failed: errno: " + str(errno) + ", strerr: " + strerror
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ except:
+ errMsg = "delete_secondary_storage_folder failed."
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ finally:
+ if local_mount_path != None:
+ # Unmount the local folder
+ umount(local_mount_path)
+ # Remove the local folder
+ os.system("rmdir " + local_mount_path)
+
+ return "1"
+
+@echo
+def post_create_private_template(session, args):
+ local_mount_path = None
+ try:
+ try:
+ # get local template folder
+ templatePath = args["templatePath"]
+ local_mount_path = os.path.join(CLOUD_DIR, util.gen_uuid())
+ mount(templatePath, local_mount_path)
+ # Retrieve args
+ filename = args["templateFilename"]
+ name = args["templateName"]
+ description = args["templateDescription"]
+ checksum = args["checksum"]
+ file_size = args["size"]
+ virtual_size = args["virtualSize"]
+ template_id = args["templateId"]
+
+ # Create the template.properties file
+ template_properties_install_path = local_mount_path + "/template.properties"
+ f = open(template_properties_install_path, "w")
+ f.write("filename=" + filename + "\n")
+ f.write("vhd=true\n")
+ f.write("id=" + template_id + "\n")
+ f.write("vhd.filename=" + filename + "\n")
+ f.write("public=false\n")
+ f.write("uniquename=" + name + "\n")
+ f.write("vhd.virtualsize=" + virtual_size + "\n")
+ f.write("virtualsize=" + virtual_size + "\n")
+ f.write("checksum=" + checksum + "\n")
+ f.write("hvm=true\n")
+ f.write("description=" + description + "\n")
+ f.write("vhd.size=" + str(file_size) + "\n")
+ f.write("size=" + str(file_size) + "\n")
+ f.close()
+ util.SMlog("Created template.properties file")
+
+ # Set permissions
+ permissions = stat.S_IREAD | stat.S_IWRITE | stat.S_IRGRP | stat.S_IWGRP | stat.S_IROTH | stat.S_IWOTH
+ os.chmod(template_properties_install_path, permissions)
+ util.SMlog("Set permissions on template and template.properties")
+
+ except:
+ errMsg = "post_create_private_template failed."
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+
+ finally:
+ if local_mount_path != None:
+ # Unmount the local folder
+ umount(local_mount_path)
+ # Remove the local folder
+ os.system("rmdir " + local_mount_path)
+ return "1"
+
+def isfile(path, isISCSI):
+ errMsg = ''
+ exists = True
+ if isISCSI:
+ exists = checkVolumeAvailablility(path)
+ else:
+ exists = os.path.isfile(path)
+
+ if not exists:
+ errMsg = "File " + path + " does not exist."
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ return errMsg
+
+def copyfile(fromFile, toFile, isISCSI):
+ util.SMlog("Starting to copy " + fromFile + " to " + toFile)
+ errMsg = ''
+ try:
+ cmd = ['dd', 'if=' + fromFile, 'of=' + toFile, 'bs=4M']
+ txt = util.pread2(cmd)
+ except:
+ try:
+ os.system("rm -f " + toFile)
+ except:
+ txt = ''
+ txt = ''
+ errMsg = "Error while copying " + fromFile + " to " + toFile + " in secondary storage"
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+
+ util.SMlog("Successfully copied " + fromFile + " to " + toFile)
+ return errMsg
+
+def chdir(path):
+ try:
+ os.chdir(path)
+ except OSError, (errno, strerror):
+ errMsg = "Unable to chdir to " + path + " because of OSError with errno: " + str(errno) + " and strerr: " + strerror
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ util.SMlog("Chdired to " + path)
+ return
+
+def scanParent(path):
+ # Do a scan for the parent for ISCSI volumes
+ # Note that the parent need not be visible on the XenServer
+ parentUUID = ''
+ try:
+ lvName = os.path.basename(path)
+ dirname = os.path.dirname(path)
+ vgName = os.path.basename(dirname)
+ vhdInfo = vhdutil.getVHDInfoLVM(lvName, lvhdutil.extractUuid, vgName)
+ parentUUID = vhdInfo.parentUuid
+ except:
+ errMsg = "Could not get vhd parent of " + path
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ return parentUUID
+
+def getParent(path, isISCSI):
+ parentUUID = ''
+ try :
+ if isISCSI:
+ parentUUID = vhdutil.getParent(path, lvhdutil.extractUuid)
+ else:
+ parentUUID = vhdutil.getParent(path, cleanup.FileVDI.extractUuid)
+ except:
+ errMsg = "Could not get vhd parent of " + path
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ return parentUUID
+
+def getParentOfSnapshot(snapshotUuid, primarySRPath, isISCSI):
+ snapshotVHD = getVHD(snapshotUuid, isISCSI)
+ snapshotPath = os.path.join(primarySRPath, snapshotVHD)
+
+ baseCopyUuid = ''
+ if isISCSI:
+ checkVolumeAvailablility(snapshotPath)
+ baseCopyUuid = scanParent(snapshotPath)
+ else:
+ baseCopyUuid = getParent(snapshotPath, isISCSI)
+
+ util.SMlog("Base copy of snapshotUuid: " + snapshotUuid + " is " + baseCopyUuid)
+ return baseCopyUuid
+
+def setParent(parent, child):
+ try:
+ cmd = [VHD_UTIL, "modify", "-p", parent, "-n", child]
+ txt = util.pread2(cmd)
+ except:
+ errMsg = "Unexpected error while trying to set parent of " + child + " to " + parent
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ util.SMlog("Successfully set parent of " + child + " to " + parent)
+ return
+
+def rename(originalVHD, newVHD):
+ try:
+ os.rename(originalVHD, newVHD)
+ except OSError, (errno, strerror):
+ errMsg = "OSError while renaming " + origiinalVHD + " to " + newVHD + "with errno: " + str(errno) + " and strerr: " + strerror
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ return
+
+def makedirs(path):
+ if not os.path.isdir(path):
+ try:
+ os.makedirs(path)
+ except OSError, (errno, strerror):
+ umount(path)
+ if os.path.isdir(path):
+ return
+ errMsg = "OSError while creating " + path + " with errno: " + str(errno) + " and strerr: " + strerror
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ return
+
+def mount(remoteDir, localDir):
+ makedirs(localDir)
+ options = "soft,tcp,timeo=133,retrans=1"
+ try:
+ cmd = ['mount', '-o', options, remoteDir, localDir]
+ txt = util.pread2(cmd)
+ except:
+ txt = ''
+ errMsg = "Unexpected error while trying to mount " + remoteDir + " to " + localDir
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ util.SMlog("Successfully mounted " + remoteDir + " to " + localDir)
+
+ return
+
+def umount(localDir):
+ try:
+ cmd = ['umount', localDir]
+ util.pread2(cmd)
+ except CommandException:
+ errMsg = "CommandException raised while trying to umount " + localDir
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+
+ util.SMlog("Successfully unmounted " + localDir)
+ return
+
+def mountSnapshotsDir(secondaryStorageMountPath, localMountPointPath, path):
+ # The aim is to mount secondaryStorageMountPath on
+ # And create <accountId>/<instanceId> dir on it, if it doesn't exist already.
+ # Assuming that secondaryStorageMountPath exists remotely
+
+ # Just mount secondaryStorageMountPath/<relativeDir>/SecondaryStorageHost/ everytime
+ # Never unmount.
+ # path is like "snapshots/account/volumeId", we mount secondary_storage:/snapshots
+ relativeDir = path.split("/")[0]
+ restDir = "/".join(path.split("/")[1:])
+ snapshotsDir = os.path.join(secondaryStorageMountPath, relativeDir)
+
+ makedirs(localMountPointPath)
+ # if something is not mounted already on localMountPointPath,
+ # mount secondaryStorageMountPath on localMountPath
+ if os.path.ismount(localMountPointPath):
+ # There is more than one secondary storage per zone.
+ # And we are mounting each sec storage under a zone-specific directory
+ # So two secondary storage snapshot dirs will never get mounted on the same point on the same XenServer.
+ util.SMlog("The remote snapshots directory has already been mounted on " + localMountPointPath)
+ else:
+ mount(snapshotsDir, localMountPointPath)
+
+ # Create accountId/instanceId dir on localMountPointPath, if it doesn't exist
+ backupsDir = os.path.join(localMountPointPath, restDir)
+ makedirs(backupsDir)
+ return backupsDir
+
+def unmountAll(path):
+ try:
+ for dir in os.listdir(path):
+ if dir.isdigit():
+ util.SMlog("Unmounting Sub-Directory: " + dir)
+ localMountPointPath = os.path.join(path, dir)
+ umount(localMountPointPath)
+ except:
+ util.SMlog("Ignoring the error while trying to unmount the snapshots dir")
+
+@echo
+def unmountSnapshotsDir(session, args):
+ dcId = args['dcId']
+ localMountPointPath = os.path.join(CLOUD_DIR, dcId)
+ localMountPointPath = os.path.join(localMountPointPath, "snapshots")
+ unmountAll(localMountPointPath)
+ try:
+ umount(localMountPointPath)
+ except:
+ util.SMlog("Ignoring the error while trying to unmount the snapshots dir.")
+
+ return "1"
+
+def getPrimarySRPath(session, primaryStorageSRUuid, isISCSI):
+ sr = session.xenapi.SR.get_by_uuid(primaryStorageSRUuid)
+ srrec = session.xenapi.SR.get_record(sr)
+ srtype = srrec["type"]
+ if srtype == "file":
+ pbd = session.xenapi.SR.get_PBDs(sr)[0]
+ pbdrec = session.xenapi.PBD.get_record(pbd)
+ primarySRPath = pbdrec["device_config"]["location"]
+ return primarySRPath
+ elif isISCSI:
+ primarySRDir = lvhdutil.VG_PREFIX + primaryStorageSRUuid
+ return os.path.join(lvhdutil.VG_LOCATION, primarySRDir)
+ else:
+ return os.path.join(SR.MOUNT_BASE, primaryStorageSRUuid)
+
+def getBackupVHD(UUID):
+ return UUID + '.' + SR.DEFAULT_TAP
+
+def getVHD(UUID, isISCSI):
+ if isISCSI:
+ return VHD_PREFIX + UUID
+ else:
+ return UUID + '.' + SR.DEFAULT_TAP
+
+def getIsTrueString(stringValue):
+ booleanValue = False
+ if (stringValue and stringValue == 'true'):
+ booleanValue = True
+ return booleanValue
+
+def makeUnavailable(uuid, primarySRPath, isISCSI):
+ if not isISCSI:
+ return
+ VHD = getVHD(uuid, isISCSI)
+ path = os.path.join(primarySRPath, VHD)
+ manageAvailability(path, '-an')
+ return
+
+def manageAvailability(path, value):
+ if path.__contains__("/var/run/sr-mount"):
+ return
+ util.SMlog("Setting availability of " + path + " to " + value)
+ try:
+ cmd = ['/usr/sbin/lvchange', value, path]
+ util.pread2(cmd)
+ except: #CommandException, (rc, cmdListStr, stderr):
+ #errMsg = "CommandException thrown while executing: " + cmdListStr + " with return code: " + str(rc) + " and stderr: " + stderr
+ errMsg = "Unexpected exception thrown by lvchange"
+ util.SMlog(errMsg)
+ if value == "-ay":
+ # Raise an error only if we are trying to make it available.
+ # Just warn if we are trying to make it unavailable after the
+ # snapshot operation is done.
+ raise xs_errors.XenError(errMsg)
+ return
+
+
+def checkVolumeAvailablility(path):
+ try:
+ if not isVolumeAvailable(path):
+ # The VHD file is not available on XenSever. The volume is probably
+ # inactive or detached.
+ # Do lvchange -ay to make it available on XenServer
+ manageAvailability(path, '-ay')
+ except:
+ errMsg = "Could not determine status of ISCSI path: " + path
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+
+ success = False
+ i = 0
+ while i < 6:
+ i = i + 1
+ # Check if the vhd is actually visible by checking for the link
+ # set isISCSI to true
+ success = isVolumeAvailable(path)
+ if success:
+ util.SMlog("Made vhd: " + path + " available and confirmed that it is visible")
+ break
+
+ # Sleep for 10 seconds before checking again.
+ time.sleep(10)
+
+ # If not visible within 1 min fail
+ if not success:
+ util.SMlog("Could not make vhd: " + path + " available despite waiting for 1 minute. Does it exist?")
+
+ return success
+
+def isVolumeAvailable(path):
+ # Check if iscsi volume is available on this XenServer.
+ status = "0"
+ try:
+ p = subprocess.Popen(["/bin/bash", "-c", "if [ -L " + path + " ]; then echo 1; else echo 0;fi"], stdout=subprocess.PIPE)
+ status = p.communicate()[0].strip("\n")
+ except:
+ errMsg = "Could not determine status of ISCSI path: " + path
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+
+ return (status == "1")
+
+def getVhdParent(session, args):
+ util.SMlog("getParent with " + str(args))
+ primaryStorageSRUuid = args['primaryStorageSRUuid']
+ snapshotUuid = args['snapshotUuid']
+ isISCSI = getIsTrueString(args['isISCSI'])
+
+ primarySRPath = getPrimarySRPath(session, primaryStorageSRUuid, isISCSI)
+ util.SMlog("primarySRPath: " + primarySRPath)
+
+ baseCopyUuid = getParentOfSnapshot(snapshotUuid, primarySRPath, isISCSI)
+
+ return baseCopyUuid
+
+
+def backupSnapshot(session, args):
+ util.SMlog("Called backupSnapshot with " + str(args))
+ primaryStorageSRUuid = args['primaryStorageSRUuid']
+ secondaryStorageMountPath = args['secondaryStorageMountPath']
+ snapshotUuid = args['snapshotUuid']
+ prevBackupUuid = args['prevBackupUuid']
+ backupUuid = args['backupUuid']
+ isISCSI = getIsTrueString(args['isISCSI'])
+ path = args['path']
+ localMountPoint = args['localMountPoint']
+ primarySRPath = getPrimarySRPath(session, primaryStorageSRUuid, isISCSI)
+ util.SMlog("primarySRPath: " + primarySRPath)
+
+ baseCopyUuid = getParentOfSnapshot(snapshotUuid, primarySRPath, isISCSI)
+ baseCopyVHD = getVHD(baseCopyUuid, isISCSI)
+ baseCopyPath = os.path.join(primarySRPath, baseCopyVHD)
+ util.SMlog("Base copy path: " + baseCopyPath)
+
+
+ # Mount secondary storage mount path on XenServer along the path
+ # /var/run/sr-mount/<dcId>/snapshots/ and create <accountId>/<volumeId> dir
+ # on it.
+ backupsDir = mountSnapshotsDir(secondaryStorageMountPath, localMountPoint, path)
+ util.SMlog("Backups dir " + backupsDir)
+ prevBackupUuid = prevBackupUuid.split("/")[-1]
+ # Check existence of snapshot on primary storage
+ isfile(baseCopyPath, isISCSI)
+ if prevBackupUuid:
+ # Check existence of prevBackupFile
+ prevBackupVHD = getBackupVHD(prevBackupUuid)
+ prevBackupFile = os.path.join(backupsDir, prevBackupVHD)
+ isfile(prevBackupFile, False)
+
+ # copy baseCopyPath to backupsDir with new uuid
+ backupVHD = getBackupVHD(backupUuid)
+ backupFile = os.path.join(backupsDir, backupVHD)
+ util.SMlog("Back up " + baseCopyUuid + " to Secondary Storage as " + backupUuid)
+ copyfile(baseCopyPath, backupFile, isISCSI)
+ vhdutil.setHidden(backupFile, False)
+
+ # Because the primary storage is always scanned, the parent of this base copy is always the first base copy.
+ # We don't want that, we want a chain of VHDs each of which is a delta from the previous.
+ # So set the parent of the current baseCopyVHD to prevBackupVHD
+ if prevBackupUuid:
+ # If there was a previous snapshot
+ setParent(prevBackupFile, backupFile)
+
+ txt = "1#" + backupUuid
+ return txt
+
+@echo
+def deleteSnapshotBackup(session, args):
+ util.SMlog("Calling deleteSnapshotBackup with " + str(args))
+ secondaryStorageMountPath = args['secondaryStorageMountPath']
+ backupUUID = args['backupUUID']
+ path = args['path']
+ localMountPoint = args['localMountPoint']
+
+ backupsDir = mountSnapshotsDir(secondaryStorageMountPath, localMountPoint, path)
+ # chdir to the backupsDir for convenience
+ chdir(backupsDir)
+
+ backupVHD = getBackupVHD(backupUUID)
+ util.SMlog("checking existence of " + backupVHD)
+
+ # The backupVHD is on secondary which is NFS and not ISCSI.
+ if not os.path.isfile(backupVHD):
+ util.SMlog("backupVHD " + backupVHD + "does not exist. Not trying to delete it")
+ return "1"
+ util.SMlog("backupVHD " + backupVHD + " exists.")
+
+ # Just delete the backupVHD
+ try:
+ os.remove(backupVHD)
+ except OSError, (errno, strerror):
+ errMsg = "OSError while removing " + backupVHD + " with errno: " + str(errno) + " and strerr: " + strerror
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+
+ return "1"
+
+@echo
+def revert_memory_snapshot(session, args):
+ util.SMlog("Calling revert_memory_snapshot with " + str(args))
+ vmName = args['vmName']
+ snapshotUUID = args['snapshotUUID']
+ oldVmUuid = args['oldVmUuid']
+ snapshotMemory = args['snapshotMemory']
+ hostUUID = args['hostUUID']
+ try:
+ cmd = '''xe vbd-list vm-uuid=%s | grep 'vdi-uuid' | grep -v 'not in database' | sed -e 's/vdi-uuid ( RO)://g' ''' % oldVmUuid
+ vdiUuids = os.popen(cmd).read().split()
+ cmd2 = '''xe vm-param-get param-name=power-state uuid=''' + oldVmUuid
+ if os.popen(cmd2).read().split()[0] != 'halted':
+ os.system("xe vm-shutdown force=true vm=" + vmName)
+ os.system("xe vm-destroy uuid=" + oldVmUuid)
+ os.system("xe snapshot-revert snapshot-uuid=" + snapshotUUID)
+ if snapshotMemory == 'true':
+ os.system("xe vm-resume vm=" + vmName + " on=" + hostUUID)
+ for vdiUuid in vdiUuids:
+ os.system("xe vdi-destroy uuid=" + vdiUuid)
+ except OSError, (errno, strerror):
+ errMsg = "OSError while reverting vm " + vmName + " to snapshot " + snapshotUUID + " with errno: " + str(errno) + " and strerr: " + strerror
+ util.SMlog(errMsg)
+ raise xs_errors.XenError(errMsg)
+ return "0"
+
+if __name__ == "__main__":
+ XenAPIPlugin.dispatch({"getVhdParent":getVhdParent, "create_secondary_storage_folder":create_secondary_storage_folder, "delete_secondary_storage_folder":delete_secondary_storage_folder, "post_create_private_template":post_create_private_template, "backupSnapshot": backupSnapshot, "deleteSnapshotBackup": deleteSnapshotBackup, "unmountSnapshotsDir": unmountSnapshotsDir, "revert_memory_snapshot":revert_memory_snapshot})
+
+
[07/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
fix devcloud: user template's guest os type is changed
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b16ccb5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b16ccb5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b16ccb5
Branch: refs/heads/4.4
Commit: 5b16ccb50e8c5b3106aeedb08aa0769a960d27ee
Parents: 3d0b739
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 15:33:56 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:36 2014 -0700
----------------------------------------------------------------------
.../hypervisor/xen/resource/XcpOssResource.java | 25 ++++++++++----------
1 file changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b16ccb5/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
index 81448d5..f136489 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -23,17 +23,11 @@ import java.util.List;
import java.util.Set;
import javax.ejb.Local;
+import javax.ws.rs.HEAD;
import org.apache.log4j.Logger;
import org.apache.xmlrpc.XmlRpcException;
-import com.xensource.xenapi.Connection;
-import com.xensource.xenapi.Types;
-import com.xensource.xenapi.Types.XenAPIException;
-import com.xensource.xenapi.VBD;
-import com.xensource.xenapi.VDI;
-import com.xensource.xenapi.VM;
-
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.NetworkUsageAnswer;
@@ -44,7 +38,12 @@ import com.cloud.agent.api.StopCommand;
import com.cloud.resource.ServerResource;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
-import com.cloud.vm.VirtualMachine;
+import com.xensource.xenapi.Connection;
+import com.xensource.xenapi.Types;
+import com.xensource.xenapi.Types.XenAPIException;
+import com.xensource.xenapi.VBD;
+import com.xensource.xenapi.VDI;
+import com.xensource.xenapi.VM;
@Local(value = ServerResource.class)
public class XcpOssResource extends CitrixResourceBase {
@@ -72,11 +71,13 @@ public class XcpOssResource extends CitrixResourceBase {
@Override
protected String getGuestOsType(String stdType, boolean bootFromCD) {
- if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
- return "Debian Squeeze 6.0 (64-bit)";
+ if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
+ return "Debian Squeeze 6.0 (64-bit)";
+ } else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) {
+ return "CentOS 5 (64-bit)";
} else {
- return CitrixHelper.getXcpGuestOsType(stdType);
- }
+ return CitrixHelper.getXcpGuestOsType(stdType);
+ }
}
@Override
[18/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
update xen/kvm system vm template download url, and update the os type to 64bit
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b35389fd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b35389fd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b35389fd
Branch: refs/heads/4.4
Commit: b35389fd200a1a22c52025abcc3f803900069eb7
Parents: b2f4939
Author: edison <su...@gmail.com>
Authored: Wed Jan 15 15:44:36 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:40 2014 -0700
----------------------------------------------------------------------
setup/db/templates.sql | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b35389fd/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 3299320..caa69c2 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -16,19 +16,19 @@
-- under the License.
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
- VALUES (1, UUID(), 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 'SYSTEM', 0, 32, 1, 'http://download.cloud.com/templates/4.2/systemvmtemplate-2013-07-12-master-xen.vhd.bz2', '74b92f031cc5c2089ee89efb81344dcf', 0, 'SystemVM Template (XenServer)', 'VHD', 183, 0, 1, 'XenServer' );
+ VALUES (1, UUID(), 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2', '74b92f031cc5c2089ee89efb81344dcf', 0, 'SystemVM Template (XenServer)', 'VHD', 183, 0, 1, 'XenServer' );
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, removed, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
VALUES (2, UUID(), 'centos53-x86_64', 'CentOS 5.3(64-bit) no GUI (XenServer)', 1, now(), now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', 'b63d854a9560c013142567bbae8d98cf', 0, 'CentOS 5.3(64-bit) no GUI (XenServer)', 'VHD', 12, 1, 1, 'XenServer', 1);
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
- VALUES (3, UUID(), 'routing-3', 'SystemVM Template (KVM)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.2/systemvmtemplate-2013-06-12-master-kvm.qcow2.bz2', '6cea42b2633841648040becb588bd8f0', 0, 'SystemVM Template (KVM)', 'QCOW2', 15, 0, 1, 'KVM' );
+ VALUES (3, UUID(), 'routing-3', 'SystemVM Template (KVM)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2', '6cea42b2633841648040becb588bd8f0', 0, 'SystemVM Template (KVM)', 'QCOW2', 15, 0, 1, 'KVM' );
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, display_text, enable_password, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
VALUES (4, UUID(), 'centos55-x86_64', 'CentOS 5.5(64-bit) no GUI (KVM)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', 'ed0e788280ff2912ea40f7f91ca7a249', 'CentOS 5.5(64-bit) no GUI (KVM)', 0, 'QCOW2', 112, 1, 1, 'KVM', 1);
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
- VALUES (5, UUID(), 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/centos56-x86_64.vhd.bz2', '905cec879afd9c9d22ecc8036131a180', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 142, 1, 1, 'XenServer', 1);
+ VALUES (5, UUID(), 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2', '905cec879afd9c9d22ecc8036131a180', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 142, 1, 1, 'XenServer', 1);
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
VALUES (7, UUID(), 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1);
@@ -68,7 +68,7 @@ INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (11,
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (12, UUID(), 1, 'CentOS 5.3 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (13, UUID(), 1, 'CentOS 5.4 (32-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (14, UUID(), 1, 'CentOS 5.4 (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (15, UUID(), 2, 'Debian GNU/Linux 5.0 (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (15, UUID(), 2, 'Debian GNU/Linux 5.0 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (16, UUID(), 3, 'Oracle Enterprise Linux 5.0 (32-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (17, UUID(), 3, 'Oracle Enterprise Linux 5.0 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (18, UUID(), 3, 'Oracle Enterprise Linux 5.1 (32-bit)');
[12/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5573: bump gson version to 1.7.2, fix https://code.google.com/p/google-gson/issues/detail?id=354
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/18f59f9c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/18f59f9c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/18f59f9c
Branch: refs/heads/4.4
Commit: 18f59f9ce82c545b5335152ab573df16fd143a39
Parents: 04220da
Author: edison <su...@gmail.com>
Authored: Mon Jan 6 11:41:18 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:38 2014 -0700
----------------------------------------------------------------------
.../datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java | 2 --
pom.xml | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/18f59f9c/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
index ae217b6..e326f61 100644
--- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
+++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
@@ -99,8 +99,6 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
@Inject
StorageManager storageMgr;
@Inject
- VolumeOrchestrationService volumeMgr;
- @Inject
VMInstanceDao vmDao;
@Inject
SnapshotDao snapshotDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/18f59f9c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 02b1808..c608c4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<cs.jasypt.version>1.9.0</cs.jasypt.version>
<cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
<cs.ehcache.version>2.6.6</cs.ehcache.version>
- <cs.gson.version>1.7.1</cs.gson.version>
+ <cs.gson.version>1.7.2</cs.gson.version>
<cs.guava.version>14.0-rc1</cs.guava.version>
<cs.xapi.version>6.2.0-1-SNAPSHOT</cs.xapi.version>
<cs.httpclient.version>3.1</cs.httpclient.version>
[25/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5329: stupid java box/unbox
Conflicts:
engine/schema/src/com/cloud/vm/VMInstanceVO.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11d11d86
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11d11d86
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11d11d86
Branch: refs/heads/4.4
Commit: 11d11d86905f4020e533b8b18e790fa61383a26d
Parents: 6b364f9
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 16:11:51 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:41 2014 -0700
----------------------------------------------------------------------
engine/schema/src/com/cloud/vm/VMInstanceVO.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11d11d86/engine/schema/src/com/cloud/vm/VMInstanceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/com/cloud/vm/VMInstanceVO.java
index 376b835..3d4337f 100644
--- a/engine/schema/src/com/cloud/vm/VMInstanceVO.java
+++ b/engine/schema/src/com/cloud/vm/VMInstanceVO.java
@@ -417,8 +417,8 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
return podIdToDeployIn;
}
- public void setPodId(long podId) {
- podIdToDeployIn = podId;
+ public void setPodId(Long podId) {
+ this.podIdToDeployIn = podId;
}
public void setPrivateMacAddress(String privateMacAddress) {
[13/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5370: delete snapshot on primary storage in case of backup snapshot failed.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4af8ece
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4af8ece
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4af8ece
Branch: refs/heads/4.4
Commit: a4af8ece8a162bf7497f2c8d3c7572dece689af0
Parents: 18f59f9
Author: edison <su...@gmail.com>
Authored: Wed Jan 8 14:14:52 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:38 2014 -0700
----------------------------------------------------------------------
.../xen/resource/XenServerStorageProcessor.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4af8ece/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
index caebe34..c1af6ca 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
@@ -1352,6 +1352,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
Long physicalSize = null;
Map<String, String> options = cmd.getOptions();
boolean fullbackup = Boolean.parseBoolean(options.get("fullSnapshot"));
+ boolean result = false;
try {
SR primaryStorageSR = hypervisorResource.getSRByNameLabelandHost(conn, primaryStorageNameLabel);
if (primaryStorageSR == null) {
@@ -1477,17 +1478,23 @@ public class XenServerStorageProcessor implements StorageProcessor {
} else {
newSnapshot.setParentSnapshotPath(prevBackupUuid);
}
+ result = true;
return new CopyCmdAnswer(newSnapshot);
} catch (XenAPIException e) {
details = "BackupSnapshot Failed due to " + e.toString();
s_logger.warn(details, e);
- // remove last bad primary snapshot when exception happens
- destroySnapshotOnPrimaryStorage(conn, snapshotUuid);
} catch (Exception e) {
details = "BackupSnapshot Failed due to " + e.getMessage();
s_logger.warn(details, e);
- // remove last bad primary snapshot when exception happens
- destroySnapshotOnPrimaryStorage(conn, snapshotUuid);
+ } finally {
+ if (!result) {
+ // remove last bad primary snapshot when exception happens
+ try {
+ destroySnapshotOnPrimaryStorage(conn, snapshotUuid);
+ } catch (Exception e) {
+ s_logger.debug("clean up snapshot failed", e);
+ }
+ }
}
return new CopyCmdAnswer(details);
[21/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5763: if vm is stopped, then don't check hypervisor support live storage migration capabilities.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9da36af7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9da36af7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9da36af7
Branch: refs/heads/4.4
Commit: 9da36af711ffc1a75da5cc66b2d4c0c553556067
Parents: a3edd1a
Author: edison <su...@gmail.com>
Authored: Wed Jan 8 15:25:26 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:40 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9da36af7/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 5ffa99b..f0b7497 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1535,12 +1535,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
liveMigrateVolume = capabilities.isStorageMotionSupported();
}
}
- }
- // If the disk is not attached to any VM then it can be moved. Otherwise, it needs to be attached to a vm
- // running on a hypervisor that supports storage motion so that it be be migrated.
- if (instanceId != null && !liveMigrateVolume) {
- throw new InvalidParameterValueException("Volume needs to be detached from VM");
+ // If vm is running, and hypervisor doesn't support live migration, then return error
+ if (!liveMigrateVolume) {
+ throw new InvalidParameterValueException("Volume needs to be detached from VM");
+ }
}
if (liveMigrateVolume && !cmd.isLiveMigrate()) {
[19/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5607: Don't delete the template if its stored in other zones.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a3edd1ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3edd1ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3edd1ac
Branch: refs/heads/4.4
Commit: a3edd1ac72f0ca7389d58e47b7497f638e277c01
Parents: 5917b25
Author: edison <su...@gmail.com>
Authored: Wed Jan 8 15:04:05 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:40 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/template/HypervisorTemplateAdapter.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3edd1ac/server/src/com/cloud/template/HypervisorTemplateAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
index 9d52b39..51dedf7 100755
--- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
@@ -399,6 +399,11 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
}
}
if (success) {
+ if ((imageStores.size() > 1) && (profile.getZoneId() != null)) {
+ //if template is stored in more than one image stores, and the zone id is not null, then don't delete other templates.
+ return success;
+ }
+
// delete all cache entries for this template
List<TemplateInfo> cacheTmpls = imageFactory.listTemplateOnCache(template.getId());
for (TemplateInfo tmplOnCache : cacheTmpls) {
[24/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5857: for some reasons, delete secondary pool failed during copy template from secondary storage to primary storage, but the volume is already copied to primary storage, we didn't clean up the volume on primary storage, then all the following copy the same template to primary storage failed, as we are always using the same uuid when creating a new volume, libvirt complaining that the volume already exists.
Current fix is ignoring "the delete secondary storage error".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b2f49394
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b2f49394
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b2f49394
Branch: refs/heads/4.4
Commit: b2f4939402b8c657a0b6d890b275f8bc97e4b15b
Parents: 36efe4d
Author: edison <su...@gmail.com>
Authored: Mon Jan 13 14:55:47 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:40 2014 -0700
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 8 ++++++--
.../cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 2 +-
.../com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java | 7 ++++++-
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b2f49394/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index a47b2ca..604bdae 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -242,8 +242,12 @@ public class KVMStorageProcessor implements StorageProcessor {
} catch (CloudRuntimeException e) {
return new CopyCmdAnswer(e.toString());
} finally {
- if (secondaryPool != null) {
- secondaryPool.delete();
+ try {
+ if (secondaryPool != null) {
+ secondaryPool.delete();
+ }
+ } catch(Exception e) {
+ s_logger.debug("Failed to clean up secondary storage", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b2f49394/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 5de8bd2..b6d527d 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -612,7 +612,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
}
s_logger.error("failed in umount retry");
}
- throw new CloudRuntimeException(e.toString());
+ throw new CloudRuntimeException(e.toString(), e);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b2f49394/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
index 54edffc..936ccf7 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
@@ -249,7 +249,12 @@ public class LibvirtStoragePool implements KVMStoragePool {
@Override
public boolean delete() {
- return this._storageAdaptor.deleteStoragePool(this);
+ try {
+ return this._storageAdaptor.deleteStoragePool(this);
+ } catch (Exception e) {
+ s_logger.debug("Failed to delete storage pool", e);
+ }
+ return false;
}
@Override
[10/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
KVM security bug: no forwarding rule applied
(cherry picked from commit e5c391fcf3852e50ebd99d4a72fd51d1753b05eb)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9dba93e1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9dba93e1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9dba93e1
Branch: refs/heads/4.4
Commit: 9dba93e10581f27c9e64c17e425814e454953294
Parents: 810e090
Author: Edison Su <su...@gmail.com>
Authored: Fri Mar 14 14:40:48 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:37 2014 -0700
----------------------------------------------------------------------
scripts/vm/network/security_group.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dba93e1/scripts/vm/network/security_group.py
----------------------------------------------------------------------
diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index 1d94de3..704b279 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -978,7 +978,7 @@ def addFWFramework(brname):
execute("iptables -N " + brfwin)
try:
- refs = execute("""iptables -n -L " + brfw + " | awk '/%s(.*)references/ {gsub(/\(/, "") ;print $3}'""" % brfw).strip()
+ refs = execute("""iptables -n -L %s | awk '/%s(.*)references/ {gsub(/\(/, "") ;print $3}'""" % (brfw,brfw)).strip()
if refs == "0":
execute("iptables -I FORWARD -i " + brname + " -j DROP")
execute("iptables -I FORWARD -o " + brname + " -j DROP")
[17/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5432:sync vm and storage commands on mgt server for kvm
Conflicts:
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/src/com/cloud/hypervisor/KVMGuru.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/73f383c5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/73f383c5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/73f383c5
Branch: refs/heads/4.4
Commit: 73f383c5ab7224dbeea5fbe702bc99cc1c5ab0c9
Parents: c171142
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 16:10:28 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:40 2014 -0700
----------------------------------------------------------------------
.../storage/command/AttachCommand.java | 6 ++++
.../command/AttachPrimaryDataStoreCmd.java | 5 ++++
.../cloudstack/storage/command/CopyCommand.java | 4 +++
.../storage/command/CreateObjectCommand.java | 4 +++
.../command/CreatePrimaryDataStoreCmd.java | 4 +++
.../storage/command/DeleteCommand.java | 4 +++
.../storage/command/DettachCommand.java | 5 ++++
.../storage/command/ForgetObjectCmd.java | 5 ++++
.../storage/command/IntroduceObjectCmd.java | 5 ++++
.../command/StorageSubSystemCommand.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 31 +++++++++++++++-----
server/src/com/cloud/hypervisor/KVMGuru.java | 13 ++++++++
12 files changed, 79 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/AttachCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/AttachCommand.java b/core/src/org/apache/cloudstack/storage/command/AttachCommand.java
index 7e47ba4..303457b 100644
--- a/core/src/org/apache/cloudstack/storage/command/AttachCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/AttachCommand.java
@@ -24,6 +24,7 @@ import com.cloud.agent.api.to.DiskTO;
public final class AttachCommand extends Command implements StorageSubSystemCommand {
private DiskTO disk;
private String vmName;
+ private boolean inSeq = false;
public AttachCommand(DiskTO disk, String vmName) {
super();
@@ -51,4 +52,9 @@ public final class AttachCommand extends Command implements StorageSubSystemComm
public void setVmName(String vmName) {
this.vmName = vmName;
}
+
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+ this.inSeq = inSeq;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java
index 2083876..25679ba 100644
--- a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java
+++ b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java
@@ -21,6 +21,11 @@ package org.apache.cloudstack.storage.command;
import com.cloud.agent.api.Command;
public final class AttachPrimaryDataStoreCmd extends Command implements StorageSubSystemCommand {
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+
+ }
+
private final String dataStore;
public AttachPrimaryDataStoreCmd(String uri) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/CopyCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/CopyCommand.java b/core/src/org/apache/cloudstack/storage/command/CopyCommand.java
index 446c61f..96822a4 100644
--- a/core/src/org/apache/cloudstack/storage/command/CopyCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/CopyCommand.java
@@ -78,4 +78,8 @@ public final class CopyCommand extends Command implements StorageSubSystemComman
return options;
}
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+ this.executeInSequence = inSeq;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java b/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java
index 121a7ee..8c239b5 100644
--- a/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java
@@ -42,4 +42,8 @@ public final class CreateObjectCommand extends Command implements StorageSubSyst
return this.data;
}
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java b/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java
index b536028..21716cf 100644
--- a/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java
+++ b/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java
@@ -35,4 +35,8 @@ public final class CreatePrimaryDataStoreCmd extends Command implements StorageS
return false;
}
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java b/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java
index 76696da..7445050 100644
--- a/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java
@@ -42,4 +42,8 @@ public final class DeleteCommand extends Command implements StorageSubSystemComm
return this.data;
}
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/DettachCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/DettachCommand.java b/core/src/org/apache/cloudstack/storage/command/DettachCommand.java
index 61cb88b..1e501d9 100644
--- a/core/src/org/apache/cloudstack/storage/command/DettachCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/DettachCommand.java
@@ -87,4 +87,9 @@ public class DettachCommand extends Command implements StorageSubSystemCommand {
public int getStoragePort() {
return _storagePort;
}
+
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java b/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java
index ffee0ab..981a098 100644
--- a/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java
+++ b/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java
@@ -36,4 +36,9 @@ public class ForgetObjectCmd extends Command implements StorageSubSystemCommand
public boolean executeInSequence() {
return false;
}
+
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java b/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java
index c6c6d23..b463b2c 100644
--- a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java
+++ b/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java
@@ -36,4 +36,9 @@ public class IntroduceObjectCmd extends Command implements StorageSubSystemComma
public boolean executeInSequence() {
return false;
}
+
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java b/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java
index d14161a..fb7b373 100644
--- a/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java
@@ -19,5 +19,5 @@
package org.apache.cloudstack.storage.command;
public interface StorageSubSystemCommand {
-
+ void setExecuteInSequence(boolean inSeq);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 6f71306..6aaedcf 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -996,7 +996,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
handlePath(vmTO.getDisks(), vm.getHypervisorType());
cmds = new Commands(Command.OnError.Stop);
- cmds.addCommand(new StartCommand(vmTO, dest.getHost(), ExecuteInSequence.value()));
+
+ cmds.addCommand(new StartCommand(vmTO, dest.getHost(), getExecuteInSequence(vm.getHypervisorType())));
+
vmGuru.finalizeDeployment(cmds, vmProfile, dest, ctx);
@@ -1045,9 +1047,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
s_logger.info("The guru did not like the answers so stopping " + vm);
}
- StopCommand cmd = new StopCommand(vm, ExecuteInSequence.value());
- StopAnswer answer = (StopAnswer)_agentMgr.easySend(destHostId, cmd);
- if (answer != null) {
+ StopCommand cmd = new StopCommand(vm, getExecuteInSequence(vm.getHypervisorType()));
+ StopAnswer answer = (StopAnswer) _agentMgr.easySend(destHostId, cmd);
+ if ( answer != null ) {
+
if (vm.getType() == VirtualMachine.Type.User) {
String platform = answer.getPlatform();
if (platform != null) {
@@ -1213,9 +1216,18 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
}
+
+ protected boolean getExecuteInSequence(HypervisorType hypervisorType) {
+ if (HypervisorType.KVM == hypervisorType) {
+ return false;
+ } else {
+ return ExecuteInSequence.value();
+ }
+ }
+
protected boolean sendStop(VirtualMachineGuru guru, VirtualMachineProfile profile, boolean force) {
VirtualMachine vm = profile.getVirtualMachine();
- StopCommand stop = new StopCommand(vm, ExecuteInSequence.value());
+ StopCommand stop = new StopCommand(vm, getExecuteInSequence(vm.getHypervisorType()));
try {
StopAnswer answer = (StopAnswer)_agentMgr.send(vm.getHostId(), stop);
if (answer != null) {
@@ -1475,7 +1487,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
vmGuru.prepareStop(profile);
- StopCommand stop = new StopCommand(vm, ExecuteInSequence.value());
+
+ StopCommand stop = new StopCommand(vm, getExecuteInSequence(vm.getHypervisorType()));
+
boolean stopped = false;
StopAnswer answer = null;
try {
@@ -2450,11 +2464,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
public Command cleanup(VirtualMachine vm) {
- return new StopCommand(vm, ExecuteInSequence.value());
+ return new StopCommand(vm, getExecuteInSequence(vm.getHypervisorType()));
}
public Command cleanup(String vmName) {
- return new StopCommand(vmName, ExecuteInSequence.value());
+ return new StopCommand(vmName, getExecuteInSequence(null));
+
}
public Commands fullHostSync(final long hostId, StartupRoutingCommand startup) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73f383c5/server/src/com/cloud/hypervisor/KVMGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java b/server/src/com/cloud/hypervisor/KVMGuru.java
index e47e699..174b32d 100644
--- a/server/src/com/cloud/hypervisor/KVMGuru.java
+++ b/server/src/com/cloud/hypervisor/KVMGuru.java
@@ -19,11 +19,14 @@ package com.cloud.hypervisor;
import javax.ejb.Local;
import javax.inject.Inject;
+import com.cloud.agent.api.Command;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.dao.GuestOSDao;
+import com.cloud.utils.Pair;
import com.cloud.vm.VirtualMachineProfile;
+import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
@Local(value = HypervisorGuru.class)
public class KVMGuru extends HypervisorGuruBase implements HypervisorGuru {
@@ -40,6 +43,7 @@ public class KVMGuru extends HypervisorGuruBase implements HypervisorGuru {
}
@Override
+
public VirtualMachineTO implement(VirtualMachineProfile vm) {
VirtualMachineTO to = toVirtualMachineTO(vm);
@@ -51,6 +55,15 @@ public class KVMGuru extends HypervisorGuruBase implements HypervisorGuru {
}
@Override
+ public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
+ if (cmd instanceof StorageSubSystemCommand) {
+ StorageSubSystemCommand c = (StorageSubSystemCommand)cmd;
+ c.setExecuteInSequence(false);
+ }
+ return new Pair<Boolean, Long>(false, new Long(hostId));
+ }
+
+ @Override
public boolean trackVmHostChange() {
return false;
}
[03/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
fix devcloud: after devcloud vm itself reboot, local storage's name label is changed to orignal
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc3e4135
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc3e4135
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc3e4135
Branch: refs/heads/4.4
Commit: fc3e413584bf3e6e4b2ed14ddaaec128959a6092
Parents: 5b16ccb
Author: Edison Su <su...@gmail.com>
Authored: Tue Jan 14 14:35:18 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:36 2014 -0700
----------------------------------------------------------------------
.../hypervisor/xen/resource/XcpOssResource.java | 37 ++++++++++++++++++++
1 file changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc3e4135/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
index f136489..14b4bf3 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -33,12 +33,17 @@ import com.cloud.agent.api.Command;
import com.cloud.agent.api.NetworkUsageAnswer;
import com.cloud.agent.api.NetworkUsageCommand;
import com.cloud.agent.api.StartupRoutingCommand;
+import com.cloud.agent.api.StartupStorageCommand;
import com.cloud.agent.api.StopAnswer;
import com.cloud.agent.api.StopCommand;
+import com.cloud.agent.api.StoragePoolInfo;
import com.cloud.resource.ServerResource;
+import com.cloud.storage.Storage;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
import com.xensource.xenapi.Connection;
+import com.xensource.xenapi.Host;
+import com.xensource.xenapi.SR;
import com.xensource.xenapi.Types;
import com.xensource.xenapi.Types.XenAPIException;
import com.xensource.xenapi.VBD;
@@ -69,6 +74,38 @@ public class XcpOssResource extends CitrixResourceBase {
cmd.setCaps(cmd.getCapabilities() + " , hvm");
}
+ protected StartupStorageCommand initializeLocalSR(Connection conn) {
+ SR extsr = getLocalEXTSR(conn);
+ if (extsr != null) {
+ try {
+ String extuuid = extsr.getUuid(conn);
+ _host.localSRuuid = extuuid;
+ long cap = extsr.getPhysicalSize(conn);
+ if (cap > 0) {
+ long avail = cap - extsr.getPhysicalUtilisation(conn);
+ String name = "Cloud Stack Local EXT Storage Pool for " + _host.uuid;
+ extsr.setNameDescription(conn, name);
+ Host host = Host.getByUuid(conn, _host.uuid);
+ String address = host.getAddress(conn);
+ StoragePoolInfo pInfo = new StoragePoolInfo(extsr.getNameLabel(conn), address, SRType.EXT.toString(), SRType.EXT.toString(), Storage.StoragePoolType.EXT, cap, avail);
+ StartupStorageCommand cmd = new StartupStorageCommand();
+ cmd.setPoolInfo(pInfo);
+ cmd.setGuid(_host.uuid);
+ cmd.setDataCenter(Long.toString(_dcId));
+ cmd.setResourceType(Storage.StorageResourceType.STORAGE_POOL);
+ return cmd;
+ }
+ } catch (XenAPIException e) {
+ String msg = "build local EXT info err in host:" + _host.uuid + e.toString();
+ s_logger.warn(msg);
+ } catch (XmlRpcException e) {
+ String msg = "build local EXT info err in host:" + _host.uuid + e.getMessage();
+ s_logger.warn(msg);
+ }
+ }
+ return null;
+ }
+
@Override
protected String getGuestOsType(String stdType, boolean bootFromCD) {
if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
[14/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5737: ignore umount secondary storage failure during backup snapshot
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/04220daf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04220daf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04220daf
Branch: refs/heads/4.4
Commit: 04220daf4c4d5d637fcc3664551a01c85ff36457
Parents: 24d1f16
Author: edison <su...@gmail.com>
Authored: Fri Jan 3 12:59:54 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:38 2014 -0700
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04220daf/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 0024c8e..a47b2ca 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -812,8 +812,13 @@ public class KVMStorageProcessor implements StorageProcessor {
} catch (Exception ex) {
s_logger.debug("Failed to delete snapshots on primary", ex);
}
- if (secondaryStoragePool != null) {
- secondaryStoragePool.delete();
+
+ try {
+ if (secondaryStoragePool != null) {
+ secondaryStoragePool.delete();
+ }
+ } catch (Exception ex) {
+ s_logger.debug("Failed to delete secondary storage", ex);
}
}
}
[02/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-4506: fix NPE in case hostid is null
Conflicts:
server/src/com/cloud/capacity/CapacityManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0bbb8437
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0bbb8437
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0bbb8437
Branch: refs/heads/4.4
Commit: 0bbb8437cd8ac7bc7c27db4318c589edf8c2bb80
Parents: eacc1d7
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 15:19:50 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:35 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/capacity/CapacityManagerImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0bbb8437/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 69e8cfa..cef019d 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -182,6 +182,10 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
@DB
@Override
public boolean releaseVmCapacity(VirtualMachine vm, final boolean moveFromReserved, final boolean moveToReservered, final Long hostId) {
+ if (hostId == null) {
+ return true;
+ }
+
final ServiceOfferingVO svo = _offeringsDao.findById(vm.getId(), vm.getServiceOfferingId());
CapacityVO capacityCpu = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_CPU);
CapacityVO capacityMemory = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_MEMORY);
[27/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
mischanged default user vm template url for xen
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6b364f95
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6b364f95
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6b364f95
Branch: refs/heads/4.4
Commit: 6b364f958854dd3b7ddc39e366ebb27f3b6956f8
Parents: 73f383c
Author: edison <su...@gmail.com>
Authored: Fri Jan 17 15:45:58 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:41 2014 -0700
----------------------------------------------------------------------
setup/db/templates.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b364f95/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 7c4dca5..6a74633 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -28,7 +28,7 @@ INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created,
VALUES (4, UUID(), 'centos55-x86_64', 'CentOS 5.5(64-bit) no GUI (KVM)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', 'ed0e788280ff2912ea40f7f91ca7a249', 'CentOS 5.5(64-bit) no GUI (KVM)', 0, 'QCOW2', 112, 1, 1, 'KVM', 1);
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
- VALUES (5, UUID(), 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2', '3e29b40377272803eebccfe40efea199', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 142, 1, 1, 'XenServer', 1);
+ VALUES (5, UUID(), 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/centos56-x86_64.vhd.bz2', '905cec879afd9c9d22ecc8036131a180', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 142, 1, 1, 'XenServer', 1);
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
VALUES (7, UUID(), 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1);
[22/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5831: return quiescevm field in volumeresponse
Conflicts:
api/src/org/apache/cloudstack/api/response/VolumeResponse.java
server/src/com/cloud/api/query/QueryManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4584d5c8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4584d5c8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4584d5c8
Branch: refs/heads/4.4
Commit: 4584d5c845043c7368121c018ab710d1d459dee4
Parents: 9da36af
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 16:03:49 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:40 2014 -0700
----------------------------------------------------------------------
.../cloudstack/api/response/VolumeResponse.java | 19 ++++++++++++++++
.../com/cloud/api/query/QueryManagerImpl.java | 23 ++++++++++++++++----
2 files changed, 38 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4584d5c8/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
index 27e95de..45c15da 100644
--- a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
@@ -204,6 +204,11 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
@Param(description = "the chain info of the volume", since = "4.4")
String chainInfo;
+ @SerializedName(ApiConstants.SNAPSHOT_QUIESCEVM)
+ @Param(description = "need quiesce vm or not when taking snapshot", since="4.3")
+ private boolean needQuiescevm;
+
+
public String getPath() {
return path;
}
@@ -425,4 +430,18 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
public void setChainInfo(String chainInfo) {
this.chainInfo = chainInfo;
}
+
+ public String getStoragePoolId() {
+ return storagePoolId;
+ }
+
+ public void setNeedQuiescevm(boolean quiescevm) {
+ this.needQuiescevm = quiescevm;
+ }
+
+ public boolean isNeedQuiescevm() {
+ return this.needQuiescevm;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4584d5c8/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index b932d42..9d5914d 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -26,6 +26,7 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
+import org.apache.cloudstack.engine.subsystem.api.storage.*;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -91,10 +92,6 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
-import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.query.QueryService;
@@ -1643,6 +1640,24 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
List<VolumeResponse> volumeResponses = ViewResponseHelper.createVolumeResponse(respView, result.first().toArray(
new VolumeJoinVO[result.first().size()]));
+ for(VolumeResponse vr : volumeResponses) {
+ String poolId = vr.getStoragePoolId();
+ DataStore store = dataStoreManager.getPrimaryDataStore(poolId);
+ if (store == null) {
+ continue;
+ }
+
+ DataStoreDriver driver = store.getDriver();
+ if (driver == null) {
+ continue;
+ }
+
+ Map<String, String> caps = driver.getCapabilities();
+ if (caps != null) {
+ boolean quiescevm = Boolean.parseBoolean(caps.get(DataStoreCapabilities.VOLUME_SNAPSHOT_QUIESCEVM.toString()));
+ vr.setNeedQuiescevm(quiescevm);
+ }
+ }
response.setResponses(volumeResponses, result.second());
return response;
}
[09/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-6245: the security group rule is lagging behind the rules in DB, due to there is a worker thread launched inside a transaction Reviewed-by: Alex
(cherry picked from commit d4fdc184fe9c6717d2ed4e4fe4c39d9759a90608)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Conflicts:
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9188223f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9188223f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9188223f
Branch: refs/heads/4.4
Commit: 9188223f3d7d0b1e70af254df28493f0926afedf
Parents: 9dba93e
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 15:39:23 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:37 2014 -0700
----------------------------------------------------------------------
.../security/SecurityGroupManagerImpl.java | 31 ++++++++++++++------
1 file changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9188223f/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index 9c1b967..f60a746 100755
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -716,7 +716,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
final Integer startPortOrTypeFinal = startPortOrType;
final Integer endPortOrCodeFinal = endPortOrCode;
final String protocolFinal = protocol;
- return Transaction.execute(new TransactionCallback<List<SecurityGroupRuleVO>>() {
+ List<SecurityGroupRuleVO> newRules = Transaction.execute(new TransactionCallback<List<SecurityGroupRuleVO>>() {
@Override
public List<SecurityGroupRuleVO> doInTransaction(TransactionStatus status) {
// Prevents other threads/management servers from creating duplicate security rules
@@ -761,9 +761,6 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
if (s_logger.isDebugEnabled()) {
s_logger.debug("Added " + newRules.size() + " rules to security group " + securityGroup.getName());
}
- final ArrayList<Long> affectedVms = new ArrayList<Long>();
- affectedVms.addAll(_securityGroupVMMapDao.listVmIdsBySecurityGroup(securityGroup.getId()));
- scheduleRulesetUpdateToHosts(affectedVms, true, null);
return newRules;
} catch (Exception e) {
s_logger.warn("Exception caught when adding security group rules ", e);
@@ -776,6 +773,15 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
}
});
+ try {
+ final ArrayList<Long> affectedVms = new ArrayList<Long>();
+ affectedVms.addAll(_securityGroupVMMapDao.listVmIdsBySecurityGroup(securityGroup.getId()));
+ scheduleRulesetUpdateToHosts(affectedVms, true, null);
+ } catch (Exception e) {
+ s_logger.debug("can't update rules on host, ignore", e);
+ }
+
+ return newRules;
}
@Override
@@ -815,7 +821,8 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
SecurityGroup securityGroup = _securityGroupDao.findById(rule.getSecurityGroupId());
_accountMgr.checkAccess(caller, AccessType.OperateEntry, true, securityGroup);
- return Transaction.execute(new TransactionCallback<Boolean>() {
+ long securityGroupId = rule.getSecurityGroupId();
+ Boolean result = Transaction.execute(new TransactionCallback<Boolean>() {
@Override
public Boolean doInTransaction(TransactionStatus status) {
SecurityGroupVO groupHandle = null;
@@ -831,10 +838,6 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
_securityGroupRuleDao.remove(id);
s_logger.debug("revokeSecurityGroupRule succeeded for security rule id: " + id);
- final ArrayList<Long> affectedVms = new ArrayList<Long>();
- affectedVms.addAll(_securityGroupVMMapDao.listVmIdsBySecurityGroup(groupHandle.getId()));
- scheduleRulesetUpdateToHosts(affectedVms, true, null);
-
return true;
} catch (Exception e) {
s_logger.warn("Exception caught when deleting security rules ", e);
@@ -846,6 +849,16 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
}
}
});
+
+ try {
+ final ArrayList<Long> affectedVms = new ArrayList<Long>();
+ affectedVms.addAll(_securityGroupVMMapDao.listVmIdsBySecurityGroup(securityGroupId));
+ scheduleRulesetUpdateToHosts(affectedVms, true, null);
+ } catch (Exception e) {
+ s_logger.debug("Can't update rules for host, ignore", e);
+ }
+
+ return result;
}
@Override
[16/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5917b25f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5917b25f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5917b25f
Branch: refs/heads/4.4
Commit: 5917b25fd35cd0cd86d36f71fb671e03476b1b1a
Parents: a4af8ec
Author: edison <su...@gmail.com>
Authored: Wed Jan 8 14:35:15 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:39 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 2 +-
.../cloudstack/storage/resource/NfsSecondaryStorageResource.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5917b25f/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index 6bf4817..388a952 100755
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -599,7 +599,7 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager,
SnapshotDataStoreVO snapshotStoreRef = _snapshotStoreDao.findBySnapshot(snapshot.getId(), DataStoreRole.Image);
if (snapshotStrategy.deleteSnapshot(snapshot.getId())) {
- if (snapshot.getRecurringType() == Type.MANUAL) {
+ if (Type.MANUAL == snapshot.getRecurringType()) {
_resourceLimitMgr.decrementResourceCount(accountId, ResourceType.snapshot);
_resourceLimitMgr.decrementResourceCount(accountId, ResourceType.secondary_storage, new Long(snapshotStoreRef.getSize()));
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5917b25f/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 9782c2e..f35b3f5 100755
--- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -1278,7 +1278,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
if (!snapshotDir.exists()) {
details = "snapshot directory " + snapshotDir.getName() + " doesn't exist";
s_logger.debug(details);
- return new Answer(cmd, false, details);
+ return new Answer(cmd, true, details);
}
// delete snapshot in the directory if exists
String lPath = absoluteSnapshotPath + "/*" + snapshotName + "*";
[04/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
fix devcloud router start
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d0b7399
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d0b7399
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d0b7399
Branch: refs/heads/4.4
Commit: 3d0b7399508de0bcd106a4a5ffad81690aa96a02
Parents: f84fc12
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 15:32:37 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:36 2014 -0700
----------------------------------------------------------------------
.../hypervisor/xen/resource/XcpOssResource.java | 2 +-
scripts/vm/hypervisor/xenserver/xcposs/vmops | 34 ++++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d0b7399/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
index d79232e..81448d5 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -80,7 +80,7 @@ public class XcpOssResource extends CitrixResourceBase {
}
@Override
- protected VBD createPatchVbd(Connection conn, String vmName, VM vm) throws XmlRpcException, XenAPIException {
+ protected synchronized VBD createPatchVbd(Connection conn, String vmName, VM vm) throws XmlRpcException, XenAPIException {
if (_host.localSRuuid != null) {
//create an iso vdi on it
String result = callHostPlugin(conn, "vmops", "createISOVHD", "uuid", _host.localSRuuid);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d0b7399/scripts/vm/hypervisor/xenserver/xcposs/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/vmops b/scripts/vm/hypervisor/xenserver/xcposs/vmops
index 20725e4..17f9c43 100644
--- a/scripts/vm/hypervisor/xenserver/xcposs/vmops
+++ b/scripts/vm/hypervisor/xenserver/xcposs/vmops
@@ -55,7 +55,7 @@ def gethostvmstats(session, args):
def setup_iscsi(session, args):
uuid=args['uuid']
try:
- cmd = ["bash", "/usr/lib/xcp/bin/setup_iscsi.sh", uuid]
+ cmd = ["b", "/opt/cloud/bin/setup_iscsi.sh", uuid]
txt = util.pread2(cmd)
except:
txt = ''
@@ -66,7 +66,7 @@ def setup_iscsi(session, args):
def getgateway(session, args):
mgmt_ip = args['mgmtIP']
try:
- cmd = ["bash", "/usr/lib/xcp/bin/network_info.sh", "-g", mgmt_ip]
+ cmd = ["bash", "/opt/cloud/bin/network_info.sh", "-g", mgmt_ip]
txt = util.pread2(cmd)
except:
txt = ''
@@ -77,7 +77,7 @@ def getgateway(session, args):
def preparemigration(session, args):
uuid = args['uuid']
try:
- cmd = ["/usr/lib/xcp/bin/make_migratable.sh", uuid]
+ cmd = ["/opt/cloud/bin/make_migratable.sh", uuid]
util.pread2(cmd)
txt = 'success'
except:
@@ -89,7 +89,7 @@ def preparemigration(session, args):
@echo
def setIptables(session, args):
try:
- '''cmd = ["/bin/bash", "/usr/lib/xcp/bin/setupxenserver.sh"]
+ '''cmd = ["/bin/bash", "/opt/cloud/bin/setupxenserver.sh"]
txt = util.pread2(cmd)'''
txt = 'success'
except:
@@ -118,7 +118,7 @@ def pingdomr(session, args):
def kill_copy_process(session, args):
namelabel = args['namelabel']
try:
- cmd = ["bash", "/usr/lib/xcp/bin/kill_copy_process.sh", namelabel]
+ cmd = ["bash", "/opt/cloud/bin/kill_copy_process.sh", namelabel]
txt = util.pread2(cmd)
except:
txt = 'false'
@@ -133,7 +133,7 @@ def pingxenserver(session, args):
def ipassoc(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/ipassoc.sh")
+ cmd.insert(0, "/opt/cloud/bin/ipassoc.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -147,7 +147,7 @@ def ipassoc(session, args):
def pingtest(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/pingtest.sh")
+ cmd.insert(0, "/opt/cloud/bin/pingtest.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -162,7 +162,7 @@ def pingtest(session, args):
def savePassword(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/save_password_to_domr.sh")
+ cmd.insert(0, "/opt/cloud/bin/save_password_to_domr.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -177,7 +177,7 @@ def savePassword(session, args):
def saveDhcpEntry(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/dhcp_entry.sh")
+ cmd.insert(0, "/opt/cloud/bin/dhcp_entry.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -192,7 +192,7 @@ def saveDhcpEntry(session, args):
def lt2p_vpn(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/l2tp_vpn.sh")
+ cmd.insert(0, "/opt/cloud/bin/l2tp_vpn.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -239,7 +239,7 @@ def setLinkLocalIP(session, args):
def setFirewallRule(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/call_firewall.sh")
+ cmd.insert(0, "/opt/cloud/bin/call_firewall.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -254,7 +254,7 @@ def setFirewallRule(session, args):
def setLoadBalancerRule(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/call_loadbalancer.sh")
+ cmd.insert(0, "/opt/cloud/bin/call_loadbalancer.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -300,7 +300,7 @@ def deleteFile(session, args):
def networkUsage(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/networkUsage.sh")
+ cmd.insert(0, "/opt/cloud/bin/networkUsage.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -1350,7 +1350,7 @@ def network_rules(session, args):
def checkRouter(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/getRouterStatus.sh")
+ cmd.insert(0, "/opt/cloud/bin/getRouterStatus.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -1364,7 +1364,7 @@ def checkRouter(session, args):
def bumpUpPriority(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/bumpUpPriority.sh")
+ cmd.insert(0, "/opt/cloud/bin/bumpUpPriority.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -1446,7 +1446,7 @@ def createISOVHD(session, args):
def routerProxy(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/router_proxy.sh")
+ cmd.insert(0, "/opt/cloud/bin/router_proxy.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
@@ -1462,7 +1462,7 @@ def routerProxy(session, args):
def getDomRVersion(session, args):
sargs = args['args']
cmd = sargs.split(' ')
- cmd.insert(0, "/usr/lib/xcp/bin/getDomRVersion.sh")
+ cmd.insert(0, "/opt/cloud/bin/getDomRVersion.sh")
cmd.insert(0, "/bin/bash")
try:
txt = util.pread2(cmd)
[26/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
fix devcloud reboot issue: should not start heartbeat for devcloud
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1ff060b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1ff060b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1ff060b
Branch: refs/heads/4.4
Commit: f1ff060bb94c65431ae03bdc61ae36338af007ec
Parents: 11d11d8
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 16:14:33 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:41 2014 -0700
----------------------------------------------------------------------
.../xen/resource/CitrixResourceBase.java | 22 +++++++++++++++-----
.../hypervisor/xen/resource/XcpOssResource.java | 5 +++++
2 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1ff060b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 372d337..bc25a94 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4700,6 +4700,16 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
}
+ protected boolean launchHeartBeat(Connection conn) {
+ String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer
+ .toString(_heartbeatInterval));
+ if (result == null || !result.contains("> DONE <")) {
+ s_logger.warn("Unable to launch the heartbeat process on " + _host.ip);
+ return false;
+ }
+ return true;
+ }
+
protected SetupAnswer execute(SetupCommand cmd) {
Connection conn = getConnection();
setupServer(conn);
@@ -4720,9 +4730,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
- String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer.toString(_heartbeatInterval));
- if (result == null || !result.contains("> DONE <")) {
- s_logger.warn("Unable to launch the heartbeat process on " + _host.ip);
+
+ boolean r = launchHeartBeat(conn);
+ if (!r) {
return null;
}
cleanupTemplateSR(conn);
@@ -4737,8 +4747,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
} catch (Types.MapDuplicateKey e) {
s_logger.debug("multipath is already set");
}
- if (cmd.needSetup()) {
- result = callHostPlugin(conn, "vmops", "setup_iscsi", "uuid", _host.uuid);
+
+ if (cmd.needSetup() ) {
+ String result = callHostPlugin(conn, "vmops", "setup_iscsi", "uuid", _host.uuid);
+
if (!result.contains("> DONE <")) {
s_logger.warn("Unable to setup iscsi: " + result);
return new SetupAnswer(cmd, result);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1ff060b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
index 14b4bf3..ba706f2 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -74,6 +74,11 @@ public class XcpOssResource extends CitrixResourceBase {
cmd.setCaps(cmd.getCapabilities() + " , hvm");
}
+ @Override
+ protected boolean launchHeartBeat(Connection conn) {
+ return true;
+ }
+
protected StartupStorageCommand initializeLocalSR(Connection conn) {
SR extsr = getLocalEXTSR(conn);
if (extsr != null) {
[11/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5395: mark snapshot_store_ref as destroyed in case of backup snapshot failed
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/810e090a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/810e090a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/810e090a
Branch: refs/heads/4.4
Commit: 810e090ad497c2ac79d8083852203f097eae4989
Parents: fc3e413
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 15:37:51 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:37 2014 -0700
----------------------------------------------------------------------
.../storage/snapshot/SnapshotServiceImpl.java | 4 ++
.../xen/resource/XenServerStorageProcessor.java | 43 ++++++++++++--------
2 files changed, 29 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/810e090a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
index 8331012..684b5bd 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
@@ -302,6 +302,10 @@ public class SnapshotServiceImpl implements SnapshotService {
if (result.isFailed()) {
try {
destSnapshot.processEvent(Event.OperationFailed);
+ //if backup snapshot failed, mark srcSnapshot in snapshot_store_ref as failed also
+ srcSnapshot.processEvent(Event.DestroyRequested);
+ srcSnapshot.processEvent(Event.OperationSuccessed);
+
srcSnapshot.processEvent(Snapshot.Event.OperationFailed);
} catch (NoTransitionException e) {
s_logger.debug("Failed to update state: " + e.toString());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/810e090a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
index a762f86..086862b 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
@@ -30,19 +30,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import com.xensource.xenapi.Connection;
-import com.xensource.xenapi.Host;
-import com.xensource.xenapi.PBD;
-import com.xensource.xenapi.Pool;
-import com.xensource.xenapi.SR;
-import com.xensource.xenapi.Types;
-import com.xensource.xenapi.Types.BadServerResponse;
-import com.xensource.xenapi.Types.VmPowerState;
-import com.xensource.xenapi.Types.XenAPIException;
-import com.xensource.xenapi.VBD;
-import com.xensource.xenapi.VDI;
-import com.xensource.xenapi.VM;
-import com.xensource.xenapi.VMGuestMetrics;
+import javax.ws.rs.HEAD;
import org.apache.cloudstack.storage.command.AttachAnswer;
import org.apache.cloudstack.storage.command.AttachCommand;
@@ -87,6 +75,19 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.storage.encoding.DecodedDataObject;
import com.cloud.utils.storage.encoding.DecodedDataStore;
import com.cloud.utils.storage.encoding.Decoder;
+import com.xensource.xenapi.Connection;
+import com.xensource.xenapi.Host;
+import com.xensource.xenapi.PBD;
+import com.xensource.xenapi.Pool;
+import com.xensource.xenapi.SR;
+import com.xensource.xenapi.Types;
+import com.xensource.xenapi.Types.BadServerResponse;
+import com.xensource.xenapi.Types.VmPowerState;
+import com.xensource.xenapi.Types.XenAPIException;
+import com.xensource.xenapi.VBD;
+import com.xensource.xenapi.VDI;
+import com.xensource.xenapi.VM;
+import com.xensource.xenapi.VMGuestMetrics;
public class XenServerStorageProcessor implements StorageProcessor {
private static final Logger s_logger = Logger.getLogger(XenServerStorageProcessor.class);
@@ -475,11 +476,15 @@ public class XenServerStorageProcessor implements StorageProcessor {
Boolean isISCSI = IsISCSI(type);
String snapshotParentUUID = getVhdParent(conn, srUUID, snapshotUUID, isISCSI);
- String preSnapshotParentUUID = getVhdParent(conn, srUUID, preSnapshotUUID, isISCSI);
- if (snapshotParentUUID != null && snapshotParentUUID.equals(preSnapshotParentUUID)) {
- // this is empty snapshot, remove it
- snapshot.destroy(conn);
- snapshotUUID = preSnapshotUUID;
+ try {
+ String preSnapshotParentUUID = getVhdParent(conn, srUUID, preSnapshotUUID, isISCSI);
+ if( snapshotParentUUID != null && snapshotParentUUID.equals(preSnapshotParentUUID)) {
+ // this is empty snapshot, remove it
+ snapshot.destroy(conn);
+ snapshotUUID = preSnapshotUUID;
+ }
+ } catch(Exception e) {
+ s_logger.debug("Failed to get parent snapshot", e);
}
}
SnapshotObjectTO newSnapshot = new SnapshotObjectTO();
@@ -1368,6 +1373,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
}
}
} catch (Exception e) {
+ s_logger.debug("Failed to get parent snapshots, take full snapshot", e);
+ fullbackup = true;
}
}
[06/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
fix devcloud: get back whatever we have before
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
scripts/vm/hypervisor/xenserver/xcposs/patch
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f84fc12d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f84fc12d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f84fc12d
Branch: refs/heads/4.4
Commit: f84fc12d26c5d9489ce20df739e5d6010b309d7b
Parents: 9900ae7
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 15:28:39 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:36 2014 -0700
----------------------------------------------------------------------
.../hypervisor/xen/resource/XcpOssResource.java | 24 -
.../xcposs/copy_vhd_from_secondarystorage.sh | 188 +++
.../xcposs/copy_vhd_to_secondarystorage.sh | 130 ++
scripts/vm/hypervisor/xenserver/xcposs/patch | 10 +-
scripts/vm/hypervisor/xenserver/xcposs/vmops | 1493 ++++++++++++++++++
.../hypervisor/xenserver/xcposs/vmopsSnapshot | 601 +++++++
6 files changed, 2418 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f84fc12d/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
index e1b8050..d79232e 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -38,14 +38,9 @@ import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.NetworkUsageAnswer;
import com.cloud.agent.api.NetworkUsageCommand;
-import com.cloud.agent.api.StartAnswer;
-import com.cloud.agent.api.StartCommand;
import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.agent.api.StopAnswer;
import com.cloud.agent.api.StopCommand;
-import com.cloud.agent.api.to.NicTO;
-import com.cloud.agent.api.to.VirtualMachineTO;
-import com.cloud.network.Networks.TrafficType;
import com.cloud.resource.ServerResource;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@@ -141,25 +136,6 @@ public class XcpOssResource extends CitrixResourceBase {
}
@Override
- public StartAnswer execute(StartCommand cmd) {
- StartAnswer answer = super.execute(cmd);
-
- VirtualMachineTO vmSpec = cmd.getVirtualMachine();
- if (vmSpec.getType() == VirtualMachine.Type.ConsoleProxy) {
- Connection conn = getConnection();
- String publicIp = null;
- for (NicTO nic : vmSpec.getNics()) {
- if (nic.getType() == TrafficType.Guest) {
- publicIp = nic.getIp();
- }
- }
- callHostPlugin(conn, "vmops", "setDNATRule", "ip", publicIp, "port", "8443", "add", "true");
- }
-
- return answer;
- }
-
- @Override
public StopAnswer execute(StopCommand cmd) {
StopAnswer answer = super.execute(cmd);
String vmName = cmd.getVmName();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f84fc12d/scripts/vm/hypervisor/xenserver/xcposs/copy_vhd_from_secondarystorage.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/copy_vhd_from_secondarystorage.sh b/scripts/vm/hypervisor/xenserver/xcposs/copy_vhd_from_secondarystorage.sh
new file mode 100755
index 0000000..a4e977b
--- /dev/null
+++ b/scripts/vm/hypervisor/xenserver/xcposs/copy_vhd_from_secondarystorage.sh
@@ -0,0 +1,188 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#set -x
+
+usage() {
+ printf "Usage: %s [vhd file in secondary storage] [uuid of the source sr] [name label] \n" $(basename $0)
+}
+
+cleanup()
+{
+ if [ ! -z $localmp ]; then
+ umount -fl $localmp
+ if [ $? -eq 0 ]; then
+ rmdir $localmp
+ fi
+ fi
+}
+
+if [ -z $1 ]; then
+ usage
+ echo "2#no mountpoint"
+ exit 0
+else
+ mountpoint=${1%/*}
+ vhdfilename=${1##*/}
+fi
+
+if [ -z $2 ]; then
+ usage
+ echo "3#no uuid of the source sr"
+ exit 0
+else
+ sruuid=$2
+fi
+
+type=$(xe sr-param-get uuid=$sruuid param-name=type)
+if [ $? -ne 0 ]; then
+ echo "4#sr $sruuid doesn't exist"
+ exit 0
+fi
+
+if [ -z $3 ]; then
+ usage
+ echo "3#no namelabel"
+ exit 0
+else
+ namelabel=$3
+fi
+
+localmp=/var/run/cloud_mount/$(uuidgen -r)
+
+mkdir -p $localmp
+if [ $? -ne 0 ]; then
+ echo "5#can't make dir $localmp"
+ exit 0
+fi
+
+mount -o tcp,soft,ro,timeo=133,retrans=1 $mountpoint $localmp
+if [ $? -ne 0 ]; then
+ echo "6#can't mount $mountpoint to $localmp"
+ exit 0
+fi
+
+vhdfile=$localmp/$vhdfilename
+if [ ${vhdfile%.vhd} == ${vhdfile} ] ; then
+ vhdfile=$(ls $vhdfile/*.vhd)
+ if [ $? -ne 0 ]; then
+ echo "7#There is no vhd file under $mountpoint"
+ cleanup
+ exit 0
+ fi
+fi
+
+
+
+VHDUTIL="/usr/bin/vhd-util"
+
+copyvhd()
+{
+ local desvhd=$1
+ local srcvhd=$2
+ local vsize=$3
+ local type=$4
+ local parent=`$VHDUTIL query -p -n $srcvhd`
+ if [ $? -ne 0 ]; then
+ echo "30#failed to query $srcvhd"
+ cleanup
+ exit 0
+ fi
+ if [ "${parent##*vhd has}" = " no parent" ]; then
+ dd if=$srcvhd of=$desvhd bs=2M
+ if [ $? -ne 0 ]; then
+ echo "31#failed to dd $srcvhd to $desvhd"
+ cleanup
+ exit 0
+ fi
+ if [ $type != "nfs" -a $type != "ext" -a $type != "file" ]; then
+ dd if=$srcvhd of=$desvhd bs=512 seek=$(($(($vsize/512))-1)) count=1
+ $VHDUTIL modify -s $vsize -n $desvhd
+ if [ $? -ne 0 ]; then
+ echo "32#failed to set new vhd physical size for vdi vdi $uuid"
+ cleanup
+ exit 0
+ fi
+ fi
+ else
+ copyvhd $desvhd $parent $vsize $type
+ $VHDUTIL coalesce -p $desvhd -n $srcvhd
+ if [ $? -ne 0 ]; then
+ echo "32#failed to coalesce $desvhd to $srcvhd"
+ cleanup
+ exit 0
+ fi
+ fi
+}
+
+size=$($VHDUTIL query -v -n $vhdfile)
+uuid=$(xe vdi-create sr-uuid=$sruuid virtual-size=${size}MiB type=user name-label=$namelabel)
+if [ $? -ne 0 ]; then
+ echo "9#can not create vdi in sr $sruuid"
+ cleanup
+ exit 0
+fi
+
+
+if [ $type == "nfs" -o $type == "ext" ]; then
+ desvhd=/run/sr-mount/$sruuid/$uuid.vhd
+ copyvhd $desvhd $vhdfile 0 $type
+
+elif [ $type == "lvmoiscsi" -o $type == "lvm" -o $type == "lvmohba" ]; then
+ lvsize=$(xe vdi-param-get uuid=$uuid param-name=physical-utilisation)
+ if [ $? -ne 0 ]; then
+ echo "12#failed to get physical size of vdi $uuid"
+ cleanup
+ exit 0
+ fi
+ desvhd=/dev/VG_XenStorage-$sruuid/VHD-$uuid
+ lvchange -ay $desvhd
+ if [ $? -ne 0 ]; then
+ echo "10#lvm can not make VDI $uuid visible"
+ cleanup
+ exit 0
+ fi
+ copyvhd $desvhd $vhdfile $lvsize $type
+elif [ $type == "file" ]; then
+ pbd=`xe sr-param-list uuid=$sruuid |grep PBDs | awk '{print $3}'`
+ path=`xe pbd-param-list uuid=$pbd |grep device-config |awk '{print $4}'`
+ desvhd=$path/$uuid.vhd
+ copyvhd $desvhd $vhdfile 0 $type
+
+else
+ echo "15#doesn't support sr type $type"
+ cleanup
+ exit 0
+fi
+
+$VHDUTIL set -n $desvhd -f "hidden" -v "0" > /dev/null
+if [ $? -ne 0 ]; then
+ echo "21#failed to set hidden to 0 $desvhd"
+ cleanup
+ exit 0
+fi
+xe sr-scan uuid=$sruuid
+if [ $? -ne 0 ]; then
+ echo "14#failed to scan sr $sruuid"
+ cleanup
+ exit 0
+fi
+
+echo "0#$uuid"
+cleanup
+exit 0
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f84fc12d/scripts/vm/hypervisor/xenserver/xcposs/copy_vhd_to_secondarystorage.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/copy_vhd_to_secondarystorage.sh b/scripts/vm/hypervisor/xenserver/xcposs/copy_vhd_to_secondarystorage.sh
new file mode 100755
index 0000000..b315c07
--- /dev/null
+++ b/scripts/vm/hypervisor/xenserver/xcposs/copy_vhd_to_secondarystorage.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#set -x
+
+usage() {
+ printf "Usage: %s [mountpoint in secondary storage] [uuid of the source vdi] [uuid of the source sr]\n" $(basename $0)
+}
+
+cleanup()
+{
+ if [ ! -z $localmp ]; then
+ umount $localmp
+ if [ $? -eq 0 ]; then
+ rmdir $localmp
+ fi
+ fi
+}
+
+if [ -z $1 ]; then
+ usage
+ echo "1#no mountpoint"
+ exit 0
+else
+ mountpoint=$1
+fi
+
+if [ -z $2 ]; then
+ usage
+ echo "2#no uuid of the source sr"
+ exit 0
+else
+ vdiuuid=$2
+fi
+
+
+if [ -z $3 ]; then
+ usage
+ echo "3#no uuid of the source sr"
+ exit 0
+else
+ sruuid=$3
+fi
+
+type=$(xe sr-param-get uuid=$sruuid param-name=type)
+if [ $? -ne 0 ]; then
+ echo "4#sr $sruuid doesn't exist"
+ exit 0
+fi
+
+localmp=/var/run/cloud_mount/$(uuidgen -r)
+
+mkdir -p $localmp
+if [ $? -ne 0 ]; then
+ echo "5#can't make dir $localmp"
+ exit 0
+fi
+
+mount -o tcp,soft,timeo=133,retrans=1 $mountpoint $localmp
+if [ $? -ne 0 ]; then
+ echo "6#can't mount $mountpoint to $localmp"
+ exit 0
+fi
+
+vhdfile=$localmp/${vdiuuid}.vhd
+
+if [ $type == "nfs" -o $type == "ext" ]; then
+ dd if=/var/run/sr-mount/$sruuid/${vdiuuid}.vhd of=$vhdfile bs=2M
+ if [ $? -ne 0 ]; then
+ rm -f $vhdfile
+ echo "8#failed to copy /var/run/sr-mount/$sruuid/${vdiuuid}.vhd to secondarystorage"
+ cleanup
+ exit 0
+ fi
+elif [ $type == "lvmoiscsi" -o $type == "lvm" -o $type == "lvmohba" ]; then
+ lvchange -ay /dev/VG_XenStorage-$sruuid/VHD-$vdiuuid
+ if [ $? -ne 0 ]; then
+ echo "9#lvm can not make VDI $vdiuuid visible"
+ cleanup
+ exit 0
+ fi
+ size=$(vhd-util query -s -n /dev/VG_XenStorage-$sruuid/VHD-$vdiuuid)
+ if [ $? -ne 0 ]; then
+ echo "10#can not get physical size of /dev/VG_XenStorage-$sruuid/VHD-$vdiuuid"
+ cleanup
+ exit 0
+ fi
+#in 2M unit
+ size=$((size>>21))
+ size=$((size+1))
+ dd if=/dev/VG_XenStorage-$sruuid/VHD-$vdiuuid of=$vhdfile bs=2M count=$size
+ if [ $? -ne 0 ]; then
+ rm -f $vhdfile
+ echo "8#failed to copy /dev/VG_XenStorage-$sruuid/VHD-$vdiuuid to secondarystorage"
+ cleanup
+ exit 0
+ fi
+#in byte unit
+ size=$((size<<21))
+ vhd-util modify -s $size -n $vhdfile
+ if [ $? -ne 0 ]; then
+ rm -f $vhdfile
+ echo "11#failed to change $vhdfile physical size"
+ cleanup
+ exit 0
+ fi
+else
+ echo "15#doesn't support sr type $type"
+ cleanup
+ exit 0
+fi
+
+echo "0#$vdiuuid"
+cleanup
+exit 0
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f84fc12d/scripts/vm/hypervisor/xenserver/xcposs/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/patch b/scripts/vm/hypervisor/xenserver/xcposs/patch
index 561d7b6..ac04a3e 100644
--- a/scripts/vm/hypervisor/xenserver/xcposs/patch
+++ b/scripts/vm/hypervisor/xenserver/xcposs/patch
@@ -27,10 +27,12 @@
# If [source path] starts with '~', then it is path relative to management server home directory.
# If [source path] does not start with '/' or '~', then it is relative path to the location of the patch file.
NFSSR.py=/usr/lib/xcp/sm
-vmops=..,0755,/usr/lib/xcp/plugins
+vmops=,0755,/usr/lib/xcp/plugins
+cloudstack_pluginlib.py=..,0755,/usr/lib/xcp/plugins
+cloudstack_plugins.conf=..,0644,/etc/xcp
ovsgre=..,0755,/usr/lib/xcp/plugins
ovstunnel=..,0755,/usr/lib/xcp/plugins
-vmopsSnapshot=..,0755,/usr/lib/xcp/plugins
+vmopsSnapshot=,0755,/usr/lib/xcp/plugins
systemvm.iso=../../../../../vms,0644,/usr/share/xcp/packages/iso/
id_rsa.cloud=../../../systemvm,0600,/root/.ssh
network_info.sh=..,0755,/opt/cloud/bin
@@ -39,8 +41,8 @@ make_migratable.sh=..,0755,/opt/cloud/bin
setup_iscsi.sh=..,0755,/opt/cloud/bin
pingtest.sh=../../..,0755,/opt/cloud/bin
cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
-copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin
-copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin
+copy_vhd_to_secondarystorage.sh=,0755,/opt/cloud/bin
+copy_vhd_from_secondarystorage.sh=,0755,/opt/cloud/bin
setup_heartbeat_sr.sh=..,0755,/opt/cloud/bin
setup_heartbeat_file.sh=..,0755,/opt/cloud/bin
check_heartbeat.sh=..,0755,/opt/cloud/bin
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f84fc12d/scripts/vm/hypervisor/xenserver/xcposs/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/vmops b/scripts/vm/hypervisor/xenserver/xcposs/vmops
new file mode 100644
index 0000000..20725e4
--- /dev/null
+++ b/scripts/vm/hypervisor/xenserver/xcposs/vmops
@@ -0,0 +1,1493 @@
+#!/usr/bin/python
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Version @VERSION@
+#
+# A plugin for executing script needed by vmops cloud
+
+import os, sys, time
+import XenAPIPlugin
+sys.path.extend(["/usr/lib/xcp/sm/", "/usr/local/sbin/", "/sbin/"])
+import base64
+import hostvmstats
+import socket
+import stat
+import tempfile
+import util
+import subprocess
+import zlib
+from util import CommandException
+
+def echo(fn):
+ def wrapped(*v, **k):
+ name = fn.__name__
+ util.SMlog("#### VMOPS enter %s ####" % name )
+ res = fn(*v, **k)
+ util.SMlog("#### VMOPS exit %s ####" % name )
+ return res
+ return wrapped
+
+@echo
+def gethostvmstats(session, args):
+ collect_host_stats = args['collectHostStats']
+ consolidation_function = args['consolidationFunction']
+ interval = args['interval']
+ start_time = args['startTime']
+ result = hostvmstats.get_stats(session, collect_host_stats, consolidation_function, interval, start_time)
+ return result
+
+@echo
+def setup_iscsi(session, args):
+ uuid=args['uuid']
+ try:
+ cmd = ["bash", "/usr/lib/xcp/bin/setup_iscsi.sh", uuid]
+ txt = util.pread2(cmd)
+ except:
+ txt = ''
+ return '> DONE <'
+
+
+@echo
+def getgateway(session, args):
+ mgmt_ip = args['mgmtIP']
+ try:
+ cmd = ["bash", "/usr/lib/xcp/bin/network_info.sh", "-g", mgmt_ip]
+ txt = util.pread2(cmd)
+ except:
+ txt = ''
+
+ return txt
+
+@echo
+def preparemigration(session, args):
+ uuid = args['uuid']
+ try:
+ cmd = ["/usr/lib/xcp/bin/make_migratable.sh", uuid]
+ util.pread2(cmd)
+ txt = 'success'
+ except:
+ util.SMlog("Catch prepare migration exception" )
+ txt = ''
+
+ return txt
+
+@echo
+def setIptables(session, args):
+ try:
+ '''cmd = ["/bin/bash", "/usr/lib/xcp/bin/setupxenserver.sh"]
+ txt = util.pread2(cmd)'''
+ txt = 'success'
+ except:
+ util.SMlog(" setIptables execution failed " )
+ txt = ''
+
+ return txt
+
+@echo
+def pingdomr(session, args):
+ host = args['host']
+ port = args['port']
+ socket.setdefaulttimeout(3)
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ try:
+ s.connect((host,int(port)))
+ txt = 'success'
+ except:
+ txt = ''
+
+ s.close()
+
+ return txt
+
+@echo
+def kill_copy_process(session, args):
+ namelabel = args['namelabel']
+ try:
+ cmd = ["bash", "/usr/lib/xcp/bin/kill_copy_process.sh", namelabel]
+ txt = util.pread2(cmd)
+ except:
+ txt = 'false'
+ return txt
+
+@echo
+def pingxenserver(session, args):
+ txt = 'success'
+ return txt
+
+@echo
+def ipassoc(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/ipassoc.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ txt = 'success'
+ except:
+ util.SMlog(" ip associate failed " )
+ txt = ''
+
+ return txt
+
+def pingtest(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/pingtest.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ txt = 'success'
+ except:
+ util.SMlog(" pingtest failed " )
+ txt = ''
+
+ return txt
+
+@echo
+def savePassword(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/save_password_to_domr.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ txt = 'success'
+ except:
+ util.SMlog(" save password to domr failed " )
+ txt = ''
+
+ return txt
+
+@echo
+def saveDhcpEntry(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/dhcp_entry.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ txt = 'success'
+ except:
+ util.SMlog(" save dhcp entry failed " )
+ txt = ''
+
+ return txt
+
+@echo
+def lt2p_vpn(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/l2tp_vpn.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ txt = 'success'
+ except:
+ util.SMlog("l2tp vpn failed " )
+ txt = ''
+
+ return txt
+
+@echo
+def setLinkLocalIP(session, args):
+ brName = args['brName']
+ try:
+ cmd = ["ip", "route", "del", "169.254.0.0/16"]
+ txt = util.pread2(cmd)
+ except:
+ txt = ''
+ try:
+ cmd = ["ifconfig", brName, "169.254.0.1", "netmask", "255.255.0.0"]
+ txt = util.pread2(cmd)
+ except:
+
+ try:
+ cmd = ["brctl", "addbr", brName]
+ txt = util.pread2(cmd)
+ except:
+ pass
+
+ try:
+ cmd = ["ifconfig", brName, "169.254.0.1", "netmask", "255.255.0.0"]
+ txt = util.pread2(cmd)
+ except:
+ pass
+ try:
+ cmd = ["ip", "route", "add", "169.254.0.0/16", "dev", brName, "src", "169.254.0.1"]
+ txt = util.pread2(cmd)
+ except:
+ txt = ''
+ txt = 'success'
+ return txt
+
+@echo
+def setFirewallRule(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/call_firewall.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ txt = 'success'
+ except:
+ util.SMlog(" set firewall rule failed " )
+ txt = ''
+
+ return txt
+
+@echo
+def setLoadBalancerRule(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/call_loadbalancer.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ txt = 'success'
+ except:
+ util.SMlog(" set loadbalancer rule failed " )
+ txt = ''
+
+ return txt
+
+@echo
+def createFile(session, args):
+ file_path = args['filepath']
+ file_contents = args['filecontents']
+
+ try:
+ f = open(file_path, "w")
+ f.write(file_contents)
+ f.close()
+ txt = 'success'
+ except:
+ util.SMlog(" failed to create HA proxy cfg file ")
+ txt = ''
+
+ return txt
+
+@echo
+def deleteFile(session, args):
+ file_path = args["filepath"]
+
+ try:
+ if os.path.isfile(file_path):
+ os.remove(file_path)
+ txt = 'success'
+ except:
+ util.SMlog(" failed to remove HA proxy cfg file ")
+ txt = ''
+
+ return txt
+
+
+@echo
+def networkUsage(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/networkUsage.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ except:
+ util.SMlog(" network usage error " )
+ txt = ''
+
+ return txt
+
+def get_private_nic(session, args):
+ vms = session.xenapi.VM.get_all()
+ host_uuid = args.get('host_uuid')
+ host = session.xenapi.host.get_by_uuid(host_uuid)
+ piflist = session.xenapi.host.get_PIFs(host)
+ mgmtnic = 'eth0'
+ for pif in piflist:
+ pifrec = session.xenapi.PIF.get_record(pif)
+ network = pifrec.get('network')
+ nwrec = session.xenapi.network.get_record(network)
+ if nwrec.get('name_label') == 'cloud-guest':
+ return pifrec.get('device')
+ if pifrec.get('management'):
+ mgmtnic = pifrec.get('device')
+
+ return mgmtnic
+
+def chain_name(vm_name):
+ if vm_name.startswith('i-') or vm_name.startswith('r-'):
+ if vm_name.endswith('untagged'):
+ return '-'.join(vm_name.split('-')[:-1])
+ return vm_name
+
+def chain_name_def(vm_name):
+ if vm_name.startswith('i-'):
+ if vm_name.endswith('untagged'):
+ return '-'.join(vm_name.split('-')[:-2]) + "-def"
+ return '-'.join(vm_name.split('-')[:-1]) + "-def"
+ return vm_name
+
+def egress_chain_name(vm_name):
+ return chain_name(vm_name) + "-eg"
+
+@echo
+def can_bridge_firewall(session, args):
+ try:
+ util.pread2(['ebtables', '-V'])
+ util.pread2(['ipset', '-V'])
+ except:
+ return 'false'
+
+ host_uuid = args.get('host_uuid')
+ try:
+ util.pread2(['iptables', '-N', 'BRIDGE-FIREWALL'])
+ util.pread2(['iptables', '-I', 'BRIDGE-FIREWALL', '-m', 'state', '--state', 'RELATED,ESTABLISHED', '-j', 'ACCEPT'])
+ util.pread2(['iptables', '-A', 'BRIDGE-FIREWALL', '-m', 'physdev', '--physdev-is-bridged', '-p', 'udp', '--dport', '67', '--sport', '68', '-j', 'ACCEPT'])
+ util.pread2(['iptables', '-A', 'BRIDGE-FIREWALL', '-m', 'physdev', '--physdev-is-bridged', '-p', 'udp', '--dport', '68', '--sport', '67', '-j', 'ACCEPT'])
+ util.pread2(['iptables', '-D', 'FORWARD', '-j', 'RH-Firewall-1-INPUT'])
+ except:
+ util.SMlog('Chain BRIDGE-FIREWALL already exists')
+ privnic = get_private_nic(session, args)
+ result = 'true'
+ try:
+ util.pread2(['/bin/bash', '-c', 'iptables -n -L FORWARD | grep BRIDGE-FIREWALL'])
+ except:
+ try:
+ util.pread2(['iptables', '-I', 'FORWARD', '-m', 'physdev', '--physdev-is-bridged', '-j', 'BRIDGE-FIREWALL'])
+ util.pread2(['iptables', '-A', 'FORWARD', '-m', 'physdev', '--physdev-is-bridged', '--physdev-out', privnic, '-j', 'ACCEPT'])
+ util.pread2(['iptables', '-A', 'FORWARD', '-j', 'DROP'])
+ except:
+ return 'false'
+ default_ebtables_rules()
+ allow_egress_traffic(session)
+ if not os.path.exists('/var/run/cloud'):
+ os.makedirs('/var/run/cloud')
+ if not os.path.exists('/var/cache/cloud'):
+ os.makedirs('/var/cache/cloud')
+ #get_ipset_keyword()
+
+ cleanup_rules_for_dead_vms(session)
+ cleanup_rules(session, args)
+
+ return result
+
+@echo
+def default_ebtables_rules():
+ try:
+ util.pread2(['ebtables', '-N', 'DEFAULT_EBTABLES'])
+ util.pread2(['ebtables', '-A', 'FORWARD', '-j' 'DEFAULT_EBTABLES'])
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', 'IPv4', '--ip-dst', '255.255.255.255', '--ip-proto', 'udp', '--ip-dport', '67', '-j', 'ACCEPT'])
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', 'ARP', '--arp-op', 'Request', '-j', 'ACCEPT'])
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', 'ARP', '--arp-op', 'Reply', '-j', 'ACCEPT'])
+ # deny mac broadcast and multicast
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', 'IPv4', '-d', 'Broadcast', '-j', 'DROP'])
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', 'IPv4', '-d', 'Multicast', '-j', 'DROP'])
+ # deny ip broadcast and multicast
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', 'IPv4', '--ip-dst', '255.255.255.255', '-j', 'DROP'])
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', 'IPv4', '--ip-dst', '224.0.0.0/4', '-j', 'DROP'])
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', 'IPv4', '-j', 'RETURN'])
+ # deny ipv6
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', 'IPv6', '-j', 'DROP'])
+ # deny vlan
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-p', '802_1Q', '-j', 'DROP'])
+ # deny all others (e.g., 802.1d, CDP)
+ util.pread2(['ebtables', '-A', 'DEFAULT_EBTABLES', '-j', 'DROP'])
+ except:
+ util.SMlog('Chain DEFAULT_EBTABLES already exists')
+
+
+@echo
+def allow_egress_traffic(session):
+ devs = []
+ for pif in session.xenapi.PIF.get_all():
+ pif_rec = session.xenapi.PIF.get_record(pif)
+ vlan = pif_rec.get('VLAN')
+ dev = pif_rec.get('device')
+ if vlan == '-1':
+ devs.append(dev)
+ else:
+ devs.append(dev + "." + vlan)
+ for d in devs:
+ try:
+ util.pread2(['/bin/bash', '-c', "iptables -n -L FORWARD | grep '%s '" % d])
+ except:
+ try:
+ util.pread2(['iptables', '-I', 'FORWARD', '2', '-m', 'physdev', '--physdev-is-bridged', '--physdev-out', d, '-j', 'ACCEPT'])
+ except:
+ util.SMlog("Failed to add FORWARD rule through to %s" % d)
+ return 'false'
+ return 'true'
+
+
+def ipset(ipsetname, proto, start, end, ips):
+ try:
+ util.pread2(['ipset', '-N', ipsetname, 'iptreemap'])
+ except:
+ util.SMlog("ipset chain already exists" + ipsetname)
+
+ result = True
+ ipsettmp = ''.join(''.join(ipsetname.split('-')).split('_')) + str(int(time.time()) % 1000)
+
+ try:
+ util.pread2(['ipset', '-N', ipsettmp, 'iptreemap'])
+ except:
+ util.SMlog("Failed to create temp ipset, reusing old name= " + ipsettmp)
+ try:
+ util.pread2(['ipset', '-F', ipsettmp])
+ except:
+ util.SMlog("Failed to clear old temp ipset name=" + ipsettmp)
+ return False
+
+ try:
+ for ip in ips:
+ try:
+ util.pread2(['ipset', '-A', ipsettmp, ip])
+ except CommandException, cex:
+ if cex.reason.rfind('already in set') == -1:
+ raise
+ except:
+ util.SMlog("Failed to program ipset " + ipsetname)
+ util.pread2(['ipset', '-F', ipsettmp])
+ util.pread2(['ipset', '-X', ipsettmp])
+ return False
+
+ try:
+ util.pread2(['ipset', '-W', ipsettmp, ipsetname])
+ except:
+ util.SMlog("Failed to swap ipset " + ipsetname)
+ result = False
+
+ try:
+ util.pread2(['ipset', '-F', ipsettmp])
+ util.pread2(['ipset', '-X', ipsettmp])
+ except:
+ # if the temporary name clashes next time we'll just reuse it
+ util.SMlog("Failed to delete temp ipset " + ipsettmp)
+
+ return result
+
+@echo
+def destroy_network_rules_for_vm(session, args):
+ vm_name = args.pop('vmName')
+ vmchain = chain_name(vm_name)
+ vmchain_egress = egress_chain_name(vm_name)
+ vmchain_default = chain_name_def(vm_name)
+
+ delete_rules_for_vm_in_bridge_firewall_chain(vm_name)
+ if vm_name.startswith('i-') or vm_name.startswith('r-') or vm_name.startswith('l-'):
+ try:
+ util.pread2(['iptables', '-F', vmchain_default])
+ util.pread2(['iptables', '-X', vmchain_default])
+ except:
+ util.SMlog("Ignoring failure to delete chain " + vmchain_default)
+
+ destroy_ebtables_rules(vmchain)
+
+ try:
+ util.pread2(['iptables', '-F', vmchain])
+ util.pread2(['iptables', '-X', vmchain])
+ except:
+ util.SMlog("Ignoring failure to delete ingress chain " + vmchain)
+
+
+ try:
+ util.pread2(['iptables', '-F', vmchain_egress])
+ util.pread2(['iptables', '-X', vmchain_egress])
+ except:
+ util.SMlog("Ignoring failure to delete egress chain " + vmchain_egress)
+
+ remove_rule_log_for_vm(vm_name)
+
+ if 1 in [ vm_name.startswith(c) for c in ['r-', 's-', 'v-', 'l-'] ]:
+ return 'true'
+
+ try:
+ setscmd = "ipset --save | grep " + vmchain + " | grep '^-N' | awk '{print $2}'"
+ setsforvm = util.pread2(['/bin/bash', '-c', setscmd]).split('\n')
+ for set in setsforvm:
+ if set != '':
+ util.pread2(['ipset', '-F', set])
+ util.pread2(['ipset', '-X', set])
+ except:
+ util.SMlog("Failed to destroy ipsets for %" % vm_name)
+
+
+ return 'true'
+
+@echo
+def destroy_ebtables_rules(vm_chain):
+
+ delcmd = "ebtables-save | grep " + vm_chain + " | sed 's/-A/-D/'"
+ delcmds = util.pread2(['/bin/bash', '-c', delcmd]).split('\n')
+ delcmds.pop()
+ for cmd in delcmds:
+ try:
+ dc = cmd.split(' ')
+ dc.insert(0, 'ebtables')
+ util.pread2(dc)
+ except:
+ util.SMlog("Ignoring failure to delete ebtables rules for vm " + vm_chain)
+ try:
+ util.pread2(['ebtables', '-F', vm_chain])
+ util.pread2(['ebtables', '-X', vm_chain])
+ except:
+ util.SMlog("Ignoring failure to delete ebtables chain for vm " + vm_chain)
+
+@echo
+def destroy_arptables_rules(vm_chain):
+ delcmd = "arptables -vL FORWARD | grep " + vm_chain + " | sed 's/-i any//' | sed 's/-o any//' | awk '{print $1,$2,$3,$4}' "
+ delcmds = util.pread2(['/bin/bash', '-c', delcmd]).split('\n')
+ delcmds.pop()
+ for cmd in delcmds:
+ try:
+ dc = cmd.split(' ')
+ dc.insert(0, 'arptables')
+ dc.insert(1, '-D')
+ dc.insert(2, 'FORWARD')
+ util.pread2(dc)
+ except:
+ util.SMlog("Ignoring failure to delete arptables rules for vm " + vm_chain)
+
+ try:
+ util.pread2(['arptables', '-F', vm_chain])
+ util.pread2(['arptables', '-X', vm_chain])
+ except:
+ util.SMlog("Ignoring failure to delete arptables chain for vm " + vm_chain)
+
+@echo
+def default_ebtables_antispoof_rules(vm_chain, vifs, vm_ip, vm_mac):
+ if vm_mac == 'ff:ff:ff:ff:ff:ff':
+ util.SMlog("Ignoring since mac address is not valid")
+ return 'true'
+
+ try:
+ util.pread2(['ebtables', '-N', vm_chain])
+ except:
+ try:
+ util.pread2(['ebtables', '-F', vm_chain])
+ except:
+ util.SMlog("Failed to create ebtables antispoof chain, skipping")
+ return 'true'
+
+ # note all rules for packets into the bridge (-i) precede all output rules (-o)
+ # always start after the first rule in the FORWARD chain that jumps to DEFAULT_EBTABLES chain
+ try:
+ for vif in vifs:
+ util.pread2(['ebtables', '-I', 'FORWARD', '2', '-i', vif, '-j', vm_chain])
+ util.pread2(['ebtables', '-A', 'FORWARD', '-o', vif, '-j', vm_chain])
+ except:
+ util.SMlog("Failed to program default ebtables FORWARD rules for %s" % vm_chain)
+ return 'false'
+
+ try:
+ for vif in vifs:
+ # only allow source mac that belongs to the vm
+ util.pread2(['ebtables', '-A', vm_chain, '-i', vif, '-s', '!', vm_mac, '-j', 'DROP'])
+ # do not allow fake dhcp responses
+ util.pread2(['ebtables', '-A', vm_chain, '-i', vif, '-p', 'IPv4', '--ip-proto', 'udp', '--ip-dport', '68', '-j', 'DROP'])
+ # do not allow snooping of dhcp requests
+ util.pread2(['ebtables', '-A', vm_chain, '-o', vif, '-p', 'IPv4', '--ip-proto', 'udp', '--ip-dport', '67', '-j', 'DROP'])
+ except:
+ util.SMlog("Failed to program default ebtables antispoof rules for %s" % vm_chain)
+ return 'false'
+
+ return 'true'
+
+@echo
+def default_arp_antispoof(vm_chain, vifs, vm_ip, vm_mac):
+ if vm_mac == 'ff:ff:ff:ff:ff:ff':
+ util.SMlog("Ignoring since mac address is not valid")
+ return 'true'
+
+ try:
+ util.pread2(['arptables', '-N', vm_chain])
+ except:
+ try:
+ util.pread2(['arptables', '-F', vm_chain])
+ except:
+ util.SMlog("Failed to create arptables rule, skipping")
+ return 'true'
+
+ # note all rules for packets into the bridge (-i) precede all output rules (-o)
+ try:
+ for vif in vifs:
+ util.pread2(['arptables', '-I', 'FORWARD', '-i', vif, '-j', vm_chain])
+ util.pread2(['arptables', '-A', 'FORWARD', '-o', vif, '-j', vm_chain])
+ except:
+ util.SMlog("Failed to program default arptables rules in FORWARD chain vm=" + vm_chain)
+ return 'false'
+
+ try:
+ for vif in vifs:
+ #accept arp replies into the bridge as long as the source mac and ips match the vm
+ util.pread2(['arptables', '-A', vm_chain, '-i', vif, '--opcode', 'Reply', '--source-mac', vm_mac, '--source-ip', vm_ip, '-j', 'ACCEPT'])
+ #accept any arp requests from this vm. In the future this can be restricted to deny attacks on hosts
+ #also important to restrict source ip and src mac in these requests as they can be used to update arp tables on destination
+ util.pread2(['arptables', '-A', vm_chain, '-i', vif, '--opcode', 'Request', '--source-mac', vm_mac, '--source-ip', vm_ip, '-j', 'RETURN'])
+ #accept any arp requests to this vm as long as the request is for this vm's ip
+ util.pread2(['arptables', '-A', vm_chain, '-o', vif, '--opcode', 'Request', '--destination-ip', vm_ip, '-j', 'ACCEPT'])
+ #accept any arp replies to this vm as long as the mac and ip matches
+ util.pread2(['arptables', '-A', vm_chain, '-o', vif, '--opcode', 'Reply', '--destination-mac', vm_mac, '--destination-ip', vm_ip, '-j', 'ACCEPT'])
+ util.pread2(['arptables', '-A', vm_chain, '-j', 'DROP'])
+
+ except:
+ util.SMlog("Failed to program default arptables rules")
+ return 'false'
+
+ return 'true'
+
+@echo
+def default_network_rules_systemvm(session, args):
+ vm_name = args.pop('vmName')
+ try:
+ vm = session.xenapi.VM.get_by_name_label(vm_name)
+ if len(vm) != 1:
+ return 'false'
+ vm_rec = session.xenapi.VM.get_record(vm[0])
+ vm_vifs = vm_rec.get('VIFs')
+ vifnums = [session.xenapi.VIF.get_record(vif).get('device') for vif in vm_vifs]
+ domid = vm_rec.get('domid')
+ except:
+ util.SMlog("### Failed to get domid or vif list for vm ##" + vm_name)
+ return 'false'
+
+ if domid == '-1':
+ util.SMlog("### Failed to get domid for vm (-1): " + vm_name)
+ return 'false'
+
+ vifs = ["vif" + domid + "." + v for v in vifnums]
+ #vm_name = '-'.join(vm_name.split('-')[:-1])
+ vmchain = chain_name(vm_name)
+
+
+ delete_rules_for_vm_in_bridge_firewall_chain(vm_name)
+
+ try:
+ util.pread2(['iptables', '-N', vmchain])
+ except:
+ util.pread2(['iptables', '-F', vmchain])
+
+ allow_egress_traffic(session)
+
+ for vif in vifs:
+ try:
+ util.pread2(['iptables', '-A', 'BRIDGE-FIREWALL', '-m', 'physdev', '--physdev-is-bridged', '--physdev-out', vif, '-j', vmchain])
+ util.pread2(['iptables', '-I', 'BRIDGE-FIREWALL', '4', '-m', 'physdev', '--physdev-is-bridged', '--physdev-in', vif, '-j', vmchain])
+ util.pread2(['iptables', '-I', vmchain, '-m', 'physdev', '--physdev-is-bridged', '--physdev-in', vif, '-j', 'RETURN'])
+ except:
+ util.SMlog("Failed to program default rules")
+ return 'false'
+
+
+ util.pread2(['iptables', '-A', vmchain, '-j', 'ACCEPT'])
+
+ if write_rule_log_for_vm(vm_name, '-1', '_ignore_', domid, '_initial_', '-1') == False:
+ util.SMlog("Failed to log default network rules for systemvm, ignoring")
+ return 'true'
+
+
+@echo
+def default_network_rules(session, args):
+ vm_name = args.pop('vmName')
+ vm_ip = args.pop('vmIP')
+ vm_id = args.pop('vmID')
+ vm_mac = args.pop('vmMAC')
+
+ try:
+ vm = session.xenapi.VM.get_by_name_label(vm_name)
+ if len(vm) != 1:
+ util.SMlog("### Failed to get record for vm " + vm_name)
+ return 'false'
+ vm_rec = session.xenapi.VM.get_record(vm[0])
+ domid = vm_rec.get('domid')
+ except:
+ util.SMlog("### Failed to get domid for vm " + vm_name)
+ return 'false'
+ if domid == '-1':
+ util.SMlog("### Failed to get domid for vm (-1): " + vm_name)
+ return 'false'
+
+ vif = "vif" + domid + ".0"
+ tap = "tap" + domid + ".0"
+ vifs = [vif]
+ try:
+ util.pread2(['ifconfig', tap])
+ vifs.append(tap)
+ except:
+ pass
+
+ delete_rules_for_vm_in_bridge_firewall_chain(vm_name)
+
+
+ vmchain = chain_name(vm_name)
+ vmchain_egress = egress_chain_name(vm_name)
+ vmchain_default = chain_name_def(vm_name)
+
+ destroy_ebtables_rules(vmchain)
+
+
+ try:
+ util.pread2(['iptables', '-N', vmchain])
+ except:
+ util.pread2(['iptables', '-F', vmchain])
+
+ try:
+ util.pread2(['iptables', '-N', vmchain_egress])
+ except:
+ util.pread2(['iptables', '-F', vmchain_egress])
+
+ try:
+ util.pread2(['iptables', '-N', vmchain_default])
+ except:
+ util.pread2(['iptables', '-F', vmchain_default])
+
+ try:
+ for v in vifs:
+ util.pread2(['iptables', '-A', 'BRIDGE-FIREWALL', '-m', 'physdev', '--physdev-is-bridged', '--physdev-out', v, '-j', vmchain_default])
+ util.pread2(['iptables', '-I', 'BRIDGE-FIREWALL', '2', '-m', 'physdev', '--physdev-is-bridged', '--physdev-in', v, '-j', vmchain_default])
+ util.pread2(['iptables', '-A', vmchain_default, '-m', 'state', '--state', 'RELATED,ESTABLISHED', '-j', 'ACCEPT'])
+ #allow dhcp
+ for v in vifs:
+ util.pread2(['iptables', '-A', vmchain_default, '-m', 'physdev', '--physdev-is-bridged', '--physdev-in', v, '-p', 'udp', '--dport', '67', '--sport', '68', '-j', 'ACCEPT'])
+ util.pread2(['iptables', '-A', vmchain_default, '-m', 'physdev', '--physdev-is-bridged', '--physdev-out', v, '-p', 'udp', '--dport', '68', '--sport', '67', '-j', 'ACCEPT'])
+
+ #don't let vm spoof its ip address
+ for v in vifs:
+ util.pread2(['iptables', '-A', vmchain_default, '-m', 'physdev', '--physdev-is-bridged', '--physdev-in', v, '--source', vm_ip,'-p', 'udp', '--dport', '53', '-j', 'RETURN'])
+ util.pread2(['iptables', '-A', vmchain_default, '-m', 'physdev', '--physdev-is-bridged', '--physdev-in', v, '--source', '!', vm_ip, '-j', 'DROP'])
+ util.pread2(['iptables', '-A', vmchain_default, '-m', 'physdev', '--physdev-is-bridged', '--physdev-out', v, '--destination', '!', vm_ip, '-j', 'DROP'])
+ util.pread2(['iptables', '-A', vmchain_default, '-m', 'physdev', '--physdev-is-bridged', '--physdev-in', v, '--source', vm_ip, '-j', vmchain_egress])
+
+ for v in vifs:
+ util.pread2(['iptables', '-A', vmchain_default, '-m', 'physdev', '--physdev-is-bridged', '--physdev-out', v, '-j', vmchain])
+ except:
+ util.SMlog("Failed to program default rules for vm " + vm_name)
+ return 'false'
+
+ default_arp_antispoof(vmchain, vifs, vm_ip, vm_mac)
+ default_ebtables_antispoof_rules(vmchain, vifs, vm_ip, vm_mac)
+
+ if write_rule_log_for_vm(vm_name, vm_id, vm_ip, domid, '_initial_', '-1', vm_mac) == False:
+ util.SMlog("Failed to log default network rules, ignoring")
+
+ util.SMlog("Programmed default rules for vm " + vm_name)
+ return 'true'
+
+@echo
+def check_domid_changed(session, vmName):
+ curr_domid = '-1'
+ try:
+ vm = session.xenapi.VM.get_by_name_label(vmName)
+ if len(vm) != 1:
+ util.SMlog("### Could not get record for vm ## " + vmName)
+ else:
+ vm_rec = session.xenapi.VM.get_record(vm[0])
+ curr_domid = vm_rec.get('domid')
+ except:
+ util.SMlog("### Failed to get domid for vm ## " + vmName)
+
+
+ logfilename = "/var/run/cloud/" + vmName +".log"
+ if not os.path.exists(logfilename):
+ return ['-1', curr_domid]
+
+ lines = (line.rstrip() for line in open(logfilename))
+
+ [_vmName,_vmID,_vmIP,old_domid,_signature,_seqno, _vmMac] = ['_', '-1', '_', '-1', '_', '-1', 'ff:ff:ff:ff:ff:ff']
+ for line in lines:
+ try:
+ [_vmName,_vmID,_vmIP,old_domid,_signature,_seqno,_vmMac] = line.split(',')
+ except ValueError,v:
+ [_vmName,_vmID,_vmIP,old_domid,_signature,_seqno] = line.split(',')
+ break
+
+ return [curr_domid, old_domid]
+
+@echo
+def delete_rules_for_vm_in_bridge_firewall_chain(vmName):
+ vm_name = vmName
+ vmchain = chain_name_def(vm_name)
+
+ delcmd = "iptables-save | grep '\-A BRIDGE-FIREWALL' | grep " + vmchain + " | sed 's/-A/-D/'"
+ delcmds = util.pread2(['/bin/bash', '-c', delcmd]).split('\n')
+ delcmds.pop()
+ for cmd in delcmds:
+ try:
+ dc = cmd.split(' ')
+ dc.insert(0, 'iptables')
+ dc.pop()
+ util.pread2(filter(None, dc))
+ except:
+ util.SMlog("Ignoring failure to delete rules for vm " + vmName)
+
+
+@echo
+def network_rules_for_rebooted_vm(session, vmName):
+ vm_name = vmName
+ [curr_domid, old_domid] = check_domid_changed(session, vm_name)
+
+ if curr_domid == old_domid:
+ return True
+
+ if old_domid == '-1':
+ return True
+
+ if curr_domid == '-1':
+ return True
+
+ util.SMlog("Found a rebooted VM -- reprogramming rules for " + vm_name)
+
+ delete_rules_for_vm_in_bridge_firewall_chain(vm_name)
+ if 1 in [ vm_name.startswith(c) for c in ['r-', 's-', 'v-', 'l-'] ]:
+ default_network_rules_systemvm(session, {"vmName":vm_name})
+ return True
+
+ vif = "vif" + curr_domid + ".0"
+ tap = "tap" + curr_domid + ".0"
+ vifs = [vif]
+ try:
+ util.pread2(['ifconfig', tap])
+ vifs.append(tap)
+ except:
+ pass
+ vmchain = chain_name(vm_name)
+ vmchain_default = chain_name_def(vm_name)
+
+ for v in vifs:
+ util.pread2(['iptables', '-A', 'BRIDGE-FIREWALL', '-m', 'physdev', '--physdev-is-bridged', '--physdev-out', v, '-j', vmchain_default])
+ util.pread2(['iptables', '-I', 'BRIDGE-FIREWALL', '2', '-m', 'physdev', '--physdev-is-bridged', '--physdev-in', v, '-j', vmchain_default])
+
+ #change antispoof rule in vmchain
+ try:
+ delcmd = "iptables-save | grep '\-A " + vmchain_default + "' | grep physdev-in | sed 's/-A/-D/'"
+ delcmd2 = "iptables-save | grep '\-A " + vmchain_default + "' | grep physdev-out | sed 's/-A/-D/'"
+ inscmd = "iptables-save | grep '\-A " + vmchain_default + "' | grep physdev-in | grep vif | sed -r 's/vif[0-9]+.0/" + vif + "/' "
+ inscmd2 = "iptables-save| grep '\-A " + vmchain_default + "' | grep physdev-in | grep tap | sed -r 's/tap[0-9]+.0/" + tap + "/' "
+ inscmd3 = "iptables-save | grep '\-A " + vmchain_default + "' | grep physdev-out | grep vif | sed -r 's/vif[0-9]+.0/" + vif + "/' "
+ inscmd4 = "iptables-save| grep '\-A " + vmchain_default + "' | grep physdev-out | grep tap | sed -r 's/tap[0-9]+.0/" + tap + "/' "
+
+ ipts = []
+ for cmd in [delcmd, delcmd2, inscmd, inscmd2, inscmd3, inscmd4]:
+ cmds = util.pread2(['/bin/bash', '-c', cmd]).split('\n')
+ cmds.pop()
+ for c in cmds:
+ ipt = c.split(' ')
+ ipt.insert(0, 'iptables')
+ ipt.pop()
+ ipts.append(ipt)
+
+ for ipt in ipts:
+ try:
+ util.pread2(filter(None,ipt))
+ except:
+ util.SMlog("Failed to rewrite antispoofing rules for vm " + vm_name)
+
+ util.pread2(['/bin/bash', '-c', 'iptables -D ' + vmchain_default + " -j " + vmchain])
+ util.pread2(['/bin/bash', '-c', 'iptables -A ' + vmchain_default + " -j " + vmchain])
+ except:
+ util.SMlog("No rules found for vm " + vm_name)
+
+ destroy_ebtables_rules(vmchain)
+ destroy_arptables_rules(vmchain)
+ [vm_ip, vm_mac] = get_vm_mac_ip_from_log(vmchain)
+ default_arp_antispoof(vmchain, vifs, vm_ip, vm_mac)
+ default_ebtables_antispoof_rules(vmchain, vifs, vm_ip, vm_mac)
+ rewrite_rule_log_for_vm(vm_name, curr_domid)
+ return True
+
+def rewrite_rule_log_for_vm(vm_name, new_domid):
+ logfilename = "/var/run/cloud/" + vm_name +".log"
+ if not os.path.exists(logfilename):
+ return
+ lines = (line.rstrip() for line in open(logfilename))
+
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno,_vmMac] = ['_', '-1', '_', '-1', '_', '-1','ff:ff:ff:ff:ff:ff']
+ for line in lines:
+ try:
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno,_vmMac] = line.split(',')
+ break
+ except ValueError,v:
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno] = line.split(',')
+
+ write_rule_log_for_vm(_vmName, _vmID, _vmIP, new_domid, _signature, '-1', _vmMac)
+
+def get_rule_log_for_vm(session, vmName):
+ vm_name = vmName;
+ logfilename = "/var/run/cloud/" + vm_name +".log"
+ if not os.path.exists(logfilename):
+ return ''
+
+ lines = (line.rstrip() for line in open(logfilename))
+
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno,_vmMac] = ['_', '-1', '_', '-1', '_', '-1', 'ff:ff:ff:ff:ff:ff']
+ for line in lines:
+ try:
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno,_vmMac] = line.split(',')
+ break
+ except ValueError,v:
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno] = line.split(',')
+
+ return ','.join([_vmName, _vmID, _vmIP, _domID, _signature, _seqno])
+
+@echo
+def get_vm_mac_ip_from_log(vm_name):
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno,_vmMac] = ['_', '-1', '0.0.0.0', '-1', '_', '-1','ff:ff:ff:ff:ff:ff']
+ logfilename = "/var/run/cloud/" + vm_name +".log"
+ if not os.path.exists(logfilename):
+ return ['_', '_']
+
+ lines = (line.rstrip() for line in open(logfilename))
+ for line in lines:
+ try:
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno,_vmMac] = line.split(',')
+ break
+ except ValueError,v:
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno] = line.split(',')
+
+ return [ _vmIP, _vmMac]
+
+@echo
+def get_rule_logs_for_vms(session, args):
+ host_uuid = args.pop('host_uuid')
+ try:
+ thishost = session.xenapi.host.get_by_uuid(host_uuid)
+ hostrec = session.xenapi.host.get_record(thishost)
+ vms = hostrec.get('resident_VMs')
+ except:
+ util.SMlog("Failed to get host from uuid " + host_uuid)
+ return ' '
+
+ result = []
+ try:
+ for name in [session.xenapi.VM.get_name_label(x) for x in vms]:
+ if 1 not in [ name.startswith(c) for c in ['r-', 's-', 'v-', 'i-', 'l-'] ]:
+ continue
+ network_rules_for_rebooted_vm(session, name)
+ if name.startswith('i-'):
+ log = get_rule_log_for_vm(session, name)
+ result.append(log)
+ except:
+ util.SMlog("Failed to get rule logs, better luck next time!")
+
+ return ";".join(result)
+
+@echo
+def cleanup_rules_for_dead_vms(session):
+ try:
+ vms = session.xenapi.VM.get_all()
+ cleaned = 0
+ for vm_name in [session.xenapi.VM.get_name_label(x) for x in vms]:
+ if 1 in [ vm_name.startswith(c) for c in ['r-', 'i-', 's-', 'v-', 'l-'] ]:
+ vm = session.xenapi.VM.get_by_name_label(vm_name)
+ if len(vm) != 1:
+ continue
+ vm_rec = session.xenapi.VM.get_record(vm[0])
+ state = vm_rec.get('power_state')
+ if state != 'Running' and state != 'Paused':
+ util.SMlog("vm " + vm_name + " is not running, cleaning up")
+ destroy_network_rules_for_vm(session, {'vmName':vm_name})
+ cleaned = cleaned+1
+
+ util.SMlog("Cleaned up rules for " + str(cleaned) + " vms")
+ except:
+ util.SMlog("Failed to cleanup rules for dead vms!")
+
+
+@echo
+def cleanup_rules(session, args):
+ instance = args.get('instance')
+ if not instance:
+ instance = 'VM'
+ resident_vms = []
+ try:
+ hostname = util.pread2(['/bin/bash', '-c', 'hostname']).split('\n')
+ if len(hostname) < 1:
+ raise Exception('Could not find hostname of this host')
+ thishost = session.xenapi.host.get_by_name_label(hostname[0])
+ if len(thishost) < 1:
+ raise Exception("Could not find host record from hostname %s of this host"%hostname[0])
+ hostrec = session.xenapi.host.get_record(thishost[0])
+ vms = hostrec.get('resident_VMs')
+ resident_vms = [session.xenapi.VM.get_name_label(x) for x in vms]
+ util.SMlog('cleanup_rules: found %s resident vms on this host %s' % (len(resident_vms)-1, hostname[0]))
+
+ chainscmd = "iptables-save | grep '^:' | awk '{print $1}' | cut -d':' -f2 | sed 's/-def/-%s/'| sed 's/-eg//' | sort|uniq" % instance
+ chains = util.pread2(['/bin/bash', '-c', chainscmd]).split('\n')
+ vmchains = [ch for ch in chains if 1 in [ ch.startswith(c) for c in ['r-', 'i-', 's-', 'v-', 'l-']]]
+ util.SMlog('cleanup_rules: found %s iptables chains for vms on this host %s' % (len(vmchains), hostname[0]))
+ cleaned = 0
+ cleanup = []
+ for chain in vmchains:
+ vm = session.xenapi.VM.get_by_name_label(chain)
+ if len(vm) != 1:
+ vm = session.xenapi.VM.get_by_name_label(chain + "-untagged")
+ if len(vm) != 1:
+ util.SMlog("chain " + chain + " does not correspond to a vm, cleaning up")
+ cleanup.append(chain)
+ continue
+ if chain not in resident_vms:
+ util.SMlog("vm " + chain + " is not running, cleaning up")
+ cleanup.append(chain)
+
+ for vm_name in cleanup:
+ destroy_network_rules_for_vm(session, {'vmName':vm_name})
+
+ util.SMlog("Cleaned up rules for " + str(len(cleanup)) + " chains")
+ return str(len(cleanup))
+ except Exception, ex:
+ util.SMlog("Failed to cleanup rules, reason= " + str(ex))
+ return '-1';
+
+@echo
+def check_rule_log_for_vm(vmName, vmID, vmIP, domID, signature, seqno):
+ vm_name = vmName;
+ logfilename = "/var/run/cloud/" + vm_name +".log"
+ if not os.path.exists(logfilename):
+ util.SMlog("Failed to find logfile %s" %logfilename)
+ return [True, True, True]
+
+ lines = (line.rstrip() for line in open(logfilename))
+
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno,_vmMac] = ['_', '-1', '_', '-1', '_', '-1', 'ff:ff:ff:ff:ff:ff']
+ try:
+ for line in lines:
+ try:
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno, _vmMac] = line.split(',')
+ except ValueError,v:
+ [_vmName,_vmID,_vmIP,_domID,_signature,_seqno] = line.split(',')
+ break
+ except:
+ util.SMlog("Failed to parse log file for vm " + vmName)
+ remove_rule_log_for_vm(vmName)
+ return [True, True, True]
+
+ reprogramDefault = False
+ if (domID != _domID) or (vmID != _vmID) or (vmIP != _vmIP):
+ util.SMlog("Change in default info set of vm %s" % vmName)
+ return [True, True, True]
+ else:
+ util.SMlog("No change in default info set of vm %s" % vmName)
+
+ reprogramChain = False
+ rewriteLog = True
+ if (int(seqno) > int(_seqno)):
+ if (_signature != signature):
+ reprogramChain = True
+ util.SMlog("Seqno increased from %s to %s: reprogamming "\
+ "ingress rules for vm %s" % (_seqno, seqno, vmName))
+ else:
+ util.SMlog("Seqno increased from %s to %s: but no change "\
+ "in signature for vm: skip programming ingress "\
+ "rules %s" % (_seqno, seqno, vmName))
+ elif (int(seqno) < int(_seqno)):
+ util.SMlog("Seqno decreased from %s to %s: ignoring these "\
+ "ingress rules for vm %s" % (_seqno, seqno, vmName))
+ rewriteLog = False
+ elif (signature != _signature):
+ util.SMlog("Seqno %s stayed the same but signature changed from "\
+ "%s to %s for vm %s" % (seqno, _signature, signature, vmName))
+ rewriteLog = True
+ reprogramChain = True
+ else:
+ util.SMlog("Seqno and signature stayed the same: %s : ignoring these "\
+ "ingress rules for vm %s" % (seqno, vmName))
+ rewriteLog = False
+
+ return [reprogramDefault, reprogramChain, rewriteLog]
+
+
+@echo
+def write_rule_log_for_vm(vmName, vmID, vmIP, domID, signature, seqno, vmMac='ff:ff:ff:ff:ff:ff'):
+ vm_name = vmName
+ logfilename = "/var/run/cloud/" + vm_name +".log"
+ util.SMlog("Writing log to " + logfilename)
+ logf = open(logfilename, 'w')
+ output = ','.join([vmName, vmID, vmIP, domID, signature, seqno, vmMac])
+ result = True
+ try:
+ logf.write(output)
+ logf.write('\n')
+ except:
+ util.SMlog("Failed to write to rule log file " + logfilename)
+ result = False
+
+ logf.close()
+
+ return result
+
+@echo
+def remove_rule_log_for_vm(vmName):
+ vm_name = vmName
+ logfilename = "/var/run/cloud/" + vm_name +".log"
+
+ result = True
+ try:
+ os.remove(logfilename)
+ except:
+ util.SMlog("Failed to delete rule log file " + logfilename)
+ result = False
+
+ return result
+
+@echo
+def inflate_rules (zipped):
+ return zlib.decompress(base64.b64decode(zipped))
+
+@echo
+def cache_ipset_keyword():
+ tmpname = 'ipsetqzvxtmp'
+ try:
+ util.pread2(['/bin/bash', '-c', 'ipset -N ' + tmpname + ' iptreemap'])
+ except:
+ util.pread2(['/bin/bash', '-c', 'ipset -F ' + tmpname])
+
+ try:
+ util.pread2(['/bin/bash', '-c', 'iptables -A INPUT -m set --set ' + tmpname + ' src' + ' -j ACCEPT'])
+ util.pread2(['/bin/bash', '-c', 'iptables -D INPUT -m set --set ' + tmpname + ' src' + ' -j ACCEPT'])
+ keyword = 'set'
+ except:
+ keyword = 'match-set'
+
+ try:
+ util.pread2(['/bin/bash', '-c', 'ipset -X ' + tmpname])
+ except:
+ pass
+
+ cachefile = "/var/cache/cloud/ipset.keyword"
+ util.SMlog("Writing ipset keyword to " + cachefile)
+ cachef = open(cachefile, 'w')
+ try:
+ cachef.write(keyword)
+ cachef.write('\n')
+ except:
+ util.SMlog("Failed to write to cache file " + cachef)
+
+ cachef.close()
+ return keyword
+
+@echo
+def get_ipset_keyword():
+ cachefile = "/var/cache/cloud/ipset.keyword"
+ keyword = 'match-set'
+
+ if not os.path.exists(cachefile):
+ util.SMlog("Failed to find ipset keyword cachefile %s" %cachefile)
+ keyword = cache_ipset_keyword()
+ else:
+ lines = (line.rstrip() for line in open(cachefile))
+ for line in lines:
+ keyword = line
+ break
+
+ return keyword
+
+@echo
+def network_rules(session, args):
+ try:
+ vm_name = args.get('vmName')
+ vm_ip = args.get('vmIP')
+ vm_id = args.get('vmID')
+ vm_mac = args.get('vmMAC')
+ signature = args.pop('signature')
+ seqno = args.pop('seqno')
+ deflated = 'false'
+ if 'deflated' in args:
+ deflated = args.pop('deflated')
+
+ try:
+ vm = session.xenapi.VM.get_by_name_label(vm_name)
+ if len(vm) != 1:
+ util.SMlog("### Could not get record for vm ## " + vm_name)
+ return 'false'
+ vm_rec = session.xenapi.VM.get_record(vm[0])
+ domid = vm_rec.get('domid')
+ except:
+ util.SMlog("### Failed to get domid for vm ## " + vm_name)
+ return 'false'
+ if domid == '-1':
+ util.SMlog("### Failed to get domid for vm (-1): " + vm_name)
+ return 'false'
+
+ vif = "vif" + domid + ".0"
+ tap = "tap" + domid + ".0"
+ vifs = [vif]
+ try:
+ util.pread2(['ifconfig', tap])
+ vifs.append(tap)
+ except:
+ pass
+
+
+ reason = 'seqno_change_or_sig_change'
+ [reprogramDefault, reprogramChain, rewriteLog] = \
+ check_rule_log_for_vm (vm_name, vm_id, vm_ip, domid, signature, seqno)
+
+ if not reprogramDefault and not reprogramChain:
+ util.SMlog("No changes detected between current state and received state")
+ reason = 'seqno_same_sig_same'
+ if rewriteLog:
+ reason = 'seqno_increased_sig_same'
+ write_rule_log_for_vm(vm_name, vm_id, vm_ip, domid, signature, seqno, vm_mac)
+ util.SMlog("Programming network rules for vm %s seqno=%s signature=%s guestIp=%s,"\
+ " do nothing, reason=%s" % (vm_name, seqno, signature, vm_ip, reason))
+ return 'true'
+
+ if not reprogramChain:
+ util.SMlog("###Not programming any ingress rules since no changes detected?")
+ return 'true'
+
+ if reprogramDefault:
+ util.SMlog("Change detected in vmId or vmIp or domId, resetting default rules")
+ default_network_rules(session, args)
+ reason = 'domid_change'
+
+ rules = args.pop('rules')
+ if deflated.lower() == 'true':
+ rules = inflate_rules (rules)
+ keyword = '--' + get_ipset_keyword()
+ lines = rules.split(' ')
+
+ util.SMlog("Programming network rules for vm %s seqno=%s numrules=%s signature=%s guestIp=%s,"\
+ " update iptables, reason=%s" % (vm_name, seqno, len(lines), signature, vm_ip, reason))
+
+ cmds = []
+ egressrules = 0
+ for line in lines:
+ tokens = line.split(':')
+ if len(tokens) != 5:
+ continue
+ type = tokens[0]
+ protocol = tokens[1]
+ start = tokens[2]
+ end = tokens[3]
+ cidrs = tokens.pop();
+ ips = cidrs.split(",")
+ ips.pop()
+ allow_any = False
+
+ if type == 'E':
+ vmchain = egress_chain_name(vm_name)
+ action = "RETURN"
+ direction = "dst"
+ egressrules = egressrules + 1
+ else:
+ vmchain = chain_name(vm_name)
+ action = "ACCEPT"
+ direction = "src"
+ if '0.0.0.0/0' in ips:
+ i = ips.index('0.0.0.0/0')
+ del ips[i]
+ allow_any = True
+ range = start + ":" + end
+ if ips:
+ ipsetname = vmchain + "_" + protocol + "_" + start + "_" + end
+ if start == "-1":
+ ipsetname = vmchain + "_" + protocol + "_any"
+
+ if ipset(ipsetname, protocol, start, end, ips) == False:
+ util.SMlog(" failed to create ipset for rule " + str(tokens))
+
+ if protocol == 'all':
+ iptables = ['iptables', '-I', vmchain, '-m', 'state', '--state', 'NEW', '-m', 'set', keyword, ipsetname, direction, '-j', action]
+ elif protocol != 'icmp':
+ iptables = ['iptables', '-I', vmchain, '-p', protocol, '-m', protocol, '--dport', range, '-m', 'state', '--state', 'NEW', '-m', 'set', keyword, ipsetname, direction, '-j', action]
+ else:
+ range = start + "/" + end
+ if start == "-1":
+ range = "any"
+ iptables = ['iptables', '-I', vmchain, '-p', 'icmp', '--icmp-type', range, '-m', 'set', keyword, ipsetname, direction, '-j', action]
+
+ cmds.append(iptables)
+ util.SMlog(iptables)
+
+ if allow_any and protocol != 'all':
+ if protocol != 'icmp':
+ iptables = ['iptables', '-I', vmchain, '-p', protocol, '-m', protocol, '--dport', range, '-m', 'state', '--state', 'NEW', '-j', action]
+ else:
+ range = start + "/" + end
+ if start == "-1":
+ range = "any"
+ iptables = ['iptables', '-I', vmchain, '-p', 'icmp', '--icmp-type', range, '-j', action]
+ cmds.append(iptables)
+ util.SMlog(iptables)
+
+ vmchain = chain_name(vm_name)
+ util.pread2(['iptables', '-F', vmchain])
+ egress_vmchain = egress_chain_name(vm_name)
+ util.pread2(['iptables', '-F', egress_vmchain])
+
+ for cmd in cmds:
+ util.pread2(cmd)
+
+ if egressrules == 0 :
+ util.pread2(['iptables', '-A', egress_vmchain, '-j', 'RETURN'])
+ else:
+ util.pread2(['iptables', '-A', egress_vmchain, '-j', 'DROP'])
+
+ util.pread2(['iptables', '-A', vmchain, '-j', 'DROP'])
+
+ if write_rule_log_for_vm(vm_name, vm_id, vm_ip, domid, signature, seqno, vm_mac) == False:
+ return 'false'
+
+ return 'true'
+ except:
+ util.SMlog("Failed to network rule !")
+
+@echo
+def checkRouter(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/getRouterStatus.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ except:
+ util.SMlog(" check router status fail! ")
+ txt = ''
+
+ return txt
+
+@echo
+def bumpUpPriority(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/bumpUpPriority.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ txt = 'success'
+ except:
+ util.SMlog("bump up priority fail! ")
+ txt = ''
+
+ return txt
+
+@echo
+def setDNATRule(session, args):
+ add = args["add"]
+ if add == "false":
+ util.pread2(["iptables", "-t", "nat", "-F"])
+ else:
+ ip = args["ip"]
+ port = args["port"]
+ util.pread2(["iptables", "-t", "nat", "-F"])
+ util.pread2(["iptables", "-t", "nat", "-A", "PREROUTING", "-i", "xenbr0", "-p", "tcp", "--dport", port, "-m", "state", "--state", "NEW", "-j", "DNAT", "--to-destination", ip +":443"])
+ return ""
+
+@echo
+def createISOVHD(session, args):
+ # Should not create the VDI if the systemvm.iso does not exist
+ if not os.path.exists('/usr/share/xcp/packages/iso/systemvm.iso'):
+ return "Failed"
+ #hack for XCP on ubuntu 12.04, as can't attach iso to a vm
+ vdis = session.xenapi.VDI.get_by_name_label("systemvm-vdi");
+ util.SMlog(vdis)
+ if len(vdis) > 0:
+ vdi_record = session.xenapi.VDI.get_record(vdis[0])
+ vdi_uuid = vdi_record['uuid']
+ return vdi_uuid
+ localsrUUid = args['uuid'];
+ sr = session.xenapi.SR.get_by_uuid(localsrUUid)
+ data = {'name_label': "systemvm-vdi",
+ 'SR': sr,
+ 'virtual_size': '50000000',
+ 'type': 'user',
+ 'sharable':False,
+ 'read_only':False,
+ 'other_config':{},
+ }
+ vdi = session.xenapi.VDI.create(data);
+ vdi_record = session.xenapi.VDI.get_record(vdi)
+
+ vdi_uuid = vdi_record['uuid']
+
+ vms = session.xenapi.VM.get_all()
+ ctrldom = None
+ for vm in vms:
+ dom0 = session.xenapi.VM.get_is_control_domain(vm)
+ if dom0 is False:
+ continue
+ else:
+ ctrldom = vm
+
+ if ctrldom is None:
+ return "Failed"
+
+ vbds = session.xenapi.VM.get_VBDs(ctrldom)
+ if len(vbds) == 0:
+ vbd = session.xenapi.VBD.create({"VDI": vdi, "VM": ctrldom, "type":"Disk", "device": "xvda4", "bootable": False, "mode": "RW", "userdevice": "4", "empty":False,
+ "other_config":{}, "qos_algorithm_type":"", "qos_algorithm_params":{}})
+ else:
+ vbd = vbds[0]
+
+ vbdr = session.xenapi.VBD.get_record(vbd)
+ if session.xenapi.VBD.get_currently_attached(vbd) is False:
+ session.xenapi.VBD.plug(vbd)
+ vbdr = session.xenapi.VBD.get_record(vbd)
+ util.pread2(["dd", "if=/usr/share/xcp/packages/iso/systemvm.iso", "of=" + "/dev/" + vbdr["device"]])
+ session.xenapi.VBD.unplug(vbd)
+ session.xenapi.VBD.destroy(vbd)
+ return vdi_uuid
+
+@echo
+def routerProxy(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/router_proxy.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ if txt is None or len(txt) == 0 :
+ txt = 'success'
+ except:
+ util.SMlog("routerProxy command " + sargs + " failed " )
+ txt = ''
+
+ return txt
+
+@echo
+def getDomRVersion(session, args):
+ sargs = args['args']
+ cmd = sargs.split(' ')
+ cmd.insert(0, "/usr/lib/xcp/bin/getDomRVersion.sh")
+ cmd.insert(0, "/bin/bash")
+ try:
+ txt = util.pread2(cmd)
+ except:
+ util.SMlog(" get domR version fail! ")
+ txt = ''
+
+ return txt
+
+if __name__ == "__main__":
+ XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, "gethostvmstats": gethostvmstats,
+ "getgateway": getgateway, "preparemigration": preparemigration,
+ "setIptables": setIptables, "pingdomr": pingdomr, "pingxenserver": pingxenserver,
+ "ipassoc": ipassoc, "savePassword": savePassword,
+ "saveDhcpEntry": saveDhcpEntry, "setFirewallRule": setFirewallRule,
+ "setLoadBalancerRule": setLoadBalancerRule, "createFile": createFile, "deleteFile": deleteFile,
+ "networkUsage": networkUsage, "network_rules":network_rules,
+ "can_bridge_firewall":can_bridge_firewall, "default_network_rules":default_network_rules,
+ "destroy_network_rules_for_vm":destroy_network_rules_for_vm,
+ "default_network_rules_systemvm":default_network_rules_systemvm,
+ "get_rule_logs_for_vms":get_rule_logs_for_vms,
+ "setLinkLocalIP":setLinkLocalIP, "lt2p_vpn":lt2p_vpn,
+ "cleanup_rules":cleanup_rules, "checkRouter":checkRouter,
+ "bumpUpPriority":bumpUpPriority, "getDomRVersion":getDomRVersion,
+ "kill_copy_process":kill_copy_process,
+ "createISOVHD":createISOVHD,
+ "routerProxy":routerProxy,
+ "setDNATRule":setDNATRule})
[15/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage
Conflicts:
api/src/com/cloud/storage/StoragePool.java
server/src/com/cloud/vm/UserVmManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24d1f161
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24d1f161
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24d1f161
Branch: refs/heads/4.4
Commit: 24d1f161b8da4cd3dc24693c12eae3f150f79291
Parents: a3736f2
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 15:53:27 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:38 2014 -0700
----------------------------------------------------------------------
api/src/com/cloud/storage/StoragePool.java | 14 +++++++++-----
server/src/com/cloud/vm/UserVmManagerImpl.java | 8 +++++++-
2 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24d1f161/api/src/com/cloud/storage/StoragePool.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/StoragePool.java b/api/src/com/cloud/storage/StoragePool.java
index 6ede960..7d54162 100644
--- a/api/src/com/cloud/storage/StoragePool.java
+++ b/api/src/com/cloud/storage/StoragePool.java
@@ -18,6 +18,7 @@ package com.cloud.storage;
import java.util.Date;
+import com.cloud.hypervisor.Hypervisor;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
@@ -98,10 +99,13 @@ public interface StoragePool extends Identity, InternalIdentity {
Long getPodId();
- /**
- * @return
- */
- String getStorageProviderName();
+ /**
+ * @return
+ */
+ String getStorageProviderName();
+
+ boolean isInMaintenance();
+
+ Hypervisor.HypervisorType getHypervisor();
- boolean isInMaintenance();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24d1f161/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 62f4a53..28f23e0 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -35,6 +35,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
@@ -3720,7 +3721,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
throw new InvalidParameterValueException("Data disks attached to the vm, can not migrate. Need to dettach data disks at first");
}
- HypervisorType destHypervisorType = _clusterDao.findById(destPool.getClusterId()).getHypervisorType();
+ HypervisorType destHypervisorType = destPool.getHypervisor();
+ if (destHypervisorType == null) {
+ destHypervisorType = _clusterDao.findById(
+ destPool.getClusterId()).getHypervisorType();
+ }
+
if (vm.getHypervisorType() != destHypervisorType) {
throw new InvalidParameterValueException("hypervisor is not compatible: dest: " + destHypervisorType.toString() + ", vm: " + vm.getHypervisorType().toString());
}
[28/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/392dc817
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/392dc817
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/392dc817
Branch: refs/heads/4.4
Commit: 392dc817af46bb6f294bb7f6cf722b3909aff175
Parents: f1ff060
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 17:37:58 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:42 2014 -0700
----------------------------------------------------------------------
api/src/com/cloud/storage/StoragePool.java | 12 +-
.../agent/test/BackupSnapshotCommandTest.java | 10 +-
.../api/agent/test/CheckNetworkAnswerTest.java | 10 +-
.../api/agent/test/SnapshotCommandTest.java | 10 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 8 +-
.../hypervisor/xen/resource/XcpOssResource.java | 13 +-
.../xen/resource/XenServerStorageProcessor.java | 139 +++++++++----------
.../CloudStackPrimaryDataStoreDriverImpl.java | 30 ++--
.../com/cloud/api/query/QueryManagerImpl.java | 11 +-
9 files changed, 132 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392dc817/api/src/com/cloud/storage/StoragePool.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/StoragePool.java b/api/src/com/cloud/storage/StoragePool.java
index 7d54162..8e03c33 100644
--- a/api/src/com/cloud/storage/StoragePool.java
+++ b/api/src/com/cloud/storage/StoragePool.java
@@ -18,10 +18,10 @@ package com.cloud.storage;
import java.util.Date;
-import com.cloud.hypervisor.Hypervisor;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.Storage.StoragePoolType;
public interface StoragePool extends Identity, InternalIdentity {
@@ -99,13 +99,9 @@ public interface StoragePool extends Identity, InternalIdentity {
Long getPodId();
- /**
- * @return
- */
- String getStorageProviderName();
-
- boolean isInMaintenance();
+ String getStorageProviderName();
- Hypervisor.HypervisorType getHypervisor();
+ boolean isInMaintenance();
+ Hypervisor.HypervisorType getHypervisor();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392dc817/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
index eaa9b94..33361e8 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
@@ -28,6 +28,7 @@ import org.junit.Test;
import com.cloud.agent.api.BackupSnapshotCommand;
import com.cloud.agent.api.to.SwiftTO;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolStatus;
@@ -145,7 +146,14 @@ public class BackupSnapshotCommandTest {
public boolean isInMaintenance() {
// TODO Auto-generated method stub
return false;
- };
+ }
+
+ @Override
+ public Hypervisor.HypervisorType getHypervisor() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ ;
};
BackupSnapshotCommand bsc = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392dc817/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
index b0872bf..66feaec 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
@@ -32,6 +32,7 @@ import com.cloud.agent.api.CheckNetworkAnswer;
import com.cloud.agent.api.CheckNetworkCommand;
import com.cloud.agent.api.storage.ResizeVolumeCommand;
import com.cloud.agent.api.to.StorageFilerTO;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.Storage;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolStatus;
@@ -184,7 +185,14 @@ public class CheckNetworkAnswerTest {
public boolean isInMaintenance() {
// TODO Auto-generated method stub
return false;
- };
+ }
+
+ @Override
+ public Hypervisor.HypervisorType getHypervisor() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ ;
};
Long newSize = 4194304L;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392dc817/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
index 8339a98..114c885 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
@@ -28,6 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import com.cloud.agent.api.SnapshotCommand;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolStatus;
@@ -146,7 +147,14 @@ public class SnapshotCommandTest {
public boolean isInMaintenance() {
// TODO Auto-generated method stub
return false;
- };
+ }
+
+ @Override
+ public Hypervisor.HypervisorType getHypervisor() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ ;
};
SnapshotCommand ssc = new SnapshotCommand(pool, "http://secondary.Storage.Url", "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "snapshotName", 101L, 102L, 103L);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392dc817/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java
index 4fb37e2..f3c9e79 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java
@@ -24,8 +24,6 @@ import java.util.Map;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver;
@@ -47,6 +45,7 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
import org.apache.cloudstack.storage.volume.VolumeObject;
+import org.apache.log4j.Logger;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
@@ -392,6 +391,11 @@ public class PrimaryDataStoreImpl implements PrimaryDataStore {
}
@Override
+ public HypervisorType getHypervisor() {
+ return pdsv.getHypervisor();
+ }
+
+ @Override
public String getStorageProviderName() {
return pdsv.getStorageProviderName();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392dc817/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
index ba706f2..4a69d3a 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Set;
import javax.ejb.Local;
-import javax.ws.rs.HEAD;
import org.apache.log4j.Logger;
import org.apache.xmlrpc.XmlRpcException;
@@ -113,13 +112,13 @@ public class XcpOssResource extends CitrixResourceBase {
@Override
protected String getGuestOsType(String stdType, boolean bootFromCD) {
- if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
- return "Debian Squeeze 6.0 (64-bit)";
- } else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) {
+ if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) {
+ return "Debian Squeeze 6.0 (64-bit)";
+ } else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) {
return "CentOS 5 (64-bit)";
} else {
- return CitrixHelper.getXcpGuestOsType(stdType);
- }
+ return CitrixHelper.getXcpGuestOsType(stdType);
+ }
}
@Override
@@ -172,7 +171,7 @@ public class XcpOssResource extends CitrixResourceBase {
@Override
public Answer executeRequest(Command cmd) {
if (cmd instanceof NetworkUsageCommand) {
- return execute((NetworkUsageCommand)cmd);
+ return execute((NetworkUsageCommand) cmd);
} else {
return super.executeRequest(cmd);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392dc817/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
index c1af6ca..265d910 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
@@ -30,8 +30,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import javax.ws.rs.HEAD;
-
import org.apache.cloudstack.storage.command.AttachAnswer;
import org.apache.cloudstack.storage.command.AttachCommand;
import org.apache.cloudstack.storage.command.AttachPrimaryDataStoreAnswer;
@@ -106,14 +104,14 @@ public class XenServerStorageProcessor implements StorageProcessor {
String isoURL = null;
if (store == null) {
- TemplateObjectTO iso = (TemplateObjectTO)disk.getData();
+ TemplateObjectTO iso = (TemplateObjectTO) disk.getData();
isoURL = iso.getName();
} else {
if (!(store instanceof NfsTO)) {
s_logger.debug("Can't attach a iso which is not created on nfs: ");
return new AttachAnswer("Can't attach a iso which is not created on nfs: ");
}
- NfsTO nfsStore = (NfsTO)store;
+ NfsTO nfsStore = (NfsTO) store;
isoURL = nfsStore.getUrl() + File.separator + data.getPath();
}
@@ -183,8 +181,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
VM.Record vmr = vm.getRecord(conn);
vmNotRunning = vmr.powerState != VmPowerState.RUNNING;
- }
- catch (CloudRuntimeException ex) {
+ } catch (CloudRuntimeException ex) {
}
Map<String, String> details = disk.getDetails();
@@ -206,8 +203,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
return new AttachAnswer(newDisk);
}
- }
- else {
+ } else {
vdi = hypervisorResource.mount(conn, null, null, data.getPath());
}
@@ -289,14 +285,14 @@ public class XenServerStorageProcessor implements StorageProcessor {
String isoURL = null;
if (store == null) {
- TemplateObjectTO iso = (TemplateObjectTO)disk.getData();
+ TemplateObjectTO iso = (TemplateObjectTO) disk.getData();
isoURL = iso.getName();
} else {
if (!(store instanceof NfsTO)) {
s_logger.debug("Can't attach a iso which is not created on nfs: ");
return new AttachAnswer("Can't attach a iso which is not created on nfs: ");
}
- NfsTO nfsStore = (NfsTO)store;
+ NfsTO nfsStore = (NfsTO) store;
isoURL = nfsStore.getUrl() + File.separator + data.getPath();
}
@@ -364,8 +360,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
VM.Record vmr = vm.getRecord(conn);
vmNotRunning = vmr.powerState != VmPowerState.RUNNING;
- }
- catch (CloudRuntimeException ex) {
+ } catch (CloudRuntimeException ex) {
}
// if the VM is not running and we're not dealing with managed storage, just return success (nothing to do here)
@@ -450,7 +445,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
@Override
public Answer createSnapshot(CreateObjectCommand cmd) {
Connection conn = hypervisorResource.getConnection();
- SnapshotObjectTO snapshotTO = (SnapshotObjectTO)cmd.getData();
+ SnapshotObjectTO snapshotTO = (SnapshotObjectTO) cmd.getData();
long snapshotId = snapshotTO.getId();
String snapshotName = snapshotTO.getName();
String details = "create snapshot operation Failed for snapshotId: " + snapshotId;
@@ -478,12 +473,12 @@ public class XenServerStorageProcessor implements StorageProcessor {
try {
String preSnapshotParentUUID = getVhdParent(conn, srUUID, preSnapshotUUID, isISCSI);
- if( snapshotParentUUID != null && snapshotParentUUID.equals(preSnapshotParentUUID)) {
+ if (snapshotParentUUID != null && snapshotParentUUID.equals(preSnapshotParentUUID)) {
// this is empty snapshot, remove it
snapshot.destroy(conn);
snapshotUUID = preSnapshotUUID;
}
- } catch(Exception e) {
+ } catch (Exception e) {
s_logger.debug("Failed to get parent snapshot", e);
}
}
@@ -558,7 +553,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
if (server.equals(dc.get("server")) && serverpath.equals(dc.get("serverpath"))) {
throw new CloudRuntimeException("There is a SR using the same configuration server:" + dc.get("server") + ", serverpath:" + dc.get("serverpath") +
- " for pool " + pool.getUuid() + "on host:" + hypervisorResource.getHost().uuid);
+ " for pool " + pool.getUuid() + "on host:" + hypervisorResource.getHost().uuid);
}
}
@@ -622,7 +617,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
}
if (target.equals(dc.get("target")) && targetiqn.equals(dc.get("targetIQN")) && lunid.equals(dc.get("lunid"))) {
throw new CloudRuntimeException("There is a SR using the same configuration target:" + dc.get("target") + ", targetIQN:" + dc.get("targetIQN") +
- ", lunid:" + dc.get("lunid") + " for pool " + pool.getUuid() + "on host:" + hypervisorResource.getHost().uuid);
+ ", lunid:" + dc.get("lunid") + " for pool " + pool.getUuid() + "on host:" + hypervisorResource.getHost().uuid);
}
}
deviceConfig.put("target", target);
@@ -713,8 +708,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
return new Answer(cmd, true, "success");
} catch (Exception e) {
String msg =
- "Catch Exception " + e.getClass().getName() + ", create StoragePool failed due to " + e.toString() + " on host:" +
- hypervisorResource.getHost().uuid + " pool: " + pool.getHost() + pool.getPath();
+ "Catch Exception " + e.getClass().getName() + ", create StoragePool failed due to " + e.toString() + " on host:" +
+ hypervisorResource.getHost().uuid + " pool: " + pool.getHost() + pool.getPath();
s_logger.warn(msg, e);
return new Answer(cmd, false, msg);
}
@@ -829,8 +824,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
private String copy_vhd_from_secondarystorage(Connection conn, String mountpoint, String sruuid, int wait) {
String nameLabel = "cloud-" + UUID.randomUUID().toString();
String results =
- hypervisorResource.callHostPluginAsync(conn, "vmopspremium", "copy_vhd_from_secondarystorage", wait, "mountpoint", mountpoint, "sruuid", sruuid, "namelabel",
- nameLabel);
+ hypervisorResource.callHostPluginAsync(conn, "vmopspremium", "copy_vhd_from_secondarystorage", wait, "mountpoint", mountpoint, "sruuid", sruuid, "namelabel",
+ nameLabel);
String errMsg = null;
if (results == null || results.isEmpty()) {
errMsg = "copy_vhd_from_secondarystorage return null";
@@ -880,8 +875,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
protected String getVhdParent(Connection conn, String primaryStorageSRUuid, String snapshotUuid, Boolean isISCSI) {
String parentUuid =
- hypervisorResource.callHostPlugin(conn, "vmopsSnapshot", "getVhdParent", "primaryStorageSRUuid", primaryStorageSRUuid, "snapshotUuid", snapshotUuid,
- "isISCSI", isISCSI.toString());
+ hypervisorResource.callHostPlugin(conn, "vmopsSnapshot", "getVhdParent", "primaryStorageSRUuid", primaryStorageSRUuid, "snapshotUuid", snapshotUuid,
+ "isISCSI", isISCSI.toString());
if (parentUuid == null || parentUuid.isEmpty() || parentUuid.equalsIgnoreCase("None")) {
s_logger.debug("Unable to get parent of VHD " + snapshotUuid + " in SR " + primaryStorageSRUuid);
@@ -900,8 +895,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
try {
if ((srcDataStoreTo instanceof NfsTO) && (srcDataTo.getObjectType() == DataObjectType.TEMPLATE)) {
- NfsTO srcImageStore = (NfsTO)srcDataStoreTo;
- TemplateObjectTO srcTemplateObjectTo = (TemplateObjectTO)srcDataTo;
+ NfsTO srcImageStore = (NfsTO) srcDataStoreTo;
+ TemplateObjectTO srcTemplateObjectTo = (TemplateObjectTO) srcDataTo;
String storeUrl = srcImageStore.getUrl();
URI uri = new URI(storeUrl);
String tmplPath = uri.getHost() + ":" + uri.getPath() + "/" + srcDataTo.getPath();
@@ -916,7 +911,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
String chapInitiatorSecret = null;
if (destDataStoreTo instanceof PrimaryDataStoreTO) {
- PrimaryDataStoreTO destPrimaryDataStoreTo = (PrimaryDataStoreTO)destDataStoreTo;
+ PrimaryDataStoreTO destPrimaryDataStoreTo = (PrimaryDataStoreTO) destDataStoreTo;
Map<String, String> details = destPrimaryDataStoreTo.getDetails();
@@ -948,8 +943,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
details.put(DiskTO.CHAP_INITIATOR_SECRET, chapInitiatorSecret);
sr = hypervisorResource.prepareManagedSr(conn, details);
- }
- else {
+ } else {
String srName = destDataStoreTo.getUuid();
Set<SR> srs = SR.getByNameLabel(conn, srName);
@@ -974,8 +968,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
uuidToReturn = tmplUuid;
tmplVdi.setNameLabel(conn, managedStoragePoolRootVolumeName);
- }
- else {
+ } else {
VDI snapshotVdi = tmplVdi.snapshot(conn, new HashMap<String, String>());
uuidToReturn = snapshotVdi.getUuid(conn);
@@ -1014,7 +1007,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
@Override
public Answer createVolume(CreateObjectCommand cmd) {
DataTO data = cmd.getData();
- VolumeObjectTO volume = (VolumeObjectTO)data;
+ VolumeObjectTO volume = (VolumeObjectTO) data;
try {
Connection conn = hypervisorResource.getConnection();
@@ -1046,7 +1039,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
Connection conn = hypervisorResource.getConnection();
DataTO srcData = cmd.getSrcTO();
DataTO destData = cmd.getDestTO();
- VolumeObjectTO volume = (VolumeObjectTO)destData;
+ VolumeObjectTO volume = (VolumeObjectTO) destData;
VDI vdi = null;
try {
VDI tmpltvdi = null;
@@ -1077,12 +1070,12 @@ public class XenServerStorageProcessor implements StorageProcessor {
DataTO srcData = cmd.getSrcTO();
DataTO destData = cmd.getDestTO();
int wait = cmd.getWait();
- VolumeObjectTO srcVolume = (VolumeObjectTO)srcData;
- VolumeObjectTO destVolume = (VolumeObjectTO)destData;
+ VolumeObjectTO srcVolume = (VolumeObjectTO) srcData;
+ VolumeObjectTO destVolume = (VolumeObjectTO) destData;
DataStoreTO srcStore = srcVolume.getDataStore();
if (srcStore instanceof NfsTO) {
- NfsTO nfsStore = (NfsTO)srcStore;
+ NfsTO nfsStore = (NfsTO) srcStore;
try {
SR primaryStoragePool = hypervisorResource.getStorageRepository(conn, destVolume.getDataStore().getUuid());
String srUuid = primaryStoragePool.getUuid(conn);
@@ -1108,15 +1101,15 @@ public class XenServerStorageProcessor implements StorageProcessor {
@Override
public Answer copyVolumeFromPrimaryToSecondary(CopyCommand cmd) {
Connection conn = hypervisorResource.getConnection();
- VolumeObjectTO srcVolume = (VolumeObjectTO)cmd.getSrcTO();
- VolumeObjectTO destVolume = (VolumeObjectTO)cmd.getDestTO();
+ VolumeObjectTO srcVolume = (VolumeObjectTO) cmd.getSrcTO();
+ VolumeObjectTO destVolume = (VolumeObjectTO) cmd.getDestTO();
int wait = cmd.getWait();
DataStoreTO destStore = destVolume.getDataStore();
if (destStore instanceof NfsTO) {
SR secondaryStorage = null;
try {
- NfsTO nfsStore = (NfsTO)destStore;
+ NfsTO nfsStore = (NfsTO) destStore;
URI uri = new URI(nfsStore.getUrl());
// Create the volume folder
if (!hypervisorResource.createSecondaryStorageFolder(conn, uri.getHost() + ":" + uri.getPath(), destVolume.getPath())) {
@@ -1149,8 +1142,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
String result = null;
try {
result =
- hypervisorResource.callHostPluginAsync(conn, "swiftxen", "swift", wait, "op", "upload", "url", swift.getUrl(), "account", swift.getAccount(), "username",
- swift.getUserName(), "key", swift.getKey(), "container", container, "ldir", ldir, "lfilename", lfilename, "isISCSI", isISCSI.toString());
+ hypervisorResource.callHostPluginAsync(conn, "swiftxen", "swift", wait, "op", "upload", "url", swift.getUrl(), "account", swift.getAccount(), "username",
+ swift.getUserName(), "key", swift.getKey(), "container", container, "ldir", ldir, "lfilename", lfilename, "isISCSI", isISCSI.toString());
if (result != null && result.equals("true")) {
return true;
}
@@ -1164,8 +1157,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
// If anybody modifies the formatting below again, I'll skin them
String result =
- hypervisorResource.callHostPlugin(conn, "vmopsSnapshot", "deleteSnapshotBackup", "backupUUID", backupUUID, "path", path, "secondaryStorageMountPath",
- secondaryStorageMountPath, "localMountPoint", localMountPoint);
+ hypervisorResource.callHostPlugin(conn, "vmopsSnapshot", "deleteSnapshotBackup", "backupUUID", backupUUID, "path", path, "secondaryStorageMountPath",
+ secondaryStorageMountPath, "localMountPoint", localMountPoint);
return result;
}
@@ -1185,7 +1178,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
}
protected String backupSnapshotToS3(final Connection connection, final S3TO s3, final String srUuid, final String folder, final String snapshotUuid,
- final Boolean iSCSIFlag, final int wait) {
+ final Boolean iSCSIFlag, final int wait) {
final String filename = iSCSIFlag ? "VHD-" + snapshotUuid : snapshotUuid + ".vhd";
final String dir = (iSCSIFlag ? "/dev/VG_XenStorage-" : "/var/run/sr-mount/") + srUuid;
@@ -1198,7 +1191,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
// recognize Boolean accessor methods ...
parameters.addAll(Arrays.asList("operation", "put", "filename", dir + "/" + filename, "iSCSIFlag", iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key",
- key, "https", s3.isHttps() != null ? s3.isHttps().toString() : "null", "maxSingleUploadSizeInBytes", String.valueOf(s3.getMaxSingleUploadSizeInBytes())));
+ key, "https", s3.isHttps() != null ? s3.isHttps().toString() : "null", "maxSingleUploadSizeInBytes", String.valueOf(s3.getMaxSingleUploadSizeInBytes())));
final String result = hypervisorResource.callHostPluginAsync(connection, "s3xen", "s3", wait, parameters.toArray(new String[parameters.size()]));
if (result != null && result.equals("true")) {
@@ -1225,7 +1218,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
}
protected String backupSnapshot(Connection conn, String primaryStorageSRUuid, String localMountPoint, String path, String secondaryStorageMountPath,
- String snapshotUuid, String prevBackupUuid, Boolean isISCSI, int wait) {
+ String snapshotUuid, String prevBackupUuid, Boolean isISCSI, int wait) {
String backupSnapshotUuid = null;
if (prevBackupUuid == null) {
@@ -1236,14 +1229,14 @@ public class XenServerStorageProcessor implements StorageProcessor {
// Using more lines does not harm the environment.
String backupUuid = UUID.randomUUID().toString();
String results =
- hypervisorResource.callHostPluginAsync(conn, "vmopsSnapshot", "backupSnapshot", wait, "primaryStorageSRUuid", primaryStorageSRUuid, "path", path,
- "secondaryStorageMountPath", secondaryStorageMountPath, "snapshotUuid", snapshotUuid, "prevBackupUuid", prevBackupUuid, "backupUuid", backupUuid,
- "isISCSI", isISCSI.toString(), "localMountPoint", localMountPoint);
+ hypervisorResource.callHostPluginAsync(conn, "vmopsSnapshot", "backupSnapshot", wait, "primaryStorageSRUuid", primaryStorageSRUuid, "path", path,
+ "secondaryStorageMountPath", secondaryStorageMountPath, "snapshotUuid", snapshotUuid, "prevBackupUuid", prevBackupUuid, "backupUuid", backupUuid,
+ "isISCSI", isISCSI.toString(), "localMountPoint", localMountPoint);
String errMsg = null;
if (results == null || results.isEmpty()) {
errMsg =
- "Could not copy backupUuid: " + backupSnapshotUuid + " from primary storage " + primaryStorageSRUuid + " to secondary storage " +
- secondaryStorageMountPath + " due to null";
+ "Could not copy backupUuid: " + backupSnapshotUuid + " from primary storage " + primaryStorageSRUuid + " to secondary storage " +
+ secondaryStorageMountPath + " due to null";
} else {
String[] tmp = results.split("#");
@@ -1257,8 +1250,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
return results;
} else {
errMsg =
- "Could not copy backupUuid: " + backupSnapshotUuid + " from primary storage " + primaryStorageSRUuid + " to secondary storage " +
- secondaryStorageMountPath + " due to " + tmp[1];
+ "Could not copy backupUuid: " + backupSnapshotUuid + " from primary storage " + primaryStorageSRUuid + " to secondary storage " +
+ secondaryStorageMountPath + " due to " + tmp[1];
}
}
String source = backupUuid + ".vhd";
@@ -1329,17 +1322,17 @@ public class XenServerStorageProcessor implements StorageProcessor {
NfsTO cacheStore = null;
String destPath = null;
if (cacheData != null) {
- cacheStore = (NfsTO)cacheData.getDataStore();
+ cacheStore = (NfsTO) cacheData.getDataStore();
secondaryStorageUrl = cacheStore.getUrl();
destPath = cacheData.getPath();
} else {
- cacheStore = (NfsTO)destData.getDataStore();
+ cacheStore = (NfsTO) destData.getDataStore();
secondaryStorageUrl = cacheStore.getUrl();
destPath = destData.getPath();
}
- SnapshotObjectTO snapshotTO = (SnapshotObjectTO)srcData;
- SnapshotObjectTO snapshotOnImage = (SnapshotObjectTO)destData;
+ SnapshotObjectTO snapshotTO = (SnapshotObjectTO) srcData;
+ SnapshotObjectTO snapshotOnImage = (SnapshotObjectTO) destData;
String snapshotUuid = snapshotTO.getPath();
String volumeUuid = snapshotTO.getVolume().getPath();
@@ -1357,7 +1350,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
SR primaryStorageSR = hypervisorResource.getSRByNameLabelandHost(conn, primaryStorageNameLabel);
if (primaryStorageSR == null) {
throw new InternalErrorException("Could not backup snapshot because the primary Storage SR could not be created from the name label: " +
- primaryStorageNameLabel);
+ primaryStorageNameLabel);
}
String psUuid = primaryStorageSR.getUuid(conn);
Boolean isISCSI = IsISCSI(primaryStorageSR.getType(conn));
@@ -1365,7 +1358,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
VDI snapshotVdi = getVDIbyUuid(conn, snapshotUuid);
String snapshotPaUuid = null;
- if ( prevSnapshotUuid != null && !fullbackup) {
+ if (prevSnapshotUuid != null && !fullbackup) {
try {
snapshotPaUuid = getVhdParent(conn, psUuid, snapshotUuid, isISCSI);
if (snapshotPaUuid != null) {
@@ -1410,7 +1403,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
if (destStore instanceof SwiftTO) {
try {
String container = "S-" + snapshotTO.getVolume().getVolumeId().toString();
- String destSnapshotName = swiftBackupSnapshot(conn, (SwiftTO)destStore, snapshotSr.getUuid(conn), snapshotBackupUuid, container, false, wait);
+ String destSnapshotName = swiftBackupSnapshot(conn, (SwiftTO) destStore, snapshotSr.getUuid(conn), snapshotBackupUuid, container, false, wait);
String swiftPath = container + File.separator + destSnapshotName;
finalPath = swiftPath;
} finally {
@@ -1423,7 +1416,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
} else if (destStore instanceof S3TO) {
try {
- finalPath = backupSnapshotToS3(conn, (S3TO)destStore, snapshotSr.getUuid(conn), folder, snapshotBackupUuid, isISCSI, wait);
+ finalPath = backupSnapshotToS3(conn, (S3TO) destStore, snapshotSr.getUuid(conn), folder, snapshotBackupUuid, isISCSI, wait);
if (finalPath == null) {
throw new CloudRuntimeException("S3 upload of snapshots " + snapshotBackupUuid + " failed");
}
@@ -1449,17 +1442,17 @@ public class XenServerStorageProcessor implements StorageProcessor {
if (destStore instanceof SwiftTO) {
String container = "S-" + snapshotTO.getVolume().getVolumeId().toString();
snapshotBackupUuid =
- swiftBackupSnapshot(conn, (SwiftTO)destStore, primaryStorageSRUuid, snapshotPaUuid, "S-" + snapshotTO.getVolume().getVolumeId().toString(),
- isISCSI, wait);
+ swiftBackupSnapshot(conn, (SwiftTO) destStore, primaryStorageSRUuid, snapshotPaUuid, "S-" + snapshotTO.getVolume().getVolumeId().toString(),
+ isISCSI, wait);
finalPath = container + File.separator + snapshotBackupUuid;
} else if (destStore instanceof S3TO) {
- finalPath = backupSnapshotToS3(conn, (S3TO)destStore, primaryStorageSRUuid, folder, snapshotPaUuid, isISCSI, wait);
+ finalPath = backupSnapshotToS3(conn, (S3TO) destStore, primaryStorageSRUuid, folder, snapshotPaUuid, isISCSI, wait);
if (finalPath == null) {
throw new CloudRuntimeException("S3 upload of snapshots " + snapshotPaUuid + " failed");
}
} else {
String results =
- backupSnapshot(conn, primaryStorageSRUuid, localMountPoint, folder, secondaryStorageMountPath, snapshotUuid, prevBackupUuid, isISCSI, wait);
+ backupSnapshot(conn, primaryStorageSRUuid, localMountPoint, folder, secondaryStorageMountPath, snapshotUuid, prevBackupUuid, isISCSI, wait);
String[] tmp = results.split("#");
snapshotBackupUuid = tmp[1];
@@ -1503,9 +1496,9 @@ public class XenServerStorageProcessor implements StorageProcessor {
@Override
public Answer createTemplateFromVolume(CopyCommand cmd) {
Connection conn = hypervisorResource.getConnection();
- VolumeObjectTO volume = (VolumeObjectTO)cmd.getSrcTO();
- TemplateObjectTO template = (TemplateObjectTO)cmd.getDestTO();
- NfsTO destStore = (NfsTO)cmd.getDestTO().getDataStore();
+ VolumeObjectTO volume = (VolumeObjectTO) cmd.getSrcTO();
+ TemplateObjectTO template = (TemplateObjectTO) cmd.getDestTO();
+ NfsTO destStore = (NfsTO) cmd.getDestTO().getDataStore();
int wait = cmd.getWait();
String secondaryStoragePoolURL = destStore.getUrl();
@@ -1548,8 +1541,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
// create the template.properties file
String templatePath = secondaryStorageMountPath + "/" + installPath;
result =
- hypervisorResource.postCreatePrivateTemplate(conn, templatePath, tmpltFilename, tmpltUUID, userSpecifiedName, null, physicalSize, virtualSize,
- template.getId());
+ hypervisorResource.postCreatePrivateTemplate(conn, templatePath, tmpltFilename, tmpltUUID, userSpecifiedName, null, physicalSize, virtualSize,
+ template.getId());
if (!result) {
throw new CloudRuntimeException("Could not create the template.properties file on secondary storage dir: " + tmpltURI);
}
@@ -1586,7 +1579,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
public Answer createVolumeFromSnapshot(CopyCommand cmd) {
Connection conn = hypervisorResource.getConnection();
DataTO srcData = cmd.getSrcTO();
- SnapshotObjectTO snapshot = (SnapshotObjectTO)srcData;
+ SnapshotObjectTO snapshot = (SnapshotObjectTO) srcData;
DataTO destData = cmd.getDestTO();
DataStoreTO imageStore = srcData.getDataStore();
@@ -1594,7 +1587,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
return new CopyCmdAnswer("unsupported protocol");
}
- NfsTO nfsImageStore = (NfsTO)imageStore;
+ NfsTO nfsImageStore = (NfsTO) imageStore;
String primaryStorageNameLabel = destData.getDataStore().getUuid();
String secondaryStorageUrl = nfsImageStore.getUrl();
int wait = cmd.getWait();
@@ -1611,7 +1604,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
SR primaryStorageSR = hypervisorResource.getSRByNameLabelandHost(conn, primaryStorageNameLabel);
if (primaryStorageSR == null) {
throw new InternalErrorException("Could not create volume from snapshot because the primary Storage SR could not be created from the name label: " +
- primaryStorageNameLabel);
+ primaryStorageNameLabel);
}
// Get the absolute path of the snapshot on the secondary storage.
String snapshotInstallPath = snapshot.getPath();
@@ -1650,7 +1643,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
@Override
public Answer deleteSnapshot(DeleteCommand cmd) {
- SnapshotObjectTO snapshot = (SnapshotObjectTO)cmd.getData();
+ SnapshotObjectTO snapshot = (SnapshotObjectTO) cmd.getData();
DataStoreTO store = snapshot.getDataStore();
if (store.getRole() == DataStoreRole.Primary) {
Connection conn = hypervisorResource.getConnection();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392dc817/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
index e326f61..5983a05 100644
--- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
+++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
@@ -24,7 +24,6 @@ import java.util.UUID;
import javax.inject.Inject;
-import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
@@ -149,10 +148,13 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
}
@Override
- public boolean connectVolumeToHost(VolumeInfo volumeInfo, Host host, DataStore dataStore) { return false; }
+ public boolean connectVolumeToHost(VolumeInfo volumeInfo, Host host, DataStore dataStore) {
+ return false;
+ }
@Override
- public void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, DataStore dataStore) {}
+ public void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, DataStore dataStore) {
+ }
@Override
public long getVolumeSizeIncludingHypervisorSnapshotReserve(Volume volume, StoragePool pool) {
@@ -166,7 +168,7 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
CreateCmdResult result = new CreateCmdResult(null, null);
if (data.getType() == DataObjectType.VOLUME) {
try {
- answer = createVolume((VolumeInfo)data);
+ answer = createVolume((VolumeInfo) data);
if ((answer == null) || (!answer.getResult())) {
result.setSuccess(false);
if (answer != null) {
@@ -258,7 +260,7 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
DataStore store = destData.getDataStore();
if (store.getRole() == DataStoreRole.Primary) {
if ((srcData.getType() == DataObjectType.TEMPLATE && destData.getType() == DataObjectType.TEMPLATE) ||
- (srcData.getType() == DataObjectType.TEMPLATE && destData.getType() == DataObjectType.VOLUME)) {
+ (srcData.getType() == DataObjectType.TEMPLATE && destData.getType() == DataObjectType.VOLUME)) {
StoragePoolVO storagePoolVO = primaryStoreDao.findById(store.getId());
if (storagePoolVO != null && storagePoolVO.getPoolType() == Storage.StoragePoolType.CLVM) {
return true;
@@ -272,10 +274,10 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCmdResult> callback) {
CreateCmdResult result = null;
try {
- SnapshotObjectTO snapshotTO = (SnapshotObjectTO)snapshot.getTO();
+ SnapshotObjectTO snapshotTO = (SnapshotObjectTO) snapshot.getTO();
Object payload = snapshot.getPayload();
if (payload != null && payload instanceof CreateSnapshotPayload) {
- CreateSnapshotPayload snapshotPayload = (CreateSnapshotPayload)payload;
+ CreateSnapshotPayload snapshotPayload = (CreateSnapshotPayload) payload;
snapshotTO.setQuiescevm(snapshotPayload.getQuiescevm());
}
@@ -283,7 +285,7 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
EndPoint ep = this.epSelector.select(snapshot, StorageAction.TAKESNAPSHOT);
Answer answer = null;
- if ( ep == null ){
+ if (ep == null) {
String errMsg = "No remote endpoint to send createObjectCommand, check if host or ssvm is down?";
s_logger.error(errMsg);
answer = new Answer(cmd, false, errMsg);
@@ -312,16 +314,16 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
@Override
public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> callback) {
- VolumeObject vol = (VolumeObject)data;
- StoragePool pool = (StoragePool)data.getDataStore();
- ResizeVolumePayload resizeParameter = (ResizeVolumePayload)vol.getpayload();
+ VolumeObject vol = (VolumeObject) data;
+ StoragePool pool = (StoragePool) data.getDataStore();
+ ResizeVolumePayload resizeParameter = (ResizeVolumePayload) vol.getpayload();
ResizeVolumeCommand resizeCmd =
- new ResizeVolumeCommand(vol.getPath(), new StorageFilerTO(pool), vol.getSize(), resizeParameter.newSize, resizeParameter.shrinkOk,
- resizeParameter.instanceName);
+ new ResizeVolumeCommand(vol.getPath(), new StorageFilerTO(pool), vol.getSize(), resizeParameter.newSize, resizeParameter.shrinkOk,
+ resizeParameter.instanceName);
CreateCmdResult result = new CreateCmdResult(null, null);
try {
- ResizeVolumeAnswer answer = (ResizeVolumeAnswer)storageMgr.sendToPool(pool, resizeParameter.hosts, resizeCmd);
+ ResizeVolumeAnswer answer = (ResizeVolumeAnswer) storageMgr.sendToPool(pool, resizeParameter.hosts, resizeCmd);
if (answer != null && answer.getResult()) {
long finalSize = answer.getNewSize();
s_logger.debug("Resize: volume started at size " + vol.getSize() + " and ended at size " + finalSize);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/392dc817/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index f2c7346..3abb944 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -26,10 +26,6 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
-import org.apache.cloudstack.engine.subsystem.api.storage.*;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
@@ -92,8 +88,15 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreCapabilities;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.query.QueryService;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.query.dao.AccountJoinDao;
import com.cloud.api.query.dao.AffinityGroupJoinDao;
[20/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
add md5sum for xen/kvm system vm template
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c1711428
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c1711428
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c1711428
Branch: refs/heads/4.4
Commit: c1711428f077f7956eb30eedcad428f9db99768d
Parents: b35389f
Author: edison <su...@gmail.com>
Authored: Wed Jan 15 15:47:28 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:40 2014 -0700
----------------------------------------------------------------------
setup/db/templates.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1711428/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index caa69c2..7c4dca5 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -22,13 +22,13 @@ INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created,
VALUES (2, UUID(), 'centos53-x86_64', 'CentOS 5.3(64-bit) no GUI (XenServer)', 1, now(), now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', 'b63d854a9560c013142567bbae8d98cf', 0, 'CentOS 5.3(64-bit) no GUI (XenServer)', 'VHD', 12, 1, 1, 'XenServer', 1);
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
- VALUES (3, UUID(), 'routing-3', 'SystemVM Template (KVM)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2', '6cea42b2633841648040becb588bd8f0', 0, 'SystemVM Template (KVM)', 'QCOW2', 15, 0, 1, 'KVM' );
+ VALUES (3, UUID(), 'routing-3', 'SystemVM Template (KVM)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2', '85a1bed07bf43cbf022451cb2ecae4ff', 0, 'SystemVM Template (KVM)', 'QCOW2', 15, 0, 1, 'KVM' );
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, display_text, enable_password, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
VALUES (4, UUID(), 'centos55-x86_64', 'CentOS 5.5(64-bit) no GUI (KVM)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', 'ed0e788280ff2912ea40f7f91ca7a249', 'CentOS 5.5(64-bit) no GUI (KVM)', 0, 'QCOW2', 112, 1, 1, 'KVM', 1);
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
- VALUES (5, UUID(), 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2', '905cec879afd9c9d22ecc8036131a180', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 142, 1, 1, 'XenServer', 1);
+ VALUES (5, UUID(), 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2', '3e29b40377272803eebccfe40efea199', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 142, 1, 1, 'XenServer', 1);
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
VALUES (7, UUID(), 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1);
[23/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5831: Fix NPE, in case the volume isn't attached to any pool
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/36efe4db
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36efe4db
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36efe4db
Branch: refs/heads/4.4
Commit: 36efe4dbf4e5d24c27f25a1f8057f1004d69c12f
Parents: 4584d5c
Author: edison <su...@gmail.com>
Authored: Wed Jan 8 17:07:45 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:40 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36efe4db/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 9d5914d..f2c7346 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1642,6 +1642,10 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
for(VolumeResponse vr : volumeResponses) {
String poolId = vr.getStoragePoolId();
+ if (poolId == null) {
+ continue;
+ }
+
DataStore store = dataStoreManager.getPrimaryDataStore(poolId);
if (store == null) {
continue;
[08/28] git commit: updated refs/heads/4.4 to 392dc81
Posted by ed...@apache.org.
CLOUDSTACK-5264: add delta snapshot for existing xenserver
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a3736f26
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3736f26
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3736f26
Branch: refs/heads/4.4
Commit: a3736f26f149eaf8c5430b2babf1e3daeec0327a
Parents: 9188223
Author: Edison Su <su...@gmail.com>
Authored: Thu Mar 27 15:50:32 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:37 2014 -0700
----------------------------------------------------------------------
.../xen/resource/XenServerStorageProcessor.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3736f26/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
index 086862b..caebe34 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
@@ -144,7 +144,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
throw new CloudRuntimeException("Unable to find CD-ROM VBD for VM: " + vmName);
} else {
// If an ISO is already inserted, eject it
- if (isoVBD.getEmpty(conn) == false) {
+ if (!isoVBD.getEmpty(conn)) {
isoVBD.eject(conn);
}
@@ -1349,8 +1349,9 @@ public class XenServerStorageProcessor implements StorageProcessor {
// By default assume failure
String details = null;
String snapshotBackupUuid = null;
- boolean fullbackup = true;
Long physicalSize = null;
+ Map<String, String> options = cmd.getOptions();
+ boolean fullbackup = Boolean.parseBoolean(options.get("fullSnapshot"));
try {
SR primaryStorageSR = hypervisorResource.getSRByNameLabelandHost(conn, primaryStorageNameLabel);
if (primaryStorageSR == null) {
@@ -1362,7 +1363,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
VDI snapshotVdi = getVDIbyUuid(conn, snapshotUuid);
String snapshotPaUuid = null;
- if (prevBackupUuid != null) {
+
+ if ( prevSnapshotUuid != null && !fullbackup) {
try {
snapshotPaUuid = getVhdParent(conn, psUuid, snapshotUuid, isISCSI);
if (snapshotPaUuid != null) {
@@ -1370,6 +1372,8 @@ public class XenServerStorageProcessor implements StorageProcessor {
String prevSnashotPaUuid = getVhdParent(conn, psUuid, prevSnapshotUuid, isISCSI);
if (snashotPaPaPaUuid != null && prevSnashotPaUuid != null && prevSnashotPaUuid.equals(snashotPaPaPaUuid)) {
fullbackup = false;
+ } else {
+ fullbackup = true;
}
}
} catch (Exception e) {