*: cleanup some duration settings

This commit should be almost a no-op and it does a few cleanup
things like replacing custom validation function with the helper
equivalent and putting the default value on a separate line.

The only non-equivalent change is introduction of non-negative
validation to `kv.dist_sender.circuit_breaker.cancellation.write_grace_period`
which seems reasonable.

Release note: None

Author: yuzefovich

pkg/ccl/changefeedccl/changefeedbase/settings.go

@@ -328,7 +328,7 @@ var UsageMetricsReportingInterval = settings.RegisterDurationSetting(
 	"changefeed.usage.reporting_interval",
 	"the interval at which the changefeed calculates and updates its usage metric",
 	5*time.Minute,
-	settings.PositiveDuration, settings.DurationInRange(2*time.Minute, 50*time.Minute),
+	settings.DurationInRange(2*time.Minute, 50*time.Minute),
 )
 
 // UsageMetricsReportingTimeoutPercent is the percent of

pkg/kv/kvclient/kvcoord/dist_sender_circuit_breaker.go

@@ -113,14 +113,9 @@ var (
 			"(these can't retry internally, so should be long enough to allow quorum/lease recovery)",
 		10*time.Second,
 		settings.WithPublic,
-		settings.WithValidateDuration(func(t time.Duration) error {
-			// This prevents probes from exiting when idle, which can lead to buildup
-			// of probe goroutines, so cap it at 1 minute.
-			if t > time.Minute {
-				return errors.New("grace period can't be more than 1 minute")
-			}
-			return nil
-		}),
+		// This prevents probes from exiting when idle, which can lead to
+		// buildup of probe goroutines, so cap it at 1 minute.
+		settings.DurationInRange(0 /* minVal */, time.Minute),
 	)
 )
 

pkg/kv/kvserver/protectedts/settings.go

@@ -44,4 +44,5 @@ var PollInterval = settings.RegisterDurationSetting(
 	"kv.protectedts.poll_interval",
 	// TODO(ajwerner): better description.
 	"the interval at which the protectedts subsystem state is polled",
-	2*time.Minute, settings.NonNegativeDuration)
+	2*time.Minute,
+	settings.NonNegativeDuration)

pkg/kv/kvserver/queue.go

