pinger: add timeout for dns resolve

kubeovn · Dec 26, 2019 · 920053c · 920053c
1 parent 5343a4a
commit 920053c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/pinger/ping.go b/pkg/pinger/ping.go
@@ -1,6 +1,7 @@
 package pinger
 
 import (
+	"context"
 	goping "github.com/sparrc/go-ping"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -145,7 +146,10 @@ func pingExternal(config *Configuration) {
 func nslookup(config *Configuration) {
 	klog.Infof("start to check dns connectivity")
 	t1 := time.Now()
-	addrs, err := net.LookupHost(config.DNS)
+	ctx, cancel := context.WithTimeout(context.TODO(), 10 * time.Second)
+	defer cancel()
+	var r net.Resolver
+	addrs, err := r.LookupHost(ctx, config.DNS)
 	elpased := time.Since(t1)
 	if err != nil {
 		klog.Errorf("failed to resolve dns %s, %v", config.DNS, err)

diff --git a/test/e2e/ip/static_ip.go b/test/e2e/ip/static_ip.go
@@ -37,7 +37,7 @@ var _ = Describe("[IP Allocation]", func() {
 				},
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
-						corev1.Container{
+						{
 							Name:  name,
 							Image: "nginx:alpine",
 						},