From 8cd7713ca99da72ab1c798819a2d99a4264453d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Fri, 13 Mar 2026 23:29:06 +0800 Subject: [PATCH] ccm,ocm: fix reserveWeekly default and remove dead reserve fields --- service/ccm/credential_state.go | 6 +----- service/ocm/credential_state.go | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/service/ccm/credential_state.go b/service/ccm/credential_state.go index d681c222b..a8f7d2f62 100644 --- a/service/ccm/credential_state.go +++ b/service/ccm/credential_state.go @@ -87,8 +87,6 @@ type defaultCredential struct { pollAccess sync.Mutex reloadAccess sync.Mutex watcherAccess sync.Mutex - reserve5h uint8 - reserveWeekly uint8 cap5h float64 capWeekly float64 usageTracker *AggregatedUsage @@ -182,7 +180,7 @@ func newDefaultCredential(ctx context.Context, tag string, options option.CCMDef } reserveWeekly := options.ReserveWeekly if reserveWeekly == 0 { - reserveWeekly = 10 + reserveWeekly = 1 } var cap5h float64 if options.Limit5h > 0 { @@ -201,8 +199,6 @@ func newDefaultCredential(ctx context.Context, tag string, options option.CCMDef tag: tag, serviceContext: ctx, credentialPath: options.CredentialPath, - reserve5h: reserve5h, - reserveWeekly: reserveWeekly, cap5h: cap5h, capWeekly: capWeekly, httpClient: httpClient, diff --git a/service/ocm/credential_state.go b/service/ocm/credential_state.go index b3564d9b0..8dacf4075 100644 --- a/service/ocm/credential_state.go +++ b/service/ocm/credential_state.go @@ -87,8 +87,6 @@ type defaultCredential struct { pollAccess sync.Mutex reloadAccess sync.Mutex watcherAccess sync.Mutex - reserve5h uint8 - reserveWeekly uint8 cap5h float64 capWeekly float64 usageTracker *AggregatedUsage @@ -190,7 +188,7 @@ func newDefaultCredential(ctx context.Context, tag string, options option.OCMDef } reserveWeekly := options.ReserveWeekly if reserveWeekly == 0 { - reserveWeekly = 10 + reserveWeekly = 1 } var cap5h float64 if options.Limit5h > 0 { @@ -209,8 +207,6 @@ func newDefaultCredential(ctx context.Context, tag string, options option.OCMDef tag: tag, serviceContext: ctx, credentialPath: options.CredentialPath, - reserve5h: reserve5h, - reserveWeekly: reserveWeekly, cap5h: cap5h, capWeekly: capWeekly, dialer: credentialDialer,