@@ -51,8 +51,7 @@ const (
 var queueGuaranteedProcessingTimeBudget = settings.RegisterDurationSetting(
 	settings.ApplicationLevel,
 	"kv.queue.process.guaranteed_time_budget",
-	"the guaranteed duration before which the processing of a queue may "+
-		"time out",
+	"the guaranteed duration before which the processing of a queue may time out",
 	defaultProcessTimeout,
 	settings.WithVisibility(settings.Reserved),
 )

pkg/kv/kvserver/replica_command.go

@@ -3234,7 +3234,8 @@ var traceSnapshotThreshold = settings.RegisterDurationSetting(
 	"kv.trace.snapshot.enable_threshold",
 	"enables tracing and gathers timing information on all snapshots;"+
 		"snapshots with a duration longer than this threshold will have their "+
-		"trace logged (set to 0 to disable);", 0,
+		"trace logged (set to 0 to disable);",
+	0,
 )
 
 var externalFileSnapshotting = settings.RegisterBoolSetting(

pkg/settings/duration.go

@@ -179,9 +179,8 @@ func RegisterDurationSetting(
 	return setting
 }
 
-// RegisterPublicDurationSettingWithExplicitUnit defines a new
-// public setting with type duration which requires an explicit unit when being
-// set.
+// RegisterDurationSettingWithExplicitUnit defines a new setting with type
+// duration which requires an explicit unit when being set.
 func RegisterDurationSettingWithExplicitUnit(
 	class Class, key InternalKey, desc string, defaultValue time.Duration, opts ...SettingOption,
 ) *DurationSettingWithExplicitUnit {

pkg/sql/exec_util.go

@@ -274,7 +274,8 @@ var traceTxnThreshold = settings.RegisterDurationSetting(
 		"note that enabling this may have a negative performance impact; "+
 		"this setting is coarser-grained than sql.trace.stmt.enable_threshold "+
 		"because it applies to all statements within a transaction as well as "+
-		"client communication (e.g. retries)", 0,
+		"client communication (e.g. retries)",
+	0,
 	settings.WithPublic)
 
 // TraceStmtThreshold is identical to traceTxnThreshold except it applies to

pkg/sql/tablemetadatacache/cluster_settings.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/settings"
-	"github.com/cockroachdb/errors"
 )
 
 const (
@@ -31,13 +30,8 @@ var DataValidDurationSetting = settings.RegisterDurationSetting(
 	"obs.tablemetadata.data_valid_duration",
 	"the duration for which the data in system.table_metadata is considered valid",
 	defaultDataValidDuration,
-	settings.WithValidateDuration(func(t time.Duration) error {
-		// This prevents the update loop from running too frequently.
-		if t < time.Minute {
-			return errors.New("validity period can't be less than 1 minute")
-		}
-		return nil
-	}),
+	// This prevents the update loop from running too frequently.
+	settings.DurationWithMinimum(time.Minute),
 	settings.WithPublic)
 
 var updateJobBatchSizeSetting = settings.RegisterIntSetting(

pkg/util/admission/work_queue.go

@@ -130,36 +130,24 @@ var epochLIFOEpochDuration = settings.RegisterDurationSetting(
 	"admission.epoch_lifo.epoch_duration",
 	"the duration of an epoch, for epoch-LIFO admission control ordering",
 	epochLength,
-	settings.WithValidateDuration(func(v time.Duration) error {
-		if v < time.Millisecond {
-			return errors.Errorf("epoch-LIFO: epoch duration is too small")
-		}
-		return nil
-	}), settings.WithPublic)
+	settings.DurationWithMinimum(time.Millisecond),
+	settings.WithPublic)
 
 var epochLIFOEpochClosingDeltaDuration = settings.RegisterDurationSetting(
 	settings.ApplicationLevel,
 	"admission.epoch_lifo.epoch_closing_delta_duration",
 	"the delta duration before closing an epoch, for epoch-LIFO admission control ordering",
 	epochClosingDelta,
-	settings.WithValidateDuration(func(v time.Duration) error {
-		if v < time.Millisecond {
-			return errors.Errorf("epoch-LIFO: epoch closing delta is too small")
-		}
-		return nil
-	}), settings.WithPublic)
+	settings.DurationWithMinimum(time.Millisecond),
+	settings.WithPublic)
 
 var epochLIFOQueueDelayThresholdToSwitchToLIFO = settings.RegisterDurationSetting(
 	settings.ApplicationLevel,
 	"admission.epoch_lifo.queue_delay_threshold_to_switch_to_lifo",
 	"the queue delay encountered by a (tenant,priority) for switching to epoch-LIFO ordering",
 	maxQueueDelayToSwitchToLifo,
-	settings.WithValidateDuration(func(v time.Duration) error {
-		if v < time.Millisecond {
-			return errors.Errorf("epoch-LIFO: queue delay threshold is too small")
-		}
-		return nil
-	}), settings.WithPublic)
+	settings.DurationWithMinimum(time.Millisecond),
+	settings.WithPublic)
 
 var rangeSequencerGCThreshold = settings.RegisterDurationSetting(
 	settings.ApplicationLevel,

pkg/util/schedulerlatency/sampler.go

@@ -33,25 +33,15 @@ var samplePeriod = settings.RegisterDurationSetting(
 	"scheduler_latency.sample_period",
 	"controls the duration between consecutive scheduler latency samples",
 	100*time.Millisecond,
-	settings.WithValidateDuration(func(period time.Duration) error {
-		if period < time.Millisecond {
-			return fmt.Errorf("minimum sample period is %s, got %s", time.Millisecond, period)
-		}
-		return nil
-	}),
+	settings.DurationWithMinimum(time.Millisecond),
 )
 
 var sampleDuration = settings.RegisterDurationSetting(
 	settings.ApplicationLevel, // used in virtual clusters
 	"scheduler_latency.sample_duration",
 	"controls the duration over which each scheduler latency sample is a measurement over",
 	2500*time.Millisecond,
-	settings.WithValidateDuration(func(duration time.Duration) error {
-		if duration < 100*time.Millisecond {
-			return fmt.Errorf("minimum sample duration is %s, got %s", 100*time.Millisecond, duration)
-		}
-		return nil
-	}),
+	settings.DurationWithMinimum(100*time.Millisecond),
 )
 
 var schedulerLatency = metric.Metadata{