Merge pull request #88 from alibaba/tengine-ingress-3.1.0

Tengine ingress 3.1.0

Author: lianglli

internal/ingress/controller/config/config.go

@@ -762,6 +762,10 @@ type Configuration struct {
 	// Value Format: server_port: domain, server_port: domain[, server_port: domain]*
 	// custom-port-domain: "443: xxx.com, 2443: yyy.com"
 	CustomPortDomain map[string]string `json:"custom-port-domain"`
+
+	// Sleep time for layer 4 load balancer during stop process
+	// Unit: seconds
+	MaxSleepTimeForStop int `json:"max-stop-sleep-time-for-stop"`
 }
 
 // NewDefault returns the default nginx configuration
@@ -939,6 +943,7 @@ func NewDefault() Configuration {
 		MaxRespAddHeaderNum:          2,
 		MaxRespAppendHeaderNum:       2,
 		User:                         "root",
+		MaxSleepTimeForStop:          35,
 	}
 
 	if klog.V(5) {

internal/ingress/controller/nginx.go

@@ -436,8 +436,13 @@ func (n *NGINXController) Stop() error {
 		}
 	}
 
+	cfg := n.store.GetBackendConfiguration()
+	lock.RemoveFile(cfg.StatusTengineFilePath)
+	klog.Infof("Sleeping %v seconds for traffic from layer 4 LB", cfg.MaxSleepTimeForStop)
+	time.Sleep(time.Duration(cfg.MaxSleepTimeForStop) * time.Second)
+
 	// send stop signal to Tengine
-	klog.Info("Stopping Tengine process")
+	klog.Info("Stopping Tengine process gracefully")
 	cmd := n.command.ExecCommand("-s", "quit")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -450,7 +455,7 @@ func (n *NGINXController) Stop() error {
 	timer := time.NewTicker(time.Second * 1)
 	for range timer.C {
 		if !nginx.IsRunning() {
-			klog.Info("Tengine process has stopped")
+			klog.Info("Tengine process has stopped gracefully")
 			timer.Stop()
 			break
 		}