review

Author: sureshanaparti

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

@@ -840,7 +840,7 @@ private boolean isReconnectStormDetected(Link link, String preferredHost, String
         boolean currentLinkTerminated = this.link != null && this.link.isTerminated();
         boolean reconnectForNewHost = this.hostname != null && this.hostname.equals(preferredHost);
         // if none of the above is true
-        boolean stormDetected = ! (reconnectForCurrentLink || currentLinkTerminated || reconnectForNewHost);
+        boolean stormDetected = !(reconnectForCurrentLink || currentLinkTerminated || reconnectForNewHost);
         // connection storm guard
         if (stormDetected) {
             logger.warn("Reconnect requested for the connection {} but current connection is " +

agent/src/test/java/com/cloud/agent/HostConnectProcessTest.java

@@ -19,6 +19,7 @@
 import com.cloud.exception.CloudException;
 import com.cloud.utils.nio.Link;
 import org.apache.logging.log4j.Logger;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -50,9 +51,13 @@ public void setUp() throws ConfigurationException {
         ReflectionTestUtils.setField(agent, "logger", logger);
     }
 
+    @After
+    public void tearDown() {
+        hostConnectProcess.stop();
+    }
+
     @Test
     public void testScheduleConnectProcess() throws InterruptedException, CloudException {
-
         hostConnectProcess.scheduleConnectProcess(link, connectionTransfer);
         Assert.assertTrue(hostConnectProcess.isInProgress());
     }

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

@@ -582,6 +582,11 @@ private AgentControlAnswer handleControlCommand(final AgentAttache attache, fina
 
     private AgentConnectStatusAnswer handleAgentConnectStatusCommand(AgentAttache attache, AgentConnectStatusCommand cmd) {
         HostVO hostVo = _hostDao.findById(attache.getId());
+        if (hostVo == null) {
+            String details = String.format("Unable to find Host in DB with id %s for AgentConnectStatusCommand hostId=%s guid=%s name=%s",
+                    attache.getId(), cmd.getHostId(), cmd.getHostGuid(), cmd.getHostName());
+            return new AgentConnectStatusAnswer(cmd, false, details);
+        }
         return getConnectStatusAnswer(hostVo, cmd);
     }
 
@@ -592,7 +597,7 @@ private AgentConnectStatusAnswer getConnectStatusAnswer(HostVO hostVo, AgentConn
         Status status = hostVo.getStatus();
         try {
             boolean lockAvailable = GlobalLock.isLockAvailable(lockName);
-            String details = String.format("Global lock %s is%s present for %s", lockName, lockAvailable ? "" : " not",
+            String details = String.format("Global lock %s is %s present for %s", lockName, lockAvailable ? "" : " not",
                     hostName);
             logger.debug(details);
             return getAgentConnectStatusAnswer(cmd, lockName, hostName, lockAvailable, status, details);
@@ -612,7 +617,7 @@ private AgentConnectStatusAnswer getAgentConnectStatusAnswer(AgentConnectStatusC
                                                                  boolean lockAvailable,
                                                                  Status status,
                                                                  String details) {
-        logger.debug(String.format("Checking whether global lock %s is present for %s", lockName, hostName));
+        logger.debug("Checking whether global lock {} is present for {}", lockName, hostName);
         AgentConnectStatusAnswer answer = new AgentConnectStatusAnswer(cmd, true, details);
         answer.setLockAvailable(lockAvailable);
         answer.setHostStatus(status);
@@ -2024,7 +2029,7 @@ protected void connectAgent(final Link link, final Command[] cmds, final Request
                 answers[i] = answer;
             }
         }
-        Response response = new Response(request, answers, _nodeId, -1);
+        Response response = new Response(request, answers[0], _nodeId, -1);
         try {
             link.send(response.toBytes());
         } catch (ClosedChannelException e) {

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

@@ -138,14 +138,14 @@ public int releaseRef() {
 
     public static boolean isLockAvailable(String name) {
         if (logger.isDebugEnabled()) {
-            logger.debug("Checking lock present for {}", name);
+            logger.debug("Checking lock availability for {}", name);
         }
         boolean result = false;
         try {
             result = DbUtil.isFreeLock(name);
         } finally {
             if (logger.isDebugEnabled()) {
-                logger.debug("Result of checking lock present for {}: {}", name, result);
+                logger.debug("Result of checking lock availability for {}: {}", name, result);
             }
         }
         return result;