diff options
author | wanghanlin <wanghanlin@corp.netease.com> | 2021-06-29 16:01:55 +0800 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2021-06-29 18:49:15 +0000 |
commit | f68dcb720cfbbfb0eee7084219af45b35bd0615f (patch) | |
tree | 82ad6a1724a3fbf72d9829a8edf3378e4691d1c1 | |
parent | 803ac6389dbd3f3c124542c1a5ad40c575537ccc (diff) |
vcl: Don't use app_socket_api to notify VPP in parent when child exited
Type: fix
Signed-off-by: wanghanlin <wanghanlin@corp.netease.com>
Change-Id: Icd2fc3cc2d0a0a6060abfb262044cf9e09ab4ba2
(cherry picked from commit b940fd4d5a16b62a5aa09b924140a135fd06c6bb)
-rw-r--r-- | src/vcl/vcl_locked.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/vcl/vcl_locked.c b/src/vcl/vcl_locked.c index 2f1bcca0182..9948bb18d0d 100644 --- a/src/vcl/vcl_locked.c +++ b/src/vcl/vcl_locked.c @@ -1490,7 +1490,11 @@ vls_cleanup_vcl_worker (vcl_worker_t * wrk) /* Unshare sessions and also cleanup worker since child may have * called _exit () and therefore vcl may not catch the event */ vls_unshare_vcl_worker_sessions (wrk); - vcl_worker_cleanup (wrk, 1 /* notify vpp */ ); + + /* Since child may have exited and thereforce fd of vpp_app_socket_api + * may have been closed, so DONOT notify VPP. + */ + vcl_worker_cleanup (wrk, vcm->cfg.vpp_app_socket_api ? 0 : 1); vls_worker_free (vls_wrk); } |