Merge #100807 #101811 #101890 #101942

100807: jobs: add job to populate system activity tables r=j82w a=j82w

The system statistics table grow to large for the
ui to quickly return results. The new activity
tables job does the aggregation and only records 
the top 500 of each of the 6 columns. This means 
for a given hour there is a limit of 3000 rows. 
This allows the ui to return results fast and reliably. 

If the job detects there are less than 3k
rows it will just copy all the rows to
the activity tables.

Epic: none
closes: #98882

Release note: none

101811: kv: deflake and unskip TestRangeLocalUncertaintyLimitAfterNewLease r=andrewbaptist a=nvanbenschoten

Fixes #99527.
Fixes #100491.

This commit deflakes and unskips TestRangeLocalUncertaintyLimitAfterNewLease. The test was flaky because it was pausing the clock for some but not all nodes in the cluster. This was because it was accidentally using a 3-node cluster instead of a 2-node cluster, like it was intending.

Release note: None

101890: go.mod: bump Pebble to 6002e39ce756, enable TestCreateCheckpoint_SpanConstrained r=RaduBerinde a=RaduBerinde

#### go.mod: bump Pebble to 6002e39ce756

6002e39c db: fix bug with restricted checkpoints
7fdab075 objstorage: add mutex in sharedReadable
4bfe993a objstorage: simplify ReadAt for objects
ed8f90b0 sstable: don't try to read past end of object
bd6e947b vfs: fix MemFS ReadAt EOF behavior
914e8582 objstorage: test shared objects with TestNotExistError
101876aa *: add skip-shared iteration mode to ScanInternal
d54c3292 objstorage: fix bug in manifest
20d15bd8 tool: add EnableSharedStorage method
60cfeb46 metamorphic: export package
4e468412 sstable: include SINGLEDELs within NumDeletions table property
691db988 db: create new type for file numbers on disk
fa2c2ec6 internal/base: add parsing for human-readable INGESTSST,LOGDATA kinds
c0ccd694 internal/base: correct InternalKeyKind prefix on IngestSST key kind

Release note: None
Epic: none

#### storage: enable TestCreateCheckpoint_SpanConstrained

The problem was fixed in Pebble.

Fixes: #100935

Release note: None


101942: kvserver: always bump epoch when acquiring expired epoch lease r=erikgrinaker a=erikgrinaker

Previously, a lease acquisition only bumped the epoch of an expired epoch leaseholder if the new lease was also an epoch lease. However, we have to bump the epoch regardless of the new lease type, to properly invalidate the old leaseholder's leases. This patch bumps the epoch regardless of the new lease type.

Resolves #101836.

Epic: none
Release note: None

Co-authored-by: j82w <[email protected]>
Co-authored-by: Nathan VanBenschoten <[email protected]>
Co-authored-by: Radu Berinde <[email protected]>
Co-authored-by: Erik Grinaker <[email protected]>

DEPS.bzl

@@ -1565,10 +1565,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "d8be5ce8a593880b4284a00d33f8bd28204b03f0d0979db850893eb76e5aac56",
-        strip_prefix = "github.com/cockroachdb/[email protected]20230411154528-23c3eabc394b",
+        sha256 = "dd7aa940304f7474dd3daa431a08eb44bb3a5821a9d70d932ad267d4a619815c",
+        strip_prefix = "github.com/cockroachdb/[email protected]20230420011906-6002e39ce756",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230411154528-23c3eabc394b.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230420011906-6002e39ce756.zip",
         ],
     )
     go_repository(

build/bazelutil/distdir_files.bzl

@@ -313,7 +313,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230411154528-23c3eabc394b.zip": "d8be5ce8a593880b4284a00d33f8bd28204b03f0d0979db850893eb76e5aac56",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230420011906-6002e39ce756.zip": "dd7aa940304f7474dd3daa431a08eb44bb3a5821a9d70d932ad267d4a619815c",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.3.zip": "7778b1e4485e4f17f35e5e592d87eb99c29e173ac9507801d000ad76dd0c261e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip": "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9",

docs/generated/settings/settings-for-tenants.txt

@@ -253,6 +253,7 @@ sql.optimizer.uniqueness_checks_for_gen_random_uuid.enabled	boolean	false	if ena
 sql.schema.telemetry.recurrence	string	@weekly	cron-tab recurrence for SQL schema telemetry job	tenant-ro
 sql.show_ranges_deprecated_behavior.enabled	boolean	true	if set, SHOW RANGES and crdb_internal.ranges{_no_leases} behave with deprecated pre-v23.1 semantics. NB: the new SHOW RANGES interface has richer WITH options than pre-v23.1 SHOW RANGES.	tenant-rw
 sql.spatial.experimental_box2d_comparison_operators.enabled	boolean	false	enables the use of certain experimental box2d comparison operators	tenant-rw
+sql.stats.activity.persisted_rows.max	integer	200000	maximum number of rows of statement and transaction activity that will be persisted in the system tables	tenant-rw
 sql.stats.automatic_collection.enabled	boolean	true	automatic statistics collection mode	tenant-rw
 sql.stats.automatic_collection.fraction_stale_rows	float	0.2	target fraction of stale rows per table that will trigger a statistics refresh	tenant-rw
 sql.stats.automatic_collection.min_stale_rows	integer	500	target minimum number of stale rows per table that will trigger a statistics refresh	tenant-rw

docs/generated/settings/settings.html

@@ -205,6 +205,7 @@
 <tr><td><div id="setting-sql-schema-telemetry-recurrence" class="anchored"><code>sql.schema.telemetry.recurrence</code></div></td><td>string</td><td><code>@weekly</code></td><td>cron-tab recurrence for SQL schema telemetry job</td><td>Serverless/Dedicated/Self-Hosted (read-only)</td></tr>
 <tr><td><div id="setting-sql-show-ranges-deprecated-behavior-enabled" class="anchored"><code>sql.show_ranges_deprecated_behavior.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if set, SHOW RANGES and crdb_internal.ranges{_no_leases} behave with deprecated pre-v23.1 semantics. NB: the new SHOW RANGES interface has richer WITH options than pre-v23.1 SHOW RANGES.</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-sql-spatial-experimental-box2d-comparison-operators-enabled" class="anchored"><code>sql.spatial.experimental_box2d_comparison_operators.enabled</code></div></td><td>boolean</td><td><code>false</code></td><td>enables the use of certain experimental box2d comparison operators</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
+<tr><td><div id="setting-sql-stats-activity-persisted-rows-max" class="anchored"><code>sql.stats.activity.persisted_rows.max</code></div></td><td>integer</td><td><code>200000</code></td><td>maximum number of rows of statement and transaction activity that will be persisted in the system tables</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-sql-stats-automatic-collection-enabled" class="anchored"><code>sql.stats.automatic_collection.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>automatic statistics collection mode</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-sql-stats-automatic-collection-fraction-stale-rows" class="anchored"><code>sql.stats.automatic_collection.fraction_stale_rows</code></div></td><td>float</td><td><code>0.2</code></td><td>target fraction of stale rows per table that will trigger a statistics refresh</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-sql-stats-automatic-collection-min-stale-rows" class="anchored"><code>sql.stats.automatic_collection.min_stale_rows</code></div></td><td>integer</td><td><code>500</code></td><td>target minimum number of stale rows per table that will trigger a statistics refresh</td><td>Serverless/Dedicated/Self-Hosted</td></tr>

go.mod

@@ -116,7 +116,7 @@ require (
 	github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
 	github.com/cockroachdb/gostdlib v1.19.0
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b
-	github.com/cockroachdb/pebble v0.0.0-20230411154528-23c3eabc394b
+	github.com/cockroachdb/pebble v0.0.0-20230420011906-6002e39ce756
 	github.com/cockroachdb/redact v1.1.3
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

go.sum

@@ -485,8 +485,8 @@ github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTy
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/pebble v0.0.0-20230411154528-23c3eabc394b h1:ZRIAKpkJSYLzRLYqqGVHItpZNJTjDlIZ/aJZKb6rjUQ=
-github.com/cockroachdb/pebble v0.0.0-20230411154528-23c3eabc394b/go.mod h1:9lRMC4XN3/BLPtIp6kAKwIaHu369NOf2rMucPzipz50=
+github.com/cockroachdb/pebble v0.0.0-20230420011906-6002e39ce756 h1:NgUWWgwtcPD4JjclHKE6GtJGJmZm0mWHfGjomCA4CsY=
+github.com/cockroachdb/pebble v0.0.0-20230420011906-6002e39ce756/go.mod h1:9lRMC4XN3/BLPtIp6kAKwIaHu369NOf2rMucPzipz50=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=

pkg/cli/testdata/doctor/test_examine_cluster

@@ -3,5 +3,5 @@ debug doctor examine cluster
 debug doctor examine cluster
 Examining 58 descriptors and 57 namespace entries...
   ParentID 100, ParentSchemaID 101: relation "foo" (105): expected matching namespace entry, found none
-Examining 18 jobs...
+Examining 20 jobs...
 ERROR: validation failed

pkg/clusterversion/cockroach_versions.go

@@ -516,6 +516,11 @@ const (
 	// was introduced.
 	V23_1_TenantIDSequence
 
+	// V23_1CreateSystemActivityUpdateJob is the version at which Cockroach adds a
+	// job that periodically updates the statement_activity and transaction_activity.
+	// tables.
+	V23_1CreateSystemActivityUpdateJob
+
 	// **********************************************************
 	// ** If we haven't yet selected a final 23.1 RC candidate **
 	// Step 1a: Add new versions for release-23.1 branch above here.
@@ -912,6 +917,10 @@ var rawVersionsSingleton = keyedVersions{
 		Key:     V23_1_TenantIDSequence,
 		Version: roachpb.Version{Major: 22, Minor: 2, Internal: 100},
 	},
+	{
+		Key:     V23_1CreateSystemActivityUpdateJob,
+		Version: roachpb.Version{Major: 22, Minor: 2, Internal: 102},
+	},
 
 	// **********************************************************
 	// ** If we haven't yet selected a final 23.1 RC candidate **

pkg/jobs/jobs_test.go

@@ -240,6 +240,7 @@ func (rts *registryTestSuite) setUp(t *testing.T) {
 			DontUseJobs:                       true,
 			SkipJobMetricsPollingJobBootstrap: true,
 			SkipAutoConfigRunnerJobBootstrap:  true,
+			SkipUpdateSQLActivityJobBootstrap: true,
 		}
 		args.Knobs.KeyVisualizer = &keyvisualizer.TestingKnobs{SkipJobBootstrap: true}
 

pkg/jobs/jobspb/jobs.proto

@@ -1196,6 +1196,12 @@ message AutoConfigTaskDetails {
 message AutoConfigTaskProgress {
 }
 
+message AutoUpdateSQLActivityDetails {
+}
+
+message AutoUpdateSQLActivityProgress {
+}
+
 message Payload {
   string description = 1;
   // If empty, the description is assumed to be the statement.
@@ -1257,6 +1263,7 @@ message Payload {
     AutoConfigRunnerDetails auto_config_runner = 41;
     AutoConfigEnvRunnerDetails auto_config_env_runner = 42;
     AutoConfigTaskDetails auto_config_task = 43;
+    AutoUpdateSQLActivityDetails auto_update_sql_activities = 44;
   }
   reserved 26;
   // PauseReason is used to describe the reason that the job is currently paused
@@ -1284,7 +1291,7 @@ message Payload {
   // specifies how old such record could get before this job is canceled.
   int64 maximum_pts_age = 40 [(gogoproto.casttype) = "time.Duration",  (gogoproto.customname) = "MaximumPTSAge"];
 
-  // NEXT ID: 44
+  // NEXT ID: 45
 }
 
 message Progress {
@@ -1329,6 +1336,7 @@ message Progress {
     AutoConfigRunnerProgress auto_config_runner = 29;
     AutoConfigEnvRunnerProgress auto_config_env_runner = 30;
     AutoConfigTaskProgress auto_config_task = 31;
+    AutoUpdateSQLActivityProgress update_sql_activity = 32;
   }
 
   uint64 trace_id = 21 [(gogoproto.nullable) = false, (gogoproto.customname) = "TraceID", (gogoproto.customtype) = "github.com/cockroachdb/cockroach/pkg/util/tracing/tracingpb.TraceID"];
@@ -1363,6 +1371,7 @@ enum Type {
   AUTO_CONFIG_RUNNER = 20 [(gogoproto.enumvalue_customname) = "TypeAutoConfigRunner"];
   AUTO_CONFIG_ENV_RUNNER = 21 [(gogoproto.enumvalue_customname) = "TypeAutoConfigEnvRunner"];
   AUTO_CONFIG_TASK = 22 [(gogoproto.enumvalue_customname) = "TypeAutoConfigTask"];
+  AUTO_UPDATE_SQL_ACTIVITY = 23 [(gogoproto.enumvalue_customname) = "TypeAutoUpdateSQLActivity"];
 }
 
 message Job {

pkg/jobs/jobspb/wrap.go

@@ -51,6 +51,7 @@ var (
 	_ Details = AutoConfigRunnerDetails{}
 	_ Details = AutoConfigEnvRunnerDetails{}
 	_ Details = AutoConfigTaskDetails{}
+	_ Details = AutoUpdateSQLActivityDetails{}
 )
 
 // ProgressDetails is a marker interface for job progress details proto structs.
@@ -74,6 +75,7 @@ var (
 	_ ProgressDetails = AutoConfigRunnerProgress{}
 	_ ProgressDetails = AutoConfigEnvRunnerProgress{}
 	_ ProgressDetails = AutoConfigTaskProgress{}
+	_ ProgressDetails = AutoUpdateSQLActivityProgress{}
 )
 
 // Type returns the payload's job type and panics if the type is invalid.
@@ -156,6 +158,7 @@ var AutomaticJobTypes = [...]Type{
 	TypeAutoConfigEnvRunner,
 	TypeAutoConfigTask,
 	TypeKeyVisualizer,
+	TypeAutoUpdateSQLActivity,
 }
 
 // DetailsType returns the type for a payload detail.
@@ -207,6 +210,8 @@ func DetailsType(d isPayload_Details) (Type, error) {
 		return TypeAutoConfigEnvRunner, nil
 	case *Payload_AutoConfigTask:
 		return TypeAutoConfigTask, nil
+	case *Payload_AutoUpdateSqlActivities:
+		return TypeAutoUpdateSQLActivity, nil
 	default:
 		return TypeUnspecified, errors.Newf("Payload.Type called on a payload with an unknown details type: %T", d)
 	}
@@ -250,6 +255,7 @@ var JobDetailsForEveryJobType = map[Type]Details{
 	TypeAutoConfigRunner:             AutoConfigRunnerDetails{},
 	TypeAutoConfigEnvRunner:          AutoConfigEnvRunnerDetails{},
 	TypeAutoConfigTask:               AutoConfigTaskDetails{},
+	TypeAutoUpdateSQLActivity:        AutoUpdateSQLActivityDetails{},
 }
 
 // WrapProgressDetails wraps a ProgressDetails object in the protobuf wrapper
@@ -303,6 +309,8 @@ func WrapProgressDetails(details ProgressDetails) interface {
 		return &Progress_AutoConfigEnvRunner{AutoConfigEnvRunner: &d}
 	case AutoConfigTaskProgress:
 		return &Progress_AutoConfigTask{AutoConfigTask: &d}
+	case AutoUpdateSQLActivityProgress:
+		return &Progress_UpdateSqlActivity{UpdateSqlActivity: &d}
 	default:
 		panic(errors.AssertionFailedf("WrapProgressDetails: unknown progress type %T", d))
 	}
@@ -354,6 +362,8 @@ func (p *Payload) UnwrapDetails() Details {
 		return *d.AutoConfigEnvRunner
 	case *Payload_AutoConfigTask:
 		return *d.AutoConfigTask
+	case *Payload_AutoUpdateSqlActivities:
+		return *d.AutoUpdateSqlActivities
 	default:
 		return nil
 	}
@@ -405,6 +415,8 @@ func (p *Progress) UnwrapDetails() ProgressDetails {
 		return *d.AutoConfigEnvRunner
 	case *Progress_AutoConfigTask:
 		return *d.AutoConfigTask
+	case *Progress_UpdateSqlActivity:
+		return *d.UpdateSqlActivity
 	default:
 		return nil
 	}
@@ -480,6 +492,8 @@ func WrapPayloadDetails(details Details) interface {
 		return &Payload_AutoConfigEnvRunner{AutoConfigEnvRunner: &d}
 	case AutoConfigTaskDetails:
 		return &Payload_AutoConfigTask{AutoConfigTask: &d}
+	case AutoUpdateSQLActivityDetails:
+		return &Payload_AutoUpdateSqlActivities{AutoUpdateSqlActivities: &d}
 	default:
 		panic(errors.AssertionFailedf("jobs.WrapPayloadDetails: unknown details type %T", d))
 	}
@@ -515,7 +529,7 @@ const (
 func (Type) SafeValue() {}
 
 // NumJobTypes is the number of jobs types.
-const NumJobTypes = 23
+const NumJobTypes = 24
 
 // ChangefeedDetailsMarshaler allows for dependency injection of
 // cloud.SanitizeExternalStorageURI to avoid the dependency from this

pkg/jobs/registry.go

@@ -301,6 +301,9 @@ const (
 
 	// AutoConfigRunnerJobID A static job ID is used for the auto config runner job.
 	AutoConfigRunnerJobID = jobspb.JobID(102)
+
+	// SqlActivityUpdaterJobID A static job ID is used for the SQL activity tables.
+	SqlActivityUpdaterJobID = jobspb.JobID(103)
 )
 
 // MakeJobID generates a new job ID.
@@ -692,6 +695,44 @@ func (r *Registry) CreateJobWithTxn(
 	return j, nil
 }
 
+// CreateIfNotExistAdoptableJobWithTxn checks if a job already exists in
+// the system.jobs table, and if it does not it will create the job. The job
+// will be adopted for execution at a later time by some node in the cluster.
+func (r *Registry) CreateIfNotExistAdoptableJobWithTxn(
+	ctx context.Context, record Record, txn isql.Txn,
+) error {
+	if record.JobID == 0 {
+		return fmt.Errorf("invalid record.JobID value: %d", record.JobID)
+	}
+
+	if txn == nil {
+		return fmt.Errorf("txn is required for job: %d", record.JobID)
+	}
+
+	// Make sure job with id doesn't already exist in system.jobs.
+	// Use a txn to avoid race conditions
+	row, err := txn.QueryRowEx(
+		ctx,
+		"check if job exists",
+		txn.KV(),
+		sessiondata.InternalExecutorOverride{User: username.RootUserName()},
+		"SELECT id FROM system.jobs WHERE id = $1",
+		record.JobID,
+	)
+	if err != nil {
+		return err
+	}
+
+	// If there isn't a row for the job, create the job.
+	if row == nil {
+		if _, err = r.CreateAdoptableJobWithTxn(ctx, record, record.JobID, txn); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // CreateAdoptableJobWithTxn creates a job which will be adopted for execution
 // at a later time by some node in the cluster.
 func (r *Registry) CreateAdoptableJobWithTxn(

pkg/jobs/registry_test.go

@@ -236,22 +236,23 @@ INSERT INTO t."%s" VALUES('a', 'foo');
 			newCanceledJob := writeJob("new_canceled", earlier, earlier.Add(time.Minute),
 				StatusCanceled, mutOptions)
 
+			sqlActivityJob := fmt.Sprintf("%d", SqlActivityUpdaterJobID)
 			db.CheckQueryResults(t, `SELECT id FROM system.jobs ORDER BY id`, [][]string{
-				{oldRunningJob}, {oldSucceededJob}, {oldFailedJob}, {oldRevertFailedJob}, {oldCanceledJob},
+				{sqlActivityJob}, {oldRunningJob}, {oldSucceededJob}, {oldFailedJob}, {oldRevertFailedJob}, {oldCanceledJob},
 				{newRunningJob}, {newSucceededJob}, {newFailedJob}, {newRevertFailedJob}, {newCanceledJob}})
 
 			if err := s.JobRegistry().(*Registry).cleanupOldJobs(ctx, earlier); err != nil {
 				t.Fatal(err)
 			}
 			db.CheckQueryResults(t, `SELECT id FROM system.jobs ORDER BY id`, [][]string{
-				{oldRunningJob}, {oldRevertFailedJob}, {newRunningJob}, {newSucceededJob},
-				{newFailedJob}, {newRevertFailedJob}, {newCanceledJob}})
+				{sqlActivityJob}, {oldRunningJob}, {oldRevertFailedJob}, {newRunningJob},
+				{newSucceededJob}, {newFailedJob}, {newRevertFailedJob}, {newCanceledJob}})
 
 			if err := s.JobRegistry().(*Registry).cleanupOldJobs(ctx, ts.Add(time.Minute*-10)); err != nil {
 				t.Fatal(err)
 			}
 			db.CheckQueryResults(t, `SELECT id FROM system.jobs ORDER BY id`, [][]string{
-				{oldRunningJob}, {oldRevertFailedJob}, {newRunningJob}, {newRevertFailedJob}})
+				{sqlActivityJob}, {oldRunningJob}, {oldRevertFailedJob}, {newRunningJob}, {newRevertFailedJob}})
 
 			// Delete the revert failed, and running jobs for the next run of the
 			// test.
@@ -280,6 +281,7 @@ func TestRegistryGCPagination(t *testing.T) {
 				DontUseJobs:                       true,
 				SkipJobMetricsPollingJobBootstrap: true,
 				SkipAutoConfigRunnerJobBootstrap:  true,
+				SkipUpdateSQLActivityJobBootstrap: true,
 			},
 			KeyVisualizer: &keyvisualizer.TestingKnobs{
 				SkipJobBootstrap: true,
@@ -447,6 +449,39 @@ func TestCreateJobWritesToJobInfo(t *testing.T) {
 		}))
 		runTests(t, createdJob)
 	})
+
+	t.Run("CreateIfNotExistAdoptableJobWithTxn", func(t *testing.T) {
+		tempRecord := Record{
+			JobID:    r.MakeJobID(),
+			Details:  jobspb.ImportDetails{},
+			Progress: jobspb.ImportProgress{},
+			Username: username.RootUserName(),
+		}
+
+		// loop to verify no errors if create if not exist is called multiple times
+		for i := 0; i < 3; i++ {
+			err := ief.Txn(ctx, func(ctx context.Context, txn isql.Txn) error {
+				return r.CreateIfNotExistAdoptableJobWithTxn(ctx, tempRecord, txn)
+			})
+			require.NoError(t, err)
+		}
+
+		require.NoError(t, ief.Txn(ctx, func(ctx context.Context, txn isql.Txn) error {
+			row, err := txn.QueryRowEx(
+				ctx,
+				"check if job exists",
+				txn.KV(),
+				sessiondata.InternalExecutorOverride{User: username.RootUserName()},
+				"SELECT id FROM system.jobs WHERE id = $1",
+				tempRecord.JobID,
+			)
+			if err != nil {
+				return err
+			}
+			require.NotNil(t, row)
+			return nil
+		}))
+	})
 }
 
 func TestBatchJobsCreation(t *testing.T) {
@@ -665,6 +700,7 @@ func TestRetriesWithExponentialBackoff(t *testing.T) {
 					DontUseJobs:                       true,
 					SkipJobMetricsPollingJobBootstrap: true,
 					SkipAutoConfigRunnerJobBootstrap:  true,
+					SkipUpdateSQLActivityJobBootstrap: true,
 				},
 				KeyVisualizer: &keyvisualizer.TestingKnobs{
 					SkipJobBootstrap: true,