Merge pull request #651 from hzxuzhonghu/fix-cni-uninstall

Fix kmesh daemon graceful exit

build/docker/start_kmesh.sh

@@ -31,6 +31,7 @@ pid=$!
 
 # pass SIGTERM to kmesh process
 function stop_kmesh() {
+        echo "received SIGTERM, stopping kmesh"
         kill $pid
 }
 
@@ -40,9 +41,14 @@ function cleanup(){
                   rmmod kmesh
           fi
 
-        echo "kmesh close"
+        echo "kmesh exit"
 }
 
 trap 'stop_kmesh' SIGTERM
-wait # wait child process exit
+
+# wait for kmesh process to exit, cannot use wait $pid here, because the script received SIGTERM, wait will return immediately
+while kill -0 $pid 2>/dev/null; do
+  sleep 1
+done
+
 cleanup

pkg/bpf/bpf_restart.go

@@ -70,13 +70,13 @@ func inferRestartStatus() StartType {
 	podName := strings.Split(env.Register("POD_NAME", "", "").Get(), "-")
 	daemonSetName := podName[0]
 	daemonSetNamespace := env.Register("POD_NAMESPACE", "", "").Get()
-	log.Infof("DaemonSet %s in namespace %s\n", daemonSetName, daemonSetNamespace)
+	log.Infof("trying to get daemonSet %s in namespace %s", daemonSetName, daemonSetNamespace)
 	daemonSet, err := clientset.AppsV1().DaemonSets(daemonSetNamespace).Get(context.TODO(), daemonSetName, metav1.GetOptions{})
 	if err == nil {
-		log.Debugf("Found DaemonSet %s in namespace %s\n", daemonSet.Name, daemonSet.Namespace)
+		log.Infof("found daemonSet %s in namespace %s", daemonSet.Name, daemonSet.Namespace)
 		return Restart
 	}
-	log.Infof("DaemonSet %s in namespace %s\n", daemonSet.Name, daemonSet.Namespace)
+	log.Infof("unable to find daemonSet %s in namespace %s: %v ", daemonSetName, daemonSetNamespace, err)
 	return Normal
 }
 
@@ -90,7 +90,7 @@ func SetStartStatus(versionMap *ebpf.Map) {
 	hash.Write([]byte(version.Get().GitVersion))
 	GitVersion = hash.Sum32()
 	oldGitVersion := getOldVersionFromMap(versionMap, 0)
-	log.Debugf("oldGitVersion:%v\nGitVersion:%v", oldGitVersion, GitVersion)
+	log.Infof("oldGitVersion: %v newGitVersion: %v", oldGitVersion, GitVersion)
 	if GitVersion == oldGitVersion {
 		log.Infof("kmesh start with Restart, load bpf maps and prog from last")
 		SetStartType(Restart)

pkg/status/status_server.go

@@ -371,7 +371,7 @@ func (s *Server) setBpfLogLevel(w http.ResponseWriter, levelStr string) {
 func (s *Server) StartServer() {
 	go func() {
 		err := s.server.ListenAndServe()
-		if err != nil {
+		if err != nil && err != http.ErrServerClosed {
 			log.Errorf("Failed to start status server: %v", err)
 		}
 	}()