lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: capture SSL_get_error once per retry; lock ha->lock in ha_check_priority_stepdown

Browse source
This commit is contained in:
Rongsong Shen 2026-05-13 16:44:55 +00:00
parent fe3cc57f27
commit ec3cab40c3
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/controller/ha.c
View file

@ -186,10 +186,13 @@ static void *probe_thread(void *arg)
int sr; int sr;
do { do {
sr = SSL_connect(ssl); sr = SSL_connect(ssl);
} while (sr <= 0 && if (sr <= 0) {
(SSL_get_error(ssl, sr) == SSL_ERROR_WANT_READ || int ssl_err = SSL_get_error(ssl, sr);
SSL_get_error(ssl, sr) == SSL_ERROR_WANT_WRITE) && if (ssl_err != SSL_ERROR_WANT_READ &&
!atomic_load(ctx->election_done)); ssl_err != SSL_ERROR_WANT_WRITE)
break;
}
} while (sr <= 0 && !atomic_load(ctx->election_done));
SSL_shutdown(ssl); SSL_shutdown(ssl);
SSL_free(ssl); SSL_free(ssl);
if (sr <= 0 || atomic_load(ctx->election_done)) if (sr <= 0 || atomic_load(ctx->election_done))
@ -326,13 +329,21 @@ void ha_check_priority_stepdown(ha_state_t *ha, int sender_priority,
if (my_term > 0 || sender_term > 0) if (my_term > 0 || sender_term > 0)
return; /* term-based election took over — don't interfere */ return; /* term-based election took over — don't interfere */
ctrl_role_t role = (ctrl_role_t)atomic_load_explicit(&ha->role, /* Hold lock to make the role-check + demote atomic, preventing a
memory_order_acquire); * concurrent promotion from racing between the two operations. */
if (role == CTRL_PRIMARY) { pthread_mutex_lock(&ha->lock);
WARN("HA: stepping down — higher-priority peer (priority=%d) present at term=0", /* Re-check term under lock in case a concurrent promotion raced us */
sender_priority); my_term = atomic_load_explicit(&ha->term, memory_order_acquire);
ha_do_demote(ha); if (my_term == 0 && sender_term == 0) {
ctrl_role_t role = (ctrl_role_t)atomic_load_explicit(&ha->role,
memory_order_acquire);
if (role == CTRL_PRIMARY) {
WARN("HA: stepping down — higher-priority peer (priority=%d) at term=0",
sender_priority);
ha_do_demote(ha);
}
} }
pthread_mutex_unlock(&ha->lock);
} }
/* /*