Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sbd-cluster: Simplify cluster connection loss handling #81

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

sbd-cluster: Simplify cluster connection loss handling #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions src/sbd-cluster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ static int reconnect_msec = 1000;
static GMainLoop *mainloop = NULL;
static guint notify_timer = 0;
static crm_cluster_t cluster;
static void clean_up(int rc);
static gboolean sbd_remote_check(gpointer user_data);
static long unsigned int find_pacemaker_remote(void);
static void sbd_membership_destroy(gpointer user_data);
Expand Down Expand Up @@ -335,17 +336,8 @@ sbd_membership_destroy(gpointer user_data)
{
cl_log(LOG_WARNING, "Lost connection to %s", name_for_cluster_type(get_cluster_type()));

if (get_cluster_type() != pcmk_cluster_unknown) {
#if SUPPORT_COROSYNC && CHECK_TWO_NODE
cmap_destroy();
#endif
}

set_servant_health(pcmk_health_unclean, LOG_ERR, "Cluster connection terminated");
notify_parent();

/* Attempt to reconnect, the watchdog will take the node down if the problem isn't transient */
sbd_membership_connect();
/* Let the inquisitor handle reconnect by restarting the servant */
clean_up(EXIT_CLUSTER_DISCONNECT);
}

/*
Expand Down Expand Up @@ -533,6 +525,13 @@ find_pacemaker_remote(void)
static void
clean_up(int rc)
{
#if SUPPORT_COROSYNC && CHECK_TWO_NODE
cmap_destroy();
#endif

if (rc >= 0) {
exit(rc);
}
return;
}

Expand Down
14 changes: 14 additions & 0 deletions src/sbd-inquisitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,20 @@ void inquisitor_child(void)
break;
}
}
} else if (sbd_is_cluster(s)) {
if (WIFEXITED(status)) {
switch(WEXITSTATUS(status)) {
case EXIT_CLUSTER_DISCONNECT:
cl_log(LOG_WARNING, "Cluster-Servant has exited (cluster connection lost)");
s->restarts = 0;
s->restart_blocked = 0;
s->outdated = 1;
s->t_last.tv_sec = 0;
break;
default:
break;
}
}
}
cleanup_servant_by_pid(pid);
}
Expand Down
3 changes: 3 additions & 0 deletions src/sbd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
/* exit status for pcmk-servant */
#define EXIT_PCMK_SERVANT_GRACEFUL_SHUTDOWN 30

/* exit status for cluster-servant */
#define EXIT_CLUSTER_DISCONNECT 40

#define HOG_CHAR 0xff
#define SECTOR_NAME_MAX 63

Expand Down