cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [3/8] git commit: updated refs/heads/volume-upload to 121ff19
Date Sat, 31 Jan 2015 12:08:14 GMT
volume-upload: gc thread to clean partially uploaded files
Fixed the following:
- Destroying volume in 'UploadAbandoned' state resulted in NPE
- Existing upload volume functionality interfered with this, added proper checks to prevent
that


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6598a65d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6598a65d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6598a65d

Branch: refs/heads/volume-upload
Commit: 6598a65dfbc27b3f06d77b5a450bdf0f94a7be44
Parents: c9908d2
Author: Koushik Das <koushik@apache.org>
Authored: Fri Jan 23 17:10:29 2015 +0530
Committer: Koushik Das <koushik@apache.org>
Committed: Sat Jan 31 17:13:22 2015 +0530

----------------------------------------------------------------------
 .../cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java  | 1 +
 .../apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java  | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6598a65d/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
index fbce860..8c92cfc 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
@@ -97,6 +97,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager
{
         stateMachines.addTransition(State.Destroying, Event.DestroyRequested, State.Destroying);
         stateMachines.addTransition(State.Destroying, Event.OperationSuccessed, State.Destroyed);
         stateMachines.addTransition(State.Destroying, Event.OperationFailed, State.Destroying);
+        stateMachines.addTransition(State.Failed, Event.DestroyRequested, State.Destroying);
         // TODO: further investigate why an extra event is sent when it is
         // alreay Ready for DownloadListener
         stateMachines.addTransition(State.Ready, Event.OperationSuccessed, State.Ready);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6598a65d/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 f3163ee..ccfeb96 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
@@ -100,6 +100,7 @@ public class VolumeDataStoreDaoImpl extends GenericDaoBase<VolumeDataStoreVO,
Lo
 
         downloadVolumeSearch = createSearchBuilder();
         downloadVolumeSearch.and("download_url", downloadVolumeSearch.entity().getExtractUrl(),
Op.NNULL);
+        downloadVolumeSearch.and("download_url_created", downloadVolumeSearch.entity().getExtractUrlCreated(),
Op.NNULL);
         downloadVolumeSearch.and("destroyed", downloadVolumeSearch.entity().getDestroyed(),
SearchCriteria.Op.EQ);
         downloadVolumeSearch.done();
 


Mime
View raw message