diff options
| author | Shawn Routhier <sar@isc.org> | 2014-11-10 19:04:13 -0800 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2014-11-10 19:04:13 -0800 |
| commit | 21d3034757a2e33cfea31f93b8585b20e8a22bbe (patch) | |
| tree | 166741338d160dfb51b7cc88137d2515a862e7eb /includes | |
| parent | 6444928cf5788ced056e39a27142a14e61b0a816 (diff) | |
| download | isc-dhcp-21d3034757a2e33cfea31f93b8585b20e8a22bbe.tar.gz | |
[master] Patch the failover code to avoid deadlocks
Patch for 36810 & 20352
This coves several related problems
1) When the primary is in conflict done it allows the secondary to
transition around resolution interrupted and potentical conflict previously
the primary would die on an illegal state.
2) It allows the servers to restart a bind update request. Previously if
one of the servers sent an udpate request and there died (or had the communications
interrupted) in some states the first server wouldn't retransmit a new
update request and the other server wouldn't send any bind updates. This
was noticed in potential conflict.
3) Updated the state transitions to move the leases on the ack queue
back to the update queue in case of conflict-done as we might need to
retransmit them all.
4) Updated a transition from startup to potentical conflict instead
of resolution interrupted when the servers reconnect during the startup
phase in order to avoid a diffferent dead lock.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/dhcpd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 2043708f..9ad641be 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -3419,6 +3419,7 @@ isc_result_t dhcp_failover_state_signal (omapi_object_t *, isc_result_t dhcp_failover_state_transition (dhcp_failover_state_t *, const char *); isc_result_t dhcp_failover_set_service_state (dhcp_failover_state_t *state); +void dhcp_failover_rescind_updates (dhcp_failover_state_t *); isc_result_t dhcp_failover_set_state (dhcp_failover_state_t *, enum failover_state); isc_result_t dhcp_failover_peer_state_changed (dhcp_failover_state_t *, |