Verify proxy running + handle stop

1 files changed, 84 insertions, 14 deletions

diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/DataplaneProxyServiceTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/DataplaneProxyServiceTest.java
index b71dfbba88a..947c99adf51 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/DataplaneProxyServiceTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/DataplaneProxyServiceTest.java
@@ -19,61 +19,107 @@ import java.time.Duration;
 
 import static com.yahoo.yolean.Exceptions.uncheck;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class DataplaneProxyServiceTest {
     private FileSystem fileSystem = Jimfs.newFileSystem();
-    DataplaneProxyService.ProxyCommands proxyCommands = Mockito.mock(DataplaneProxyService.ProxyCommands.class);
+    DataplaneProxyService.ProxyCommands proxyCommandsMock = Mockito.mock(DataplaneProxyService.ProxyCommands.class);
 
     @Test
     public void starts_and_reloads_if_no_errors() throws IOException {
-        DataplaneProxyService service = dataplaneProxyService(proxyCommands);
+        DataplaneProxyService service = dataplaneProxyService(proxyCommandsMock);
 
         assertEquals(DataplaneProxyService.NginxState.INITIALIZING, service.state());
         service.reconfigure(proxyConfig(), credentials(fileSystem));
 
         // Simulate executor next tick
-        service.startOrReloadNginx();
+        service.converge();
         assertEquals(DataplaneProxyService.NginxState.RUNNING, service.state());
 
         // Trigger reload by recreating the proxy config (generates new server cert)
         service.reconfigure(proxyConfig(), credentials(fileSystem));
-        service.startOrReloadNginx();
+        service.converge();
         assertEquals(DataplaneProxyService.NginxState.RUNNING, service.state());
     }
 
     @Test
     public void retries_startup_errors() throws IOException {
-        Mockito.doThrow(new RuntimeException("IO error")).doNothing().when(proxyCommands).start(any());
-        DataplaneProxyService service = dataplaneProxyService(proxyCommands);
+        Mockito.doThrow(new RuntimeException("IO error")).doNothing().when(proxyCommandsMock).start(any());
+        DataplaneProxyService service = dataplaneProxyService(proxyCommandsMock);
 
         assertEquals(DataplaneProxyService.NginxState.INITIALIZING, service.state());
         service.reconfigure(proxyConfig(), credentials(fileSystem));
 
-        // Start nginx,
-        service.startOrReloadNginx();
+        // Start nginx, starting will fail, so the service should be in INITIALIZING state
+        service.converge();
         assertEquals(DataplaneProxyService.NginxState.INITIALIZING, service.state());
-        service.startOrReloadNginx();
+        service.converge();
         assertEquals(DataplaneProxyService.NginxState.RUNNING, service.state());
     }
 
     @Test
     public void retries_reload_errors() throws IOException {
-        Mockito.doThrow(new RuntimeException("IO error")).doNothing().when(proxyCommands).reload();
-        DataplaneProxyService service = dataplaneProxyService(proxyCommands);
+        Mockito.doThrow(new RuntimeException("IO error")).doNothing().when(proxyCommandsMock).reload();
+        when(proxyCommandsMock.isRunning()).thenReturn(false);
+        DataplaneProxyService service = dataplaneProxyService(proxyCommandsMock);
 
         // Make sure service in running state
         service.reconfigure(proxyConfig(), credentials(fileSystem));
-        service.startOrReloadNginx();
+        service.converge();
         assertEquals(DataplaneProxyService.NginxState.RUNNING, service.state());
+        when(proxyCommandsMock.isRunning()).thenReturn(true);
 
         // Trigger reload, verifies 2nd attempt succeeds
         service.reconfigure(proxyConfig(), credentials(fileSystem));
-        service.startOrReloadNginx();
+        service.converge();
         assertEquals(DataplaneProxyService.NginxState.RELOAD_REQUIRED, service.state());
-        service.startOrReloadNginx();
+        service.converge();
+        assertEquals(DataplaneProxyService.NginxState.RUNNING, service.state());
+        verify(proxyCommandsMock, times(2)).reload();
+    }
+
+    @Test
+    public void converges_to_wanted_state_when_nginx_not_running() throws IOException {
+        DataplaneProxyService.ProxyCommands proxyCommands = new TestProxyCommands();
+        DataplaneProxyService service = dataplaneProxyService(proxyCommands);
+
+        assertFalse(proxyCommands.isRunning());
+        service.reconfigure(proxyConfig(), credentials(fileSystem));
+        service.converge();
         assertEquals(DataplaneProxyService.NginxState.RUNNING, service.state());
+        assertTrue(proxyCommands.isRunning());
 
+        // Simulate nginx process dying
+        proxyCommands.stop();
+        assertFalse(proxyCommands.isRunning());
+        service.converge();
+        assertTrue(proxyCommands.isRunning());
+    }
+
+    @Test
+    public void shuts_down() throws IOException {
+        DataplaneProxyService.ProxyCommands proxyCommands = new TestProxyCommands();
+        DataplaneProxyService service = dataplaneProxyService(proxyCommands);
+        service.converge();
+        assertTrue(proxyCommands.isRunning());
+        assertEquals(DataplaneProxyService.NginxState.RUNNING, service.state());
+
+        new Thread(service::deconstruct).start(); // deconstruct will block until nginx is stopped
+        // Wait for above thread to set the wanted state to STOPPED
+        while (service.wantedState() != DataplaneProxyService.NginxState.STOPPED) {
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+            }
+        }
+        service.converge();
+        assertEquals(service.state(), DataplaneProxyService.NginxState.STOPPED);
+        assertFalse(proxyCommands.isRunning());
     }
 
     private DataplaneProxyService dataplaneProxyService(DataplaneProxyService.ProxyCommands proxyCommands) throws IOException {
@@ -101,4 +147,28 @@ public class DataplaneProxyServiceTest {
         uncheck(() -> Files.createDirectories(path));
         return new DataplaneProxyCredentials(path.resolve("cert.pem"), path.resolve("key.pem"));
     }
+
+    private static class TestProxyCommands implements DataplaneProxyService.ProxyCommands {
+        private boolean running = false;
+
+        @Override
+        public void start(Path configFile) {
+            running = true;
+        }
+
+        @Override
+        public void stop() {
+            running = false;
+        }
+
+        @Override
+        public void reload() {
+
+        }
+
+        @Override
+        public boolean isRunning() {
+            return running;
+        }
+    }
 }