You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2014/04/14 06:22:42 UTC

git commit: updated refs/heads/master to 5f53dce

Repository: cloudstack
Updated Branches:
  refs/heads/master a3bfda135 -> 5f53dced5


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


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

Branch: refs/heads/master
Commit: 5f53dced5e32eb5cc79d82a2b86b111be510d3fd
Parents: a3bfda1
Author: Koushik Das <ko...@apache.org>
Authored: Thu Apr 10 12:05:04 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Mon Apr 14 09:39:51 2014 +0530

----------------------------------------------------------------------
 .../src/com/cloud/resource/AgentResourceBase.java   | 16 +++++++++++++++-
 .../com/cloud/resource/AgentRoutingResource.java    |  2 +-
 .../com/cloud/resource/AgentStorageResource.java    |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f53dced/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java
index 3cc9115..cf4b40e 100644
--- 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.Date;
 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 @@ public class AgentResourceBase implements ServerResource {
     }
 
     @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;
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f53dced/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java
index 2fca291..f857261 100644
--- 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 class AgentRoutingResource extends AgentStorageResource {
     }
 
     @Override
-    public Answer executeRequest(Command cmd) {
+    public Answer executeRequestInContext(Command cmd) {
         try {
             if (cmd instanceof StartCommand) {
                 return execute((StartCommand)cmd);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f53dced/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java
index f52fd60..751da9e 100644
--- 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 class AgentStorageResource extends AgentResourceBase implements Secondary
     }
 
     @Override
-    public Answer executeRequest(Command cmd) {
+    public Answer executeRequestInContext(Command cmd) {
         if (cmd instanceof ReadyCommand) {
             return new ReadyAnswer((ReadyCommand)cmd);
         } else {