Skip to content

Use erpc #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josevalim merged 1 commit into from
May 19, 2025
Merged

Use erpc #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions lib/phoenix/live_dashboard/pages/ecto_stats_page.ex
View file
Open in desktop
Copy link
Contributor

@timothyvanderaerden timothyvanderaerden May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we follow this change for the extras libraries? Since all of them use :rpc.call inside the query/3 function if I'm not mistaken.

%{columns: columns, rows: rows} = info_module.query(table_name, {repo, node}, opts)
# EctoMySQLExtras
case :rpc.call(node, repo, :query!, [query, [], query_opts]) do
  {:badrpc, {:EXIT, {:undef, _}}} ->
    raise "repository is not defined on remote node"

  {:badrpc, error} ->
    raise "cannot send query to remote node #{inspect(node)}. Reason: #{inspect(error)}"

  result ->
    result
end

Copy link
Contributor

@SteffenDE SteffenDE May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me!

Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@ defmodule Phoenix.LiveDashboard.EctoStatsPage do
end

defp named_stats_available_repos(node) do
case :rpc.call(node, Ecto.Repo, :all_running, []) do
try do
:erpc.call(node, Ecto.Repo, :all_running, [])
catch
_, _ ->
{:error, :cannot_list_running_repos}
else
repos when is_list(repos) ->
{:ok, Enum.filter(repos, fn repo -> extra_available?(node, repo) end)}

{:badrpc, _error} ->
{:error, :cannot_list_running_repos}
end
end

Expand Down Expand Up @@ -125,7 +127,7 @@ defmodule Phoenix.LiveDashboard.EctoStatsPage do
end

defp info_module_for(node, repo) do
case :rpc.call(node, repo, :__adapter__, []) do
case :erpc.call(node, repo, :__adapter__, []) do
Ecto.Adapters.Postgres -> EctoPSQLExtras
Ecto.Adapters.MyXQL -> EctoMySQLExtras
Ecto.Adapters.SQLite3 -> EctoSQLite3Extras
Expand Down
45 changes: 18 additions & 27 deletions lib/phoenix/live_dashboard/system_info.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,12 @@ defmodule Phoenix.LiveDashboard.SystemInfo do
end

def node_capabilities(node, requirements) do
case :rpc.call(node, :code, :is_loaded, [__MODULE__]) do
case :erpc.call(node, :code, :is_loaded, [__MODULE__]) do
{:file, _} ->
maybe_replace(node, fetch_capabilities(node, requirements), requirements)

false ->
load(node, requirements)

{:error, reason} ->
raise("Failed to load #{__MODULE__} on #{node}: #{inspect(reason)}")
end
end

Expand All @@ -38,81 +35,75 @@ defmodule Phoenix.LiveDashboard.SystemInfo do

defp load(node, requirements) do
{_module, binary, filename} = :code.get_object_code(__MODULE__)
:rpc.call(node, :code, :load_binary, [__MODULE__, filename, binary])
:erpc.call(node, :code, :load_binary, [__MODULE__, filename, binary])
fetch_capabilities(node, requirements)
end

## Fetchers

def fetch_processes(node, search, sort_by, sort_dir, limit, prev_reductions \\ nil) do
search = search && String.downcase(search)

:rpc.call(node, __MODULE__, :processes_callback, [
search,
sort_by,
sort_dir,
limit,
prev_reductions
])
args = [search, sort_by, sort_dir, limit, prev_reductions]
:erpc.call(node, __MODULE__, :processes_callback, args)
end

def fetch_ets(node, search, sort_by, sort_dir, limit) do
search = search && String.downcase(search)
:rpc.call(node, __MODULE__, :ets_callback, [search, sort_by, sort_dir, limit])
:erpc.call(node, __MODULE__, :ets_callback, [search, sort_by, sort_dir, limit])
end

def fetch_sockets(node, search, sort_by, sort_dir, limit) do
search = search && String.downcase(search)
:rpc.call(node, __MODULE__, :sockets_callback, [search, sort_by, sort_dir, limit])
:erpc.call(node, __MODULE__, :sockets_callback, [search, sort_by, sort_dir, limit])
end

def fetch_socket_info(port) do
:rpc.call(node(port), __MODULE__, :socket_info_callback, [port])
:erpc.call(node(port), __MODULE__, :socket_info_callback, [port])
end

def fetch_process_info(pid) do
:rpc.call(node(pid), __MODULE__, :process_info_callback, [pid])
:erpc.call(node(pid), __MODULE__, :process_info_callback, [pid])
end

def fetch_ports(node, search, sort_by, sort_dir, limit) do
search = search && String.downcase(search)
:rpc.call(node, __MODULE__, :ports_callback, [search, sort_by, sort_dir, limit])
:erpc.call(node, __MODULE__, :ports_callback, [search, sort_by, sort_dir, limit])
end

def fetch_applications(node, search, sort_by, sort_dir, limit) do
:rpc.call(node, __MODULE__, :applications_info_callback, [search, sort_by, sort_dir, limit])
:erpc.call(node, __MODULE__, :applications_info_callback, [search, sort_by, sort_dir, limit])
end

def fetch_port_info(port) do
:rpc.call(node(port), __MODULE__, :port_info_callback, [port])
:erpc.call(node(port), __MODULE__, :port_info_callback, [port])
end

def fetch_ets_info(node, ref) do
:rpc.call(node, __MODULE__, :ets_info_callback, [ref])
:erpc.call(node, __MODULE__, :ets_info_callback, [ref])
end

def fetch_system_info(node, keys, app) do
:rpc.call(node, __MODULE__, :info_callback, [keys, app])
:erpc.call(node, __MODULE__, :info_callback, [keys, app])
end

def fetch_system_usage(node) do
:rpc.call(node, __MODULE__, :usage_callback, [])
:erpc.call(node, __MODULE__, :usage_callback, [])
end

def fetch_os_mon_info(node) do
:rpc.call(node, __MODULE__, :os_mon_callback, [])
:erpc.call(node, __MODULE__, :os_mon_callback, [])
end

def fetch_capabilities(node, requirements) do
:rpc.call(node, __MODULE__, :capabilities_callback, [requirements])
:erpc.call(node, __MODULE__, :capabilities_callback, [requirements])
end

def fetch_app_tree(node, application) do
:rpc.call(node, __MODULE__, :app_tree_callback, [application])
:erpc.call(node, __MODULE__, :app_tree_callback, [application])
end

def fetch_memory_allocators(node, max_carrier_sizes) do
:rpc.call(node, __MODULE__, :memory_allocators_callback, [max_carrier_sizes])
:erpc.call(node, __MODULE__, :memory_allocators_callback, [max_carrier_sizes])
end

## System callbacks
Expand Down
Loading