cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [2/3] git commit: updated refs/heads/object_store to 9777e56
Date Mon, 13 May 2013 22:52:09 GMT
We still need the hack of Ready to Ready transition for NFS.


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

Branch: refs/heads/object_store
Commit: 5341f299ff0271a2216f087a1b589b642cc3e9cd
Parents: eeb0123
Author: Min Chen <min.chen@citrix.com>
Authored: Mon May 13 15:33:59 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Mon May 13 15:46:00 2013 -0700

----------------------------------------------------------------------
 .../image/manager/ImageDataManagerImpl.java        |    2 ++
 .../datastore/ObjectInDataStoreManagerImpl.java    |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5341f299/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java
b/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java
index f9dd5a6..d870830 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java
@@ -41,6 +41,8 @@ public class ImageDataManagerImpl implements ImageDataManager {
         stateMachine.addTransition(TemplateState.Destroying, TemplateEvent.DestroyRequested,
TemplateState.Destroying);
         stateMachine.addTransition(TemplateState.Destroying, TemplateEvent.OperationFailed,
TemplateState.Destroying);
         stateMachine.addTransition(TemplateState.Destroying, TemplateEvent.OperationSucceeded,
TemplateState.Destroyed);
+        //TODO: this should not be needed, but it happened during testing where multiple
success event is sent to callback
+        stateMachine.addTransition(TemplateState.Ready, TemplateEvent.OperationSucceeded,
TemplateState.Ready);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5341f299/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 78c3184..10c94e4 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
@@ -108,6 +108,9 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager
{
                 State.Destroyed);
         stateMachines.addTransition(State.Destroying, Event.OperationFailed,
                 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);
     }
 
     @Override


Mime
View raw message