Patch timeout and timer-leak commits from 2.2.0_release (#260)

oceanbase · Mar 25, 2024 · 0cd0680 · 0cd0680
1 parent 496df7c
commit 0cd0680
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/internal/const/oceanbase/time.go b/internal/const/oceanbase/time.go
@@ -33,11 +33,11 @@ const (
 )
 
 const (
-	BootstrapTimeoutSeconds       = 300
-	LocalityChangeTimeoutSeconds  = 3600
-	DefaultStateWaitTimeout       = 300
+	BootstrapTimeoutSeconds       = 2100
+	LocalityChangeTimeoutSeconds  = 86400 // 1 day
+	DefaultStateWaitTimeout       = 1800
 	TimeConsumingStateWaitTimeout = 3600
-	ServerDeleteTimeoutSeconds    = 86400
+	ServerDeleteTimeoutSeconds    = 604800 // 7 days
 )
 
 const (

diff --git a/internal/const/pod/pod.go b/internal/const/pod/pod.go
@@ -13,5 +13,5 @@ See the Mulan PSL v2 for more details.
 package pod
 
 const (
-	ReadyTimeoutSeconds = 300
+	ReadyTimeoutSeconds = 1800
 )
diff --git a/internal/telemetry/recorder.go b/internal/telemetry/recorder.go
@@ -16,7 +16,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -90,7 +89,6 @@ func (t *recorder) GenerateTelemetryRecord(object any, objectType, eventType, re
 		select {
 		case ch <- record:
 		case <-ctx.Done():
-		case <-time.After(DefaultWaitThrottlerSeconds * time.Second):
 		default:
 		}
 	}(t.ctx, t.chanIn())