fix: apisix restart failed (#10495)

apisix/cli/ops.lua

@@ -805,7 +805,7 @@ local function start(env, ...)
 
         local ok, err, err_no = signal.kill(pid, signone)
         if ok then
-            print("APISIX is running...")
+            print("the old process is still running, the new one won't be started!")
             return
         -- no such process
         elseif err_no ~= errno.ESRCH then
@@ -916,10 +916,32 @@ local function stop(env)
 end
 
 
+local function sleep(n)
+  execute("sleep " .. tonumber(n))
+end
+
+
+local function wait_stop_finish(env, n)
+    for i = 1, n do
+         -- check running
+        local pid_path = env.apisix_home .. "/logs/nginx.pid"
+        local pid = util.read_file(pid_path)
+        pid = tonumber(pid)
+        if not pid then
+            print("old apisix process has stopped")
+            return
+        else
+            sleep(1)
+        end
+    end
+end
+
+
 local function restart(env)
   -- test configuration
   test(env)
   stop(env)
+  wait_stop_finish(env, 3)
   start(env)
 end
 

t/cli/test_cmd.sh

@@ -24,7 +24,7 @@ git checkout conf/config.yaml
 # check restart with old nginx.pid exist
 echo "-1" > logs/nginx.pid
 out=$(./bin/apisix start 2>&1 || true)
-if echo "$out" | grep "APISIX is running"; then
+if echo "$out" | grep "the old process is still running"; then
     rm logs/nginx.pid
     echo "failed: should reject bad nginx.pid"
     exit 1
@@ -50,7 +50,7 @@ echo "pass: no corresponding process"
 
 # check running when run repeatedly
 out=$(make run; make run || true)
-if ! echo "$out" | grep "APISIX is running"; then
+if ! echo "$out" | grep "the old process is still running"; then
     echo "failed: should find APISIX running"
     exit 1
 fi

t/cli/test_prometheus_stream.sh

@@ -64,6 +64,8 @@ make stop
 
 echo "passed: prometheus works when both http & stream are enabled"
 
+sleep 1 #wait for stop finish
+
 echo "
 apisix:
     proxy_mode: stream

t/cli/test_validate_config.sh

@@ -142,7 +142,7 @@ nginx_config:
 
 # apisix restart
 out=$(./bin/apisix restart 2>&1 || true)
-if ! (echo "$out" | grep "\[emerg\] unknown directive \"notexist\"") && ! (echo "$out" | grep "APISIX is running"); then
+if ! (echo "$out" | grep "\[emerg\] unknown directive \"notexist\"") && ! (echo "$out" | grep "the old process is still running"); then
     echo "failed: should restart failed when configuration invalid"
     exit 1
 fi