chore: improve active_count (#481)

supabase · Nov 14, 2024 · bfba3fd · bfba3fd
1 parent f054c35
commit bfba3fd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/supavisor/client_handler.ex b/lib/supavisor/client_handler.ex
@@ -529,6 +529,7 @@ defmodule Supavisor.ClientHandler do
     {:keep_state, %{data | active_count: reset_active_count(data)}, handle_actions(data)}
   end
 
+  # handle Flush message
   def handle_event(:info, {proto, _, <<?H, 4::32, _::binary>> = msg}, _, data)
       when proto in @proto do
     Logger.debug("ClientHandler: Receive flush while not idle")
@@ -1125,11 +1126,7 @@ defmodule Supavisor.ClientHandler do
 
   @spec reset_active_count(map()) :: 0
   def reset_active_count(data) do
-    if data.active_count >= @switch_active_count do
-      Logger.debug("ClientHandler: Activate socket #{inspect(data.active_count)}")
-      HandlerHelpers.activate(data.sock)
-    end
-
+    HandlerHelpers.activate(data.sock)
     0
   end
 end
diff --git a/lib/supavisor/db_handler.ex b/lib/supavisor/db_handler.ex
@@ -295,8 +295,7 @@ defmodule Supavisor.DbHandler do
     Logger.debug("DbHandler: Got write replica message  #{inspect(bin)}")
 
     if String.ends_with?(bin, Server.ready_for_query()) do
-      if data.active_count >= @switch_active_count,
-        do: HandlerHelpers.activate(data.sock)
+      HandlerHelpers.activate(data.sock)
 
       {_, stats} = Telem.network_usage(:db, data.sock, data.id, data.stats)
 
@@ -363,7 +362,7 @@ defmodule Supavisor.DbHandler do
     end
 
     if state == :busy or data.mode == :session do
-      sock_send(data.sock, <<?X, 4::32>>)
+      sock_send(data.sock, Server.terminate_message())
       :gen_tcp.close(elem(data.sock, 1))
       {:stop, {:client_handler_down, data.mode}}
     else

diff --git a/lib/supavisor/protocol/server.ex b/lib/supavisor/protocol/server.ex
@@ -15,6 +15,7 @@ defmodule Supavisor.Protocol.Server do
   @scram_request <<?R, 23::32, 10::32, "SCRAM-SHA-256", 0, 0>>
   @msg_cancel_header <<16::32, 1234::16, 5678::16>>
   @application_name <<?S, 31::32, "application_name", 0, "Supavisor", 0>>
+  @terminate_message <<?X, 4::32>>
 
   defmodule Pkt do
     @moduledoc "Representing a packet structure with tag, length, and payload fields."
@@ -470,4 +471,7 @@ defmodule Supavisor.Protocol.Server do
 
   @spec application_name() :: binary
   def application_name, do: @application_name
+
+  @spec terminate_message() :: binary
+  def terminate_message(), do: @terminate_message
 end