diff options
author | Ethan Jackson <ethan@nicira.com> | 2013-09-20 15:32:08 -0700 |
---|---|---|
committer | Ethan Jackson <ethan@nicira.com> | 2013-09-20 15:39:31 -0700 |
commit | 0258d4a0efff965917a4968361da1be15ee4deca (patch) | |
tree | c19358a2bd1ab4b356b3b6d3999713346379cadf | |
parent | 03f209ba2737bf29391e64c4eb387648c9d71e86 (diff) | |
download | openvswitch-0258d4a0efff965917a4968361da1be15ee4deca.tar.gz |
cfm: Don't enforce CFM_FAULT_INTERVAL.
While upgrading a deployment, it's possible that transient
configuration changes could cause the cfm interval on two ends of a
link to be different. If these two configured values are close to
each other, this condition could have no impact on traffic. Therefore
it's better to let this slide than force a tunnel down guaranteeing an
impact
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
-rw-r--r-- | lib/cfm.c | 2 | ||||
-rw-r--r-- | lib/cfm.h | 3 |
2 files changed, 1 insertions, 4 deletions
@@ -730,7 +730,6 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p) ccm_seq = ntohl(ccm->seq); if (ccm_interval != cfm->ccm_interval) { - cfm_fault |= CFM_FAULT_INTERVAL; VLOG_WARN_RL(&rl, "%s: received a CCM with an unexpected interval" " (%"PRIu8") from RMP %"PRIu64, cfm->name, ccm_interval, ccm_mpid); @@ -738,7 +737,6 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p) if (extended && ccm_interval == 0 && ccm_interval_ms_x != cfm->ccm_interval_ms) { - cfm_fault |= CFM_FAULT_INTERVAL; VLOG_WARN_RL(&rl, "%s: received a CCM with an unexpected extended" " interval (%"PRIu16"ms) from RMP %"PRIu64, cfm->name, ccm_interval_ms_x, ccm_mpid); @@ -34,8 +34,7 @@ struct flow_wildcards; CFM_FAULT_REASON(MAID, maid) \ CFM_FAULT_REASON(LOOPBACK, loopback) \ CFM_FAULT_REASON(OVERFLOW, overflow) \ - CFM_FAULT_REASON(OVERRIDE, override) \ - CFM_FAULT_REASON(INTERVAL, interval) + CFM_FAULT_REASON(OVERRIDE, override) enum cfm_fault_bit_index { #define CFM_FAULT_REASON(NAME, STR) CFM_FAULT_INDEX_##NAME, |