Ref #27090: implement timings metrics for Docker (Swarm)

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java

@@ -67,6 +67,10 @@ public void initialize() {
 
 	@Override
 	protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Exception {
+		Container container = new Container();
+		container.setSpec(spec);
+		container.setIndex(spec.getIndex());
+
 		Builder hostConfigBuilder = HostConfig.builder();
 
 		if (imagePullPolicy == ImagePullPolicy.Always
@@ -118,21 +122,26 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 			    .cmd(spec.getCmd())
 			    .env(convertEnv(buildEnv(spec, proxy)))
 			    .build();
-		ContainerCreation containerCreation = dockerClient.createContainer(containerConfig);
-		
-		if (spec.getNetworkConnections() != null) {
-			for (String networkConnection: spec.getNetworkConnections()) {
-				dockerClient.connectToNetwork(containerCreation.id(), networkConnection);
+
+		try {
+			// tell the status service we are starting the container
+			proxyStatusService.containerStarting(proxy, container);
+			ContainerCreation containerCreation = dockerClient.createContainer(containerConfig);
+			container.setId(containerCreation.id());
+
+			if (spec.getNetworkConnections() != null) {
+				for (String networkConnection: spec.getNetworkConnections()) {
+					dockerClient.connectToNetwork(containerCreation.id(), networkConnection);
+				}
 			}
+
+			dockerClient.startContainer(containerCreation.id());
+			proxyStatusService.containerStarted(proxy, container);
+		} catch (DockerException ex) {
+			proxyStatusService.containerStartFailed(proxy, container);
+			throw ex;
 		}
-		
-		dockerClient.startContainer(containerCreation.id());
-		
-		Container container = new Container();
-		container.setSpec(spec);
-		container.setId(containerCreation.id());
-		container.setIndex(spec.getIndex());
-		
+
 		// Calculate proxy routes for all configured ports.
 		for (String mappingKey: spec.getPortMapping().keySet()) {
 			int containerPort = spec.getPortMapping().get(mappingKey);

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java

@@ -177,6 +177,8 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 			serviceId = dockerClient.createService(serviceSpecBuilder.build()).id();
 		}
 
+		// tell the status service we are starting the container
+		proxyStatusService.containerStarting(proxy, container);
 		container.getParameters().put(PARAM_SERVICE_ID, serviceId);
 
 		// Give the service some time to start up and launch a container.
@@ -196,8 +198,10 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 
 		if (!containerFound) {
 			dockerClient.removeService(serviceId);
+			proxyStatusService.containerStartFailed(proxy, container);
 			throw new IllegalStateException("Swarm container did not start in time");
 		}
+		proxyStatusService.containerStarted(proxy, container);
 
 		// Calculate proxy routes for all configured ports.
 		for (String mappingKey: spec.getPortMapping().keySet()) {

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

@@ -311,7 +311,7 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 			container.getParameters().put(PARAM_POD, pod);
 			proxy.getContainers().add(container);
 
-			proxyStatusService.containerStartupFailed(proxy, container);
+			proxyStatusService.containerStartFailed(proxy, container);
 			throw new ContainerProxyException("Container did not become ready in time");
 		}
 		proxyStatusService.containerStarted(proxy, container);

src/main/java/eu/openanalytics/containerproxy/service/ProxyStatusService.java

@@ -57,7 +57,7 @@ public void containerStarted(Proxy proxy, Container container) {
     /**
      * Step 3 (fail): container could not be started
      */
-    public void containerStartupFailed(Proxy proxy, Container container) {
+    public void containerStartFailed(Proxy proxy, Container container) {
         startupLog.get(proxy.getId()).getStartContainer(container.getIndex()).stepFailed();
         startupLog.get(proxy.getId()).getCreateProxy().stepFailed();
     }