Merge cockroachdb#108381 cockroachdb#108409

108381: authors: add DarrylWong to authors r=DarrylWong a=DarrylWong

Release note: None
Epic: None

108409: dev: add deadlock detector support to roachprod-stress r=AlexTalks a=AlexTalks

This adds a new `--deadlock` flag to the `dev roachprod-stress` command, which enables the deadlock detector in the stressed test(s).

Epic: none

Release note: None

Co-authored-by: DarrylWong <[email protected]>
Co-authored-by: Alex Sarkesian <[email protected]>

Author: 3 people

AUTHORS

@@ -137,7 +137,7 @@ Daniel Theophanes <[email protected]>
 Daniel Upton <[email protected]>
 Darin Peshev <[email protected]> Darin <[email protected]> <@cockroachlabs.com>
 Darius Asri Rezaei <[email protected]> <[email protected]>
-Darryl Wong <[email protected]>
+Darryl Wong <[email protected]> <[email protected]>
 David Ding <[email protected]> <[email protected]>
 David Eisenstat <[email protected]>
 David Hartunian <@cockroachlabs.com>

pkg/cmd/dev/roachprod_stress.go

@@ -39,6 +39,7 @@ func makeRoachprodStressCmd(runE func(cmd *cobra.Command, args []string) error)
 	roachprodStressCmd.Flags().String(volumeFlag, "bzlhome", "the Docker volume to use as the container home directory (only used for cross builds)")
 	roachprodStressCmd.Flags().String(clusterFlag, "", "the name of the cluster (must be set)")
 	roachprodStressCmd.Flags().Bool(raceFlag, false, "run tests using race builds")
+	roachprodStressCmd.Flags().Bool(deadlockFlag, false, "run tests using the deadlock detector")
 	return roachprodStressCmd
 }
 
@@ -48,6 +49,7 @@ func (d *dev) roachprodStress(cmd *cobra.Command, commandLine []string) error {
 		cluster       = mustGetFlagString(cmd, clusterFlag)
 		volume        = mustGetFlagString(cmd, volumeFlag)
 		race          = mustGetFlagBool(cmd, raceFlag)
+		deadlock      = mustGetFlagBool(cmd, deadlockFlag)
 		stressCmdArgs = mustGetFlagString(cmd, stressArgsFlag)
 	)
 	if cluster == "" {
@@ -109,6 +111,9 @@ func (d *dev) roachprodStress(cmd *cobra.Command, commandLine []string) error {
 	if race {
 		crossArgs = append(crossArgs, "--config=race")
 	}
+	if deadlock {
+		crossArgs = append(crossArgs, "--define", "gotags=bazel,gss,deadlock")
+	}
 	err = d.crossBuild(ctx, crossArgs, targets, "crosslinux", volume, nil)
 	if err != nil {
 		return err