change methods and improve tests

Author: filipecabaco

lib/realtime/api.ex

@@ -129,6 +129,8 @@ defmodule Realtime.Api do
   """
   @spec update_tenant_by_external_id(binary(), map()) :: {:ok, Tenant.t()} | {:error, term()}
   def update_tenant_by_external_id(tenant_id, attrs) when is_binary(tenant_id) do
+    IO.inspect(node())
+
     if master_region?() do
       tenant_id
       |> get_tenant_by_external_id(use_replica?: false)

lib/realtime/nodes.ex

@@ -94,11 +94,6 @@ defmodule Realtime.Nodes do
   @spec launch_node(String.t(), String.t() | nil, atom()) :: atom()
   def launch_node(tenant_id, region, default) do
     case region_nodes(region) do
-      [node] ->
-        Logger.warning("Only one region node (#{inspect(node)}) for #{region} using default #{inspect(default)}")
-
-        default
-
       [] ->
         Logger.warning("Zero region nodes for #{region} using #{inspect(default)}")
         default

lib/realtime/tenants/migrations.ex

@@ -170,12 +170,10 @@ defmodule Realtime.Tenants.Migrations do
       migrations_ran: tenant.migrations_ran
     }
 
-    region = Tenants.region(tenant)
-
     node =
-      case Nodes.node_from_region(region, tenant.external_id) do
-        {:ok, node} -> node
-        {:error, :not_available} -> node()
+      case Nodes.get_node_for_tenant(tenant) do
+        {:ok, node, _} -> node
+        {:error, _} -> node()
       end
 
     GenRpc.call(node, __MODULE__, :start_migration, [attrs], tenant_id: tenant.external_id)

test/integration/region_aware_migrations_test.exs

@@ -21,20 +21,26 @@ defmodule Realtime.Integration.RegionAwareMigrationsTest do
           "poll_interval" => 100,
           "poll_max_changes" => 100,
           "poll_max_record_bytes" => 1_048_576,
-          "region" => "eu-west-2",
+          "region" => "ap-southeast-2",
           "publication" => "supabase_realtime_test",
           "ssl_enforced" => false
         }
       }
     ]
 
     tenant = tenant_fixture(%{extensions: settings})
+    region = Application.get_env(:realtime, :region)
 
-    {:ok, node} = Clustered.start(nil, extra_config: [{:realtime, :region, Tenants.region(tenant)}])
+    {:ok, node} =
+      Clustered.start(nil,
+        extra_config: [
+          {:realtime, :region, Tenants.region(tenant)},
+          {:realtime, :master_region, region}
+        ]
+      )
 
     on_exit(fn -> Clustered.stop() end)
 
-    Process.sleep(1000)
     %{tenant: tenant, node: node}
   end
 
@@ -57,5 +63,8 @@ defmodule Realtime.Integration.RegionAwareMigrationsTest do
     end)
 
     assert :ok = Migrations.run_migrations(tenant)
+    Process.sleep(1000)
+    tenant = Realtime.Repo.reload!(tenant)
+    refute tenant.migrations_ran == 0
   end
 end

test/realtime/nodes_test.exs

@@ -108,7 +108,7 @@ defmodule Realtime.NodesTest do
       assert region == expected_region
     end
 
-    test "on existing tenant id, and a single node for a given region, returns default", %{
+    test "on existing tenant id, and a single node for a given region, returns single node", %{
       tenant: tenant,
       region: region
     } do
@@ -117,7 +117,7 @@ defmodule Realtime.NodesTest do
 
       expected_region = Tenants.region(tenant)
 
-      assert node == node()
+      assert node != node()
       assert region == expected_region
     end
 

test/realtime_web/controllers/tenant_controller_test.exs

@@ -419,7 +419,7 @@ defmodule RealtimeWeb.TenantControllerTest do
 
       conn = get(conn, ~p"/api/tenants/#{tenant.external_id}/health")
       data = json_response(conn, 200)["data"]
-      Process.sleep(4000)
+      Process.sleep(1000)
 
       assert {:ok, %{rows: []}} = Postgrex.query(db_conn, "SELECT * FROM realtime.messages", [])