Merge #156970 #157072 #157076

156970: ui: add store disk write bytes to storage dashboard r=annrpom a=annrpom

This patch adds a metric for store disk write bytes in the Storage dashboard.

Epic: none
Informs: https://github.com/cockroachlabs/support/issues/3470

Release note: None

<img width="720" height="308" alt="image" src="https://github.com/user-attachments/assets/94629b53-2dc7-4a42-8b68-85ddbd93d006" />
<img width="968" height="411" alt="image" src="https://github.com/user-attachments/assets/e7136191-8df7-4dcf-8150-815661395af1" />

<img width="968" height="407" alt="image" src="https://github.com/user-attachments/assets/3add06df-0f76-48c5-b467-aca2f9742869" />
<img width="975" height="414" alt="image" src="https://github.com/user-attachments/assets/0b6b5812-be09-4def-83e4-96ce57dd36de" />


157072: sql: avoid buffering notice for upgrading to SERIALIZABLE r=rafiss a=rafiss

This avoids flakiness in a test which expects the notice, but would sometimes not see it.

informs #157069
informs #157068
informs #153543
informs #156686
informs #156638
informs #156513

Release note: None

157076: gceworker: use who instead of w, remove unison bootstrap r=rickystewart a=rail

Previously, we used the w command to check for active sessions, but it stopped reporting TTYs in the output in Ubuntu 24.04. This change switches to the combination of who and ps to achieve the same goal.

Upstream report: https://bugs.launchpad.net/ubuntu/+source/procps/+bug/2092307

Additionally, we no longer need to bootstrap Unison, because this workflow has been unreliable.

Remove duplicated `gcloud` subcommand.

Release note: none
Epic: none

Co-authored-by: Annie Pompa <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>
Co-authored-by: Rail Aliiev <[email protected]>

Author: 4 people

build/bootstrap/autoshutdown.cron.sh

@@ -49,7 +49,19 @@ active_exists() {
   [[ $age -lt $AUTO_SHUTDOWN_DURATION ]]
 }
 
-if active_exists || w -hs | grep pts | grep -vq "pts/[0-9]* *tmux" || pgrep unison || pgrep -f remote-dev-server.sh; then
+active_session(){
+  # Check for active sessions that are not tmux/screen/zellij sessions.
+  # Example of who output:
+  # rail_cockroachlabs_com pts/0        2025-11-07 18:10 (179.78.23.130)
+  # rail_cockroachlabs_com pts/1        2025-11-07 18:13 (tmux(2747).%0)
+  # rail_cockroachlabs_com pts/2        2025-11-07 18:13 (tmux(2747).%0)
+  if who | grep "pts/" | grep -vqE '\((tmux|screen|zellij)\('; then
+    return 0
+  fi
+  return 1
+}
+
+if active_exists || active_session || pgrep -f remote-dev-server.sh; then
   # Auto-shutdown is disabled (via /.active) or there is a remote session.
   echo 0 > $FILE
   exit 0

build/bootstrap/bootstrap-debian.sh

@@ -70,9 +70,6 @@ echo '4cb534c52cdd47a6223d4596d530e7c9c785438ab3b0a49ff347e991c210b2cd /tmp/baze
 chmod +x /tmp/bazelisk
 sudo mv /tmp/bazelisk /usr/bin/bazel
 
-# Install the Unison file-syncer.
-. bootstrap/bootstrap-unison.sh
-
 # Configure environment variables for CockroachDB
 echo 'export PATH="${PATH}:${HOME}/go/src/github.com/cockroachdb/cockroach/bin:/usr/local/go/bin"' >> ~/.bashrc_bootstrap
 echo >> ~/.bashrc

build/bootstrap/bootstrap-unison.sh

@@ -82,7 +82,13 @@ func (ex *connExecutor) maybeAdjustTxnForDDL(ctx context.Context, stmt Statement
 					return err
 				}
 				ex.extraTxnState.upgradedToSerializable = true
-				p.BufferClientNotice(ctx, pgnotice.Newf("setting transaction isolation level to SERIALIZABLE due to schema change"))
+				if err := p.SendClientNotice(
+					ctx,
+					pgnotice.Newf("setting transaction isolation level to SERIALIZABLE due to schema change"),
+					false, /* immediateFlush */
+				); err != nil {
+					return err
+				}
 			} else {
 				return txnSchemaChangeErr
 			}

pkg/sql/conn_executor_ddl.go

@@ -466,5 +466,55 @@ export default function (props: GraphDashboardProps) {
         )}
       </Axis>
     </LineGraph>,
