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

Fix slave boostrap from incomplete master log

Browse Source 
When the master's log does not contain the complete history, slaves
that bootstrap from scratch encountered a loop, because the master
falsely assumed a race with log truncation.
This commit is contained in:
Viktor Dukhovni
2016-07-07 23:00:29 -04:00
parent f32fd2d56d
commit 2d32982ed4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/kadm5/ipropd_master.c
View File

@@ -761,7 +761,12 @@ send_diffs (kadm5_server_context *server_context, slave *s, int log_fd,
} }
if (ver == s->version + 1) if (ver == s->version + 1)
break; break;
if (ver == s->version) {
/*
* We don't expect to reach the slave's version, except when it is
* starting empty with the uber record.
*/
if (ver == s->version && !(ver == 0 && op == kadm_nop)) {
/* /*
* This shouldn't happen, but recall we're not holding a lock on * This shouldn't happen, but recall we're not holding a lock on
* the log. * the log.
@@ -772,7 +777,9 @@ send_diffs (kadm5_server_context *server_context, slave *s, int log_fd,
send_are_you_there(context, s); send_are_you_there(context, s);
return 0; return 0;
} }
if (left == 0) {
/* If we've reached the uber record, send the complete database */
if (left == 0 || (ver == 0 && op == kadm_nop)) {
krb5_storage_free(sp); krb5_storage_free(sp);
krb5_warnx(context, krb5_warnx(context,
"slave %s (version %lu) out of sync with master " "slave %s (version %lu) out of sync with master "