add pending jobs count to ms response

Author: sureshanaparti

api/src/main/java/org/apache/cloudstack/api/response/ManagementServerResponse.java

@@ -86,6 +86,10 @@ public class ManagementServerResponse extends BaseResponse {
     @Param(description = "the number of host agents this Management Server is responsible for", since = "4.21.0.0")
     private Long agentsCount;
 
+    @SerializedName(ApiConstants.PENDING_JOBS_COUNT)
+    @Param(description = "the number of pending jobs in this Management Server", since = "4.21.0.0")
+    private Long pendingJobsCount;
+
     public String getId() {
         return this.id;
     }
@@ -134,6 +138,10 @@ public Long getAgentsCount() {
         return this.agentsCount;
     }
 
+    public Long getPendingJobsCount() {
+        return this.pendingJobsCount;
+    }
+
     public void setId(String id) {
         this.id = id;
     }
@@ -186,6 +194,10 @@ public void setAgentsCount(Long agentsCount) {
         this.agentsCount = agentsCount;
     }
 
+    public void setPendingJobsCount(Long pendingJobsCount) {
+        this.pendingJobsCount = pendingJobsCount;
+    }
+
     public String getKernelVersion() {
         return kernelVersion;
     }

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -143,6 +143,7 @@
 import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.framework.jobs.AsyncJobManager;
 import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
 import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementVO;
 import org.apache.cloudstack.outofbandmanagement.dao.OutOfBandManagementDao;
@@ -613,6 +614,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     @Inject
     private ManagementServerHostPeerJoinDao mshostPeerJoinDao;
 
+    @Inject
+    private AsyncJobManager jobManager;
 
     private SearchCriteria<ServiceOfferingJoinVO> getMinimumCpuServiceOfferingJoinSearchCriteria(int cpu) {
         SearchCriteria<ServiceOfferingJoinVO> sc = _srvOfferingJoinDao.createSearchCriteria();
@@ -5429,6 +5432,7 @@ protected ManagementServerResponse createManagementServerResponse(ManagementServ
             }
         }
         mgmtResponse.setAgentsCount((long) hostDao.countByMs(mgmt.getMsid()));
+        mgmtResponse.setPendingJobsCount(jobManager.countPendingNonPseudoJobs(mgmt.getMsid()));
         mgmtResponse.setObjectName("managementserver");
         return mgmtResponse;
     }

ui/public/locales/en.json

@@ -1683,6 +1683,7 @@
 "label.peerstate": "Peer State",
 "label.peerstate.lastupdated": "Peer State Updated Time",
 "label.pending.jobs": "Pending Jobs",
+"label.pendingjobscount": "Number Of pending jobs",
 "label.per.account": "Per Account",
 "label.per.zone": "Per zone",
 "label.percentage": "Percentage",

ui/src/config/section/infra/managementServers.js

@@ -26,14 +26,14 @@ export default {
   permission: ['listManagementServersMetrics'],
   resourceType: 'ManagementServer',
   columns: () => {
-    const fields = ['name', 'state', 'serviceip', 'version', 'osdistribution', 'agentscount']
+    const fields = ['name', 'state', 'serviceip', 'version', 'osdistribution', 'pendingjobscount', 'agentscount']
     const metricsFields = ['collectiontime', 'availableprocessors', 'cpuload', 'heapmemoryused']
     if (store.getters.metrics) {
       fields.push(...metricsFields)
     }
     return fields
   },
-  details: ['collectiontime', 'usageislocal', 'dbislocal', 'lastserverstart', 'lastserverstop', 'lastboottime', 'version', 'loginfo', 'systemtotalcpucycles', 'systemloadaverages', 'systemcycleusage', 'systemmemorytotal', 'systemmemoryfree', 'systemmemoryvirtualsize', 'availableprocessors', 'javadistribution', 'javaversion', 'osdistribution', 'kernelversion', 'agentscount', 'sessions', 'heapmemoryused', 'heapmemorytotal', 'threadsblockedcount', 'threadsdeamoncount', 'threadsnewcount', 'threadsrunnablecount', 'threadsterminatedcount', 'threadstotalcount', 'threadswaitingcount'],
+  details: ['collectiontime', 'usageislocal', 'dbislocal', 'lastserverstart', 'lastserverstop', 'lastboottime', 'version', 'loginfo', 'systemtotalcpucycles', 'systemloadaverages', 'systemcycleusage', 'systemmemorytotal', 'systemmemoryfree', 'systemmemoryvirtualsize', 'availableprocessors', 'javadistribution', 'javaversion', 'osdistribution', 'kernelversion', 'pendingjobscount', 'agentscount', 'sessions', 'heapmemoryused', 'heapmemorytotal', 'threadsblockedcount', 'threadsdeamoncount', 'threadsnewcount', 'threadsrunnablecount', 'threadsterminatedcount', 'threadstotalcount', 'threadswaitingcount'],
   tabs: [
     {
       name: 'details',