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
c2cd7a8b
Commit
c2cd7a8b
authored
Sep 15, 2021
by
Dmitry Gruzd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '340478-fix-migration-worker' into 'master'"
This reverts merge request !69958
parent
da560e59
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
120 additions
and
136 deletions
+120
-136
ee/app/workers/elastic/migration_worker.rb
ee/app/workers/elastic/migration_worker.rb
+2
-2
ee/spec/workers/elastic/migration_worker_spec.rb
ee/spec/workers/elastic/migration_worker_spec.rb
+118
-134
No files found.
ee/app/workers/elastic/migration_worker.rb
View file @
c2cd7a8b
...
...
@@ -87,9 +87,9 @@ module Elastic
end
def
current_migration
uncompleted_migrations
=
Elastic
::
MigrationRecord
.
load_versions
(
completed:
fals
e
)
completed_migrations
=
Elastic
::
MigrationRecord
.
load_versions
(
completed:
tru
e
)
Elastic
::
DataMigrationService
.
migrations
.
find
{
|
migration
|
un
completed_migrations
.
include?
(
migration
.
version
)
}
Elastic
::
DataMigrationService
.
migrations
.
find
{
|
migration
|
!
completed_migrations
.
include?
(
migration
.
version
)
}
end
def
pause_indexing!
(
migration
)
...
...
ee/spec/workers/elastic/migration_worker_spec.rb
View file @
c2cd7a8b
This diff is collapsed.
Click to expand it.
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