cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/master to 071004e
Date Thu, 18 Sep 2014 02:05:15 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 674af6e47 -> 071004e3e


removed start/stop VR from queue


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

Branch: refs/heads/master
Commit: 071004e3e193e92d32eb425e375f3ec13ac1571f
Parents: 674af6e
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Wed Sep 17 19:04:34 2014 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Wed Sep 17 19:04:34 2014 -0700

----------------------------------------------------------------------
 core/src/com/cloud/agent/api/StartCommand.java | 4 ++++
 core/src/com/cloud/agent/api/StopCommand.java  | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/071004e3/core/src/com/cloud/agent/api/StartCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartCommand.java b/core/src/com/cloud/agent/api/StartCommand.java
index d411cba..24b0ac3 100644
--- a/core/src/com/cloud/agent/api/StartCommand.java
+++ b/core/src/com/cloud/agent/api/StartCommand.java
@@ -36,6 +36,10 @@ public class StartCommand extends Command {
 
     @Override
     public boolean executeInSequence() {
+        //VR start doesn't go through queue
+        if (vm.getName() != null && vm.getName().startsWith("r-")) {
+            return false;
+        }
         return executeInSequence;
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/071004e3/core/src/com/cloud/agent/api/StopCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StopCommand.java b/core/src/com/cloud/agent/api/StopCommand.java
index 90b8a04..c4948cd 100755
--- a/core/src/com/cloud/agent/api/StopCommand.java
+++ b/core/src/com/cloud/agent/api/StopCommand.java
@@ -56,6 +56,10 @@ public class StopCommand extends RebootCommand {
 
     @Override
     public boolean executeInSequence() {
+        //VR stop doesn't go through queue
+        if (vmName != null && vmName.startsWith("r-")) {
+            return false;
+        }
         return executeInSequence;
     }
 


Mime
View raw message