Merge #78193 #79788 #80696

78193: docs: update the tenant setting RFC r=rafiss a=knz Fixes #77935. Release note: None 79788: scripts: add download link to cockroach-sql r=nickvigilante a=knz Informs cockroachdb/docs#13562. 80696: stopper: dump stacks after 2 minutes of hung quiesce r=erikgrinaker a=tbg Quiesce should never take two minutes. If it does, the stacks are what will allow you to figure out where the problem (bug) is. I was compelled to add this while looking at a test failure in `TestChangefeedBackfillObservability` where > I220428 07:19:47.969264 208992 util/stop/stopper.go:591 â‹® [-] 92 quiescing... was the last thing printed before TeamCity terminated the test suite approximately 45m later. Release note: None Co-authored-by: Raphael 'kena' Poss <[email protected]> Co-authored-by: Tobias Grieger <[email protected]>
cockroachdb · Apr 28, 2022 · 232e975 · 232e975
4 parents efad149 + d4c53c9 + bf9df63 + 617c289
commit 232e975
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/docs/RFCS/20211106_multitenant_cluster_settings.md b/docs/RFCS/20211106_multitenant_cluster_settings.md
@@ -1,9 +1,9 @@
 - Feature Name: Multi-tenant cluster settings
-- Status: draft
+- Status: accepted
 - Start Date: 2021-11-06
 - Authors: Radu Berinde
-- RFC PR: (PR # after acceptance of initial draft)
-- Cockroach Issue: (one or more # from the issue tracker)
+- RFC PR: #73349
+- Cockroach Issue: #77935
 
 # Summary
 
@@ -125,8 +125,13 @@ New statements for the system tenant only (which concern only `tenant-ro` and
      otherwise the setting default.
 
  - `SHOW CLUSTER SETTING <setting> FOR TENANT <id>`
+   - Display the setting override. If there is no override, the statement
+     returns NULL. (We choose to not make this statement 'peek' into
+     the tenant to display the customization set by the tenant itself.)
 
  - `SHOW [ALL] CLUSTER SETTINGS FOR TENANT <id>`
+   - Display the setting overrides for the given tenant. If there is no
+     override, the statement returns NULL.
 
 In all statements above, using `id=1` (the system tenant's ID) is not valid.
 

diff --git a/pkg/util/stop/stopper.go b/pkg/util/stop/stopper.go
@@ -590,6 +590,9 @@ func (s *Stopper) Quiesce(ctx context.Context) {
 	defer time.AfterFunc(5*time.Second, func() {
 		log.Infof(ctx, "quiescing...")
 	}).Stop()
+	defer time.AfterFunc(2*time.Minute, func() {
+		log.DumpStacks(ctx, "slow quiesce")
+	}).Stop()
 	defer s.Recover(ctx)
 
 	func() {

diff --git a/scripts/release-notes.py b/scripts/release-notes.py
@@ -854,13 +854,24 @@ def analyze_standalone_commit(commit):
 
     print("""### Downloads
 
+#### Full CockroachDB executable
+
 <div id="os-tabs" class="filters clearfix">
     <a href="https://binaries.cockroachdb.com/cockroach-""" + current_version + """.linux-amd64.tgz"><button id="linux" class="filter-button" data-scope="linux" data-eventcategory="linux-binary-release-notes">Linux</button></a>
     <a href="https://binaries.cockroachdb.com/cockroach-""" + current_version + """.darwin-10.9-amd64.tgz"><button id="mac" class="filter-button" data-scope="mac" data-eventcategory="mac-binary-release-notes">Mac</button></a>
     <a href="https://binaries.cockroachdb.com/cockroach-""" + current_version + """.windows-6.2-amd64.zip"><button id="windows" class="filter-button" data-scope="windows" data-eventcategory="windows-binary-release-notes">Windows</button></a>
     <a target="_blank" href="https://github.com/cockroachdb/cockroach/releases/tag/""" + current_version + '"' + """><button id="source" class="filter-button" data-scope="source" data-eventcategory="source-release-notes">Source</button></a>
 </div>
 
+#### SQL-only executable
+
+<div id="os-tabs" class="filters clearfix">
+    <a href="https://binaries.cockroachdb.com/cockroach-sql-""" + current_version + """.linux-amd64"><button id="linux" class="filter-button" data-scope="linux" data-eventcategory="linux-binary-release-notes">Linux</button></a>
+    <a href="https://binaries.cockroachdb.com/cockroach-sql-""" + current_version + """.darwin-10.9-amd64"><button id="mac" class="filter-button" data-scope="mac" data-eventcategory="mac-binary-release-notes">Mac</button></a>
+    <a href="https://binaries.cockroachdb.com/cockroach-sql-""" + current_version + """.windows-6.2-amd64.exe"><button id="windows" class="filter-button" data-scope="windows" data-eventcategory="windows-binary-release-notes">Windows</button></a>
+    <a target="_blank" href="https://github.com/cockroachdb/cockroach/releases/tag/""" + current_version + '"' + """><button id="source" class="filter-button" data-scope="source" data-eventcategory="source-release-notes">Source</button></a>
+</div>
+
 <section class="filter-content" data-scope="windows">
 {% include_cached windows_warning.md %}
 </section>