Merge #145287 #145415 #145546 #145554

145287: workload: add support to csv generation for decimal r=jeffswenson a=jeffswenson

PR #144818 modified the tpcc workload so that it generates decimals instead of floats. Usually fixture generation uses a special case in process data generator, but the import roachtests uses a datum -> csv conversation code path that was missing support for the decimal type.

Fixes: #145058
Fixes: #145058
Fixes: #145185

Release note: none

145415: drtprod: add YAML files for PUA tests r=vidit-bhat,nameisbhaskar a=shailendra-patel

This PR introduces the following changes:

1. Adds YAML configuration files to run Performance Under Adversity (PUA) tests end-to-end.
2. Includes a wait time in the drtprod execution steps.

Epic: none

Release note: None

145546: go.mod: update tokenbucket to 42689b6 r=RaduBerinde a=sumeerbhola

Epic: none

Release note: None

145554: workflow: enable auto-merge-backports r=lunevalex a=rail

This commit enables auto-merge-backports for the repository.

Epic: none
Release note: none

Co-authored-by: Jeff Swenson <[email protected]>
Co-authored-by: Shailendra Patel <[email protected]>
Co-authored-by: sumeerbhola <[email protected]>
Co-authored-by: Rail Aliiev <[email protected]>

Author: 5 people

.github/workflows/auto-merge-backports.yml

@@ -75,15 +75,15 @@ jobs:
               console.log(`Merging PR #${pr.number}, Created at: ${pr.createdAt}, Approved: ${approved}, Labels: ${labels}`);
 
               // Merge the PR
-              // try {
-              //  console.log(`Merging PR #${pr.number}`);
-              //  await github.rest.pulls.merge({
-              //    owner: context.repo.owner,
-              //    repo: context.repo.repo,
-              //    pull_number: pr.number,
-              //    merge_method: "merge",
-              //  });
-              // } catch (err) {
-              //  console.warn(`Failed to merge PR #${pr.number}: ${err.message}`);
-              // }
+              try {
+                console.log(`Merging PR #${pr.number}`);
+                await github.rest.pulls.merge({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  pull_number: pr.number,
+                  merge_method: "merge",
+                });
+              } catch (err) {
+                console.warn(`Failed to merge PR #${pr.number}: ${err.message}`);
+              }
             }

DEPS.bzl

@@ -1965,10 +1965,10 @@ def go_deps():
         name = "com_github_cockroachdb_tokenbucket",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/cockroachdb/tokenbucket",
