feat: add new transaction handler #402
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abc3
force-pushed
the
feat/proxy_transaction
branch
from
8c88398
to
4402c5c
Compare
hauleth
reviewed
Jul 26, 2024
lib/supavisor.ex
Outdated
| opts = | ||
| %{ | ||
| max_connections: args.max_clients, | ||
| num_acceptors: if(acceptors < 10, do: 10, else: acceptors), |
There was a problem hiding this comment.
Suggested change
| num_acceptors: if(acceptors < 10, do: 10, else: acceptors), | |
| num_acceptors: max(acceptors, 10), |
There was a problem hiding this comment.
ohh, cool, didn't know that
| alias Supavisor.Helpers, as: H | ||
| alias Supavisor.HandlerHelpers, as: HH | ||
|
|
||
| alias Supavisor.{ | ||
| alias S.{ |
There was a problem hiding this comment.
Suggested change
| alias S.{ | |
| alias Supavisor.{ |
I am not a fan of alias Supavisor, as: S, and this make it even worse.
There was a problem hiding this comment.
yeah, let's make it more readable
Comment on lines
298
to
340
| with {:ok, sup} <- | ||
| Supavisor.start_dist(data.id, data.auth_secrets, log_level: data.log_level), | ||
| true <- if(node(sup) == node(), do: true, else: :proxy), | ||
| {:ok, opts} <- Supavisor.subscribe(sup, data.id) do | ||
| Process.monitor(opts.workers.manager) | ||
| data = Map.merge(data, opts.workers) | ||
| data = %{data | idle_timeout: opts.idle_timeout} | ||
|
|
||
| next = | ||
| if opts.ps == [] do | ||
| {:timeout, 10_000, :wait_ps} | ||
| else | ||
| {:next_event, :internal, {:client, {:greetings, opts.ps}}} | ||
| end | ||
|
|
||
| {:keep_state, data, next} | ||
| else | ||
| {:error, :max_clients_reached} -> | ||
| msg = "Max client connections reached" | ||
| Logger.error("ClientHandler: #{msg}") | ||
| :ok = HH.send_error(data.sock, "XX000", msg) | ||
| Telem.client_join(:fail, data.id) | ||
| {:stop, {:shutdown, :max_clients_reached}} | ||
|
|
||
| :proxy -> | ||
| {:ok, %{port: port, host: host}} = S.get_pool_ranch(data.id) | ||
|
|
||
| auth = | ||
| Map.merge(data.auth, %{ | ||
| port: port, | ||
| host: host, | ||
| ip_version: :v4, | ||
| upstream_ssl: false, | ||
| upstream_tls_ca: nil, | ||
| upstream_verify: nil | ||
| }) | ||
|
|
||
| data = Map.merge(data, %{auth: auth, mode: :session, proxy: true}) | ||
| {:keep_state, data, {:next_event, :internal, {:client, :connect_db}}} | ||
|
|
||
| error -> | ||
| Logger.error("ClientHandler: Subscribe error: #{inspect(error)}") | ||
| {:keep_state_and_data, {:timeout, 1000, :subscribe}} |
There was a problem hiding this comment.
That with looks super heavy, but I do not have immediate plan how to make it cleaner.
| case ProxyDb.send_startup(sock, auth) do | ||
| tenant = if(data.proxy, do: S.tenant(data.id)) | ||
|
|
||
| case Db.send_startup(sock, auth, tenant) do |
| clients when clients == [{self(), []}] or clients == [] -> PromEx.remove_metrics(data.id) | ||
| _ -> :ok | ||
| if data.id != nil do | ||
| with clients <- Registry.lookup(Supavisor.Registry.TenantClients, data.id), |
There was a problem hiding this comment.
Why use with for this clause? It cannot fail.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.