+
+    <LineGraph
+      title="Store Disk Write Bytes/s"
+      sources={storeSources}
+      isKvGraph={true}
+      tenantSource={tenantSource}
+      tooltip={
+        <div>
+          The number of bytes written to the store's disk per second{" "}
+          {tooltipSelection} (as reported by the OS).
+        </div>
+      }
+      showMetricsInTooltip={true}
+    >
+      <Axis units={AxisUnits.Bytes} label="bytes">
+        {storeMetrics(
+          {
+            name: "cr.store.storage.disk.write.bytes",
+            nonNegativeRate: true,
+          },
+          nodeIDs,
+          storeIDsByNodeID,
+        )}
+      </Axis>
+    </LineGraph>,
+
+    <LineGraph
+      title="Store Disk Read Bytes/s"
+      sources={storeSources}
+      isKvGraph={true}
+      tenantSource={tenantSource}
+      tooltip={
+        <div>
+          The number of bytes read from the store's disk per second{" "}
+          {tooltipSelection} (as reported by the OS).
+        </div>
+      }
+      showMetricsInTooltip={true}
+    >
+      <Axis units={AxisUnits.Bytes} label="bytes">
+        {storeMetrics(
+          {
+            name: "cr.store.storage.disk.read.bytes",
+            nonNegativeRate: true,
+          },
+          nodeIDs,
+          storeIDsByNodeID,
+        )}
+      </Axis>
+    </LineGraph>,
   ];
 }

pkg/ui/workspaces/db-console/src/views/cluster/containers/nodeGraphs/dashboards/storage.tsx

@@ -98,7 +98,7 @@ create)
 		echo "Using dev license key from \$COCKROACH_DEV_LICENSE"
 	else
 		echo -n "Enter your dev license key (if any): "
-		read COCKROACH_DEV_LICENSE
+		read -r COCKROACH_DEV_LICENSE
 	fi
 
 	gsuite_account_for_label="$(
@@ -163,7 +163,7 @@ start)
 		echo "Set GCEWORKER_START_SSH_COMMAND=mosh to use mosh instead"
 	fi
 	echo "****************************************"
-	$0 ${GCEWORKER_START_SSH_COMMAND-ssh}
+	$0 "${GCEWORKER_START_SSH_COMMAND-ssh}"
 	;;
 stop)
 	read -r -p "This will stop the VM. Are you sure? [yes] " response
@@ -221,9 +221,6 @@ ssh)
 mosh)
 	mosh --ssh "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" "$(user_domain_suffix)@${FQNAME}"
 	;;
-gcloud)
-	gcloud "$@"
-	;;
 get)
 	rpath="${1}"
 	# Check whether we have an absolute path like /foo, ~foo, or ~/foo.
@@ -253,56 +250,15 @@ put)
 	gcloud compute scp --recurse "${lpaths[@]}" "${to}"
 	;;
 ip)
-	echo "$(get_ip)"
-	;;
-sync)
-	if ! hash unison 2>/dev/null; then
-		echo 'unison not found (on macOS, run `brew install unison`)' >&2
-		exit 1
-	fi
-	if ! hash unison-fsmonitor 2>/dev/null; then
-		echo 'unison-fsmonitor not installed (on macOS, run `brew install eugenmayer/dockersync/unox`)'
-		exit 1
-	fi
-	if (($# == 0)); then
-		host=. # Sync the Cockroach repo by default.
-		worker=go/src/github.com/cockroachdb/cockroach
-	elif (($# == 2)); then
-		host=$1
-		worker=$2
-	else
-		echo "usage: $0 mount [HOST-PATH WORKER-PATH]" >&2
-		exit 1
-	fi
-	read -p "Warning: sync will overwrite files on the GCE worker with your local copy. Continue? (Y/n) "
-	if [[ "$REPLY" && "$REPLY" != [Yy] ]]; then
-		exit 1
-	fi
-	tmpfile=$(mktemp)
-	trap 'rm -f ${tmpfile}' EXIT
-	unison "$host" "ssh://${NAME}.${CLOUDSDK_COMPUTE_ZONE}.${CLOUDSDK_CORE_PROJECT}/$worker" \
-		-sshargs "-F ${tmpfile}" -auto -prefer "$host" -repeat watch \
-		-ignore 'Path .localcluster.certs*' \
-		-ignore 'Path .git' \
-		-ignore 'Path _bazel*' \
-		-ignore 'Path bazel-out*' \
-		-ignore 'Path bin*' \
-		-ignore 'Path build/builder_home' \
-		-ignore 'Path pkg/sql/parser/gen' \
-		-ignore 'Path pkg/ui/node_modules' \
-		-ignore 'Path pkg/ui/.cache-loader' \
-		-ignore 'Path cockroach-data' \
-		-ignore 'Name *.d' \
-		-ignore 'Name *.o' \
-		-ignore 'Name zcgo_flags*.go'
+	get_ip
 	;;
 vscode)
 	start_and_wait "${NAME}"
-	HOST=$(gcloud_compute_ssh --dry-run ${NAME} | awk '{print $NF}')
-	code --wait --remote ssh-remote+$HOST "$@"
+	HOST="$(gcloud_compute_ssh --dry-run "$NAME" | awk '{print $NF}')"
+	code --wait --remote ssh-remote+"$HOST" "$@"
 	;;
 status)
-	gcloud compute instances describe ${NAME} --format="table(name,status,lastStartTimestamp,lastStopTimestamp)"
+	gcloud compute instances describe "$NAME" --format="table(name,status,lastStartTimestamp,lastStopTimestamp)"
 	;;
 update-hosts)
 	NEW_IP="$(get_ip)"