Update method to findOneInUpStateByLongestRuntime

Author: weizhouapache

framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostDao.java

@@ -56,5 +56,5 @@ public interface ManagementServerHostDao extends GenericDao<ManagementServerHost
 
     ManagementServerHostVO findOneInUpState(Filter filter);
 
-    ManagementServerHostVO findOneByLongestRuntime();
+    ManagementServerHostVO findOneInUpStateByLongestRuntime();
 }

framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java

@@ -273,7 +273,7 @@ public ManagementServerHostVO findOneInUpState(Filter filter) {
     }
 
     @Override
-    public ManagementServerHostVO findOneByLongestRuntime() {
+    public ManagementServerHostVO findOneInUpStateByLongestRuntime() {
         SearchCriteria<ManagementServerHostVO> sc = StateSearch.create();
         sc.setParameters("state", ManagementServerHost.State.Up);
         sc.setParameters("runid", 0);

plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookServiceImpl.java

@@ -319,7 +319,7 @@ public class WebhookDeliveryCleanupWorker extends ManagedContextRunnable {
 
         protected void runCleanupForLongestRunningManagementServer() {
             try {
-                ManagementServerHostVO msHost = managementServerHostDao.findOneByLongestRuntime();
+                ManagementServerHostVO msHost = managementServerHostDao.findOneInUpStateByLongestRuntime();
                 if (msHost == null || (msHost.getMsid() != ManagementServerNode.getManagementServerId())) {
                     logger.debug("Skipping the webhook delivery cleanup task on this management server");
                     return;

server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java

@@ -2152,7 +2152,7 @@ protected void runInContext() {
             try {
                 if (lock.lock(30)) {
                     try {
-                        ManagementServerHostVO msHost = managementServerHostDao.findOneByLongestRuntime();
+                        ManagementServerHostVO msHost = managementServerHostDao.findOneInUpStateByLongestRuntime();
                         if (msHost == null || (msHost.getMsid() != ManagementServerNode.getManagementServerId())) {
                             logger.trace("Skipping the resource counters recalculation task on this management server");
                             return;

server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java

@@ -629,7 +629,7 @@ protected void runInContext() {
         }
 
         protected void runCleanupForLongestRunningManagementServer() {
-            ManagementServerHostVO msHost = managementServerHostDao.findOneByLongestRuntime();
+            ManagementServerHostVO msHost = managementServerHostDao.findOneInUpStateByLongestRuntime();
             if (msHost == null || (msHost.getMsid() != ManagementServerNode.getManagementServerId())) {
                 logger.debug("Skipping the expunged resource cleanup task on this management server");
                 return;

server/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedulerImpl.java

@@ -196,7 +196,7 @@ public boolean start() {
         final TimerTask schedulerPollTask = new ManagedContextTimerTask() {
             @Override
             protected void runInContext() {
-                ManagementServerHostVO msHost = managementServerHostDao.findOneByLongestRuntime();
+                ManagementServerHostVO msHost = managementServerHostDao.findOneInUpStateByLongestRuntime();
                 if (msHost == null || (msHost.getMsid() != ManagementServerNode.getManagementServerId())) {
                     logger.debug("Skipping the vm scheduler poll task on this management server");
                     return;