removed start/stop VR from queue

Anthony Xu · Anthony Xu · commit 071004e3e193 · 2014-09-17T19:04:34.000-07:00
diff --git a/core/src/com/cloud/agent/api/StartCommand.java b/core/src/com/cloud/agent/api/StartCommand.java
@@ -36,6 +36,10 @@ public VirtualMachineTO getVirtualMachine() {
 
     @Override
     public boolean executeInSequence() {
+        //VR start doesn't go through queue
+        if (vm.getName() != null && vm.getName().startsWith("r-")) {
+            return false;
+        }
         return executeInSequence;
     }
 
diff --git a/core/src/com/cloud/agent/api/StopCommand.java b/core/src/com/cloud/agent/api/StopCommand.java
@@ -56,6 +56,10 @@ public StopCommand(String vmName, boolean executeInSequence, boolean checkBefore
 
     @Override
     public boolean executeInSequence() {
+        //VR stop doesn't go through queue
+        if (vmName != null && vmName.startsWith("r-")) {
+            return false;
+        }
         return executeInSequence;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@ public VirtualMachineTO getVirtualMachine() {`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`public boolean executeInSequence() {`
	`39`	`+ //VR start doesn't go through queue`
	`40`	`+ if (vm.getName() != null && vm.getName().startsWith("r-")) {`
	`41`	`+ return false;`
	`42`	`+ }`
`39`	`43`	`return executeInSequence;`
`40`	`44`	`}`
`41`	`45`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ public StopCommand(String vmName, boolean executeInSequence, boolean checkBefore`
`56`	`56`
`57`	`57`	`@Override`
`58`	`58`	`public boolean executeInSequence() {`
	`59`	`+ //VR stop doesn't go through queue`
	`60`	`+ if (vmName != null && vmName.startsWith("r-")) {`
	`61`	`+ return false;`
	`62`	`+ }`
`59`	`63`	`return executeInSequence;`
`60`	`64`	`}`
`61`	`65`