diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2021-03-19 16:01:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 16:01:13 +0800 |
| commit | e4af4775d5f727d21eef4a6367e17bea0151fa77 (patch) | |
| tree | 5f301c948cc79908b2b4ba230a604ad890d14bee | |
| parent | Merge pull request #2657 from fisherxu/automated-cherry-pick-of-#2599-upstrea... (diff) | |
| parent | Shorten the reconnect wait time when connect failed (diff) | |
| download | kubeedge-e4af4775d5f727d21eef4a6367e17bea0151fa77.tar.gz | |
Merge pull request #2646 from fisherxu/automated-cherry-pick-of-#2641-upstream-release-1.6
Automated cherry pick of #2641: Shorten the reconnect wait time when connect failed
| -rw-r--r-- | edge/pkg/edgehub/edgehub.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/edge/pkg/edgehub/edgehub.go b/edge/pkg/edgehub/edgehub.go index 01acc19f7..4714f4326 100644 --- a/edge/pkg/edgehub/edgehub.go +++ b/edge/pkg/edgehub/edgehub.go @@ -81,10 +81,13 @@ func (eh *EdgeHub) Start() { klog.Fatalf("failed to init controller: %v", err) return } + + waitTime := time.Duration(config.Config.Heartbeat) * time.Second * 2 + err = eh.chClient.Init() if err != nil { - klog.Errorf("connection error, try again after 60s: %v", err) - time.Sleep(waitConnectionPeriod) + klog.Errorf("connection failed: %v, will reconnect after %s", err, waitTime.String()) + time.Sleep(waitTime) continue } // execute hook func after connect @@ -102,7 +105,8 @@ func (eh *EdgeHub) Start() { eh.pubConnectInfo(false) // sleep one period of heartbeat, then try to connect cloud hub again - time.Sleep(time.Duration(config.Config.Heartbeat) * time.Second * 2) + klog.Warningf("connection is broken, will reconnect after %s", waitTime.String()) + time.Sleep(waitTime) // clean channel clean: |