address comments

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

agent/conf/agent.properties

@@ -434,8 +434,9 @@ iscsi.session.cleanup.enabled=false
 # Implicit host tags managed by agent.properties
 # host.tags=
 
-# Timeout(in seconds) for SSL handshake when agent connects to server
+# Timeout(in seconds) for SSL handshake when agent connects to server. When no value is set then default value of 30s
+# will be used
 #ssl.handshake.timeout=
 
-# Wait(in seconds) during agent reconnections
+# Wait(in seconds) during agent reconnections. When no value is set then default value of 5s will be used
 #backoff.seconds=

agent/src/main/java/com/cloud/agent/Agent.java

@@ -526,7 +526,7 @@ public void sendStartup(final Link link) {
 
     protected String retrieveHostname() {
         if (logger.isTraceEnabled()) {
-            logger.trace(" Retrieving hostname " + serverResource.getClass().getSimpleName());
+            logger.trace("Retrieving hostname with resource={}", serverResource.getClass().getSimpleName());
         }
         final String result = Script.runSimpleBashScript(Script.getExecutableAbsolutePath("hostname"), 500);
         if (StringUtils.isNotBlank(result)) {

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

@@ -179,7 +179,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
 
     protected ExecutorService _executor;
     protected ThreadPoolExecutor _connectExecutor;
-    protected ThreadPoolExecutor _directAgentExecutor;
+    protected ScheduledExecutorService _directAgentExecutor;
     protected ScheduledExecutorService _cronJobExecutor;
     protected ScheduledExecutorService _monitorExecutor;
 
@@ -243,12 +243,13 @@ public boolean configure(final String name, final Map<String, Object> params) th
                 caService, RemoteAgentSslHandshakeTimeout.value());
         logger.info("Listening on {} with {} workers.", Port.value(), Workers.value());
 
+        final int directAgentPoolSize = DirectAgentPoolSize.value();
         // executes all agent commands other than cron and ping
-        _directAgentExecutor = new ThreadPoolExecutor(Math.max(agentTaskThreads/10, 1), DirectAgentPoolSize.value(), 120L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new NamedThreadFactory("DirectAgent"));
+        _directAgentExecutor = new ScheduledThreadPoolExecutor(directAgentPoolSize, new NamedThreadFactory("DirectAgent"));
         // executes cron and ping agent commands
-        _cronJobExecutor = new ScheduledThreadPoolExecutor(DirectAgentPoolSize.value(), new NamedThreadFactory("DirectAgentCronJob"));
-        logger.debug("Created DirectAgentAttache pool with size: {}.", DirectAgentPoolSize.value());
-        _directAgentThreadCap = Math.round(DirectAgentPoolSize.value() * DirectAgentThreadCap.value()) + 1; // add 1 to always make the value > 0
+        _cronJobExecutor = new ScheduledThreadPoolExecutor(directAgentPoolSize, new NamedThreadFactory("DirectAgentCronJob"));
+        logger.debug("Created DirectAgentAttache pool with size: {}.", directAgentPoolSize);
+        _directAgentThreadCap = Math.round(directAgentPoolSize * DirectAgentThreadCap.value()) + 1; // add 1 to always make the value > 0
 
         _monitorExecutor = new ScheduledThreadPoolExecutor(1, new NamedThreadFactory("AgentMonitor"));
 
@@ -1642,7 +1643,7 @@ public void pullAgentOutMaintenance(final long hostId) {
         }
     }
 
-    public ThreadPoolExecutor getDirectAgentPool() {
+    public ScheduledExecutorService getDirectAgentPool() {
         return _directAgentExecutor;
     }
 

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -3803,7 +3803,6 @@ public int getTimeout() {
     public boolean processCommands(final long agentId, final long seq, final Command[] cmds) {
         boolean processed = false;
         for (final Command cmd : cmds) {
-            // FIXME: PingRoutingCommand handler is DB & CPU hotspot
             if (cmd instanceof PingRoutingCommand) {
                 final PingRoutingCommand ping = (PingRoutingCommand)cmd;
                 if (ping.getHostVmStateReport() != null) {

engine/schema/src/main/java/com/cloud/dc/dao/ClusterDao.java

@@ -59,6 +59,4 @@ public interface ClusterDao extends GenericDao<ClusterVO, Long> {
     List<CPU.CPUArch> getClustersArchsByZone(long zoneId);
 
     List<ClusterVO> listClustersByArchAndZoneId(long zoneId, CPU.CPUArch arch);
-
-    List<Long> listAllIds();
 }

engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java

@@ -171,12 +171,10 @@ public List<HypervisorType> getAvailableHypervisorInZone(Long zoneId) {
             sc.setParameters("zoneId", zoneId);
         }
         List<ClusterVO> clusters = listBy(sc);
-        List<HypervisorType> distinctHypervisors = new ArrayList<>(4);
-        for (ClusterVO cluster : clusters) {
-            distinctHypervisors.add(cluster.getHypervisorType());
-        }
-
-        return distinctHypervisors;
+        return clusters.stream()
+                .map(ClusterVO::getHypervisorType)
+                .distinct()
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -346,12 +344,4 @@ public List<ClusterVO> listClustersByArchAndZoneId(long zoneId, CPU.CPUArch arch
         sc.setParameters("arch", arch);
         return listBy(sc);
     }
-
-    @Override
-    public List<Long> listAllIds() {
-        GenericSearchBuilder<ClusterVO, Long> sb = createSearchBuilder(Long.class);
-        sb.selectFields(sb.entity().getId());
-        sb.done();
-        return customSearch(sb.create(), null);
-    }
 }

engine/schema/src/main/java/com/cloud/host/dao/HostDao.java

@@ -192,8 +192,6 @@ List<Long> findHostIdsByZoneClusterResourceStateTypeAndHypervisorType(final Long
             final List<ResourceState> resourceStates, final List<Type> types,
             final List<Hypervisor.HypervisorType> hypervisorTypes);
 
-    List<Long> listAllIds();
-
     List<HypervisorType> listDistinctHypervisorTypes(final Long zoneId);
 
     List<HostVO> listByIds(final List<Long> ids);

engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java

@@ -1743,11 +1743,6 @@ public List<Long> findHostIdsByZoneClusterResourceStateTypeAndHypervisorType(fin
         return customSearch(sc, null);
     }
 
-    @Override
-    public List<Long> listAllIds() {
-        return listIdsBy(null, null, null, null, null, null, null);
-    }
-
     @Override
     public List<HypervisorType> listDistinctHypervisorTypes(final Long zoneId) {
         GenericSearchBuilder<HostVO, HypervisorType> sb = createSearchBuilder(HypervisorType.class);

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java

@@ -154,6 +154,4 @@ Pair<List<Long>, Integer> searchForIdsAndCount(Long storagePoolId, String storag
             String keyword, Filter searchFilter);
 
     List<StoragePoolVO> listByIds(List<Long> ids);
-
-    List<Long> listAllIds();
 }

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java

@@ -800,12 +800,4 @@ private SearchCriteria<StoragePoolVO> createStoragePoolSearchCriteria(Long stora
         sc.setParameters("parent", 0);
         return sc;
     }
-
-    @Override
-    public List<Long> listAllIds() {
-        GenericSearchBuilder<StoragePoolVO, Long> sb = createSearchBuilder(Long.class);
-        sb.selectFields(sb.entity().getId());
-        sb.done();
-        return customSearch(sb.create(), null);
-    }
 }