cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [02/10] Add Manage Context framework
Date Thu, 03 Oct 2013 19:47:55 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/framework/managed-context/src/test/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContextTest.java
----------------------------------------------------------------------
diff --git a/framework/managed-context/src/test/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContextTest.java b/framework/managed-context/src/test/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContextTest.java
new file mode 100644
index 0000000..aa2d2e6
--- /dev/null
+++ b/framework/managed-context/src/test/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContextTest.java
@@ -0,0 +1,269 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.managed.context.impl;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import org.apache.cloudstack.managed.context.ManagedContextListener;
+import org.apache.cloudstack.managed.threadlocal.ManagedThreadLocal;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DefaultManagedContextTest {
+
+    DefaultManagedContext context;
+    
+    @Before
+    public void init() {
+        ManagedThreadLocal.setValidateInContext(false);
+        
+        context = new DefaultManagedContext();
+    }
+    
+    @Test
+    public void testCallable() throws Exception {
+        assertEquals(5, context.callWithContext(new Callable<Integer>() {
+            @Override
+            public Integer call() throws Exception {
+                return 5;
+            }
+        }).intValue());
+    }
+
+    @Test
+    public void testRunnable() throws Exception {
+        final List<Object> touch = new ArrayList<Object>();
+        
+        context.runWithContext(new Runnable() {
+            @Override
+            public void run() {
+                touch.add(new Object());
+            }
+        });
+        
+        assertEquals(1, touch.size());
+    }
+    
+    @Test
+    public void testGoodListeners() throws Exception {
+        final List<Object> touch = new ArrayList<Object>();
+
+        context.registerListener(new ManagedContextListener<Object>() {
+            @Override
+            public Object onEnterContext(boolean reentry) {
+                touch.add("enter");
+                return "hi";
+            }
+
+            @Override
+            public void onLeaveContext(Object data, boolean reentry) {
+                touch.add("leave");
+                assertEquals("hi", data);
+            }
+        });
+
+        context.registerListener(new ManagedContextListener<Object>() {
+            @Override
+            public Object onEnterContext(boolean reentry) {
+                touch.add("enter1");
+                return "hi";
+            }
+
+            @Override
+            public void onLeaveContext(Object data, boolean reentry) {
+                touch.add("leave1");
+                assertEquals("hi", data);
+            }
+        });
+        
+        assertEquals(5, context.callWithContext(new Callable<Integer>() {
+            @Override
+            public Integer call() throws Exception {
+                return 5;
+            }
+        }).intValue());
+        
+        assertEquals("enter", touch.get(0));
+        assertEquals("enter1", touch.get(1));
+        assertEquals("leave1", touch.get(2));
+        assertEquals("leave", touch.get(3));
+    }
+    
+    @Test
+    public void testBadListeners() throws Exception {
+        final List<Object> touch = new ArrayList<Object>();
+
+        context.registerListener(new ManagedContextListener<Object>() {
+            @Override
+            public Object onEnterContext(boolean reentry) {
+                touch.add("enter");
+                throw new RuntimeException("I'm a failure");
+            }
+
+            @Override
+            public void onLeaveContext(Object data, boolean reentry) {
+                touch.add("leave");
+                assertNull(data);
+            }
+        });
+
+        context.registerListener(new ManagedContextListener<Object>() {
+            @Override
+            public Object onEnterContext(boolean reentry) {
+                touch.add("enter1");
+                return "hi";
+            }
+
+            @Override
+            public void onLeaveContext(Object data, boolean reentry) {
+                touch.add("leave1");
+                assertEquals("hi", data);
+            }
+        });
+        
+        try {
+            context.callWithContext(new Callable<Integer>() {
+                @Override
+                public Integer call() throws Exception {
+                    return 5;
+                }
+            }).intValue();
+            
+            fail();
+        } catch ( Throwable t ) {
+            assertTrue(t instanceof RuntimeException);
+            assertEquals("I'm a failure", t.getMessage());
+        }
+        
+        assertEquals("enter", touch.get(0));
+        assertEquals("enter1", touch.get(1));
+        assertEquals("leave1", touch.get(2));
+        assertEquals("leave", touch.get(3));
+    }
+    
+    @Test
+    public void testBadInvocation() throws Exception {
+        final List<Object> touch = new ArrayList<Object>();
+
+        context.registerListener(new ManagedContextListener<Object>() {
+            @Override
+            public Object onEnterContext(boolean reentry) {
+                touch.add("enter");
+                return "hi";
+            }
+
+            @Override
+            public void onLeaveContext(Object data, boolean reentry) {
+                touch.add("leave");
+                assertEquals("hi", data);
+            }
+        });
+
+        context.registerListener(new ManagedContextListener<Object>() {
+            @Override
+            public Object onEnterContext(boolean reentry) {
+                touch.add("enter1");
+                return "hi1";
+            }
+
+            @Override
+            public void onLeaveContext(Object data, boolean reentry) {
+                touch.add("leave1");
+                assertEquals("hi1", data);
+            }
+        });
+        
+        try {
+            context.callWithContext(new Callable<Integer>() {
+                @Override
+                public Integer call() throws Exception {
+                    throw new RuntimeException("I'm a failure");
+                }
+            }).intValue();
+            
+            fail();
+        } catch ( Throwable t ) {
+            assertTrue(t.getMessage(), t instanceof RuntimeException);
+            assertEquals("I'm a failure", t.getMessage());
+        }
+        
+        assertEquals("enter", touch.get(0));
+        assertEquals("enter1", touch.get(1));
+        assertEquals("leave1", touch.get(2));
+        assertEquals("leave", touch.get(3));
+    }
+    
+    @Test
+    public void testBadListernInExit() throws Exception {
+        final List<Object> touch = new ArrayList<Object>();
+
+        context.registerListener(new ManagedContextListener<Object>() {
+            @Override
+            public Object onEnterContext(boolean reentry) {
+                touch.add("enter");
+                return "hi";
+            }
+
+            @Override
+            public void onLeaveContext(Object data, boolean reentry) {
+                touch.add("leave");
+                assertEquals("hi", data);
+                
+                throw new RuntimeException("I'm a failure");
+            }
+        });
+
+        context.registerListener(new ManagedContextListener<Object>() {
+            @Override
+            public Object onEnterContext(boolean reentry) {
+                touch.add("enter1");
+                return "hi1";
+            }
+
+            @Override
+            public void onLeaveContext(Object data, boolean reentry) {
+                touch.add("leave1");
+                assertEquals("hi1", data);
+            }
+        });
+        
+        try {
+            context.callWithContext(new Callable<Integer>() {
+                @Override
+                public Integer call() throws Exception {
+                    return 5;
+                }
+            }).intValue();
+            
+            fail();
+        } catch ( Throwable t ) {
+            assertTrue(t.getMessage(), t instanceof RuntimeException);
+            assertEquals("I'm a failure", t.getMessage());
+        }
+        
+        assertEquals("enter", touch.get(0));
+        assertEquals("enter1", touch.get(1));
+        assertEquals("leave1", touch.get(2));
+        assertEquals("leave", touch.get(3));
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/framework/pom.xml
----------------------------------------------------------------------
diff --git a/framework/pom.xml b/framework/pom.xml
index 1764076..4ea2df1 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -37,5 +37,6 @@
     <module>cluster</module>
     <module>db</module>
     <module>config</module>
+    <module>managed-context</module>
   </modules>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
----------------------------------------------------------------------
diff --git a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
index 1c0c6be..478c8d7 100644
--- a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
+++ b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
@@ -20,7 +20,9 @@
 package org.apache.cloudstack.mom.rabbitmq;
 
 import com.rabbitmq.client.*;
+
 import org.apache.cloudstack.framework.events.*;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.log4j.Logger;
 
 import com.cloud.utils.Ternary;
@@ -28,6 +30,7 @@ import com.cloud.utils.component.ManagerBase;
 
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
+
 import java.io.IOException;
 import java.net.ConnectException;
 import java.util.Map;
@@ -493,12 +496,13 @@ public class RabbitMQEventBus extends ManagerBase implements EventBus {
     }
 
     // retry logic to connect back to AMQP server after loss of connection
-    private class ReconnectionTask implements Runnable {
+    private class ReconnectionTask extends ManagedContextRunnable {
 
         boolean connected = false;
         Connection connection = null;
 
-        public void run() {
+        @Override
+        protected void runInContext() {
 
             while (!connected) {
                 try {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
index 0e4d9ee..1117110 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
@@ -20,7 +20,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.log4j.Logger;
+
 import com.cloud.utils.script.Script;
 
 import org.libvirt.Connect;
@@ -68,10 +71,10 @@ public class KVMHAMonitor extends KVMHABase implements Runnable {
         }
     }
 
-    private class Monitor implements Runnable {
+    private class Monitor extends ManagedContextRunnable {
 
         @Override
-        public void run() {
+        protected void runInContext() {
             synchronized (_storagePool) {
                 for (String uuid : _storagePool.keySet()) {
                     NfsStoragePool primaryStoragePool = _storagePool.get(uuid);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
index 8da9da0..9dfe91d 100755
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
@@ -31,7 +31,6 @@ import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.AddUcsManagerCmd;
 import org.apache.cloudstack.api.AssociateUcsProfileToBladeCmd;
 import org.apache.cloudstack.api.DeleteUcsManagerCmd;
@@ -43,6 +42,7 @@ import org.apache.cloudstack.api.response.UcsBladeResponse;
 import org.apache.cloudstack.api.response.UcsManagerResponse;
 import org.apache.cloudstack.api.response.UcsProfileResponse;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.configuration.Config;
 import com.cloud.dc.ClusterDetailsDao;
@@ -98,7 +98,7 @@ public class UcsManagerImpl implements UcsManager {
     private ScheduledExecutorService syncBladesExecutor;
     private int syncBladeInterval;
 
-    private class SyncBladesThread implements Runnable {
+    private class SyncBladesThread extends ManagedContextRunnable {
 
 		private void discoverNewBlades(Map<String, UcsBladeVO> previous,
 				Map<String, ComputeBlade> now, UcsManagerVO mgr) {
@@ -156,7 +156,7 @@ public class UcsManagerImpl implements UcsManager {
     	}
 
 		@Override
-		public void run() {
+		protected void runInContext() {
 			try {
 				List<UcsManagerVO> mgrs = ucsDao.listAll();
 				for (UcsManagerVO mgr : mgrs) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
index 6b719eb..3f8fc5c 100644
--- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
+++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
@@ -36,11 +36,11 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
-
 import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
@@ -749,9 +749,9 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast
         _gcCandidateElbVmIds = currentGcCandidates;
     }
     
-    public class CleanupThread implements Runnable {
+    public class CleanupThread extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             garbageCollectUnusedElbVms();
             
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1c85bc4..d8c6f40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,6 +172,7 @@
     <module>test</module>
     <module>client</module>
     <module>services</module>
+    <module>maven-standard</module>
   </modules>
 
   <dependencyManagement>
@@ -380,6 +381,16 @@
         <artifactId>wsdl4j</artifactId>
         <version>1.4</version>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.7.5</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/alert/AlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
index 6f5d25a..ed0c9fd 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -48,6 +48,7 @@ import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 
@@ -455,9 +456,9 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi
 
     }
 
-    class CapacityChecker extends TimerTask {
+    class CapacityChecker extends ManagedContextTimerTask {
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 s_logger.debug("Running Capacity Checker ... ");
                 checkForAlerts();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/api/ApiAsyncJobDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiAsyncJobDispatcher.java b/server/src/com/cloud/api/ApiAsyncJobDispatcher.java
index 7092ef3..22ccb89 100644
--- a/server/src/com/cloud/api/ApiAsyncJobDispatcher.java
+++ b/server/src/com/cloud/api/ApiAsyncJobDispatcher.java
@@ -36,6 +36,7 @@ import org.apache.cloudstack.framework.jobs.AsyncJob;
 import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
 import org.apache.cloudstack.jobs.JobInfo;
+import org.apache.cloudstack.managed.context.ManagedContext;
 
 import com.cloud.user.Account;
 import com.cloud.user.User;
@@ -51,12 +52,23 @@ public class ApiAsyncJobDispatcher extends AdapterBase implements AsyncJobDispat
     @Inject private AsyncJobManager _asyncJobMgr;
     @Inject
     private EntityManager _entityMgr;
+    @Inject
+    ManagedContext _managedContext;
     
     public ApiAsyncJobDispatcher() {
     }
     
-	@Override
-    public void runJob(AsyncJob job) {
+    @Override
+    public void runJob(final AsyncJob job) {
+        _managedContext.runWithContext(new Runnable() {
+            @Override
+            public void run() {
+                runJobInContext(job);
+            }
+        });
+    }
+    
+	protected void runJobInContext(AsyncJob job) {
         BaseAsyncCmd cmdObj = null;
         try {
             Class<?> cmdClass = Class.forName(job.getCmd());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 26789e3..b73045d 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -119,6 +119,7 @@ import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
 import org.apache.cloudstack.framework.jobs.AsyncJob;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
 import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.api.response.ApiResponseSerializer;
 import com.cloud.configuration.Config;
@@ -183,11 +184,6 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
     public ApiServer() {
     }
 
-    @PostConstruct
-    void initComponent() {
-        CallContext.init(_entityMgr);
-    }
-
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         init();
@@ -976,7 +972,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
         }
     }
 
-    static class WorkerTask implements Runnable {
+    static class WorkerTask extends ManagedContextRunnable {
         private final HttpService _httpService;
         private final HttpServerConnection _conn;
 
@@ -986,7 +982,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
         }
 
         @Override
-        public void run() {
+        protected void runInContext() {
             HttpContext context = new BasicHttpContext(null);
             try {
                 while (!Thread.interrupted() && _conn.isOpen()) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/api/ApiServlet.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index 552327c..def18d0 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -34,11 +34,11 @@ import javax.servlet.http.HttpSession;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.support.SpringBeanAutowiringSupport;
-
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.managed.context.ManagedContext;
 
 import com.cloud.exception.CloudAuthenticationException;
 import com.cloud.user.Account;
@@ -57,6 +57,8 @@ public class ApiServlet extends HttpServlet {
     @Inject AccountService _accountMgr;
     @Inject
     EntityManager _entityMgr;
+    @Inject
+    ManagedContext _managedContext;
 
     public ApiServlet() {
     }
@@ -105,8 +107,16 @@ public class ApiServlet extends HttpServlet {
         }
     }
 
-    @SuppressWarnings("unchecked")
-    private void processRequest(HttpServletRequest req, HttpServletResponse resp) {
+    private void processRequest(final HttpServletRequest req, final HttpServletResponse resp) {
+        _managedContext.runWithContext(new Runnable() {
+            @Override
+            public void run() {
+                processRequestInContext(req, resp);
+            }
+        });
+    }
+    
+    private void processRequestInContext(HttpServletRequest req, HttpServletResponse resp) {
         StringBuffer auditTrailSb = new StringBuffer();
         auditTrailSb.append(" " + req.getRemoteAddr());
         auditTrailSb.append(" -- " + req.getMethod() + " ");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 8cd44f4..dcfb24c 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Timer;
-import java.util.TimerTask;
 import java.util.TreeSet;
 
 import javax.ejb.Local;
@@ -43,6 +42,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.messagebus.MessageBus;
 import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
@@ -688,9 +688,9 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
         return false;
     }
 
-    class HostReservationReleaseChecker extends TimerTask {
+    class HostReservationReleaseChecker extends ManagedContextTimerTask {
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 s_logger.debug("Checking if any host reservation can be released ... ");
                 checkHostReservations();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
index f1e0f3f..1107a7a 100644
--- a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
@@ -26,8 +26,8 @@ import javax.naming.ConfigurationException;
 
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
-
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.alert.AlertManager;
 import com.cloud.usage.dao.UsageJobDao;
@@ -65,9 +65,9 @@ public class HighAvailabilityManagerExtImpl extends HighAvailabilityManagerImpl
         return true;
     }
 	
-	protected class UsageServerMonitorTask implements Runnable {
+	protected class UsageServerMonitorTask  extends ManagedContextRunnable{
         @Override
-        public void run() {
+        protected void runInContext() {
             if (s_logger.isInfoEnabled()) {
                 s_logger.info("checking health of usage server");
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index 464b952..59337c0 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -31,10 +31,10 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.NDC;
-
-import org.apache.cloudstack.context.ServerContexts;
 import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContext;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.alert.AlertManager;
@@ -116,6 +116,9 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
     @Inject
     ClusterDetailsDao _clusterDetailsDao;
     long _serverId;
+    
+    @Inject
+    ManagedContext _managedContext;
 
     List<Investigator> _investigators;
     public List<Investigator> getInvestigators() {
@@ -773,9 +776,9 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
         return true;
     }
 
-    protected class CleanupTask implements Runnable {
+    protected class CleanupTask extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             s_logger.info("HA Cleanup Thread Running");
 
             try {
@@ -793,71 +796,75 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
 
         @Override
         public void run() {
-            ServerContexts.registerSystemContext();
-            try {
-                s_logger.info("Starting work");
-                while (!_stopped) {
-                    HaWorkVO work = null;
-                        try {
-                        s_logger.trace("Checking the database");
-                        work = _haDao.take(_serverId);
-                        if (work == null) {
-                            try {
-                                synchronized (this) {
-                                    wait(_timeToSleep);
-                                }
-                                continue;
-                            } catch (final InterruptedException e) {
-                                s_logger.info("Interrupted");
-                                continue;
-                            }
-                        }
+            s_logger.info("Starting work");
+            while (!_stopped) {
+                _managedContext.runWithContext(new Runnable() {
+                    @Override
+                    public void run() {
+                        runWithContext();
+                    }
+                });
+            }
+            s_logger.info("Time to go home!");
+        }
 
-                        NDC.push("work-" + work.getId());
-                        s_logger.info("Processing " + work);
-
-                        try {
-                            final WorkType wt = work.getWorkType();
-                            Long nextTime = null;
-                            if (wt == WorkType.Migration) {
-                                nextTime = migrate(work);
-                            } else if (wt == WorkType.HA) {
-                                nextTime = restart(work);
-                            } else if (wt == WorkType.Stop || wt == WorkType.CheckStop || wt == WorkType.ForceStop) {
-                                nextTime = stopVM(work);
-                            } else if (wt == WorkType.Destroy) {
-                                nextTime = destroyVM(work);
-                            } else {
-                                assert false : "How did we get here with " + wt.toString();
-                                continue;
-                            }
-
-                            if (nextTime == null) {
-                                s_logger.info("Completed " + work);
-                                work.setStep(Step.Done);
-                            } else {
-                                s_logger.info("Rescheduling " + work + " to try again at " + new Date(nextTime << 10));
-                                work.setTimeToTry(nextTime);
-                                work.setServerId(null);
-                                work.setDateTaken(null);
-                            }
-                        } catch (Exception e) {
-                            s_logger.error("Terminating " + work, e);
-                            work.setStep(Step.Error);
-                        }
-                        _haDao.update(work.getId(), work);
-                    } catch (final Throwable th) {
-                        s_logger.error("Caught this throwable, ", th);
-                    } finally {
-                        if (work != null) {
-                            NDC.pop();
-                            }
+        private void runWithContext() {
+            HaWorkVO work = null;
+                try {
+                s_logger.trace("Checking the database");
+                work = _haDao.take(_serverId);
+                if (work == null) {
+                    try {
+                        synchronized (this) {
+                            wait(_timeToSleep);
                         }
+                        return;
+                    } catch (final InterruptedException e) {
+                        s_logger.info("Interrupted");
+                        return;
+                    }
+                }
+
+                NDC.push("work-" + work.getId());
+                s_logger.info("Processing " + work);
+
+                try {
+                    final WorkType wt = work.getWorkType();
+                    Long nextTime = null;
+                    if (wt == WorkType.Migration) {
+                        nextTime = migrate(work);
+                    } else if (wt == WorkType.HA) {
+                        nextTime = restart(work);
+                    } else if (wt == WorkType.Stop || wt == WorkType.CheckStop || wt == WorkType.ForceStop) {
+                        nextTime = stopVM(work);
+                    } else if (wt == WorkType.Destroy) {
+                        nextTime = destroyVM(work);
+                    } else {
+                        assert false : "How did we get here with " + wt.toString();
+                        return;
+                    }
+
+                    if (nextTime == null) {
+                        s_logger.info("Completed " + work);
+                        work.setStep(Step.Done);
+                    } else {
+                        s_logger.info("Rescheduling " + work + " to try again at " + new Date(nextTime << 10));
+                        work.setTimeToTry(nextTime);
+                        work.setServerId(null);
+                        work.setDateTaken(null);
                     }
-                s_logger.info("Time to go home!");
+                } catch (Exception e) {
+                    s_logger.error("Terminating " + work, e);
+                    work.setStep(Step.Error);
+                }
+                _haDao.update(work.getId(), work);
+            } catch (final Throwable th) {
+                s_logger.error("Caught this throwable, ", th);
             } finally {
-                ServerContexts.unregisterSystemContext();
-            }
+                if (work != null) {
+                    NDC.pop();
+                    }
+                }
         }
 
         public synchronized void wakup() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java b/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java
index f5c6eec..00dd25c 100644
--- a/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java
+++ b/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java
@@ -31,8 +31,8 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
-
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.ExternalNetworkResourceUsageAnswer;
@@ -331,14 +331,14 @@ public class ExternalDeviceUsageManagerImpl extends ManagerBase implements Exter
         }
     }
 
-    protected class ExternalDeviceNetworkUsageTask implements Runnable {
+    protected class ExternalDeviceNetworkUsageTask extends ManagedContextRunnable {
 
         public ExternalDeviceNetworkUsageTask() {
 
         }
 
         @Override
-        public void run() {
+        protected void runInContext() {
             GlobalLock scanLock = GlobalLock.getInternLock("ExternalDeviceNetworkUsageManagerImpl");
             try {
                 if (scanLock.lock(20)) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java b/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java
index 1daa3f0..4794ee4 100644
--- a/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java
@@ -29,8 +29,8 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
-
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.configuration.Config;
 import com.cloud.exception.ResourceUnavailableException;
@@ -87,9 +87,9 @@ public class LBHealthCheckManagerImpl extends ManagerBase implements LBHealthChe
         return this.name;
     }
 
-    protected class UpdateLBHealthCheck implements Runnable {
+    protected class UpdateLBHealthCheck extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 updateLBHealthCheck(Scheme.Public);
                 updateLBHealthCheck(Scheme.Internal);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 043c376..5ea7560 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -41,16 +41,15 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.context.ServerContexts;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
@@ -852,14 +851,13 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
         }
 
 
-    protected class NetworkUsageTask implements Runnable {
+    protected class NetworkUsageTask extends ManagedContextRunnable {
 
         public NetworkUsageTask() {
         }
 
         @Override
-        public void run() {
-            ServerContexts.registerSystemContext();
+        protected void runInContext() {
             try{
                 final List<DomainRouterVO> routers = _routerDao.listByStateAndNetworkType(State.Running, GuestType.Isolated, mgmtSrvrId);
                 s_logger.debug("Found " + routers.size() + " running routers. ");
@@ -957,19 +955,17 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
                 }
             } catch (Exception e) {
                 s_logger.warn("Error while collecting network stats", e);
-            } finally {
-                ServerContexts.unregisterSystemContext();
             }
         }
     }
 
-    protected class NetworkStatsUpdateTask implements Runnable {
+    protected class NetworkStatsUpdateTask extends ManagedContextRunnable {
 
         public NetworkStatsUpdateTask() {
         }
 
         @Override
-        public void run() {
+        protected void runInContext() {
             GlobalLock scanLock = GlobalLock.getInternLock("network.stats");
             try {
                 if(scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
@@ -1201,7 +1197,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
         return priority;
     }
 
-    protected class RvRStatusUpdateTask implements Runnable {
+    protected class RvRStatusUpdateTask extends ManagedContextRunnable {
 
         public RvRStatusUpdateTask() {
         }
@@ -1280,60 +1276,54 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
         }
 
         @Override
-        public void run() {
-            ServerContexts.registerSystemContext();
-            try {
-                while (true) {
-                    try {
-                            Long networkId = _vrUpdateQueue.take();  // This is a blocking call so this thread won't run all the time if no work item in queue.
-                            List <DomainRouterVO> routers = _routerDao.listByNetworkAndRole(networkId, Role.VIRTUAL_ROUTER);
-        
-                            if (routers.size() != 2) {
-                                continue;
-                            }
-                            /*
-                             * We update the router pair which the lower id router owned by this mgmt server, in order
-                             * to prevent duplicate update of router status from cluster mgmt servers
-                             */
-                            DomainRouterVO router0 = routers.get(0);
-                            DomainRouterVO router1 = routers.get(1);
-                            DomainRouterVO router = router0;
-                            if ((router0.getId() < router1.getId()) && router0.getHostId() != null) {
-                            	router = router0;
-                            } else {
-                            	router = router1;
-                            }
-                            if (router.getHostId() == null) {
-                            	s_logger.debug("Skip router pair (" + router0.getInstanceName() + "," + router1.getInstanceName() + ") due to can't find host");
-                            	continue;
-                            }
-                            HostVO host = _hostDao.findById(router.getHostId());
-                            if (host == null || host.getManagementServerId() == null ||
-                                    host.getManagementServerId() != ManagementServerNode.getManagementServerId()) {
-                            	s_logger.debug("Skip router pair (" + router0.getInstanceName() + "," + router1.getInstanceName() + ") due to not belong to this mgmt server");
-                                continue;
-                            }
-                        updateRoutersRedundantState(routers);
-                        checkDuplicateMaster(routers);
-                        checkSanity(routers);
-                    } catch (Exception ex) {
-                        s_logger.error("Fail to complete the RvRStatusUpdateTask! ", ex);
-                    }
+        protected void runInContext() {
+            while (true) {
+                try {
+                        Long networkId = _vrUpdateQueue.take();  // This is a blocking call so this thread won't run all the time if no work item in queue.
+                        List <DomainRouterVO> routers = _routerDao.listByNetworkAndRole(networkId, Role.VIRTUAL_ROUTER);
+    
+                        if (routers.size() != 2) {
+                            continue;
+                        }
+                        /*
+                         * We update the router pair which the lower id router owned by this mgmt server, in order
+                         * to prevent duplicate update of router status from cluster mgmt servers
+                         */
+                        DomainRouterVO router0 = routers.get(0);
+                        DomainRouterVO router1 = routers.get(1);
+                        DomainRouterVO router = router0;
+                        if ((router0.getId() < router1.getId()) && router0.getHostId() != null) {
+                        	router = router0;
+                        } else {
+                        	router = router1;
+                        }
+                        if (router.getHostId() == null) {
+                        	s_logger.debug("Skip router pair (" + router0.getInstanceName() + "," + router1.getInstanceName() + ") due to can't find host");
+                        	continue;
+                        }
+                        HostVO host = _hostDao.findById(router.getHostId());
+                        if (host == null || host.getManagementServerId() == null ||
+                                host.getManagementServerId() != ManagementServerNode.getManagementServerId()) {
+                        	s_logger.debug("Skip router pair (" + router0.getInstanceName() + "," + router1.getInstanceName() + ") due to not belong to this mgmt server");
+                            continue;
+                        }
+                    updateRoutersRedundantState(routers);
+                    checkDuplicateMaster(routers);
+                    checkSanity(routers);
+                } catch (Exception ex) {
+                    s_logger.error("Fail to complete the RvRStatusUpdateTask! ", ex);
                 }
-            } finally {
-                ServerContexts.unregisterSystemContext();
             }
         }
     }
     
-    protected class CheckRouterTask implements Runnable {
+    protected class CheckRouterTask extends ManagedContextRunnable {
 
         public CheckRouterTask() {
         }
 
         @Override
-        public void run() {
-            ServerContexts.registerSystemContext();
+        protected void runInContext() {
             try {
                 final List<DomainRouterVO> routers = _routerDao.listIsolatedByHostId(null);
                 s_logger.debug("Found " + routers.size() + " routers to update status. ");
@@ -1350,8 +1340,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
                 }
             } catch (Exception ex) {
                 s_logger.error("Fail to complete the CheckRouterTask! ", ex);
-            } finally {
-                ServerContexts.unregisterSystemContext();
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index 18ee0f1..8b2db9d 100755
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -40,7 +40,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd;
 import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd;
 import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupCmd;
@@ -50,6 +49,7 @@ import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupI
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
 
 import com.cloud.agent.AgentManager;
@@ -187,9 +187,9 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
         }
     }
 
-    public class WorkerThread implements Runnable {
+    public class WorkerThread extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 Transaction txn = Transaction.open("SG Work");
                 try {
@@ -210,9 +210,9 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
         }
     }
 
-    public class CleanupThread implements Runnable {
+    public class CleanupThread extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 Transaction txn = Transaction.open("SG Cleanup");
                 try {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
index a42881e..2fee7f3 100644
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
@@ -25,8 +25,10 @@ import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.ejb.Local;
+import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import org.apache.cloudstack.managed.context.ManagedContext;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
@@ -54,6 +56,9 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl{
     SecurityGroupWorkTracker _workTracker;
     SecurityManagerMBeanImpl _mBean;
     
+    @Inject
+    ManagedContext _managedContext;
+    
     WorkerThread[] _workers;
     private Set<Long> _disabledVms = Collections.newSetFromMap(new ConcurrentHashMap<Long, Boolean>());
     private boolean _schedulerDisabled = false;
@@ -68,7 +73,12 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl{
         public void run() {
             while (true) {
                 try{
-                    work(); 
+                    _managedContext.runWithContext(new Runnable() {
+                        @Override
+                        public void run() {
+                            work(); 
+                        }
+                    });
                 } catch (final Throwable th) {
                     s_logger.error("SG Work: Caught this throwable, ", th);
                 } 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 73b3aea..651e82c 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -31,8 +31,6 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd;
 import org.apache.cloudstack.api.command.user.vpc.ListStaticRoutesCmd;
@@ -40,6 +38,8 @@ import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.log4j.Logger;
 
 import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManager;
@@ -1932,9 +1932,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         }
     }
     
-    protected class VpcCleanupTask implements Runnable {
+    protected class VpcCleanupTask extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 GlobalLock lock = GlobalLock.getInternLock("VpcCleanup");
                 if (lock == null) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/projects/ProjectManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java
index edcdf3f..a385739 100755
--- a/server/src/com/cloud/projects/ProjectManagerImpl.java
+++ b/server/src/com/cloud/projects/ProjectManagerImpl.java
@@ -42,7 +42,7 @@ import javax.naming.ConfigurationException;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -83,7 +83,6 @@ import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
-
 import com.sun.mail.smtp.SMTPMessage;
 import com.sun.mail.smtp.SMTPSSLTransport;
 import com.sun.mail.smtp.SMTPTransport;
@@ -1003,9 +1002,9 @@ public class ProjectManagerImpl extends ManagerBase implements ProjectManager {
         }
     }
 
-    public class ExpiredInvitationsCleanup implements Runnable {
+    public class ExpiredInvitationsCleanup extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 TimeZone.getDefault();
                 List<ProjectInvitationVO> invitationsToExpire = _projectInvitationDao.listInvitationsToExpire(_invitationTimeOut);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 376e943..1f8713a 100755
--- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -32,9 +32,9 @@ import javax.naming.ConfigurationException;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
-
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -939,13 +939,13 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         return _resourceCountDao.getResourceCount(account.getId(), ResourceOwnerType.Account, type);
     }
 
-    protected class ResourceCountCheckTask implements Runnable {
+    protected class ResourceCountCheckTask extends ManagedContextRunnable {
         public ResourceCountCheckTask() {
 
         }
 
         @Override
-        public void run() {
+        protected void runInContext() {
             s_logger.info("Running resource count check periodic task");
             List<DomainVO> domains = _domainDao.findImmediateChildrenForParent(DomainVO.ROOT_DOMAIN);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 1c31610..0a0fcdc 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -432,6 +432,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
@@ -2862,9 +2863,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         return cmdList;
     }
 
-    protected class EventPurgeTask implements Runnable {
+    protected class EventPurgeTask extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 GlobalLock lock = GlobalLock.getInternLock("EventPurge");
                 if (lock == null) {
@@ -2896,9 +2897,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         }
     }
 
-    protected class AlertPurgeTask implements Runnable {
+    protected class AlertPurgeTask extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 GlobalLock lock = GlobalLock.getInternLock("AlertPurge");
                 if (lock == null) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
index 5e110aa..b4ec915 100755
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -37,6 +37,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
@@ -230,9 +231,9 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
 
 	}
 
-	class HostCollector implements Runnable {
+	class HostCollector extends ManagedContextRunnable {
 		@Override
-        public void run() {
+        protected void runInContext() {
 			try {
 				s_logger.debug("HostStatsCollector is running...");
 
@@ -273,9 +274,9 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
 		}
 	}
 
-	class VmStatsCollector implements Runnable {
+	class VmStatsCollector extends ManagedContextRunnable {
 		@Override
-        public void run() {
+        protected void runInContext() {
 			try {
 				s_logger.debug("VmStatsCollector is running...");
 
@@ -350,9 +351,9 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
 		return _VmStats.get(id);
 	}
 
-    class VmDiskStatsUpdaterTask implements Runnable {
+    class VmDiskStatsUpdaterTask extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             GlobalLock scanLock = GlobalLock.getInternLock("vm.disk.stats");
             try {
                 if(scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
@@ -397,9 +398,9 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
         }
     }
 
-    class VmDiskStatsTask implements Runnable {
+    class VmDiskStatsTask extends ManagedContextRunnable {
         @Override
-        public void run() {
+        protected void runInContext() {
             // collect the vm disk statistics(total) from hypervisor. added by weizhou, 2013.03.
             Transaction txn = Transaction.open(Transaction.CLOUD_DB);
             try {
@@ -520,9 +521,9 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
         }
     }
 
-	class StorageCollector implements Runnable {
+	class StorageCollector extends ManagedContextRunnable {
 		@Override
-        public void run() {
+        protected void runInContext() {
 			try {
 	            if (s_logger.isDebugEnabled()) {
 	            	s_logger.debug("StorageCollector is running...");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 415111d..c046057 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -43,7 +43,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
-
 import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd;
 import org.apache.cloudstack.api.command.admin.storage.CancelPrimaryStorageMaintenanceCmd;
 import org.apache.cloudstack.api.command.admin.storage.CreateSecondaryStagingStoreCmd;
@@ -74,6 +73,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeAp
 import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
 import org.apache.cloudstack.framework.async.AsyncCallFuture;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDao;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
@@ -1243,13 +1243,13 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
         return (PrimaryDataStoreInfo) dataStoreMgr.getDataStore(primaryStorage.getId(), DataStoreRole.Primary);
     }
 
-    protected class StorageGarbageCollector implements Runnable {
+    protected class StorageGarbageCollector extends ManagedContextRunnable {
 
         public StorageGarbageCollector() {
         }
 
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 s_logger.trace("Storage Garbage Collection Thread is running.");
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/storage/download/DownloadListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/download/DownloadListener.java b/server/src/com/cloud/storage/download/DownloadListener.java
index e5efcb2..91ae0ae 100755
--- a/server/src/com/cloud/storage/download/DownloadListener.java
+++ b/server/src/com/cloud/storage/download/DownloadListener.java
@@ -27,7 +27,6 @@ import javax.inject.Inject;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
@@ -36,6 +35,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService;
 import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
 import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
 import org.apache.cloudstack.storage.command.DownloadCommand;
 import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType;
 import org.apache.cloudstack.storage.command.DownloadProgressCommand;
@@ -68,7 +68,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 public class DownloadListener implements Listener {
 
 
-	private static final class StatusTask extends TimerTask {
+	private static final class StatusTask extends ManagedContextTimerTask {
 		private final DownloadListener dl;
 		private final RequestType reqType;
 
@@ -78,13 +78,13 @@ public class DownloadListener implements Listener {
 		}
 
 		@Override
-		public void run() {
+		protected void runInContext() {
 		  dl.sendCommand(reqType);
 
 		}
 	}
 
-	private static final class TimeoutTask extends TimerTask {
+	private static final class TimeoutTask extends ManagedContextTimerTask {
 		private final DownloadListener dl;
 
 		public TimeoutTask( DownloadListener dl) {
@@ -92,7 +92,7 @@ public class DownloadListener implements Listener {
 		}
 
 		@Override
-		public void run() {
+		protected void runInContext() {
 		  dl.checkProgress();
 		}
 	}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
index 52e20f0..15e9cd3 100644
--- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
@@ -33,11 +33,11 @@ import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotCmd;
-import org.apache.cloudstack.context.ServerContexts;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
 import org.apache.cloudstack.framework.jobs.dao.AsyncJobDao;
 import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
 
 import com.cloud.api.ApiDispatcher;
 import com.cloud.api.ApiGsonHelper;
@@ -371,17 +371,14 @@ public class SnapshotSchedulerImpl extends ManagerBase implements SnapshotSchedu
             _testClockTimer.schedule(_testTimerTask, 100*1000L, 60*1000L);
         }
         else {
-            TimerTask timerTask = new TimerTask() {
+            TimerTask timerTask = new ManagedContextTimerTask() {
                 @Override
-                public void run() {
-                    ServerContexts.registerSystemContext();
+                protected void runInContext() {
                     try {
                         Date currentTimestamp = new Date();
                         poll(currentTimestamp);
                     } catch (Throwable t) {
                         s_logger.warn("Catch throwable in snapshot scheduler ", t);
-                    } finally {
-                        ServerContexts.unregisterSystemContext();
                     }
                 }
             };

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/storage/upload/UploadListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/com/cloud/storage/upload/UploadListener.java
index 09db421..add5877 100755
--- a/server/src/com/cloud/storage/upload/UploadListener.java
+++ b/server/src/com/cloud/storage/upload/UploadListener.java
@@ -27,7 +27,6 @@ import javax.inject.Inject;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.command.user.iso.ExtractIsoCmd;
 import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;
 import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd;
@@ -38,6 +37,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
 import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
 import org.apache.cloudstack.jobs.JobInfo;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
 
 import com.cloud.agent.Listener;
 import com.cloud.agent.api.AgentControlAnswer;
@@ -63,7 +63,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 
 public class UploadListener implements Listener {
 
-    private static final class StatusTask extends TimerTask {
+    private static final class StatusTask extends ManagedContextTimerTask {
         private final UploadListener ul;
         private final RequestType reqType;
 
@@ -73,13 +73,13 @@ public class UploadListener implements Listener {
         }
 
         @Override
-        public void run() {
+        protected void runInContext() {
             ul.sendCommand(reqType);
 
         }
     }
 
-    private static final class TimeoutTask extends TimerTask {
+    private static final class TimeoutTask extends ManagedContextTimerTask {
         private final UploadListener ul;
 
         public TimeoutTask(UploadListener ul) {
@@ -87,7 +87,7 @@ public class UploadListener implements Listener {
         }
 
         @Override
-        public void run() {
+        protected void runInContext() {
             ul.checkProgress();
         }
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
index 12378de..4eb4900 100755
--- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
@@ -34,13 +34,13 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
-
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
 import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
@@ -441,13 +441,13 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor {
 
 	}
 
-    protected class StorageGarbageCollector implements Runnable {
+    protected class StorageGarbageCollector extends ManagedContextRunnable {
 
         public StorageGarbageCollector() {
         }
 
         @Override
-        public void run() {
+        protected void runInContext() {
             try {
                 GlobalLock scanLock = GlobalLock.getInternLock("uploadmonitor.storageGC");
                 try {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 5240102..c1ce892 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -73,6 +73,7 @@ import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.storage.command.AttachCommand;
 import org.apache.cloudstack.storage.command.CommandResult;
 import org.apache.cloudstack.storage.command.DettachCommand;
@@ -488,9 +489,9 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         for (final StoragePoolVO pool : pools) {
             if (pool.getDataCenterId() == zoneId) {
                 s_logger.info("Schedule to preload template " + template.getId() + " into primary storage " + pool.getId());
-                _preloadExecutor.execute(new Runnable() {
+                _preloadExecutor.execute(new ManagedContextRunnable() {
                     @Override
-                    public void run() {
+                    protected void runInContext() {
                         try {
                             reallyRun();
                         } catch (Throwable e) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 396319a..ae93548 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -50,9 +50,9 @@ import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
 import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
 import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.context.ServerContexts;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.region.gslb.GlobalLoadBalancerRuleDao;
 
 import com.cloud.api.ApiDBUtils;
@@ -1492,18 +1492,10 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
         return _userDao.remove(id);
     }
 
-    public class ResourceCountCalculateTask implements Runnable {
+    protected class AccountCleanupTask extends ManagedContextRunnable {
         @Override
-        public void run() {
-
-        }
-    }
-
-    protected class AccountCleanupTask implements Runnable {
-        @Override
-        public void run() {
+        protected void runInContext() {
             try {
-                ServerContexts.registerSystemContext();
                 GlobalLock lock = GlobalLock.getInternLock("AccountCleanup");
                 if (lock == null) {
                     s_logger.debug("Couldn't get the global lock");
@@ -1585,7 +1577,6 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
                     s_logger.error("Exception ", e);
                 } finally {
                     lock.unlock();
-                    ServerContexts.unregisterSystemContext();
                 }
             } catch (Exception e) {
                 s_logger.error("Exception ", e);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/vm/SystemVmLoadScanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/SystemVmLoadScanner.java b/server/src/com/cloud/vm/SystemVmLoadScanner.java
index 3932c3b..6e55216 100644
--- a/server/src/com/cloud/vm/SystemVmLoadScanner.java
+++ b/server/src/com/cloud/vm/SystemVmLoadScanner.java
@@ -21,8 +21,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.context.ServerContexts;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.utils.Pair;
 import com.cloud.utils.concurrency.NamedThreadFactory;
@@ -64,17 +63,14 @@ public class SystemVmLoadScanner<T> {
     }
 
     private Runnable getCapacityScanTask() {
-        return new Runnable() {
+        return new ManagedContextRunnable() {
 
             @Override
-            public void run() {
-                ServerContexts.registerSystemContext();
+            protected void runInContext() {
                 try {
                     reallyRun();
                 } catch (Throwable e) {
                     s_logger.warn("Unexpected exception " + e.getMessage(), e);
-                } finally {
-                    ServerContexts.unregisterSystemContext();
                 }
             }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 55d166c..6e87916 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -61,7 +61,6 @@ import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
 import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
 import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.context.ServerContexts;
 import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
@@ -72,6 +71,7 @@ import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.to.TemplateObjectTO;
@@ -1708,13 +1708,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         }
     }
 
-    protected class ExpungeTask implements Runnable {
+    protected class ExpungeTask extends ManagedContextRunnable {
         public ExpungeTask() {
         }
 
         @Override
-        public void run() {
-            ServerContexts.registerSystemContext();
+        protected void runInContext() {
             GlobalLock scanLock = GlobalLock.getInternLock("UserVMExpunge");
             try {
                 if (scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
@@ -1748,7 +1747,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 }
             } finally {
                 scanLock.releaseRef();
-                ServerContexts.unregisterSystemContext();
             }
         }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index 90ce4db..5f28674 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -35,10 +35,10 @@ import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.managed.context.ManagedContext;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.usage.UsageTypes;
-
 import org.springframework.stereotype.Component;
 
 import com.cloud.alert.AlertManager;
@@ -279,7 +279,17 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
         return true;
     }
 
+    @Override
     public void run() {
+        new ManagedContextRunnable() {
+            @Override
+            protected void runInContext() {
+                runInContext();
+            }
+        };
+    }
+    
+    protected void runInContext() {
         if (s_logger.isInfoEnabled()) {
             s_logger.info("starting usage job...");
         }
@@ -1651,8 +1661,9 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
         m_usageVMSnapshotDao.persist(vsVO);
     }
 
-    private class Heartbeat implements Runnable {
-        public void run() {
+    private class Heartbeat extends ManagedContextRunnable {
+        @Override
+        protected void runInContext() {
             Transaction usageTxn = Transaction.open(Transaction.USAGE_DB);
             try {
                 if(!m_heartbeatLock.lock(3)) { // 3 second timeout
@@ -1757,8 +1768,9 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
         }
     }
     
-    private class SanityCheck implements Runnable {
-        public void run() {
+    private class SanityCheck extends ManagedContextRunnable {
+        @Override
+        protected void runInContext() {
             UsageSanityChecker usc = new UsageSanityChecker();
             try {
                 String errors = usc.runSanityCheck();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/usage/src/com/cloud/usage/parser/UsageParser.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/parser/UsageParser.java b/usage/src/com/cloud/usage/parser/UsageParser.java
index 410e876..80437d5 100644
--- a/usage/src/com/cloud/usage/parser/UsageParser.java
+++ b/usage/src/com/cloud/usage/parser/UsageParser.java
@@ -18,12 +18,13 @@ package com.cloud.usage.parser;
 
 import java.util.Date;
 
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.log4j.Logger;
 
-public abstract class UsageParser implements Runnable {
+public abstract class UsageParser extends ManagedContextRunnable {
     public static final Logger s_logger = Logger.getLogger(UsageParser.class.getName());
     
-    public void run() {
+    protected void runInContext() {
         try {
             parse(null);
         } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 09c9602..35012b2 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -26,7 +26,12 @@
     <version>4.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <dependencies>  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-framework-managed-context</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -36,6 +41,14 @@
       <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aed5e9dc/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
index 18af7cd..c36b3a8 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
@@ -23,6 +23,8 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
 import org.apache.log4j.Logger;
 
 public class VmwareContextPool {
@@ -117,9 +119,9 @@ public class VmwareContextPool {
 	}
 	
 	private TimerTask getTimerTask() {
-		return new TimerTask() {
-			@Override
-			public void run() {
+		return new ManagedContextTimerTask() {
+            @Override
+            protected void runInContext() {
 				try {
 					// doIdleCheck();
 					


Mime
View raw message