Optimization and informer system rework

EliXorZz · EliXorZz · commit 86ef1755db92 · 2022-07-30T17:43:50.000+02:00
diff --git a/common/src/main/java/fr/epsilon/common/Epsilon.java b/common/src/main/java/fr/epsilon/common/Epsilon.java
@@ -7,16 +7,29 @@
 import fr.epsilon.common.instance.EInstanceModule;
 import fr.epsilon.common.queue.EQueueModule;
 import fr.epsilon.common.template.ETemplate;
+import io.kubernetes.client.informer.ResourceEventHandler;
+import io.kubernetes.client.informer.SharedIndexInformer;
+import io.kubernetes.client.informer.SharedInformer;
 import io.kubernetes.client.informer.SharedInformerFactory;
+import io.kubernetes.client.informer.cache.Lister;
 import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.openapi.ApiException;
+import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.util.Config;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
+import io.kubernetes.client.util.generic.KubernetesApiResponse;
 import okhttp3.*;
 
 import java.io.FileReader;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class Epsilon {
     private static Epsilon singleton;
@@ -26,17 +39,29 @@ public class Epsilon {
     private final EInstanceModule instanceModule;
     private final EQueueModule queueModule;
 
+    private String namespace;
+
     private SharedInformerFactory informerFactory;
-    private GenericKubernetesApi<EpsilonInstanceCRD, EpsilonInstanceCRDList> epsilonInstanceClient;
+    private InstanceInformer instanceInformer;
 
     private ETemplate template;
 
     public Epsilon() {
+        Path namespacePath = Paths.get("/var/run/secrets/kubernetes.io/serviceaccount/namespace");
+
+        try (Stream<String> lines = Files.lines(namespacePath)) {
+            this.namespace = lines.collect(Collectors.joining(System.lineSeparator()));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
         try {
             ApiClient kubeClient = Config.defaultClient();
+            GenericKubernetesApi<EpsilonInstanceCRD, EpsilonInstanceCRDList> epsilonInstanceClient =
+                    new GenericKubernetesApi<>(EpsilonInstanceCRD.class, EpsilonInstanceCRDList.class, "controller.epsilon" + ".fr", "v1", "epsiloninstances", kubeClient);
 
             this.informerFactory = new SharedInformerFactory(kubeClient);
-            this.epsilonInstanceClient = new GenericKubernetesApi<>(EpsilonInstanceCRD.class, EpsilonInstanceCRDList.class, "controller.epsilon.fr", "v1", "epsiloninstances", kubeClient);
+            this.instanceInformer = new InstanceInformer(namespace, informerFactory, epsilonInstanceClient);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -63,12 +88,10 @@ public static Epsilon get() {
         return singleton;
     }
 
-    public SharedInformerFactory getInformerFactory() {
-        return informerFactory;
-    }
+    public InstanceInformer runInstanceInformer() {
+        informerFactory.startAllRegisteredInformers();
 
-    public GenericKubernetesApi<EpsilonInstanceCRD, EpsilonInstanceCRDList> getEpsilonInstanceClient() {
-        return epsilonInstanceClient;
+        return instanceInformer;
     }
 
     public String name() {
diff --git a/common/src/main/java/fr/epsilon/common/InstanceInformer.java b/common/src/main/java/fr/epsilon/common/InstanceInformer.java
@@ -0,0 +1,67 @@
+package fr.epsilon.common;
+
+import fr.epsilon.common.crd.EpsilonInstanceCRD;
+import fr.epsilon.common.crd.EpsilonInstanceCRDList;
+import fr.epsilon.common.instance.EInstance;
+import io.kubernetes.client.informer.ResourceEventHandler;
+import io.kubernetes.client.informer.SharedIndexInformer;
+import io.kubernetes.client.informer.SharedInformerFactory;
+import io.kubernetes.client.informer.cache.Lister;
+import io.kubernetes.client.util.generic.GenericKubernetesApi;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+public class InstanceInformer {
+    private SharedIndexInformer<EpsilonInstanceCRD> instanceInformer;
+
+    private Lister<EpsilonInstanceCRD> instanceStore;
+
+    private List<InstanceInformerListener> listeners;
+
+    public InstanceInformer(String namespace, SharedInformerFactory informerFactory, GenericKubernetesApi<EpsilonInstanceCRD, EpsilonInstanceCRDList> epsilonInstanceClient) {
+        this.instanceInformer = informerFactory.sharedIndexInformerFor(epsilonInstanceClient,
+                EpsilonInstanceCRD.class, TimeUnit.MINUTES.toMillis(10), namespace);
+
+        this.instanceStore = new Lister<>(instanceInformer.getIndexer());
+
+        this.listeners = new ArrayList<>();
+
+        instanceInformer.addEventHandlerWithResyncPeriod(new ResourceEventHandler<EpsilonInstanceCRD>() {
+            @Override
+            public void onAdd(EpsilonInstanceCRD instance) {}
+
+            @Override
+            public void onUpdate(EpsilonInstanceCRD oldInstance, EpsilonInstanceCRD newInstance) {
+                if (newInstance.getStatus() != null) {
+                    for (InstanceInformerListener listener : listeners) {
+                        listener.onInstanceUpdate(newInstance.getInstance());
+                    }
+                }
+            }
+
+            @Override
+            public void onDelete(EpsilonInstanceCRD instance, boolean deletedFinalStateUnknown) {
+                for (InstanceInformerListener listener : listeners) {
+                    listener.onInstanceUpdate(instance.getInstance());
+                }
+            }
+        }, TimeUnit.MINUTES.toMillis(5));
+    }
+
+    public EInstance getInstance(String name) {
+        return instanceStore.get(name).getInstance();
+    }
+
+    public List<EInstance> getInstances() {
+        return instanceStore.list().stream()
+                .map(EpsilonInstanceCRD::getInstance)
+                .collect(Collectors.toList());
+    }
+
+    public void registerListener(InstanceInformerListener listener) {
+        listeners.add(listener);
+    }
+}
diff --git a/common/src/main/java/fr/epsilon/common/InstanceInformerListener.java b/common/src/main/java/fr/epsilon/common/InstanceInformerListener.java
@@ -0,0 +1,9 @@
+package fr.epsilon.common;
+
+import fr.epsilon.common.crd.EpsilonInstanceCRD;
+import fr.epsilon.common.instance.EInstance;
+
+public interface InstanceInformerListener {
+    void onInstanceUpdate(EInstance instance);
+    void onInstanceRemove(EInstance instance);
+}
diff --git a/common/src/main/java/fr/epsilon/common/crd/EpsilonInstanceCRD.java b/common/src/main/java/fr/epsilon/common/crd/EpsilonInstanceCRD.java
@@ -1,6 +1,9 @@
 package fr.epsilon.common.crd;
 
 import com.google.gson.annotations.SerializedName;
+import fr.epsilon.common.instance.EInstance;
+import fr.epsilon.common.instance.EState;
+import fr.epsilon.common.instance.EType;
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 
@@ -47,4 +50,26 @@ public String getName() {
     public EpsilonInstanceCRDStatus getStatus() {
         return status;
     }
+
+    public EInstance getInstance() {
+        if (getStatus() != null) {
+            String template = getStatus().getTemplate();
+
+            String content = getStatus().getContent();
+
+            boolean hub = getStatus().isHub();
+
+            EType type = getStatus().getType();
+            EState state = getStatus().getState();
+
+            int slots = getStatus().getSlots();
+            int onlineCount = getStatus().getOnlineCount();
+
+            String ip = getStatus().getIp();
+
+            return new EInstance(getName(), template, content, hub, type, state, slots, onlineCount, ip);
+        }
+
+        return null;
+    }
 }
diff --git a/common/src/main/java/fr/epsilon/common/crd/EpsilonInstanceCRDStatus.java b/common/src/main/java/fr/epsilon/common/crd/EpsilonInstanceCRDStatus.java
@@ -19,7 +19,7 @@ public class EpsilonInstanceCRDStatus {
 
     public static final String SERIALIZED_NAME_SLOTS = "slots";
 
-    public static final String SERIALIZED_NAME_CLOSE = "close";
+    public static final String SERIALIZED_NAME_ONLINE = "online";
 
     @SerializedName(SERIALIZED_NAME_IP)
     private String ip = null;
@@ -42,8 +42,8 @@ public class EpsilonInstanceCRDStatus {
     @SerializedName(SERIALIZED_NAME_SLOTS)
     private Integer slots = null;
 
-    @SerializedName(SERIALIZED_NAME_CLOSE)
-    private Boolean close = null;
+    @SerializedName(SERIALIZED_NAME_ONLINE)
+    private Integer online = null;
 
     public String getIp() {
         return ip;
@@ -73,7 +73,7 @@ public Integer getSlots() {
         return slots;
     }
 
-    public Boolean isClose() {
-        return close;
+    public Integer getOnlineCount() {
+        return online;
     }
 }
diff --git a/common/src/main/java/fr/epsilon/common/instance/EInstance.java b/common/src/main/java/fr/epsilon/common/instance/EInstance.java
@@ -5,10 +5,31 @@
 public class EInstance {
     private String name;
     private String template;
+
+    private String content;
+
+    private boolean hub;
+
+    private EType type;
     private EState state;
+
     private int slots;
     private int online_count;
 
+    private String ip;
+
+    public EInstance(String name, String template, String content, boolean hub, EType type, EState state, int slots, int online_count, String ip) {
+        this.name = name;
+        this.template = template;
+        this.content = content;
+        this.hub = hub;
+        this.type = type;
+        this.state = state;
+        this.slots = slots;
+        this.online_count = online_count;
+        this.ip = ip;
+    }
+
     public String getName() {
         return name;
     }
@@ -17,6 +38,18 @@ public String getTemplate() {
         return template;
     }
 
+    public String getContent() {
+        return content;
+    }
+
+    public boolean isHub() {
+        return hub;
+    }
+
+    public EType getType() {
+        return type;
+    }
+
     public EState getState() {
         return state;
     }
@@ -29,6 +62,10 @@ public int getOnlineCount() {
         return online_count;
     }
 
+    public String getIp() {
+        return ip;
+    }
+
     public boolean enableInGame() {
         return Epsilon.get().instanceModule().inGameInstance(name);
     }
diff --git a/proxy/src/main/java/fr/epsilon/exporter/EpsilonExporter.java b/proxy/src/main/java/fr/epsilon/exporter/EpsilonExporter.java
@@ -25,7 +25,7 @@ public void onEnable() {
         getProxy().getServers().clear();
 
         this.register = new EpsilonRegister(this);
-        register.runInformer();
+        register.run();
 
         EpsilonEventStream.init(this);
 
diff --git a/proxy/src/main/java/fr/epsilon/exporter/listener/EpsilonRegister.java b/proxy/src/main/java/fr/epsilon/exporter/listener/EpsilonRegister.java
