You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/08/27 23:46:04 UTC
[1/3] git commit: updated refs/heads/4.2 to 2fdfd66
Updated Branches:
refs/heads/4.2 ee090f8b3 -> 2fdfd66f6
CLOUDSTACK-4520: [upgrade][vmware]ExtractVolumeCmd fails with NPE while
attempting to download a volume.(cherry picked from commit 13d9070d5e11fc8b15156b4d3978446837904641)
Signed-off-by: animesh <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/15f50c11
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/15f50c11
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/15f50c11
Branch: refs/heads/4.2
Commit: 15f50c112b3f1c1237272937df6e138c8a2e22e0
Parents: ee090f8
Author: Min Chen <mi...@citrix.com>
Authored: Tue Aug 27 13:57:04 2013 -0700
Committer: animesh <an...@apache.org>
Committed: Tue Aug 27 14:35:21 2013 -0700
----------------------------------------------------------------------
engine/schema/src/com/cloud/storage/VolumeVO.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15f50c11/engine/schema/src/com/cloud/storage/VolumeVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/VolumeVO.java b/engine/schema/src/com/cloud/storage/VolumeVO.java
index bbecf03..ea3d6bf 100755
--- a/engine/schema/src/com/cloud/storage/VolumeVO.java
+++ b/engine/schema/src/com/cloud/storage/VolumeVO.java
@@ -238,6 +238,7 @@ public class VolumeVO implements Volume {
this.chainInfo = that.getChainInfo();
this.templateId = that.getTemplateId();
this.deviceId = that.getDeviceId();
+ this.format = that.getFormat();
this.uuid = UUID.randomUUID().toString();
}
[2/3] git commit: updated refs/heads/4.2 to 2fdfd66
Posted by an...@apache.org.
CLOUDSTACK-4516:[Upgrade][VMWare]
MySQLIntegrityConstraintViolationException while performing any task
using local storage after upgrade from 3.0.7 to 4.2.(cherry picked from commit 21cb33a02ce2ff1e1b22af275068451a3ab6add5)
Signed-off-by: animesh <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/9333e028
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9333e028
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9333e028
Branch: refs/heads/4.2
Commit: 9333e028378dfa5a78b1ab1b79f06a031e70b21d
Parents: 15f50c1
Author: Min Chen <mi...@citrix.com>
Authored: Tue Aug 27 14:11:55 2013 -0700
Committer: animesh <an...@apache.org>
Committed: Tue Aug 27 14:35:38 2013 -0700
----------------------------------------------------------------------
.../cloudstack/storage/endpoint/DefaultEndPointSelector.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9333e028/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
index a1d7315..98c6a3f 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -96,13 +96,13 @@ public class DefaultEndPointSelector implements EndPointSelector {
sbuilder.append(sqlBase);
if (scope.getScopeType() == ScopeType.HOST) {
- sbuilder.append(" and id = ");
+ sbuilder.append(" and h.id = ");
sbuilder.append(scope.getScopeId());
} else if (scope.getScopeType() == ScopeType.CLUSTER) {
- sbuilder.append(" and cluster_id = ");
+ sbuilder.append(" and h.cluster_id = ");
sbuilder.append(scope.getScopeId());
} else if (scope.getScopeType() == ScopeType.ZONE) {
- sbuilder.append(" and data_center_id = ");
+ sbuilder.append(" and h.data_center_id = ");
sbuilder.append(scope.getScopeId());
}
// TODO: order by rand() is slow if there are lot of hosts
[3/3] git commit: updated refs/heads/4.2 to 2fdfd66
Posted by an...@apache.org.
CLOUDSTACK-4459: one more try, bypass libvirt to find volume if libvirt call failed
(cherry picked from commit cfe3a0fee39379c4ab1fdad9150924b9e46becd6)
Signed-off-by: animesh <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/2fdfd66f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fdfd66f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fdfd66f
Branch: refs/heads/4.2
Commit: 2fdfd66f6581c5f26939634eb1a755509f7ce25f
Parents: 9333e02
Author: Edison Su <su...@gmail.com>
Authored: Tue Aug 27 14:15:50 2013 -0700
Committer: animesh <an...@apache.org>
Committed: Tue Aug 27 14:36:53 2013 -0700
----------------------------------------------------------------------
.../kvm/storage/LibvirtStoragePool.java | 32 +++++++++++++-
.../com/cloud/template/TemplateManagerImpl.java | 45 +++++++++++++-------
2 files changed, 60 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fdfd66f/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 2ce5175..dc7981c 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
@@ -16,14 +16,19 @@
// under the License.
package com.cloud.hypervisor.kvm.storage;
+import java.io.File;
import java.util.List;
+import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
+import org.apache.log4j.Logger;
import org.libvirt.StoragePool;
import com.cloud.storage.Storage.StoragePoolType;
public class LibvirtStoragePool implements KVMStoragePool {
+ private static final Logger s_logger = Logger
+ .getLogger(LibvirtStoragePool.class);
protected String uuid;
protected String uri;
protected long capacity;
@@ -120,7 +125,32 @@ public class LibvirtStoragePool implements KVMStoragePool {
@Override
public KVMPhysicalDisk getPhysicalDisk(String volumeUuid) {
- return this._storageAdaptor.getPhysicalDisk(volumeUuid, this);
+ KVMPhysicalDisk disk = null;
+ try {
+ disk = this._storageAdaptor.getPhysicalDisk(volumeUuid, this);
+ } catch (CloudRuntimeException e) {
+ if ((this.getStoragePoolType() != StoragePoolType.NetworkFilesystem) ||
+ (this.getStoragePoolType() != StoragePoolType.Filesystem)) {
+ throw e;
+ }
+ }
+
+ if (disk != null) {
+ return disk;
+ }
+ s_logger.debug("find volume bypass libvirt");
+ //For network file system or file system, try to use java file to find the volume, instead of through libvirt. BUG:CLOUDSTACK-4459
+ String localPoolPath = this.getLocalPath();
+ File f = new File(localPoolPath + File.separator + volumeUuid);
+ if (!f.exists()) {
+ s_logger.debug("volume: " + volumeUuid + " not exist on storage pool");
+ throw new CloudRuntimeException("Can't find volume:" + volumeUuid);
+ }
+ disk = new KVMPhysicalDisk(f.getPath(), volumeUuid, this);
+ disk.setFormat(PhysicalDiskFormat.QCOW2);
+ disk.setSize(f.length());
+ disk.setVirtualSize(f.length());
+ return disk;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fdfd66f/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index a263720..2a0e04d 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -780,29 +780,42 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
}
@Override
+ @DB
public void evictTemplateFromStoragePool(VMTemplateStoragePoolVO templatePoolVO) {
- StoragePool pool = (StoragePool) this._dataStoreMgr.getPrimaryDataStore(templatePoolVO.getPoolId());
- VMTemplateVO template = _tmpltDao.findByIdIncludingRemoved(templatePoolVO.getTemplateId());
-
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Evicting " + templatePoolVO);
+ //Need to hold the lock, otherwise, another thread may create a volume from the template at the same time.
+ //Assumption here is that, we will hold the same lock during create volume from template
+ VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.acquireInLockTable(templatePoolVO.getId());
+ if (templatePoolRef == null) {
+ s_logger.debug("can't aquire the lock for template pool ref:" + templatePoolVO.getId());
+ return;
}
- DestroyCommand cmd = new DestroyCommand(pool, templatePoolVO);
try {
- Answer answer = _storageMgr.sendToPool(pool, cmd);
+ StoragePool pool = (StoragePool) this._dataStoreMgr.getPrimaryDataStore(templatePoolVO.getPoolId());
+ VMTemplateVO template = _tmpltDao.findByIdIncludingRemoved(templatePoolVO.getTemplateId());
+
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Evicting " + templatePoolVO);
+ }
+ DestroyCommand cmd = new DestroyCommand(pool, templatePoolVO);
- if (answer != null && answer.getResult()) {
- // Remove the templatePoolVO
- if (_tmpltPoolDao.remove(templatePoolVO.getId())) {
- s_logger.debug("Successfully evicted template: " + template.getName() + " from storage pool: " + pool.getName());
+ try {
+ Answer answer = _storageMgr.sendToPool(pool, cmd);
+
+ if (answer != null && answer.getResult()) {
+ // Remove the templatePoolVO
+ if (_tmpltPoolDao.remove(templatePoolVO.getId())) {
+ s_logger.debug("Successfully evicted template: " + template.getName() + " from storage pool: " + pool.getName());
+ }
+ } else {
+ s_logger.info("Will retry evicte template: " + template.getName() + " from storage pool: " + pool.getName());
}
- } else {
- s_logger.info("Will retry evicte template: " + template.getName() + " from storage pool: " + pool.getName());
+ } catch (StorageUnavailableException e) {
+ s_logger.info("Storage is unavailable currently. Will retry evicte template: " + template.getName() + " from storage pool: "
+ + pool.getName());
}
- } catch (StorageUnavailableException e) {
- s_logger.info("Storage is unavailable currently. Will retry evicte template: " + template.getName() + " from storage pool: "
- + pool.getName());
+ } finally {
+ _tmpltPoolDao.releaseFromLockTable(templatePoolRef.getId());
}
}