Merge #151526 #152461

151526: roachtest: add --cockroach-stage flag for remote binary staging r=dt a=dt

Add --cockroach-stage flag that stages binaries directly from cloud storage instead of uploading local files. The flag accepts version/SHA values like "latest", "v23.2.0", or commit SHAs, is mutually exclusive with --cockroach, and normalizes "latest" to empty string for proper .LATEST URL construction.

Release note: none.
Epic: none

152461: fuzzystrmatch: fix out of bounds in LevenshteinLessEqual r=rafiss a=rafiss

This fixes a bug that was added when this function was introduced in 7a538b3.

No release note since this bug was not released yet.

fixes #152418
Release note: None

Co-authored-by: David Taylor <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>

Author: 3 people

pkg/cmd/roachtest/cluster.go

@@ -1932,9 +1932,15 @@ func (c *clusterImpl) PutE(
 }
 
 // PutCockroach uploads a binary with or without runtime assertions enabled,
-// as determined by t.Cockroach(). Note that we upload to all nodes even if they
-// don't use the binary, so that the test runner can always fetch logs.
+// as determined by t.Cockroach(). If --cockroach-stage flag is set, it stages
+// the binary from cloud storage instead of uploading a local binary.
+// Note that we upload/stage to all nodes even if they don't use the binary,
+// so that the test runner can always fetch logs.
 func (c *clusterImpl) PutCockroach(ctx context.Context, l *logger.Logger, t *testImpl) error {
+	if roachtestflags.CockroachStage != "" {
+		// Use staging instead of upload when --cockroach-stage is specified
+		return c.Stage(ctx, l, "cockroach", roachtestflags.CockroachStage, ".", c.All())
+	}
 	return c.PutE(ctx, l, t.Cockroach(), test.DefaultCockroachPath, c.All())
 }
 

pkg/cmd/roachtest/main.go

@@ -573,4 +573,16 @@ func validateAndConfigure(cmd *cobra.Command, args []string) {
 	if roachtestflags.SelectiveTests && selectProbFlagInfo != nil {
 		printErrAndExit(fmt.Errorf("select-probability and selective-tests=true are incompatible. Disable one of them"))
 	}
+
+	// --cockroach and --cockroach-stage flags are mutually exclusive.
+	cockroachFlagInfo := roachtestflags.Changed(&roachtestflags.CockroachPath)
+	cockroachStageFlagInfo := roachtestflags.Changed(&roachtestflags.CockroachStage)
+	if cockroachFlagInfo != nil && cockroachStageFlagInfo != nil {
+		printErrAndExit(fmt.Errorf("--cockroach and --cockroach-stage are mutually exclusive. Use one or the other"))
+	}
+
+	// Normalize "latest" to empty string for staging system
+	if roachtestflags.CockroachStage == "latest" {
+		roachtestflags.CockroachStage = ""
+	}
 }

pkg/cmd/roachtest/roachtestflags/flags.go

@@ -112,6 +112,15 @@ var (
 		Usage: `Absolute path to cockroach binary to use`,
 	})
 
+	CockroachStage string
+	_              = registerRunFlag(&CockroachStage, FlagInfo{
+		Name: "cockroach-stage",
+		Usage: `
+			Stage cockroach binary from cloud storage instead of uploading local binary.
+			Specify version/SHA (e.g., "latest", "v23.2.0", or commit SHA).
+			Mutually exclusive with --cockroach.`,
+	})
+
 	ConfigPath string
 	_          = registerRunOpsFlag(&ConfigPath, FlagInfo{
 		Name: "config",

pkg/util/fuzzystrmatch/leven.go

@@ -123,6 +123,9 @@ func LevenshteinLessEqualDistanceWithCost(
 				bestColumn = -netInserts
 			}
 			stopColumn = bestColumn + (slackDist / (insCost + delCost)) + 1
+			if stopColumn < 0 {
+				stopColumn = 0
+			}
 			if stopColumn > lenS {
 				stopColumn = lenS + 1
 			}

pkg/util/fuzzystrmatch/leven_test.go

@@ -5,7 +5,10 @@
 
 package fuzzystrmatch
 
-import "testing"
+import (
+	"math"
+	"testing"
+)
 
 func TestLevenshteinDistance(t *testing.T) {
 	tt := []struct {
@@ -482,3 +485,33 @@ func TestLevenshteinLessEqualDistanceWithCost(t *testing.T) {
 		}
 	}
 }
+
+func TestLevenshtein_ExtremeValues(t *testing.T) {
+	// Test all combinations of math.MinInt64 and math.MaxInt64 for integer
+	// arguments. This ensures the function handles extreme values correctly
+	// without panicking.
+	extremeValues := []int{math.MinInt64, math.MaxInt64, 0, 1, -1, -6503603920424974249, -3160545599026710833, 3234088755759361354}
+	testStrings := []string{"ab", "bc", "", "test"}
+
+	for _, source := range testStrings {
+		for _, target := range testStrings {
+			for _, insCost := range extremeValues {
+				for _, delCost := range extremeValues {
+					for _, subCost := range extremeValues {
+						for _, maxDist := range extremeValues {
+							// Call the functions and ensure it doesn't panic. We don't check
+							// the exact result since extreme values may cause integer
+							// overflow, but we ensure no panic occurs.
+							_ = LevenshteinLessEqualDistanceWithCost(
+								source, target, insCost, delCost, subCost, maxDist,
+							)
+							_ = LevenshteinDistanceWithCost(
+								source, target, insCost, delCost, subCost,
+							)
+						}
+					}
+				}
+			}
+		}
+	}
+}