review changes

Author: sureshanaparti

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

@@ -887,7 +887,7 @@ private void handleStartupAnswer(StartupAnswer startup, Response response, Link
         }
         String hostName = startup.getHostName();
         if (org.apache.commons.lang3.StringUtils.isNotEmpty(hostName)) {
-            setName(hostUuid);
+            setName(hostName);
         }
         pingInterval = startup.getPingInterval() * 1000L; // change to ms.
 

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

@@ -1768,7 +1768,8 @@ private AgentAttache sendReadyAndGetAttache(HostVO host, ReadyCommand ready, Lin
         GlobalLock joinLock = getHostJoinLock(host.getId());
         try {
             long processStart = System.currentTimeMillis();
-            if (joinLock.lock(getTimeoutSec())) {
+            int timeOutSec = getTimeoutSec();
+            if (joinLock.lock(timeOutSec)) {
                 logProcessingStart(host, joinLock);
                 try {
                     updateReadyCommandWithMSList(host, ready, startup);
@@ -1778,7 +1779,7 @@ private AgentAttache sendReadyAndGetAttache(HostVO host, ReadyCommand ready, Lin
                     joinLock.unlock();
                 }
             } else {
-                throw createLockAcquisitionException(host, joinLock, processStart);
+                throw createLockAcquisitionException(host, joinLock, timeOutSec, processStart);
             }
         } finally {
             joinLock.releaseRef();
@@ -1798,14 +1799,14 @@ private void logProcessingFinish(HostVO host, GlobalLock joinLock, long processS
         StringBuilder msgBuilder = getSummaryMsgBuilder("Processing Host connection finished",
                 EventTypes.EVENT_HOST_RECONNECT, host.getUuid(), host.getName(), joinLock.getName(), null, null,
                 processFinish);
-        logger.fatal(msgBuilder.toString());
+        logger.info(msgBuilder.toString());
     }
 
     private void updateReadyCommandWithMSList(HostVO host, ReadyCommand ready, StartupCommand[] startup) {
         List<String> agentMSHostList = new ArrayList<>();
         String lbAlgorithm = null;
 
-        if (startup != null) {
+        if (startup != null && startup.length > 0) {
             String agentMSHosts = startup[0].getMsHostList();
             if (StringUtils.isNotEmpty(agentMSHosts)) {
                 String[] msHosts = agentMSHosts.split("@");
@@ -1828,19 +1829,19 @@ private void setReadyCommandMSList(HostVO host, ReadyCommand ready) {
         ready.setAvoidMsHostList(avoidMsList);
         ready.setLbAlgorithm(indirectAgentLB.getLBAlgorithmName());
         ready.setLbCheckInterval(indirectAgentLB.getLBPreferredHostCheckInterval(host.getClusterId()));
-        logger.debug("Agent's management server host list is not up to date, sending list update:" + newMSList);
+        logger.debug("Agent's management server host list is not up to date, sending list update:{}", newMSList);
     }
 
     private AgentAttache createAndNotifyAttache(HostVO host, Link link, StartupCommand[] startup) throws ConnectionException {
         AgentAttache attache = createAttacheForConnect(host, link);
         return notifyMonitorsOfConnection(attache, startup, false);
     }
 
-    private ConnectionException createLockAcquisitionException(HostVO host, GlobalLock joinLock, long processStart) {
+    private ConnectionException createLockAcquisitionException(HostVO host, GlobalLock joinLock, int timeOutSec, long processStart) {
         long processFinish = System.currentTimeMillis() - processStart;
         String title = "Failed to connect Host";
-        String summary = String.format("Failure due to unable to acquire lock %s during %s seconds",
-                joinLock.getName(), 60);
+        String summary = String.format("Failure due to unable to acquire lock %s during %d seconds",
+                joinLock.getName(), timeOutSec);
 
         StringBuilder msgBuilder = getSummaryMsgBuilder(title, EventTypes.EVENT_HOST_RECONNECT, host.getUuid(),
                 host.getName(), joinLock.getName(), summary, null, processFinish);
@@ -2023,7 +2024,7 @@ protected void connectAgent(final Link link, final Command[] cmds, final Request
                 answers[i] = answer;
             }
         }
-        Response response = new Response(request, answers[0], _nodeId, -1);
+        Response response = new Response(request, answers, _nodeId, -1);
         try {
             link.send(response.toBytes());
         } catch (ClosedChannelException e) {

framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletImpl.java

@@ -141,11 +141,15 @@ public boolean ping(final String callingPeer) throws RemoteException {
     private String executePostMethod(final CloseableHttpClient client, final HttpPost method) {
         String result = null;
         String request = null;
-        try {
-            request = EntityUtils.toString(method.getEntity(), Charset.defaultCharset());
-        } catch (Exception e) {
-            logger.warn("Failed to retrieve request entity for POST {}", serviceUrl, e);
+
+        if (logger.isDebugEnabled()) {
+            try {
+                request = EntityUtils.toString(method.getEntity(), Charset.defaultCharset());
+            } catch (Exception e) {
+                logger.warn("Failed to retrieve request entity for POST {}", serviceUrl, e);
+            }
         }
+
         try {
             final Profiler profiler = new Profiler();
             profiler.start();
@@ -155,15 +159,14 @@ private String executePostMethod(final CloseableHttpClient client, final HttpPos
                 result = EntityUtils.toString(httpResponse.getEntity());
                 profiler.stop();
                 if (logger.isDebugEnabled()) {
-                    logger.debug("POST " + serviceUrl + " request: " + request + ", response :" + result + ", responding time: " + profiler.getDurationInMillis() + " ms");
+                    logger.debug("POST {} request: {}, response :{}, responding time: {} ms", serviceUrl, request, result, profiler.getDurationInMillis());
                 }
             } else {
                 profiler.stop();
-                logger.error("Invalid response code : " + response + ", from : " + serviceUrl + " request: " + request +  ", method : " + method.getParams().getParameter("method") + " responding time: " +
-                        profiler.getDurationInMillis());
+                logger.error("Invalid response code : {}, from : {} request: {}, method : {} responding time: {}", response, serviceUrl, request, method.getParams().getParameter("method"), profiler.getDurationInMillis());
             }
         } catch (IOException e) {
-            logger.error("Exception from : " + serviceUrl + " request: " + request +  ", method : " + method.getParams().getParameter("method") + ", exception :", e);
+            logger.error("Exception from : {} request: {}, method : {}, exception :", serviceUrl, request, method.getParams().getParameter("method"), e);
         } finally {
             method.releaseConnection();
         }

framework/db/src/main/java/com/cloud/utils/db/GlobalLock.java

@@ -223,7 +223,7 @@ public boolean lock(int timeoutSeconds) {
                 synchronized (this) {
                     if (ownerThread == Thread.currentThread()) {
                         logger.warn("Global lock {} re-entrance detected, owner thread: {}, reference count: {}, " +
-                                "lock count: {}", getThreadName(ownerThread), name, referenceCount, lockCount);
+                                "lock count: {}", name, getThreadName(ownerThread), referenceCount, lockCount);
                         // if it is re-entrance, then we may have more lock counts than needed?
                         lockCount++;
 

utils/src/main/java/com/cloud/utils/backoff/impl/ExponentialWithJitterBackoff.java

@@ -74,11 +74,12 @@ public void waitBeforeRetry() {
         Thread current = Thread.currentThread();
         try {
             asleep.put(current.getName(), current);
-            logger.debug(String.format("Going to sleep for %s", DateUtil.formatMillis(waitMs)));
+            logger.debug("Going to sleep for {}", DateUtil.formatMillis(waitMs));
             Thread.sleep(waitMs);
-            logger.debug(String.format("Sleep done for %s", DateUtil.formatMillis(waitMs)));
+            logger.debug("Sleep done for {}", DateUtil.formatMillis(waitMs));
         } catch (InterruptedException e) {
-            logger.info(String.format("Thread %s interrupted while waiting for retry", current.getName()), e);
+            interrupted = true;
+            logger.info("Thread {} interrupted while waiting for retry", current.getName(), e);
         } finally {
             asleep.remove(current.getName());
             calculateNextAttempt();
@@ -154,8 +155,9 @@ private long getNextDelay() {
 
     @Override
     public long getTimeToWait() {
-        long delay = getNextDelay();
-        int jitter = random.nextInt((int) delay / 2);
+        long delay = Math.max(1L, getNextDelay());
+        int jitterBound = (int) Math.max(1L, delay / 2);
+        int jitter = random.nextInt(jitterBound);
         return delay + jitter;
     }
 

utils/src/main/java/com/cloud/utils/nio/Link.java

@@ -386,7 +386,7 @@ public String getIpAddress() {
 
     public synchronized void terminated() {
         if (LOGGER.isTraceEnabled()) {
-            LOGGER.debug("Terminating connection to {}", _addr);
+            LOGGER.trace("Terminating connection to {}", _addr);
         }
         _key = null;
     }

utils/src/main/java/com/cloud/utils/nio/NioConnection.java

@@ -142,7 +142,9 @@ public void stop() {
             _sslHandshakeExecutor.shutdownNow();
         }
         if (_threadExecutor != null) {
-            _futureTask.cancel(false);
+            if (_futureTask != null) {
+                _futureTask.cancel(false);
+            }
             _threadExecutor.shutdownNow();
         }
         _isRunning = false;