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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b4056b69
Commit
b4056b69
authored
Mar 23, 2021
by
Dmitry Gruzd
Committed by
Dylan Griffith
Mar 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix reindexing retry for the notes migration
parent
45b6085d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
ee/changelogs/unreleased/297646-fix-reindexing-retry.yml
ee/changelogs/unreleased/297646-fix-reindexing-retry.yml
+5
-0
ee/elastic/migrate/20210302104500_migrate_notes_to_separate_index.rb
...migrate/20210302104500_migrate_notes_to_separate_index.rb
+1
-1
ee/spec/elastic/migrate/20210201104800_migrate_notes_to_separate_index_spec.rb
...te/20210201104800_migrate_notes_to_separate_index_spec.rb
+2
-0
No files found.
ee/changelogs/unreleased/297646-fix-reindexing-retry.yml
0 → 100644
View file @
b4056b69
---
title
:
Fix reindexing retry for the notes migration
merge_request
:
57248
author
:
type
:
fixed
ee/elastic/migrate/20210302104500_migrate_notes_to_separate_index.rb
View file @
b4056b69
...
...
@@ -74,7 +74,7 @@ class MigrateNotesToSeparateIndex < Elastic::Migration
set_migration_state
(
slice:
slice
,
task_id:
task_id
,
task_id:
nil
,
retry_attempt:
retry_attempt
+
1
,
max_slices:
max_slices
)
...
...
ee/spec/elastic/migrate/20210201104800_migrate_notes_to_separate_index_spec.rb
View file @
b4056b69
...
...
@@ -147,6 +147,7 @@ RSpec.describe MigrateNotesToSeparateIndex do
migration
.
set_migration_state
(
slice:
0
,
max_slices:
2
,
task_id:
'task_id'
)
expect
{
migration
.
migrate
}.
to
raise_error
(
/total is not equal/
)
expect
(
migration
.
migration_state
[
:task_id
]).
to
be_nil
end
end
...
...
@@ -159,6 +160,7 @@ RSpec.describe MigrateNotesToSeparateIndex do
migration
.
set_migration_state
(
slice:
0
,
max_slices:
2
,
task_id:
'task_id'
)
expect
{
migration
.
migrate
}.
to
raise_error
(
/failed with/
)
expect
(
migration
.
migration_state
[
:task_id
]).
to
be_nil
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