Skip to content

fix migrations deadlock #45

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

Open
ttt161 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix migrations deadlock #45

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
8 changes: 4 additions & 4 deletions priv/schemas/postgres-schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ CREATE TABLE IF NOT EXISTS namespace_events(
FOREIGN KEY ("task_id") REFERENCES namespace_tasks ("task_id")
);

CREATE INDEX IF NOT EXISTS "process_idx" on namespace_events USING HASH ("process_id");
CREATE INDEX IF NOT EXISTS "process_idx" on namespace_tasks USING HASH ("process_id");
CREATE INDEX IF NOT EXISTS "process_idx" on namespace_schedule USING HASH ("process_id");
CREATE INDEX IF NOT EXISTS "task_idx" on namespace_running USING HASH ("task_id");
CREATE INDEX IF NOT EXISTS "namespace_events_process_idx" on namespace_events USING HASH ("process_id");
CREATE INDEX IF NOT EXISTS "namespace_tasks_process_idx" on namespace_tasks USING HASH ("process_id");
CREATE INDEX IF NOT EXISTS "namespace_schedule_process_idx" on namespace_schedule USING HASH ("process_id");
CREATE INDEX IF NOT EXISTS "namespace_running_task_idx" on namespace_running USING HASH ("task_id");
81 changes: 65 additions & 16 deletions src/storage/postgres/prg_pg_migration.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,23 +165,24 @@ db_init(#{pool := Pool}, NsId) ->
" (process_id), "
"FOREIGN KEY (task_id) REFERENCES " ++ TaskTable ++ " (task_id))"
),
%% DELETED VIA MIGRATION 4
%% create indexes
{ok, _, _} = epg_pool:query(
Connection,
"CREATE INDEX IF NOT EXISTS process_idx on " ++ EventsTable ++ " USING HASH (process_id)"
),
{ok, _, _} = epg_pool:query(
Connection,
"CREATE INDEX IF NOT EXISTS process_idx on " ++ TaskTable ++ " USING HASH (process_id)"
),
{ok, _, _} = epg_pool:query(
Connection,
"CREATE INDEX IF NOT EXISTS process_idx on " ++ ScheduleTable ++ " USING HASH (process_id)"
),
{ok, _, _} = epg_pool:query(
Connection,
"CREATE INDEX IF NOT EXISTS task_idx on " ++ RunningTable ++ " USING HASH (task_id)"
),
%{ok, _, _} = epg_pool:query(
% Connection,
% "CREATE INDEX IF NOT EXISTS process_idx on " ++ EventsTable ++ " USING HASH (process_id)"
%),
%{ok, _, _} = epg_pool:query(
% Connection,
% "CREATE INDEX IF NOT EXISTS process_idx on " ++ TaskTable ++ " USING HASH (process_id)"
%),
%{ok, _, _} = epg_pool:query(
% Connection,
%% "CREATE INDEX IF NOT EXISTS process_idx on " ++ ScheduleTable ++ " USING HASH (process_id)"
%),
%{ok, _, _} = epg_pool:query(
% Connection,
% "CREATE INDEX IF NOT EXISTS task_idx on " ++ RunningTable ++ " USING HASH (task_id)"
%),

%% MIGRATIONS
%% MIGRATION 1
Expand Down Expand Up @@ -259,6 +260,15 @@ db_init(#{pool := Pool}, NsId) ->
)
end,

%% MIGRATION 4
%% Drop wrong indexes if exists, create new indexes
{ok, _, _} = drop_index(Connection, "process_idx"),
{ok, _, _} = drop_index(Connection, "task_idx"),
{ok, _, _} = create_index(Connection, EventsTable, "process_idx", "(process_id)"),
{ok, _, _} = create_index(Connection, TaskTable, "process_idx", "(process_id)"),
{ok, _, _} = create_index(Connection, ScheduleTable, "process_idx", "(process_id)"),
{ok, _, _} = create_index(Connection, RunningTable, "task_idx", "(task_id)"),

%%% END
{ok, [], []}
end
Expand Down Expand Up @@ -287,3 +297,42 @@ cleanup(#{pool := Pool}, NsId) ->
end
),
ok.

%%

drop_index(Connection, IndexName) ->
{ok, _, [{IsIndexExists}]} = epg_pool:query(
Connection,
"SELECT EXISTS (SELECT 1 FROM pg_indexes WHERE indexname = $1)",
[IndexName]
),
case IsIndexExists of
true ->
epg_pool:query(Connection, "DROP INDEX " ++ IndexName);
false ->
{ok, [], []}
end.

create_index(Connection, Table, Index, Fields) ->
create_index(Connection, Table, Index, " HASH ", Fields).

create_index(Connection, Table, Index, IndexType, Fields) ->
%% unwrap table name and wrap index name
IndexName = "\"" ++ string:replace(Table, "\"", "", all) ++ "_" ++ Index ++ "\"",
%% re-wrap for using in WHERE section
IndexNameStr = string:replace(IndexName, "\"", "'", all),
{ok, _, [{IsIndexExists}]} = epg_pool:query(
Connection,
"SELECT EXISTS (SELECT 1 FROM pg_indexes WHERE indexname = " ++ IndexNameStr ++ " )"
),
case IsIndexExists of
true ->
{ok, [], []};
false ->
epg_pool:query(
Connection,
"CREATE INDEX " ++ IndexName ++
" on " ++ Table ++
" USING " ++ IndexType ++ " " ++ Fields
)
end.
Loading