diff --git a/githooks/commit-msg b/githooks/commit-msg index 634d1c71feb7..146aed08dfb9 100755 --- a/githooks/commit-msg +++ b/githooks/commit-msg @@ -140,7 +140,6 @@ else "cli change") ;; "ops change") ;; "sql change") ;; - "api change") ;; "ui change") ;; "general change") ;; "build change") ;; @@ -157,8 +156,6 @@ else hint "Try 'Release note ($lcat)' -> 'Release note (security update)'" ;; sql*) hint "Try 'Release note ($lcat)' -> 'Release note (sql change)'" ;; - api*) - hint "Try 'Release note ($lcat)' -> 'Release note (api change)'" ;; "admin ui"*|"admin-ui"*) hint "Try 'Release note ($lcat)' -> 'Release note (ui change)'" ;; "backwards-incompatible"*|"backward incompatible"*) diff --git a/githooks/prepare-commit-msg b/githooks/prepare-commit-msg index 2b6488303df5..1a24e426bd2a 100755 --- a/githooks/prepare-commit-msg +++ b/githooks/prepare-commit-msg @@ -148,7 +148,6 @@ $cchar Categories for release notes:\\ $cchar - cli change\\ $cchar - ops change\\ $cchar - sql change\\ -$cchar - api change\\ $cchar - ui change\\ $cchar - security update\\ $cchar - general change (e.g., change of required Go version)\\ diff --git a/pkg/kv/kvserver/replica_raft_overload.go b/pkg/kv/kvserver/replica_raft_overload.go index 18b1b04ef729..01aa92240cb5 100644 --- a/pkg/kv/kvserver/replica_raft_overload.go +++ b/pkg/kv/kvserver/replica_raft_overload.go @@ -28,9 +28,7 @@ var pauseReplicationIOThreshold = settings.RegisterFloatSetting( settings.SystemOnly, "admission.kv.pause_replication_io_threshold", "pause replication to non-essential followers when their I/O admission control score exceeds the given threshold (zero to disable)", - // TODO(tbg): set a sub-one default. - // See: https://github.com/cockroachdb/cockroach/issues/83920 - 10000, + 0.8, func(v float64) error { if v == 0 { return nil diff --git a/pkg/kv/kvserver/store_raft.go b/pkg/kv/kvserver/store_raft.go index 284e60d8c197..92164cd63f8e 100644 --- a/pkg/kv/kvserver/store_raft.go +++ b/pkg/kv/kvserver/store_raft.go @@ -12,6 +12,7 @@ package kvserver import ( "context" + "math" "time" "unsafe" @@ -770,6 +771,9 @@ func (s *Store) updateIOThresholdMap() { ioThresholdMap[sd.StoreID] = &ioThreshold } threshold := pauseReplicationIOThreshold.Get(&s.cfg.Settings.SV) + if threshold <= 0 { + threshold = math.MaxFloat64 + } old, cur := s.ioThresholds.Replace(ioThresholdMap, threshold) // Log whenever the set of overloaded stores changes. shouldLog := log.V(1) || old.seq != cur.seq diff --git a/pkg/ui/workspaces/db-console/src/redux/localsettings.ts b/pkg/ui/workspaces/db-console/src/redux/localsettings.ts index a1eca5b94508..5a72a80912f7 100644 --- a/pkg/ui/workspaces/db-console/src/redux/localsettings.ts +++ b/pkg/ui/workspaces/db-console/src/redux/localsettings.ts @@ -157,6 +157,9 @@ export class LocalSetting { innerSelector, () => getValueFromSessionStorage(this.key), (uiSettings, cachedValue) => { + if (cachedValue != null && uiSettings[this.key] == null) { + uiSettings[this.key] = cachedValue; + } return uiSettings[this.key] ?? cachedValue ?? defaultValue; }, ); diff --git a/pkg/ui/workspaces/db-console/src/views/statements/activeStatementsSelectors.tsx b/pkg/ui/workspaces/db-console/src/views/statements/activeStatementsSelectors.tsx index 4bc79b1b8fa8..f0af55b6c1ca 100644 --- a/pkg/ui/workspaces/db-console/src/views/statements/activeStatementsSelectors.tsx +++ b/pkg/ui/workspaces/db-console/src/views/statements/activeStatementsSelectors.tsx @@ -27,13 +27,15 @@ const selectedColumnsLocalSetting = new LocalSetting< null, ); +const defaultActiveFilters = { app: defaultFilters.app }; + const filtersLocalSetting = new LocalSetting< AdminUIState, ActiveStatementFilters >( "filters/ActiveStatementsPage", (state: AdminUIState) => state.localSettings, - { app: defaultFilters.app }, + defaultActiveFilters, ); const sortSettingLocalSetting = new LocalSetting( diff --git a/pkg/ui/workspaces/db-console/src/views/transactions/activeTransactionsSelectors.tsx b/pkg/ui/workspaces/db-console/src/views/transactions/activeTransactionsSelectors.tsx index 7fab80df9ae9..2fd785d34efc 100644 --- a/pkg/ui/workspaces/db-console/src/views/transactions/activeTransactionsSelectors.tsx +++ b/pkg/ui/workspaces/db-console/src/views/transactions/activeTransactionsSelectors.tsx @@ -28,13 +28,15 @@ const transactionsColumnsLocalSetting = new LocalSetting< null, ); +const defaultActiveTxnFilters = { app: defaultFilters.app }; + const filtersLocalSetting = new LocalSetting< AdminUIState, ActiveTransactionFilters >( "filters/ActiveTransactionsPage", (state: AdminUIState) => state.localSettings, - { app: defaultFilters.app }, + defaultActiveTxnFilters, ); const sortSettingLocalSetting = new LocalSetting( diff --git a/scripts/release-notes.py b/scripts/release-notes.py index 10fd84866bd0..b7128710a6c1 100755 --- a/scripts/release-notes.py +++ b/scripts/release-notes.py @@ -157,7 +157,6 @@ def lookup_person(name, email): 'cli change': "Command-line changes", 'ops change': "Operational changes", 'sql change': "SQL language changes", - 'api change': "API endpoint changes", 'ui change': "DB Console changes", 'general change': "General changes", 'build change': "Build changes", @@ -177,7 +176,6 @@ def lookup_person(name, email): 'sql change', 'ops change', 'cli change', - 'api change', 'ui change', 'bug fix', 'performance improvement', @@ -195,8 +193,6 @@ def lookup_person(name, email): 'ui': 'ui change', 'operational change': 'ops change', 'admin ui': 'ui change', - 'api': 'api change', - 'http': 'api change', 'backwards-incompatible change': 'backward-incompatible change', 'enterprise': 'enterprise change', 'security': 'security update',