You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2015/01/31 13:08:16 UTC
[5/8] git commit: updated refs/heads/volume-upload to 121ff19
volume-upload: Volume uploaded using new POST based upload goes to inconsistent state on destroying SSVM
Added a check not to cleanup volume related entries when SSVM is destroyed for volumes upload using the POST based upload feature
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae21f44c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae21f44c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae21f44c
Branch: refs/heads/volume-upload
Commit: ae21f44c7ba7a8c2d93a29dbd426fc85bb2f749a
Parents: 71873c8
Author: Koushik Das <ko...@apache.org>
Authored: Wed Jan 28 12:44:45 2015 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Sat Jan 31 17:19:58 2015 +0530
----------------------------------------------------------------------
.../apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae21f44c/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
index ccfeb96..a691a4c 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
@@ -58,7 +58,7 @@ public class VolumeDataStoreDaoImpl extends GenericDaoBase<VolumeDataStoreVO, Lo
private SearchBuilder<VolumeDataStoreVO> uploadVolumeSearch;
private SearchBuilder<VolumeVO> volumeOnlySearch;
private SearchBuilder<VolumeDataStoreVO> uploadVolumeStateSearch;
- private static final String EXPIRE_DOWNLOAD_URLS_FOR_ZONE = "update volume_store_ref set download_url_created=? where store_id in (select id from image_store where data_center_id=?)";
+ private static final String EXPIRE_DOWNLOAD_URLS_FOR_ZONE = "update volume_store_ref set download_url_created=? where download_url_created is not null and store_id in (select id from image_store where data_center_id=?)";
@Inject