From 094d56512ef10a968ce69523bd5d3ae7a03fe7d0 Mon Sep 17 00:00:00 2001 From: Zhang Kang Date: Mon, 29 Apr 2024 16:06:19 +0800 Subject: [PATCH] set nri always reconnect Signed-off-by: Zhang Kang --- pkg/koordlet/runtimehooks/config.go | 5 +++-- pkg/koordlet/runtimehooks/config_test.go | 5 +++-- pkg/koordlet/runtimehooks/nri/server.go | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/koordlet/runtimehooks/config.go b/pkg/koordlet/runtimehooks/config.go index 791b7e6a3..716c36a91 100644 --- a/pkg/koordlet/runtimehooks/config.go +++ b/pkg/koordlet/runtimehooks/config.go @@ -18,6 +18,7 @@ package runtimehooks import ( "flag" + "math" "time" "k8s.io/apimachinery/pkg/util/runtime" @@ -134,8 +135,8 @@ func NewDefaultConfig() *Config { RuntimeHooksNRI: true, RuntimeHooksNRIConnectTimeout: 2 * time.Second, RuntimeHooksNRIBackOffDuration: 1 * time.Second, - RuntimeHooksNRIBackOffCap: 10 * time.Minute, - RuntimeHooksNRIBackOffSteps: 100, + RuntimeHooksNRIBackOffCap: 1<<62 - 1, + RuntimeHooksNRIBackOffSteps: math.MaxInt32, RuntimeHooksNRIBackOffFactor: 2, RuntimeHooksNRISocketPath: "nri/nri.sock", RuntimeHookReconcileInterval: 10 * time.Second, diff --git a/pkg/koordlet/runtimehooks/config_test.go b/pkg/koordlet/runtimehooks/config_test.go index baab22875..e4da12ba2 100644 --- a/pkg/koordlet/runtimehooks/config_test.go +++ b/pkg/koordlet/runtimehooks/config_test.go @@ -18,6 +18,7 @@ package runtimehooks import ( "flag" + "math" "testing" "time" @@ -38,8 +39,8 @@ func Test_NewDefaultConfig(t *testing.T) { RuntimeHooksNRI: true, RuntimeHooksNRIConnectTimeout: 2 * time.Second, RuntimeHooksNRIBackOffDuration: 1 * time.Second, - RuntimeHooksNRIBackOffCap: 10 * time.Minute, - RuntimeHooksNRIBackOffSteps: 100, + RuntimeHooksNRIBackOffCap: 1<<62 - 1, + RuntimeHooksNRIBackOffSteps: math.MaxInt32, RuntimeHooksNRIBackOffFactor: 2, RuntimeHooksNRISocketPath: "nri/nri.sock", RuntimeHookReconcileInterval: 10 * time.Second, diff --git a/pkg/koordlet/runtimehooks/nri/server.go b/pkg/koordlet/runtimehooks/nri/server.go index 513f148c6..bbf1954d4 100644 --- a/pkg/koordlet/runtimehooks/nri/server.go +++ b/pkg/koordlet/runtimehooks/nri/server.go @@ -253,6 +253,7 @@ func (p *NriServer) onClose() { } } + // TODO: high version wait not support BackoffUntil with BackOffManger as parameters, when updated to v0.27.0 version wait, we can refine ExponentialBackoff. err := wait.ExponentialBackoff(p.options.BackOff, retryFunc) if err != nil { klog.Errorf("nri server restart failed after several times retry")