fixups

Author: vishesh92

server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java

@@ -324,6 +324,27 @@ private boolean provisionKvmHostViaSsh(Host host, String caProvider) {
             provisionCertificateViaSsh(sshConnection, hostIp, host.getName(), caProvider);
 
             SSHCmdHelper.sshExecuteCmd(sshConnection, "sudo service cloudstack-agent restart");
+
+            long start = System.currentTimeMillis();
+            while ((System.currentTimeMillis() - start) < 120000) {
+                Host refreshedHost = hostDao.findById(host.getId());
+                if (refreshedHost != null && (refreshedHost.getStatus() == Status.Up || refreshedHost.getStatus() == Status.Alert)) {
+                    logger.debug("Host {} is now in {} state, attempting to reconnect", host, refreshedHost.getStatus());
+                    try {
+                        agentManager.reconnect(host.getId());
+                        logger.debug("Successfully reconnected agent to host {}", host);
+                    } catch (AgentUnavailableException | CloudRuntimeException e) {
+                        logger.warn("Failed to reconnect agent to host {} after certificate provisioning", host, e);
+                    }
+                    break;
+                }
+                try {
+                    Thread.sleep(5000);
+                } catch (InterruptedException e) {
+                    logger.debug("Interrupted while polling for host {} status", host);
+                    break;
+                }
+            }
             return true;
         } catch (Exception e) {
             logger.error("Error during forced SSH provisioning for KVM host " + host.getUuid(), e);

server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java

@@ -264,6 +264,9 @@ public void testProvisionCertificateViaSsh() throws Exception {
     @Test
     public void testProvisionKvmHostViaSsh() throws Exception {
         HostVO host = Mockito.mock(HostVO.class);
+        Mockito.when(host.getId()).thenReturn(1L);
+        Mockito.when(host.getStatus()).thenReturn(com.cloud.host.Status.Up);
+        Mockito.when(hostDao.findById(1L)).thenReturn(host);
         Mockito.when(host.getPrivateIpAddress()).thenReturn("192.168.1.1");
         Mockito.when(host.getName()).thenReturn("host1");
         Mockito.when(host.getClusterId()).thenReturn(1L);

services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketSSLEngineManager.java

@@ -24,8 +24,6 @@
 import javax.net.ssl.SSLSession;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 
 public class NioSocketSSLEngineManager {
 
@@ -34,7 +32,6 @@ public class NioSocketSSLEngineManager {
     private final ByteBuffer myNetData;
     private final ByteBuffer peerNetData;
 
-    private final Executor executor;
     private final NioSocketInputStream inputStream;
     private final NioSocketOutputStream outputStream;
 
@@ -43,8 +40,6 @@ public NioSocketSSLEngineManager(SSLEngine sslEngine, NioSocketHandler socket) {
         this.outputStream = socket.getOutputStream();
         engine = sslEngine;
 
-        executor = Executors.newSingleThreadExecutor();
-
         int networkBufSize = Math.max(engine.getSession().getPacketBufferSize(), ConsoleProxy.defaultBufferSize);
         myNetData = ByteBuffer.allocate(networkBufSize);
         peerNetData = ByteBuffer.allocate(networkBufSize);
@@ -129,7 +124,7 @@ public void doHandshake() throws SSLException {
     private void executeTasks() {
         Runnable task;
         while ((task = engine.getDelegatedTask()) != null) {
-            executor.execute(task);
+            task.run();
         }
     }
 

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

@@ -32,8 +32,7 @@
 import java.security.KeyStore;
 import java.security.SecureRandom;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -430,7 +429,7 @@ public static SSLContext initClientSSLContext() throws GeneralSecurityException,
         }
 
         final KeyStore ks = loadKeyStore(stream, passphrase);
-        final TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+        final TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
         tmf.init(ks);
         TrustManager[] tms;
         if (stream != null) {
@@ -607,7 +606,6 @@ public static boolean doHandshake(final SocketChannel socketChannel, final SSLEn
         ByteBuffer myNetData = ByteBuffer.allocate(netBufferSize);
         ByteBuffer peerNetData = ByteBuffer.allocate(netBufferSize);
 
-        final Executor executor = Executors.newSingleThreadExecutor();
         final long startTimeMills = System.currentTimeMillis();
 
         HandshakeStatus handshakeStatus = sslEngine.getHandshakeStatus();
@@ -644,7 +642,7 @@ public static boolean doHandshake(final SocketChannel socketChannel, final SSLEn
                         if (LOGGER.isTraceEnabled()) {
                             LOGGER.trace("SSL: Running delegated task!");
                         }
-                        executor.execute(task);
+                        task.run();
                     }
                     break;
                 case FINISHED: