C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix quorum check when recovering broken etcd cluster (#8126)

Browse source
This commit is contained in:
Florian Ruynat 2021-10-27 00:23:09 +02:00 committed by GitHub
parent 331647f4ab
commit 9eacde212f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/etcd/tasks/join_etcd_member.yml
View file

@ -32,6 +32,9 @@
register: etcd_member_in_cluster register: etcd_member_in_cluster
changed_when: false changed_when: false
check_mode: no check_mode: no
retries: "{{ etcd_retries }}"
delay: "{{ retry_stagger | random + 3 }}"
until: etcd_member_in_cluster.rc == 0
tags: tags:
- facts - facts
environment: environment:

3
roles/recover_control_plane/etcd/tasks/main.yml
View file

@ -20,10 +20,9 @@
when: when:
- groups['broken_etcd'] - groups['broken_etcd']
# When there is an error, everything is printed in stderr_lines, even "is healthy" messages.
- name: Set has_quorum fact - name: Set has_quorum fact
set_fact: set_fact:
has_quorum: "{{ etcd_endpoint_health.stderr_lines | select('match', '.*is healthy.*') | list | length >= etcd_endpoint_health.stderr_lines | select('match', '.*is unhealthy.*') | list | length }}" has_quorum: "{{ etcd_endpoint_health.stdout_lines | select('match', '.*is healthy.*') | list | length >= etcd_endpoint_health.stderr_lines | select('match', '.*is unhealthy.*') | list | length }}"
when: when:
- groups['broken_etcd'] - groups['broken_etcd']