cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [23/50] [abbrv] git commit: updated refs/heads/rbac to 929fbab
Date Fri, 17 Jan 2014 22:40:25 GMT
CLOUDSTACK-5696: fix a regression caused by out-of-band sync changes


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

Branch: refs/heads/rbac
Commit: 14e399410bb86b89284738b23be147e564f38c10
Parents: 753b563
Author: Kelven Yang <kelveny@gmail.com>
Authored: Wed Jan 15 16:21:05 2014 -0800
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Wed Jan 15 16:22:27 2014 -0800

----------------------------------------------------------------------
 api/src/com/cloud/vm/VirtualMachine.java                         | 1 +
 .../cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java      | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14e39941/api/src/com/cloud/vm/VirtualMachine.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/VirtualMachine.java b/api/src/com/cloud/vm/VirtualMachine.java
index 52b947f..d6e70a8 100755
--- a/api/src/com/cloud/vm/VirtualMachine.java
+++ b/api/src/com/cloud/vm/VirtualMachine.java
@@ -124,6 +124,7 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity,
I
             s_fsm.addTransition(State.Stopping, VirtualMachine.Event.FollowAgentPowerOffReport,
State.Stopped);
             s_fsm.addTransition(State.Running, VirtualMachine.Event.FollowAgentPowerOffReport,
State.Stopped);
             s_fsm.addTransition(State.Migrating, VirtualMachine.Event.FollowAgentPowerOffReport,
State.Stopped);
+            s_fsm.addTransition(State.Stopped, VirtualMachine.Event.FollowAgentPowerOffReport,
State.Stopped);
         }
 
         public static boolean isVmStarted(State oldState, Event e, State newState) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14e39941/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
index bfd9f18..c3ac0e6 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
@@ -475,7 +475,9 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
                         if (jobDispatcher != null) {
                             jobDispatcher.runJob(job);
                         } else {
-                            s_logger.error("Unable to find a wakeup dispatcher from the joined
job: " + job);
+                            // TODO, job wakeup is not in use yet
+                            if (s_logger.isTraceEnabled())
+                                s_logger.trace("Unable to find a wakeup dispatcher from the
joined job: " + job);
                         }
                     } else {
                         AsyncJobDispatcher jobDispatcher = getDispatcher(job.getDispatcher());


Mime
View raw message