sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

ctdb-recovery: Use single char ASCII numbers for status from child

Browse Source 
'0' = Child took the mutex
  '1' = Unable to take mutex - contention
  '2' = Unable to take mutex - timeout
  '3' = Unable to take mutex - error

This is a straightforward API.  When the child is generalised to an
external helper then this makes it easier for a helper to be, for
example, a simple script.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2016-04-01 14:35:15 +11:00 committed by Amitay Isaacs
parent 4842b6bb91
commit 14a2330692
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ctdb/server/ctdb_recover.c
View File

@ -800,7 +800,7 @@ static void cluster_mutex_handler(struct tevent_context *ev,
{ {
struct ctdb_cluster_mutex_handle *h= struct ctdb_cluster_mutex_handle *h=
talloc_get_type(private_data, struct ctdb_cluster_mutex_handle); talloc_get_type(private_data, struct ctdb_cluster_mutex_handle);
char c = 0; char c = '0';
int ret; int ret;
int status = 0; int status = 0;
const char *err = NULL; const char *err = NULL;
@ -813,14 +813,14 @@ static void cluster_mutex_handler(struct tevent_context *ev,
ret = sys_read(h->fd[0], &c, 1); ret = sys_read(h->fd[0], &c, 1);
if (ret == 1) { if (ret == 1) {
/* Child wrote status. EACCES indicates that it was unable /* Child wrote status. '1' indicates that it was unable
* to take the lock, which is the expected outcome. * to take the lock, which is the expected outcome.
* 0 indicates that it was able to take the * '0' indicates that it was able to take the
* lock, which is an error because the recovery daemon * lock, which is an error because the recovery daemon
* should be holding the lock. */ * should be holding the lock. */
double l = timeval_elapsed(&h->start_time); double l = timeval_elapsed(&h->start_time);
if (c == EACCES) { if (c == '1') {
status = 0; status = 0;
err = NULL; err = NULL;
@ -974,7 +974,7 @@ int32_t ctdb_control_set_recmode(struct ctdb_context *ctdb,
} }
if (h->child == 0) { if (h->child == 0) {
char cc = EACCES; char cc = '1';
close(h->fd[0]); close(h->fd[0]);
prctl_set_comment("ctdb_recmode"); prctl_set_comment("ctdb_recmode");
@ -986,7 +986,7 @@ int32_t ctdb_control_set_recmode(struct ctdb_context *ctdb,
("ERROR: Daemon able to take recovery lock on \"%s\" during recovery\n", ("ERROR: Daemon able to take recovery lock on \"%s\" during recovery\n",
ctdb->recovery_lock_file)); ctdb->recovery_lock_file));
ctdb_recovery_unlock(ctdb); ctdb_recovery_unlock(ctdb);
cc = 0; cc = '0';
} }
sys_write(h->fd[1], &cc, 1); sys_write(h->fd[1], &cc, 1);