minor fix (#9)

Author: WangXiangUSTC

chaos.go

@@ -21,17 +21,17 @@ const (
 	// ScopeAll means chaos works on all host
 	ScopeAll = "all"
 
-	// ModeError means return error for DNS request
-	ModeError = "error"
-	// ModeRandom means return random IP for DNS request
-	ModeRandom = "random"
+	// ActionError means return error for DNS request
+	ActionError = "error"
+	// ActionRandom means return random IP for DNS request
+	ActionRandom = "random"
 )
 
 // PodInfo saves some information for pod
 type PodInfo struct {
 	Namespace      string
 	Name           string
-	Mode           string
+	Action         string
 	Scope          string
 	IP             string
 	LastUpdateTime time.Time
@@ -49,7 +49,7 @@ func (p *PodInfo) IsOverdue() bool {
 }
 
 func (k Kubernetes) chaosDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg, state request.Request, podInfo *PodInfo) (int, error) {
-	if podInfo.Mode == ModeError {
+	if podInfo.Action == ActionError {
 		return dns.RcodeServerFailure, nil
 	}
 
@@ -165,9 +165,11 @@ func (k Kubernetes) needChaos(podInfo *PodInfo, state request.Request) bool {
 		return true
 	}
 
+	// FIXME: this function is wrong, need to fix it
 	qname := state.QName()
 	zone := plugin.Zones(k.Zones).Matches(qname)
 
+	log.Infof("qname: %s, zone: %s, scope: %s, zones: %s", qname, zone, podInfo.Scope, k.Zones)
 	if zone == "" {
 		// is outer host
 		if podInfo.Scope == ScopeOuter {
@@ -184,5 +186,10 @@ func (k Kubernetes) needChaos(podInfo *PodInfo, state request.Request) bool {
 }
 
 func (k Kubernetes) getPodFromCluster(namespace, name string) (*api.Pod, error) {
-	return k.Client.Pods(namespace).Get(context.Background(), name, meta.GetOptions{})
+	pods := k.Client.Pods(namespace)
+	if pods == nil {
+		log.Infof("getPodFromCluster, pods is nil")
+		return nil, nil
+	}
+	return pods.Get(context.Background(), name, meta.GetOptions{})
 }

grpc_server.go

@@ -12,7 +12,13 @@ import (
 
 // CreateGRPCServer ...
 func (k Kubernetes) CreateGRPCServer() error {
-	log.Info("CreateGRPCServer")
+	if k.grpcPort == 0 {
+		// use default port
+		k.grpcPort = 9288
+
+	}
+	log.Infof("CreateGRPCServer on port %d", k.grpcPort)
+
 	grpcListener, err := net.Listen("tcp", fmt.Sprintf(":%d", k.grpcPort))
 	if err != nil {
 		return err
@@ -24,6 +30,7 @@ func (k Kubernetes) CreateGRPCServer() error {
 		if err := s.Serve(grpcListener); err != nil {
 			log.Errorf("grpc serve error %v", err)
 		}
+		log.Info("grpc server end")
 	}()
 	log.Info("CreateGRPCServer end")
 	return nil
@@ -41,6 +48,7 @@ func (k Kubernetes) SetDNSChaos(ctx context.Context, req *pb.SetDNSChaosRequest)
 	for _, pod := range req.Pods {
 		v1Pod, err := k.getPodFromCluster(pod.Namespace, pod.Name)
 		if err != nil {
+			log.Errorf("fail to getPodFromCluster %v", err)
 			return nil, err
 		}
 
@@ -57,7 +65,7 @@ func (k Kubernetes) SetDNSChaos(ctx context.Context, req *pb.SetDNSChaosRequest)
 		podInfo := &PodInfo{
 			Namespace:      pod.Namespace,
 			Name:           pod.Name,
-			Mode:           req.Mode,
+			Action:         req.Action,
 			Scope:          req.Scope,
 			IP:             v1Pod.Status.PodIP,
 			LastUpdateTime: time.Now(),
@@ -77,6 +85,11 @@ func (k Kubernetes) CancelDNSChaos(ctx context.Context, req *pb.CancelDNSChaosRe
 	log.Infof("receive CancelDNSChaos request %v", req)
 	k.Lock()
 	defer k.Unlock()
+
+	if _, ok := k.chaosMap[req.Name]; !ok {
+		return nil, nil
+	}
+
 	for _, pod := range k.chaosMap[req.Name].Pods {
 		if _, ok := k.podMap[pod.Namespace]; ok {
 			if podInfo, ok := k.podMap[pod.Namespace][pod.Name]; ok {

setup.go

@@ -43,11 +43,6 @@ func setup(c *caddy.Controller) error {
 		return plugin.Error(pluginName, err)
 	}
 
-	err = k.CreateGRPCServer()
-	if err != nil {
-		return plugin.Error(pluginName, err)
-	}
-
 	err = k.InitKubeCache(context.Background())
 	if err != nil {
 		return plugin.Error(pluginName, err)
@@ -66,6 +61,11 @@ func setup(c *caddy.Controller) error {
 		return nil
 	})
 
+	err = k.CreateGRPCServer()
+	if err != nil {
+		return plugin.Error(pluginName, err)
+	}
+
 	return nil
 }
 
@@ -287,9 +287,6 @@ func ParseStanza(c *caddy.Controller) (*Kubernetes, error) {
 					return nil, err
 				}
 				k8s.grpcPort = port
-			} else {
-				// use default port
-				k8s.grpcPort = 9288
 			}
 		default:
 			return nil, c.Errf("unknown property '%s'", c.Val())