From 7a2546c24afed87b079cabe6df1bd8249db47a40 Mon Sep 17 00:00:00 2001 From: congqixia Date: Tue, 22 Jun 2021 17:40:07 +0800 Subject: [PATCH] Fix proxy panic if quit before init (#5981) Signed-off-by: Congqi Xia --- internal/proxy/proxy.go | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 8212a57686..ac9bef5120 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -370,13 +370,23 @@ func (node *Proxy) Start() error { func (node *Proxy) Stop() error { node.cancel() - node.idAllocator.Close() - node.segAssigner.Close() - node.sched.Close() - node.tick.Close() - err := node.chTicker.close() - if err != nil { - return err + if node.idAllocator != nil { + node.idAllocator.Close() + } + if node.segAssigner != nil { + node.segAssigner.Close() + } + if node.sched != nil { + node.sched.Close() + } + if node.tick != nil { + node.tick.Close() + } + if node.chTicker != nil { + err := node.chTicker.close() + if err != nil { + return err + } } node.wg.Wait()