Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
f5abc2e8
Commit
f5abc2e8
authored
Sep 25, 2018
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a CTE to remove the query timeout
parent
059da9bc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
113 additions
and
10 deletions
+113
-10
changelogs/unreleased/50359-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout.yml
...ed-error-canceling-statement-due-to-statement-timeout.yml
+5
-0
db/migrate/20181002172433_remove_restricted_todos_with_cte.rb
...igrate/20181002172433_remove_restricted_todos_with_cte.rb
+32
-0
db/schema.rb
db/schema.rb
+1
-1
lib/gitlab/background_migration/remove_restricted_todos.rb
lib/gitlab/background_migration/remove_restricted_todos.rb
+75
-9
No files found.
changelogs/unreleased/50359-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout.yml
0 → 100644
View file @
f5abc2e8
---
title
:
Fix timeout when running the RemoveRestrictedTodos background migration
merge_request
:
21893
author
:
type
:
fixed
db/migrate/20181002172433_remove_restricted_todos_with_cte.rb
0 → 100644
View file @
f5abc2e8
# frozen_string_literal: true
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
# rescheduling of the revised RemoveRestrictedTodos background migration
class
RemoveRestrictedTodosWithCte
<
ActiveRecord
::
Migration
DOWNTIME
=
false
disable_ddl_transaction!
MIGRATION
=
'RemoveRestrictedTodos'
.
freeze
BATCH_SIZE
=
1000
DELAY_INTERVAL
=
5
.
minutes
.
to_i
class
Project
<
ActiveRecord
::
Base
include
EachBatch
self
.
table_name
=
'projects'
end
def
up
Project
.
where
(
'EXISTS (SELECT 1 FROM todos WHERE todos.project_id = projects.id)'
)
.
each_batch
(
of:
BATCH_SIZE
)
do
|
batch
,
index
|
range
=
batch
.
pluck
(
'MIN(id)'
,
'MAX(id)'
).
first
BackgroundMigrationWorker
.
perform_in
(
index
*
DELAY_INTERVAL
,
MIGRATION
,
range
)
end
end
def
down
# nothing to do
end
end
db/schema.rb
View file @
f5abc2e8
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended that you check this file into your version control system.
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2018
0924201039
)
do
ActiveRecord
::
Schema
.
define
(
version:
2018
1002172433
)
do
# These are extensions that must be enabled in order to support this database
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
enable_extension
"plpgsql"
...
...
lib/gitlab/background_migration/remove_restricted_todos.rb
View file @
f5abc2e8
# frozen_string_literal: true
# frozen_string_literal: true
# rubocop:disable Style/Documentation
# rubocop:disable Style/Documentation
# rubocop:disable Metrics/ClassLength
module
Gitlab
module
Gitlab
module
BackgroundMigration
module
BackgroundMigration
...
@@ -49,11 +50,14 @@ module Gitlab
...
@@ -49,11 +50,14 @@ module Gitlab
private
private
def
remove_non_members_todos
(
project_id
)
def
remove_non_members_todos
(
project_id
)
Todo
.
where
(
project_id:
project_id
)
if
Gitlab
::
Database
.
postgresql?
.
where
(
'user_id NOT IN (?)'
,
authorized_users
(
project_id
))
batch_remove_todos_cte
(
project_id
)
.
each_batch
(
of:
5000
)
do
|
batch
|
else
batch
.
delete_all
unauthorized_project_todos
(
project_id
)
end
.
each_batch
(
of:
5000
)
do
|
batch
|
batch
.
delete_all
end
end
end
end
def
remove_confidential_issue_todos
(
project_id
)
def
remove_confidential_issue_todos
(
project_id
)
...
@@ -86,10 +90,13 @@ module Gitlab
...
@@ -86,10 +90,13 @@ module Gitlab
next
if
target_types
.
empty?
next
if
target_types
.
empty?
Todo
.
where
(
project_id:
project_id
)
if
Gitlab
::
Database
.
postgresql?
.
where
(
'user_id NOT IN (?)'
,
authorized_users
(
project_id
))
batch_remove_todos_cte
(
project_id
,
target_types
)
.
where
(
target_type:
target_types
)
else
.
delete_all
unauthorized_project_todos
(
project_id
)
.
where
(
target_type:
target_types
)
.
delete_all
end
end
end
end
end
...
@@ -100,6 +107,65 @@ module Gitlab
...
@@ -100,6 +107,65 @@ module Gitlab
def
authorized_users
(
project_id
)
def
authorized_users
(
project_id
)
ProjectAuthorization
.
select
(
:user_id
).
where
(
project_id:
project_id
)
ProjectAuthorization
.
select
(
:user_id
).
where
(
project_id:
project_id
)
end
end
def
unauthorized_project_todos
(
project_id
)
Todo
.
where
(
project_id:
project_id
)
.
where
(
'user_id NOT IN (?)'
,
authorized_users
(
project_id
))
end
def
batch_remove_todos_cte
(
project_id
,
target_types
=
nil
)
loop
do
count
=
remove_todos_cte
(
project_id
,
target_types
)
break
if
count
==
0
end
end
def
remove_todos_cte
(
project_id
,
target_types
=
nil
)
sql
=
[]
sql
<<
with_all_todos_sql
(
project_id
,
target_types
)
sql
<<
as_deleted_sql
sql
<<
"SELECT count(*) FROM deleted"
result
=
Todo
.
connection
.
exec_query
(
sql
.
join
(
' '
))
result
.
rows
[
0
][
0
].
to_i
end
def
with_all_todos_sql
(
project_id
,
target_types
=
nil
)
if
target_types
table
=
Arel
::
Table
.
new
(:
todos
)
in_target
=
table
[:
target_type
].
in
(
target_types
)
target_types_sql
=
" AND
#{
in_target
.
to_sql
}
"
end
<<-
SQL
WITH all_todos AS (
SELECT id
FROM "todos"
WHERE "todos"."project_id" =
#{
project_id
}
AND (user_id NOT IN (
SELECT "project_authorizations"."user_id"
FROM "project_authorizations"
WHERE "project_authorizations"."project_id" =
#{
project_id
}
)
#{
target_types_sql
}
)
),
SQL
end
def
as_deleted_sql
<<-
SQL
deleted AS (
DELETE FROM todos
WHERE id IN (
SELECT id
FROM all_todos
LIMIT 5000
)
RETURNING id
)
SQL
end
end
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment