mirror of
https://gitee.com/rancher/rancher.git
synced 2025-12-06 15:59:37 +08:00
Consider empty string values for sql-cache-* settings (#51556)
Ref: https://github.com/rancher/rancher/issues/51555
This commit is contained in:
committed by
GitHub
parent
7e92fa2794
commit
47f8e1ca07
@@ -385,7 +385,7 @@ func getSQLCacheGCValues(wranglerContext *wrangler.Context) (time.Duration, int)
|
||||
gcIntervalSetting, err := wranglerContext.Mgmt.Setting().Get(settings.SQLCacheGCInterval.Name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
logrus.Warnf("Unable to fetch %s setting (will use default): %v", settings.SQLCacheGCInterval.Name, err)
|
||||
} else {
|
||||
} else if gcIntervalSetting.Value != "" {
|
||||
dur, err := time.ParseDuration(gcIntervalSetting.Value)
|
||||
if err != nil {
|
||||
logrus.Warnf("Invalid GC interval %q: %v", gcIntervalSetting.Value, err)
|
||||
@@ -398,7 +398,7 @@ func getSQLCacheGCValues(wranglerContext *wrangler.Context) (time.Duration, int)
|
||||
gcKeepCountSetting, err := wranglerContext.Mgmt.Setting().Get(settings.SQLCacheGCKeepCount.Name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
logrus.Warnf("Unable to fetch %s setting (will use default): %v", settings.SQLCacheGCKeepCount.Name, err)
|
||||
} else {
|
||||
} else if gcKeepCountSetting.Value != "" {
|
||||
count, err := strconv.Atoi(gcKeepCountSetting.Value)
|
||||
if err != nil {
|
||||
logrus.Warnf("Invalid GC keep count %q: %v", gcKeepCountSetting.Value, err)
|
||||
|
||||
Reference in New Issue
Block a user