From 46f6e723c82622d12794aa0968458a23b17d0d7d Mon Sep 17 00:00:00 2001 From: gran Date: Wed, 21 Apr 2021 11:49:27 +0800 Subject: [PATCH] Fix Traceflow IPv6 DS e2e error --- .../controller/traceflow/traceflow_controller.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/agent/controller/traceflow/traceflow_controller.go b/pkg/agent/controller/traceflow/traceflow_controller.go index 0d80e307107..bfbb326d531 100644 --- a/pkg/agent/controller/traceflow/traceflow_controller.go +++ b/pkg/agent/controller/traceflow/traceflow_controller.go @@ -58,9 +58,10 @@ const ( maxRetryDelay = 300 * time.Second // Default number of workers processing traceflow request. defaultWorkers = 4 - // Seconds delay before injecting packet into OVS. The time of different nodes may not be completely + // Delay in milliseconds before injecting packet into OVS. The time of different nodes may not be completely // synchronized, which requires a delay before inject packet. - injectPacketDelay = 5 + injectPacketDelay = 2000 + injectLocalPacketDelay = 100 // ICMP Echo Request type and code. icmpEchoRequestType uint8 = 8 @@ -365,7 +366,11 @@ func (c *Controller) startTraceflow(tf *crdv1alpha1.Traceflow) error { // If the destination is Service/IP or the packet will // be sent to remote Node, wait a small period for other // Nodes. - time.Sleep(time.Duration(injectPacketDelay) * time.Second) + time.Sleep(time.Duration(injectPacketDelay) * time.Millisecond) + } else { + // Issue #2116 + // Wait a small period after flows installed to avoid unexpected behavior. + time.Sleep(time.Duration(injectLocalPacketDelay) * time.Millisecond) } klog.V(2).Infof("Injecting packet for Traceflow %s", tf.Name) err = c.ofClient.SendTraceflowPacket(tfState.tag, packet, ofPort, -1)