try again

Author: David Cooke

build.gradle

@@ -4,7 +4,7 @@ allprojects {
     apply plugin: 'jacoco'
 
     group = 'uk.co.ractf'
-    version = '0.0.71'
+    version = '0.0.72'
 
     repositories {
         maven { url "https://repo1.maven.org/maven2/" }

polaris-application/src/main/java/uk/co/ractf/polaris/node/runner/docker/DockerRunner.java

@@ -1,8 +1,5 @@
 package uk.co.ractf.polaris.node.runner.docker;
 
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.MetricFilter;
-import com.codahale.metrics.MetricRegistry;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.PullImageResultCallback;
 import com.github.dockerjava.api.model.*;
@@ -39,8 +36,6 @@ public class DockerRunner implements Runner<Container> {
     private final ClusterState state;
     private final AuthConfigFactory authConfigFactory;
     private final NotificationFacade notifications;
-    private final MetricRegistry metricRegistry;
-    private Counter containerCounter;
 
     private final Set<String> images = new ConcurrentSkipListSet<>();
     private final Set<String> downloadingImages = new ConcurrentSkipListSet<>();
@@ -51,14 +46,12 @@ public class DockerRunner implements Runner<Container> {
 
     @Inject
     public DockerRunner(final DockerClient dockerClient, final Node node, final ClusterState state,
-                        final AuthConfigFactory authConfigFactory, final NotificationFacade notifications,
-                        final MetricRegistry metricRegistry) {
+                        final AuthConfigFactory authConfigFactory, final NotificationFacade notifications) {
         this.dockerClient = dockerClient;
         this.node = node;
         this.state = state;
         this.authConfigFactory = authConfigFactory;
         this.notifications = notifications;
-        this.metricRegistry = metricRegistry;
     }
 
     private Capability[] createCapabilityArray(final List<String> capabilities) {
@@ -119,10 +112,6 @@ public void startPod(final Task task, final Container container, final Instance
             return;
         }
         try {
-            if (containerCounter == null) {
-                containerCounter = metricRegistry.getCounters(MetricFilter.startsWith("polaris")).get("polaris.instances.total");
-            }
-            containerCounter.inc();
             log.info("starting {}", instance.getId());
             startingContainers.add(container.getId() + instance.getId());
 

polaris-application/src/main/java/uk/co/ractf/polaris/node/service/InstanceReconciliationService.java

@@ -85,19 +85,19 @@ protected void runOneIteration() {
                 for (final var pod : task.getPods()) {
                     if (!getRunner(pod).canStartPod(pod)) {
                         log.info("Pulling image for {}/{}...", task.getId(), pod.getId());
-                        getRunner(pod).preparePod(task, pod);
+                        //getRunner(pod).preparePod(task, pod);
                     }
                 }
                 for (final var pod : task.getPods()) {
                     log.info("Creating pod {} from task {} and instance {}...", pod.getId(), task.getId(), instance.getId());
-                    getRunner(pod).createPod(task, pod, instance);
+                    //getRunner(pod).createPod(task, pod, instance);
                 }
                 recentlyStartedInstances.put(instance.getId(), "");
                 if (task.getPods().size() > 1) {
                     /* TODO: This is assuming theres only one runner, thats a safe assumption now, the code shouldn't
                     *  be written assuming it is. */
                     log.info("Networking pods from task {} and instance {}...", task.getId(), instance.getId());
-                    getRunner(task.getPods().get(0)).createNetwork(task.getPods(), task, instance);
+                    //getRunner(task.getPods().get(0)).createNetwork(task.getPods(), task, instance);
                 }
                 for (final var pod : task.getPods()) {
                     CompletableFuture.runAsync(() -> {

polaris-application/src/main/java/uk/co/ractf/polaris/state/ConsulState.java

@@ -1,5 +1,7 @@
 package uk.co.ractf.polaris.state;
 
+import com.codahale.metrics.Counter;
+import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -35,10 +37,13 @@ public class ConsulState implements ClusterState {
 
     private final Consul consul;
     private final String sessionId;
+    private final MetricRegistry metricRegistry;
+    private Counter containerCounter;
 
     @Inject
-    public ConsulState(final Consul consul) {
+    public ConsulState(final Consul consul, final MetricRegistry metricRegistry) {
         this.consul = consul;
+        this.metricRegistry = metricRegistry;
         //TODO: this is probably terrible for debugging
         final Session session = ImmutableSession.builder().name(UUID.randomUUID().toString()).build();
         this.sessionId = consul.sessionClient().createSession(session).getId();
@@ -110,6 +115,10 @@ public void deleteInstance(final Instance instance) {
 
     @Override
     public void setInstance(final Instance instance) {
+        if (containerCounter == null) {
+            containerCounter = metricRegistry.counter("polaris.instances.total");
+        }
+        containerCounter.inc();
         consul.keyValueClient().performTransaction(
                 Operation.builder(Verb.SET)
                         .key(ConsulPath.instance(instance.getId()))