-        sha256 = "150f3e8e5b515c0886cda0809f09b5d5173d7f2c30eb2f2c6045c2aeb2183aa3",
-        strip_prefix = "github.com/cockroachdb/[email protected]20230807174530-cc333fc44b06",
+        sha256 = "2802e556b469d0989364cf8244bd4992e34e34a72a8c514df9dd787c694c3efd",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250429170803-42689b6311bb",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/tokenbucket/com_github_cockroachdb_tokenbucket-v0.0.0-20230807174530-cc333fc44b06.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/tokenbucket/com_github_cockroachdb_tokenbucket-v0.0.0-20250429170803-42689b6311bb.zip",
         ],
     )
     go_repository(

build/bazelutil/distdir_files.bzl

@@ -372,7 +372,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/strtime/com_github_cockroachdb_strtime-v0.0.0-20250401230151-b9140bbb29b5.zip": "8743d12484dd18c95cfccbd253557ef1d2aa3298299f79eacf62d4a91dd24e6e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/swiss/com_github_cockroachdb_swiss-v0.0.0-20250304010804-34a2c6a59016.zip": "b9968f20abf619de68e0276595d8a2ccc6fbfac924446af878805d19c31f6560",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/tablewriter/com_github_cockroachdb_tablewriter-v0.0.5-0.20200105123400-bd15540e8847.zip": "79daf1c29ec50cdd8dd1ea33f8a814963646a45a2ebe22742d652579340ebde0",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/tokenbucket/com_github_cockroachdb_tokenbucket-v0.0.0-20230807174530-cc333fc44b06.zip": "150f3e8e5b515c0886cda0809f09b5d5173d7f2c30eb2f2c6045c2aeb2183aa3",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/tokenbucket/com_github_cockroachdb_tokenbucket-v0.0.0-20250429170803-42689b6311bb.zip": "2802e556b469d0989364cf8244bd4992e34e34a72a8c514df9dd787c694c3efd",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/tools/com_github_cockroachdb_tools-v0.0.0-20211112185054-642e51449b40.zip": "37a3737dd23768b4997b2f0341d625658f5862cdbf808f7fbf3a7f9fd25913a7",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/ttycolor/com_github_cockroachdb_ttycolor-v0.0.0-20210902133924-c7d7dcdde4e8.zip": "1260533510c89abd6d8af573a40f0246f6865d5091144dea509b2c48e7c61614",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/version/com_github_cockroachdb_version-v0.0.0-20250314144055-3860cd14adf2.zip": "4e734ab8c4e4ff81003fedffa30dc5727f9b210c72a188ee3127eeedea09f644",

go.mod

@@ -142,7 +142,7 @@ require (
 	github.com/cockroachdb/redact v1.1.6
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b
-	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06
+	github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb
 	github.com/cockroachdb/tools v0.0.0-20211112185054-642e51449b40
 	github.com/cockroachdb/ttycolor v0.0.0-20210902133924-c7d7dcdde4e8
 	github.com/cockroachdb/version v0.0.0-20250314144055-3860cd14adf2

go.sum

@@ -608,8 +608,8 @@ github.com/cockroachdb/swiss v0.0.0-20250304010804-34a2c6a59016 h1:d0dxi6Q8yGtRB
 github.com/cockroachdb/swiss v0.0.0-20250304010804-34a2c6a59016/go.mod h1:yBRu/cnL4ks9bgy4vAASdjIW+/xMlFwuHKqtmh3GZQg=
 github.com/cockroachdb/tablewriter v0.0.5-0.20200105123400-bd15540e8847 h1:c7yLgqcm/3c9lYtpWeVD9NYqA9cKsKHdpQM62PHtTUM=
 github.com/cockroachdb/tablewriter v0.0.5-0.20200105123400-bd15540e8847/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
-github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
-github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
+github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g=
+github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
 github.com/cockroachdb/tools v0.0.0-20211112185054-642e51449b40 h1:qVTb3XEv+7VVjPetop8yGbN95HfCeqZx+VMveeSJPZw=
 github.com/cockroachdb/tools v0.0.0-20211112185054-642e51449b40/go.mod h1:cllxeV+TYc387/XzQRnDg6YThHoDzFewovWffzAm37Q=
 github.com/cockroachdb/ttycolor v0.0.0-20210902133924-c7d7dcdde4e8 h1:Hli+oX84dKq44sLVCcsGKqifm5Lg9J8VoJ2P3h9iPdI=

pkg/cmd/drtprod/cli/commands/yamlprocessor.go

@@ -15,6 +15,7 @@ import (
 	"slices"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/cmd/drtprod/helpers"
 	"github.com/cockroachdb/cockroach/pkg/roachprod"
@@ -116,6 +117,7 @@ type step struct {
 	Flags             map[string]interface{} `yaml:"flags"`               // Flags to pass to the command or script
 	ContinueOnFailure bool                   `yaml:"continue_on_failure"` // Whether to continue on failure
 	OnRollback        []step                 `yaml:"on_rollback"`         // Steps to execute if rollback is needed
+	Wait              int                    `yaml:"wait"`                // Wait time in seconds before executing the next step
 }
 
 // target defines a target cluster with associated steps to be executed.
@@ -140,6 +142,7 @@ type command struct {
 	args              []string   // Command arguments
 	continueOnFailure bool       // Whether to continue on failure
 	rollbackCmds      []*command // Rollback commands to execute in case of failure
+	wait              int        // Wait time in seconds before executing the next step
 }
 
 // String returns the command as a string for easy printing.
@@ -547,6 +550,10 @@ func executeCommands(ctx context.Context, logPrefix string, cmds []*command) err
 			fmt.Printf("[%s] Failed <%v>, Error Ignored: %v\n", logPrefix, cmd, err)
 		} else {
 			fmt.Printf("[%s] Completed <%v>\n", logPrefix, cmd)
+			if cmd.wait > 0 {
+				fmt.Printf("[%s] Waiting for %d seconds\n", logPrefix, cmd.wait)
+				time.Sleep(time.Duration(cmd.wait) * time.Second)
+			}
 		}
 
 		// Add rollback commands if specified
@@ -604,6 +611,7 @@ func generateStepCmd(clusterName string, s step) (*command, error) {
 			return nil, err
 		}
 	}
+	cmd.wait = s.Wait
 	return cmd, err
 }