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
8b995a98
Commit
8b995a98
authored
Oct 21, 2021
by
John McDonnell
Committed by
Anastasia McDonald
Oct 21, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing gitaly backend node recovery tests
parent
05914949
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
qa/qa/service/praefect_manager.rb
qa/qa/service/praefect_manager.rb
+0
-1
qa/qa/specs/features/api/3_create/gitaly/backend_node_recovery_spec.rb
...eatures/api/3_create/gitaly/backend_node_recovery_spec.rb
+5
-8
No files found.
qa/qa/service/praefect_manager.rb
View file @
8b995a98
...
...
@@ -376,7 +376,6 @@ module QA
select job from replication_queue
where state = 'ready'
and job ->> 'change' = 'update'
and job ->> 'source_node_storage' = '
#{
current_primary_node
}
'
and job ->> 'target_node_storage' = '
#{
@primary_node
}
';
SQL
)
do
|
line
|
...
...
qa/qa/specs/features/api/3_create/gitaly/backend_node_recovery_spec.rb
View file @
8b995a98
...
...
@@ -31,14 +31,6 @@ module QA
praefect_manager
.
stop_primary_node
praefect_manager
.
wait_for_gitaly_check
# Confirm that we have access to the repo after failover
Support
::
Waiter
.
wait_until
(
retry_on_exception:
true
,
sleep_interval:
5
)
do
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commits
|
commits
.
project
=
project
commits
.
sha
=
project
.
default_branch
end
end
# Push a commit to the new primary
Resource
::
Repository
::
ProjectPush
.
fabricate!
do
|
push
|
push
.
project
=
project
...
...
@@ -58,6 +50,11 @@ module QA
# Wait for automatic replication
praefect_manager
.
wait_for_replication
(
project
.
id
)
# Force switch to the old primary node
# This ensures that the commit was replicated
praefect_manager
.
stop_secondary_node
praefect_manager
.
stop_tertiary_node
# Confirm that both commits are available
expect
(
project
.
commits
.
map
{
|
commit
|
commit
[
:message
].
chomp
})
.
to
include
(
"Initial commit"
).
and
include
(
"pushed after failover"
)
...
...
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