oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

make ipropd_slave tell its status in a status file

Browse Source 
The ipropd_slave will log its status to /var/heimdal/ipropd-slave-status
if its connecting, up to date, or disconnected.

The master will now also confirm to slaves that are are in fact up to date
if they just restart, before there was no confirmation, the slave just didn't
get any deltas.
This commit is contained in:
Love Hörnquist Åstrand
2012-02-15 20:59:54 -08:00
parent c293aaa031
commit bf37778dbd
5 changed files with 144 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
lib/kadm5/ipropd_slave.c
View File

@@ -337,6 +337,27 @@ send_im_here (krb5_context context, int fd,
krb5_err (context, 1, ret, "krb5_write_priv_message");
}
static void
reinit_log(krb5_context context,
kadm5_server_context *server_context,
int32_t vno)
{
krb5_error_code ret;
ret = kadm5_log_reinit (server_context);
if (ret)
krb5_err(context, 1, ret, "kadm5_log_reinit");
ret = kadm5_log_set_version (server_context, vno - 1);
if (ret)
krb5_err (context, 1, ret, "kadm5_log_set_version");
ret = kadm5_log_nop (server_context);
if (ret)
krb5_err (context, 1, ret, "kadm5_log_nop");
}
static krb5_error_code
receive_everything (krb5_context context, int fd,
kadm5_server_context *server_context,
@@ -417,17 +438,7 @@ receive_everything (krb5_context context, int fd,
krb5_ret_int32 (sp, &vno);
krb5_storage_free(sp);
ret = kadm5_log_reinit (server_context);
if (ret)
krb5_err(context, 1, ret, "kadm5_log_reinit");
ret = kadm5_log_set_version (server_context, vno - 1);
if (ret)
krb5_err (context, 1, ret, "kadm5_log_set_version");
ret = kadm5_log_nop (server_context);
if (ret)
krb5_err (context, 1, ret, "kadm5_log_nop");
reinit_log(context, server_context, vno);
ret = mydb->hdb_rename (context, mydb, server_context->db->hdb_name);
if (ret)
@@ -448,6 +459,46 @@ receive_everything (krb5_context context, int fd,
return ret;
}
static void
slave_status(const char *file, const char *status, ...)
__attribute__ ((format (printf, 2, 3)));
static void
slave_status(const char *file, const char *fmt, ...)
{
char *status = NULL;
va_list args;
int len;
va_start(args, fmt);
len = vasprintf(&status, fmt, args);
va_end(args);
if (len < 0 || status == NULL) {
unlink(file);
return;
}
rk_dumpdata(file, status, len);
free(status);
}
static void
is_up_to_date(krb5_context context, const char *file,
kadm5_server_context *server_context)
{
krb5_error_code ret;
char buf[80];
ret = krb5_format_time(context, time(NULL), buf, sizeof(buf), 1);
if (ret) {
unlink(file);
return;
}
slave_status(file, "up-to-date with version: %lu at %s\n",
(unsigned long)server_context->log_context.version, buf);
}
static char *status_file;
static char *config_file;
static char *realm;
static int version_flag;
@@ -465,6 +516,8 @@ static struct getargs args[] = {
"keytab to get authentication from", "kspec" },
{ "time-lost", 0, arg_string, &server_time_lost,
"time before server is considered lost", "time" },
{ "status-file", 0, arg_string, &status_file,
"file to write out status into", "file" },
{ "port", 0, arg_string, &port_str,
"port ipropd-slave will connect to", "port"},
#ifdef SUPPORT_DETACH
@@ -549,6 +602,13 @@ main(int argc, char **argv)
master = argv[0];
if (status_file == NULL) {
if (asprintf(&status_file, "%s/ipropd-slave-status", hdb_db_dir(context)) < 0 || status_file == NULL)
krb5_errx(context, 1, "can't allocate status file buffer");
}
slave_status(status_file, "bootstrapping\n");
#ifdef SUPPORT_DETACH
if (detach_from_console)
daemon(0, 0);
@@ -565,6 +625,8 @@ main(int argc, char **argv)
if (time_before_lost < 0)
krb5_errx (context, 1, "couldn't parse time: %s", server_time_lost);
slave_status(status_file, "getting credentials from keytab/database\n");
memset(&conf, 0, sizeof(conf));
if(realm) {
conf.mask |= KADM5_CONFIG_REALM;
@@ -581,6 +643,8 @@ main(int argc, char **argv)
server_context = (kadm5_server_context *)kadm_handle;
slave_status(status_file, "creating log file\n");
ret = kadm5_log_init (server_context);
if (ret)
krb5_err (context, 1, ret, "kadm5_log_init");
@@ -618,6 +682,8 @@ main(int argc, char **argv)
}
before = now;
slave_status(status_file, "connecting to master: %s\n", master);
master_fd = connect_to_master (context, master, port_str);
if (master_fd < 0)
goto retry;
@@ -649,6 +715,8 @@ main(int argc, char **argv)
connected = TRUE;
slave_status(status_file, "connected to master, waiting instructions\n");
while (connected && !exit_flag) {
krb5_data out;
krb5_storage *sp;
@@ -693,18 +761,28 @@ main(int argc, char **argv)
receive (context, sp, server_context);
ret = ihave (context, auth_context, master_fd,
server_context->log_context.version);
if (ret)
if (ret) {
connected = FALSE;
} else {
is_up_to_date(context, status_file, server_context);
}
break;
case TELL_YOU_EVERYTHING :
ret = receive_everything (context, master_fd, server_context,
auth_context);
if (ret)
connected = FALSE;
else
is_up_to_date(context, status_file, server_context);
break;
case ARE_YOU_THERE :
is_up_to_date(context, status_file, server_context);
send_im_here (context, master_fd, auth_context);
break;
case YOU_HAVE_LAST_VERSION:
is_up_to_date(context, status_file, server_context);
break;
case NOW_YOU_HAVE :
case I_HAVE :
case ONE_PRINC :
@@ -717,9 +795,12 @@ main(int argc, char **argv)
krb5_data_free (&out);
}
slave_status(status_file, "disconnected from master");
retry:
if (connected == FALSE)
krb5_warnx (context, "disconnected for server");
if (exit_flag)
krb5_warnx (context, "got an exit signal");
@@ -727,10 +808,15 @@ main(int argc, char **argv)
close(master_fd);
reconnect += backoff;
if (reconnect > reconnect_max)
if (reconnect > reconnect_max) {
slave_status(status_file, "disconnected from master for a long time");
reconnect = reconnect_max;
}
}
if (status_file)
unlink(status_file);
if (0);
#ifndef NO_SIGXCPU
else if(exit_flag == SIGXCPU)