CLOUDSTACK-6363: [Automation] jetty server is going OOM for simulator

koushik-das · koushik-das · commit 5f53dced5e32 · 2014-04-14T09:39:51.000+05:30
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java
@@ -25,10 +25,12 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.log4j.Logger;
 
 import com.cloud.agent.IAgentControl;
@@ -244,7 +246,19 @@ protected String findScript(String script) {
     }
 
     @Override
-    public Answer executeRequest(Command cmd) {
+    public final Answer executeRequest(final Command cmd) {
+        final AtomicReference<Answer> result = new AtomicReference<Answer>();
+        new ManagedContextRunnable() {
+            @Override
+            protected void runInContext() {
+                result.set(executeRequestInContext(cmd));
+            }
+        }.run();
+
+        return result.get();
+    }
+
+    public Answer executeRequestInContext(Command cmd) {
         return null;
     }
 
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java
@@ -77,7 +77,7 @@ public AgentRoutingResource() {
     }
 
     @Override
-    public Answer executeRequest(Command cmd) {
+    public Answer executeRequestInContext(Command cmd) {
         try {
             if (cmd instanceof StartCommand) {
                 return execute((StartCommand)cmd);
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java
@@ -54,7 +54,7 @@ public AgentStorageResource() {
     }
 
     @Override
-    public Answer executeRequest(Command cmd) {
+    public Answer executeRequestInContext(Command cmd) {
         if (cmd instanceof ReadyCommand) {
             return new ReadyAnswer((ReadyCommand)cmd);
         } else {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public AgentRoutingResource() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@Override`
`80`		`- public Answer executeRequest(Command cmd) {`
	`80`	`+ public Answer executeRequestInContext(Command cmd) {`
`81`	`81`	`try {`
`82`	`82`	`if (cmd instanceof StartCommand) {`
`83`	`83`	`return execute((StartCommand)cmd);`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public AgentStorageResource() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- public Answer executeRequest(Command cmd) {`
	`57`	`+ public Answer executeRequestInContext(Command cmd) {`
`58`	`58`	`if (cmd instanceof ReadyCommand) {`
`59`	`59`	`return new ReadyAnswer((ReadyCommand)cmd);`
`60`	`60`	`} else {`