Postpone joining cluster until Supervisor registers itself

Author: martosaur

lib/nebulex_local_multilevel_adapter/sidecar.ex

@@ -16,10 +16,29 @@ defmodule NebulexLocalMultilevelAdapter.Sidecar do
     # Trap exit signals to run cleanup job
     _ = Process.flag(:trap_exit, true)
 
+    {:ok, adapter_meta, {:continue, :join_cluster}}
+  end
+
+  @impl true
+  def handle_continue(:join_cluster, adapter_meta) do
+    join_cluster(adapter_meta)
+  end
+
+  @impl true
+  def handle_info(:join_cluster, adapter_meta) do
+    join_cluster(adapter_meta)
+  end
+
+  def join_cluster(adapter_meta) do
+    _ = Nebulex.Cache.Registry.lookup(adapter_meta.name)
+
     # Ensure joining the cluster only when the cache supervision tree is started
     :ok = Cluster.join(adapter_meta.name)
-
-    {:ok, adapter_meta}
+    {:noreply, adapter_meta}
+  rescue
+    ArgumentError ->
+      Process.send_after(self(), :join_cluster, 50)
+      {:noreply, adapter_meta}
   end
 
   @impl true

test/clustered_test.exs

@@ -17,6 +17,12 @@ defmodule NebulexLocalMultilevelAdapter.ClusteredTest do
          ]}
       ])
 
+    wait_until(fn ->
+      Enum.all?([Cache.Isolated, Cache.Connected], fn cache ->
+        [_, _, _] = Nebulex.Cache.Cluster.get_nodes(cache)
+      end)
+    end)
+
     on_exit(fn ->
       :ok = Process.sleep(100)
       stop_caches(node_pid_list)