fix(discovery): ensure all nodes have parent ref

cryostatio · Apr 22, 2024 · a05895c · a05895c
1 parent 3d6f4fc
commit a05895c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/io/cryostat/discovery/ContainerDiscovery.java b/src/main/java/io/cryostat/discovery/ContainerDiscovery.java
@@ -172,6 +172,7 @@ void onStart(@Observes StartupEvent evt) {
             plugin.realm = node;
             plugin.builtin = true;
             universe.children.add(node);
+            node.parent = universe;
             plugin.persist();
             universe.persist();
         }
@@ -364,7 +365,9 @@ public void handleContainerEvent(ContainerSpec desc, EventKind evtKind) {
                         DiscoveryNode.environment(podName, ContainerDiscoveryNodeType.POD);
                 if (!realm.children.contains(pod)) {
                     pod.children.add(node);
+                    node.parent = pod;
                     realm.children.add(pod);
+                    pod.parent = realm;
                 } else {
                     pod =
                             DiscoveryNode.getChild(
@@ -376,10 +379,12 @@ public void handleContainerEvent(ContainerSpec desc, EventKind evtKind) {
                                                                     .equals(n.nodeType))
                                     .orElseThrow();
                     pod.children.add(node);
+                    node.parent = pod;
                 }
                 pod.persist();
             } else {
                 realm.children.add(node);
+                node.parent = realm;
             }
             target.persist();
             node.persist();

diff --git a/src/main/java/io/cryostat/discovery/CustomDiscovery.java b/src/main/java/io/cryostat/discovery/CustomDiscovery.java
@@ -77,6 +77,7 @@ void onStart(@Observes StartupEvent evt) {
             plugin.realm = node;
             plugin.builtin = true;
             universe.children.add(node);
+            node.parent = universe;
             plugin.persist();
             universe.persist();
         }
@@ -167,6 +168,7 @@ Response doV2Create(
             DiscoveryNode realm = DiscoveryNode.getRealm(REALM).orElseThrow();
 
             realm.children.add(node);
+            node.parent = realm;
             target.persist();
             node.persist();
             realm.persist();

diff --git a/src/main/java/io/cryostat/discovery/DiscoveryNode.java b/src/main/java/io/cryostat/discovery/DiscoveryNode.java
@@ -79,9 +79,10 @@ public class DiscoveryNode extends PanacheEntity {
     @Nullable
     public List<DiscoveryNode> children = new ArrayList<>();
 
-    @ManyToOne(cascade = {CascadeType.ALL})
-    @JsonIgnore
+    @Nullable
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "parentNode")
+    @JsonIgnore
     public DiscoveryNode parent;
 
     @OneToOne(

diff --git a/src/main/java/io/cryostat/discovery/JDPDiscovery.java b/src/main/java/io/cryostat/discovery/JDPDiscovery.java
@@ -74,6 +74,7 @@ void onStart(@Observes StartupEvent evt) {
             plugin.realm = node;
             plugin.builtin = true;
             universe.children.add(node);
+            node.parent = universe;
             plugin.persist();
             universe.persist();
         }
@@ -143,6 +144,7 @@ public synchronized void handleJdpEvent(JvmDiscoveryEvent evt) {
 
                 target.discoveryNode = node;
                 realm.children.add(node);
+                node.parent = realm;
                 target.persist();
                 node.persist();
                 realm.persist();