Merge #144220 #144232

144220: scripts: add gceworker.sh update-hosts r=tbg a=tbg

This adds a line like this to /etc/hosts:

    34.107.119.188 gceworker-tbg.local

AFAIK we don't have a stable DNS entry for gceworkers, so this helps set up remote development in Goland, for example.

Epic: none
Release note: none

144232: crosscluster: disable write buffering r=yuzefovich,jeffswenson a=stevendanna

The txnWriteBuffer does not yet support the OriginTimestamp and OriginID write options used by LDR.  Soon, it will reject requests with these options set.

This opts LDR out of this setting even in a cluster were the cluster setting has changed the default.

Epic: none
Release note: None

Co-authored-by: Tobias Grieger <[email protected]>
Co-authored-by: Steven Danna <[email protected]>

Author: 3 people

pkg/crosscluster/logical/lww_kv_processor.go

@@ -224,6 +224,7 @@ func (p *kvRowProcessor) processOneRow(
 	refreshCount int,
 ) error {
 	if err := p.cfg.DB.KV().Txn(ctx, func(ctx context.Context, txn *kv.Txn) error {
+		txn.SetBufferedWritesEnabled(false)
 		b := makeKVBatch(useLowPriority.Get(&p.cfg.Settings.SV), txn)
 
 		if err := p.addToBatch(ctx, txn, b, dstTableID, row, k, prevValue); err != nil {

pkg/crosscluster/logical/lww_row_processor.go

@@ -388,8 +388,9 @@ func (srp *sqlRowProcessor) GetLastRow() cdcevent.Row {
 }
 
 var (
-	forceGenericPlan = sessiondatapb.PlanCacheModeForceGeneric
-	ieOverrideBase   = sessiondata.InternalExecutorOverride{
+	bufferedWritesEnabled = false
+	forceGenericPlan      = sessiondatapb.PlanCacheModeForceGeneric
+	ieOverrideBase        = sessiondata.InternalExecutorOverride{
 		// The OriginIDForLogicalDataReplication session variable will bind the
 		// origin ID 1 to each per-statement batch request header sent by the
 		// internal executor. This metadata will be plumbed to the MVCCValueHeader
@@ -412,8 +413,9 @@ var (
 		GrowStackSize: true,
 		// We don't get any benefits from generating plan gists for internal
 		// queries, so we disable them.
-		DisablePlanGists: true,
-		QualityOfService: &sessiondatapb.BulkLowQoS,
+		DisablePlanGists:      true,
+		QualityOfService:      &sessiondatapb.BulkLowQoS,
+		BufferedWritesEnabled: &bufferedWritesEnabled,
 	}
 )
 

pkg/sql/internal.go

@@ -962,6 +962,9 @@ func applyOverrides(o sessiondata.InternalExecutorOverride, sd *sessiondata.Sess
 	if o.DisablePlanGists {
 		sd.DisablePlanGists = true
 	}
+	if o.BufferedWritesEnabled != nil {
+		sd.BufferedWritesEnabled = *o.BufferedWritesEnabled
+	}
 
 	if o.MultiOverride != "" {
 		overrides := strings.Split(o.MultiOverride, ",")

pkg/sql/sessiondata/internal.go

@@ -84,6 +84,9 @@ type InternalExecutorOverride struct {
 	GrowStackSize bool
 	// DisablePlanGists, if true, overrides the disable_plan_gists session var.
 	DisablePlanGists bool
+	// BufferedWritesEnabled, if set, controls whether the buffered writes KV transaction
+	// protocol is used for user queries on the current session.
+	BufferedWritesEnabled *bool
 }
 
 // NoSessionDataOverride is the empty InternalExecutorOverride which does not

scripts/gceworker.sh

@@ -30,6 +30,10 @@ if [[ "${cmd}" ]]; then
 	shift
 fi
 
+function get_ip() {
+	gcloud compute instances describe --format="value(networkInterfaces[0].accessConfigs[0].natIP)" "${NAME}"
+}
+
 function user_domain_suffix() {
 	gcloud auth list --limit 1 --filter="status:ACTIVE account:@cockroachlabs.com" --format="value(account)" | sed 's/[@\.\-]/_/g'
 }
@@ -57,7 +61,7 @@ EOF
 }
 
 function refresh_ssh_config() {
-	IP=$($0 ip)
+	IP=$(get_ip)
 	if ! grep -q "${FQNAME}" ~/.ssh/config; then
 		USER_DOMAIN_SUFFIX="$(user_domain_suffix)"
 		echo "No alias found for ${FQNAME} in ~/.ssh/config. Creating one for ${USER_DOMAIN_SUFFIX} now with the instance external ip."
@@ -249,7 +253,7 @@ put)
 	gcloud compute scp --recurse ${lpath} "${to}"
 	;;
 ip)
-	gcloud compute instances describe --format="value(networkInterfaces[0].accessConfigs[0].natIP)" "${NAME}"
+	echo "$(get_ip)"
 	;;
 sync)
 	if ! hash unison 2>/dev/null; then
@@ -300,8 +304,17 @@ vscode)
 status)
 	gcloud compute instances describe ${NAME} --format="table(name,status,lastStartTimestamp,lastStopTimestamp)"
 	;;
+update-hosts)
+	NEW_IP="$(get_ip)"
+	HOSTS_FILE="/etc/hosts"
+
+	# Step 1: Remove any existing gceworker line.
+	sudo sed -i '' "/${NAME}\.local/d" "${HOSTS_FILE}"
+	# Step 2: Insert the new line at the end unconditionally
+	echo "${NEW_IP} ${NAME}.local" | sudo tee -a ${HOSTS_FILE} > /dev/null
+	;;
 *)
-	echo "$0: unknown command: ${cmd}, use one of create, start, stop, resume, suspend, delete, status, ssh, get, put, or sync"
+	echo "$0: unknown command: ${cmd}, use one of create, start, stop, resume, suspend, delete, status, ssh, get, put, sync, or update-hosts"
 	exit 1
 	;;
 esac