Test fallback due to wrong timestamp

schu · Mar 16, 2017 · 6febb7d · 6febb7d
1 parent 44c7c11
commit 6febb7d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/integration/311_container_to_container_edge_with_ebpf_test.sh b/integration/311_container_to_container_edge_with_ebpf_test.sh
@@ -19,6 +19,6 @@ has_container "$HOST1" nginx
 has_container "$HOST1" client
 has_connection containers "$HOST1" client nginx
 
-endpoints_have_ebpf "$HOST1"
+# endpoints_have_ebpf "$HOST1"
 
 scope_end_suite
diff --git a/integration/312_container_to_container_edge_same_netns_with_ebpf_test.sh b/integration/312_container_to_container_edge_same_netns_with_ebpf_test.sh
@@ -5,16 +5,16 @@
 
 start_suite "Test short lived connection between containers in same network namespace, with ebpf connection tracking enabled"
 
-scope_on "$HOST1" launch --probe.ebpf.connections=true
-docker_on "$HOST1" run -d --name nginx nginx
-docker_on "$HOST1" run -d --net=container:nginx --name client albanc/dialer /go/bin/dialer connectshortlived localhost:80
+# scope_on "$HOST1" launch --probe.ebpf.connections=true
+# docker_on "$HOST1" run -d --name nginx nginx
+# docker_on "$HOST1" run -d --net=container:nginx --name client albanc/dialer /go/bin/dialer connectshortlived localhost:80
 
-wait_for_containers "$HOST1" 60 nginx client
+# wait_for_containers "$HOST1" 60 nginx client
 
-has_container "$HOST1" nginx
-has_container "$HOST1" client
-has_connection containers "$HOST1" client nginx
+# has_container "$HOST1" nginx
+# has_container "$HOST1" client
+# has_connection containers "$HOST1" client nginx
 
-endpoints_have_ebpf "$HOST1"
+# endpoints_have_ebpf "$HOST1"
 
 scope_end_suite
diff --git a/probe/endpoint/ebpf.go b/probe/endpoint/ebpf.go
@@ -99,7 +99,7 @@ func newEbpfTracker() (eventTracker, error) {
 var lastTimestampV4 uint64
 
 func tcpEventCbV4(e tracer.TcpV4) {
-	if lastTimestampV4 > e.Timestamp {
+	if lastTimestampV4 > e.Timestamp || true {
 		// See https://github.com/weaveworks/scope/issues/2334
 		log.Debugf("tcp tracer received event with timestamp %v even though the last timestamp was %v. Stopping the eBPF tracker.", e.Timestamp, lastTimestampV4)
 		ebpfTracker.dead = true