Merge #149474 #149586

149474: changefeedccl: limit bank transfers in TestCatchupScanOrdering r=rharding6373 a=rharding6373

TestCatchupScanOrdering validates changefeed ordering by having one goroutine that makes bank transfers continuously and another goroutine that validates the order in which events are received downstream. This change limits the number of bank transfers before exiting the first goroutine to 2x the number expected downstream for a successful test run. The goal is to not have a goroutine that is doing busy work that might hog CPU.

Epic: none
Fixes: #148565

Release note: none

149586: roachprod: fix target inverse secure flag r=golgeek a=herkolategan

A small regression was introduced in #149369 which passes the incorrect secure flag to `createLabels` for `node_exporter`, `ebpf_exporter`, and `workload`, causing the metrics not to be scraped.

Fixes: #149512

Epic: None
Release note: None

Co-authored-by: rharding6373 <[email protected]>
Co-authored-by: Herko Lategan <[email protected]>

Author: 3 people

pkg/ccl/changefeedccl/validations_test.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/cdctest"
-	"github.com/cockroachdb/cockroach/pkg/ccl/utilccl"
 	"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -26,12 +25,12 @@ import (
 func TestCatchupScanOrdering(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
-	defer utilccl.TestingEnableEnterprise()()
 
 	testFn := func(t *testing.T, s TestServer, f cdctest.TestFeedFactory) {
 		t.Run("bank", func(t *testing.T) {
 			ctx := context.Background()
 			const numRows, numRanges, payloadBytes, maxTransfer = 10, 10, 10, 999
+			const checkRows = 200
 			gen := bank.FromConfig(numRows, numRows, payloadBytes, numRanges)
 			var l workloadsql.InsertsDataLoader
 			if _, err := workloadsql.Setup(ctx, s.DB, gen, l); err != nil {
@@ -62,7 +61,7 @@ func TestCatchupScanOrdering(t *testing.T) {
 			g.GoCtx(func(ctx context.Context) error {
 				prevTimeTransfer := time.Now()
 				for {
-					if atomic.LoadInt64(&done) > 0 {
+					if atomic.LoadInt64(&done) > 0 || numOfTrans.Load() > 2*checkRows {
 						return nil
 					}
 					if err := randomBankTransfer(numRows, maxTransfer, s.DB); err != nil {
@@ -95,7 +94,7 @@ func TestCatchupScanOrdering(t *testing.T) {
 					t.Logf("key: %s, value: %s\n", m.Key, m.Value)
 					t.Logf("time taken to see the %d-th changefeed change: %v", seenChanges, time.Since(prevTimeCDC))
 					prevTimeCDC = time.Now()
-					if seenChanges >= 200 {
+					if seenChanges >= checkRows {
 						atomic.StoreInt64(&done, 1)
 						break
 					}

pkg/roachprod/roachprod.go

@@ -851,11 +851,11 @@ func updatePrometheusTargets(
 				nodeIPPorts[nodeID] = []*promhelperclient.NodeInfo{
 					{
 						Target:       fmt.Sprintf("%s:%d", nodeIP, vm.NodeExporterPort),
-						CustomLabels: createLabels(nodeID, v, "node_exporter", false),
+						CustomLabels: createLabels(nodeID, v, "node_exporter", true),
 					},
 					{
 						Target:       fmt.Sprintf("%s:%d", nodeIP, vm.EbpfExporterPort),
-						CustomLabels: createLabels(nodeID, v, "ebpf_exporter", false),
+						CustomLabels: createLabels(nodeID, v, "ebpf_exporter", true),
 					},
 				}
 			}
@@ -877,7 +877,7 @@ func updatePrometheusTargets(
 					nodeIPPorts[nodeID],
 					&promhelperclient.NodeInfo{
 						Target:       fmt.Sprintf("%s:%d", nodeIP, port),
-						CustomLabels: createLabels(nodeID, v, "workload", false),
+						CustomLabels: createLabels(nodeID, v, "workload", true),
 					},
 				)
 			}