From: Ethan Jackson Date: Fri, 20 Sep 2013 22:32:08 +0000 (-0700) Subject: cfm: Don't enforce CFM_FAULT_INTERVAL. X-Git-Tag: v2.0~19 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=e59f4d1b6840c0b77e48e0c50739b979d14857c2 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 Acked-by: Ben Pfaff --- diff --git a/lib/cfm.c b/lib/cfm.c index e1866ff5d..e8f86dc9f 100644 --- a/lib/cfm.c +++ b/lib/cfm.c @@ -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); diff --git a/lib/cfm.h b/lib/cfm.h index 0f3e97c33..cff713f98 100644 --- a/lib/cfm.h +++ b/lib/cfm.h @@ -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,