From 527f25143121194854eb988afdfc86b71bcec467 Mon Sep 17 00:00:00 2001 From: longxiucai Date: Tue, 13 Oct 2026 17:14:21 +0800 Subject: [PATCH] Fix etcd-events member add failing when the member already exists (#13640) join_etcd_member.yml tolerates 'Peer URLs already exists' since #6587, but the etcd-events twin was missed: when a previous run was interrupted after the member was added, the re-run keeps retrying etcdctl member add until etcd_retries is exhausted and aborts the play. Mirror the exact until/failed_when pair from the etcd version. --- roles/etcd/tasks/join_etcd-events_member.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/etcd/tasks/join_etcd-events_member.yml b/roles/etcd/tasks/join_etcd-events_member.yml index e6c0215e5..12eeb0f8c 100644 --- a/roles/etcd/tasks/join_etcd-events_member.yml +++ b/roles/etcd/tasks/join_etcd-events_member.yml @@ -2,7 +2,8 @@ - name: Join Member | Add member to etcd-events cluster command: "{{ bin_dir }}/etcdctl member add {{ etcd_member_name }} --peer-urls={{ etcd_events_peer_url }}" register: member_add_result - until: member_add_result.rc == 0 + until: member_add_result.rc == 0 or 'Peer URLs already exists' in member_add_result.stderr + failed_when: member_add_result.rc != 0 and 'Peer URLs already exists' not in member_add_result.stderr retries: "{{ etcd_retries }}" delay: "{{ retry_stagger | random + 3 }}" environment: