Merge #154939 #155220 #155739 #155785

154939: stress: rename Stress to DevStress r=herkolategan,jeffswenson a=stevendanna

This renames the current implementation of Stress to DevStress and then adds a new Stress function that covers both local and nightly stress runs.

Epic: none
Release note: None

155220: sidetransport: remove a call to timeutil.Now() r=stevendanna a=stevendanna

This removes an extra call to timeutil.Now(). Just something I noticed when reading the code. timeutil.Unit() should be able to use the monotonic clock if `by` has a monotonic clock reading already which is also nice.

It might be nice to make a version of the pacer that can use crtime.Mono but that is a larger change.

Epic: none
Release note: None

155739: storage: add storage.tombstone_dense_compaction_threshold setting r=RaduBerinde a=RaduBerinde

Add a cluster setting to control the tombstone-dense compaction
threshold.

Fixes: #155715
Release note: None

155785: gssapi: add shim for old __res_nsearch version r=dt a=dt

Release note: none.
Epic: none.

Co-authored-by: Steven Danna <danna@cockroachlabs.com>
Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
Co-authored-by: David Taylor <davidt@davidt.io>

Author: 4 people

build/bazelutil/cc/BUILD.bazel

@@ -0,0 +1,16 @@
+cc_library(
+    name = "resolver_compat",
+    srcs = ["res_compat.c"],
+    visibility = ["//visibility:public"],
+    alwayslink = True,
+)
+
+cc_library(
+    name = "resolver_libs",
+    linkopts = [
+        "-Wl,--push-state,--no-as-needed",
+        "-lresolv",
+        "-Wl,--pop-state",
+    ],
+    visibility = ["//visibility:public"],
+)

build/bazelutil/cc/res_compat.c

@@ -0,0 +1,14 @@
+// res_compat.c
+#include <resolv.h>
+
+// Provide a weak __res_nsearch for old krb5 objects.
+// Forward to the public res_nsearch symbol on modern glibc.
+__attribute__((weak))
+int __res_nsearch(res_state statp,
+                  const char *dname,
+                  int class,
+                  int type,
+                  unsigned char *answer,
+                  int anslen) {
+  return res_nsearch(statp, dname, class, type, answer, anslen);
+}

pkg/backup/restore_test.go

