Skip to content

Handle abnormal MySQL structure_load death gracefully #723

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
greg-rychlewski merged 7 commits into from
Mar 29, 2026
Merged

Handle abnormal MySQL structure_load death gracefully #723

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d93fbd4
handle process dying gracefully
greg-rychlewski Mar 29, 2026
c14f47c
fix test
greg-rychlewski Mar 29, 2026
21debd9
test
greg-rychlewski Mar 29, 2026
2d76c3b
test
greg-rychlewski Mar 29, 2026
ecf52dd
test
greg-rychlewski Mar 29, 2026
b541c12
test
greg-rychlewski Mar 29, 2026
ba48be7
restore old trap exit
greg-rychlewski Mar 29, 2026
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
14 changes: 14 additions & 0 deletions integration_test/myxql/storage_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,20 @@ defmodule Ecto.Integration.StorageTest do
drop_database()
end

test "structure load will fail on SQL errors" do
create_database()
File.mkdir_p!(tmp_path())
error_path = Path.join(tmp_path(), "error.sql")
File.write!(error_path, "SELECT 1; SELECKT 1; SELECT 2;")

{:error, message} =
Ecto.Adapters.MyXQL.structure_load(tmp_path(), [dump_path: error_path] ++ params())

assert message =~ ~r/ERROR.*SELECKT/
after
drop_database()
end

test "storage status is up when database is created" do
create_database()
assert :up == Ecto.Adapters.MyXQL.storage_status(params())
Expand Down
5 changes: 5 additions & 0 deletions lib/ecto/adapters/myxql.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,8 @@ defmodule Ecto.Adapters.MyXQL do
args: args
]

# Trap exits in case mysql dies in the middle of execution so that we can surface the error
Process.flag(:trap_exit, true)
Copy link
Copy Markdown
Member

@josevalim josevalim Mar 29, 2026

Choose a reason for hiding this comment

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

Do we need to trap exits? I am not sure if ports in Erlang are linked to the current process. But if we do have, we should probably revert the trap_exit flag to its original value once we are done!

Copy link
Copy Markdown
Member Author

@greg-rychlewski greg-rychlewski Mar 29, 2026

Choose a reason for hiding this comment

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

I believe so but definitely not an expert. I originally got it from the erlang docs example here: https://www.erlang.org/doc/system/c_port.html.

I also did a test here where I ignore the "normal" exist message and also don't trap exits and I didn't receive the abnormal exit message.

Copy link
Copy Markdown
Member Author

@greg-rychlewski greg-rychlewski Mar 29, 2026

Choose a reason for hiding this comment

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

we should probably revert the trap_exit flag to its original value once we are done!

done!

port = Port.open({:spawn_executable, abs_cmd}, port_opts)
Port.command(port, contents)
# Use this as a signal to close the port since we cannot
Expand Down Expand Up @@ -653,6 +655,9 @@ defmodule Ecto.Adapters.MyXQL do
collect_output(port, acc)
end

{:EXIT, ^port, _reason} ->
{acc, 1}

{^port, {:exit_status, status}} ->
{acc, status}
end
Expand Down
Loading