@@ -107,7 +107,7 @@ func TestRestoreRetryFastFails(t *testing.T) {
 	// runtime does not exceed the max duration of the retry policy, or
 	// else very few attempts will be made.
 	maxDuration := 500 * time.Millisecond
-	if skip.Stress() {
+	if skip.DevStress() {
 		// Under stress, the restore will take longer to complete, so we need to
 		// increase max duration accordingly.
 		maxDuration = 1500 * time.Millisecond

pkg/ccl/gssapiccl/BUILD.bazel

@@ -11,17 +11,12 @@ go_library(
         "//conditions:default": ["empty.go"],
     }),
     cdeps = select({
-        "@io_bazel_rules_go//go/platform:linux": ["//c-deps:libkrb5"],
+        "@io_bazel_rules_go//go/platform:linux": [
+            "//c-deps:libkrb5", "//build/bazelutil/cc:resolver_compat","//build/bazelutil/cc:resolver_libs",
+        ],
         "//conditions:default": [],
     }),
     cgo = True,
-    clinkopts = select({
-        # NB: On Ubuntu, res_nsearch is found in the resolv_wrapper library,
-        # found in the libresolv-wrapper package.
-        "//build/toolchains:is_dev_linux": ["-ldl -lresolv -lresolv_wrapper"],
-        "@io_bazel_rules_go//go/platform:linux": ["-ldl -lresolv"],
-        "//conditions:default": [],
-    }),
     importpath = "github.com/cockroachdb/cockroach/pkg/ccl/gssapiccl",
     visibility = ["//visibility:public"],
     deps = select({

pkg/ccl/kvccl/kvtenantccl/upgradeinterlockccl/local_test_util_test.go

@@ -107,7 +107,7 @@ func runTest(t *testing.T, variant sharedtestutil.TestVariant, test sharedtestut
 		// extend the TTL by 10x to handle cases where the system is too
 		// overloaded to heartbeat at sub-second intervals.
 		ttlOverride := 250 * time.Millisecond
-		if skip.Stress() {
+		if skip.DevStress() {
 			ttlOverride *= 10
 		}
 		heartbeatOverride := ttlOverride / 10

pkg/crosscluster/replicationtestutils/testutils.go

@@ -582,7 +582,7 @@ func (c *TenantStreamingClusters) SrcExec(exec srcInitExecFunc) {
 
 func WaitUntilStartTimeReached(t *testing.T, db *sqlutils.SQLRunner, ingestionJobID jobspb.JobID) {
 	timeout := 45 * time.Second
-	if skip.Stress() || util.RaceEnabled {
+	if skip.DevStress() || util.RaceEnabled {
 		timeout *= 5
 	}
 	testutils.SucceedsWithin(t, func() error {

pkg/kv/kvserver/closedts/sidetransport/sender.go

@@ -697,8 +697,10 @@ func (b *updatesBuf) PaceBroadcastUpdate(ctx context.Context, condVar *sync.Cond
 		}
 		b.mu.Unlock()
 
-		if workLeft > 0 && timeutil.Now().Before(by) {
-			time.Sleep(by.Sub(timeutil.Now()))
+		if workLeft > 0 {
+			if wait := timeutil.Until(by); wait > 0 {
+				time.Sleep(wait)
+			}
 		}
 	}
 }

pkg/sql/mvcc_statistics_update_job_test.go

@@ -203,7 +203,7 @@ func TestTenantGlobalAggregatedLivebytes(t *testing.T) {
 		// Exact match for non stress tests, and allow values to differ by up to
 		// 5% in stress situations.
 		confidenceLevel := 0.0
-		if skip.Stress() {
+		if skip.DevStress() {
 			confidenceLevel = 0.05
 		}
 		testutils.SucceedsSoon(t, func() error {

pkg/storage/pebble.go

@@ -524,6 +524,14 @@ var baselineDeletionRate = settings.RegisterIntSetting(
 	settings.NonNegativeInt,
 )
 
+var tombstoneDenseCompactionThreshold = settings.RegisterIntSetting(
+	settings.ApplicationLevel,
+	"storage.tombstone_dense_compaction_threshold",
+	"percentage of tombstone-dense data blocks that trigger a compaction (0 = disabled)",
+	10, // 10%
+	settings.IntInRange(0, 100),
+)
+
 // EngineComparer is a pebble.Comparer object that implements MVCC-specific
 // comparator settings for use with Pebble.
 var EngineComparer = func() pebble.Comparer {
@@ -962,6 +970,9 @@ func newPebble(ctx context.Context, cfg engineConfig) (p *Pebble, err error) {
 	cfg.opts.TargetByteDeletionRate = func() int {
 		return int(baselineDeletionRate.Get(&cfg.settings.SV))
 	}
+	cfg.opts.Experimental.TombstoneDenseCompactionThreshold = func() float64 {
+		return 0.01 * float64(tombstoneDenseCompactionThreshold.Get(&cfg.settings.SV))
+	}
 	if cfg.opts.Experimental.UseDeprecatedCompensatedScore == nil {
 		cfg.opts.Experimental.UseDeprecatedCompensatedScore = func() bool {
 			return useDeprecatedCompensatedScore.Get(&cfg.settings.SV)

pkg/testutils/skip/skip.go

@@ -188,8 +188,8 @@ func UnderDuressWithIssue(t SkippableTest, githubIssueID int, args ...interface{
 	}
 }
 
-// Duress catures the conditions that currently lead us to
-// believe that tests may be slower than normal.
+// Duress captures the conditions that currently lead us to believe that tests
+// may be slower than normal.
 func Duress() bool {
 	return util.RaceEnabled || Stress() || syncutil.DeadlockEnabled
 }