Skip to content

Commit 658969b

Browse files
craig[bot]angles-n-daemons
andcommitted
Merge #149997
149997: structlogging: fix flaky hot range job test r=angles-n-daemons a=angles-n-daemons A change introduced in 80d454f fixed the exit behavior of the hot range logging job so that it would restart if it were an app tenant, and exit gracefully if it were a system tenant. However, due to the stochastic nature of the test deployment, when there is only a system tenant, it would mistakenly believe `ApplicationLayer().Codec` would not be the system codec, and therefore fail the test. This PR fixes this test, by affixing the deployment mode of the test to include an app tenant. Fixes: #149977 Epic: none Release note: none Co-authored-by: Brian Dillmann <[email protected]>
2 parents f69bb10 + e071638 commit 658969b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

pkg/server/structlogging/hot_ranges_log_job_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ func TestHotRangesLoggingJobExitProcedure(t *testing.T) {
2727
defer log.Scope(t).Close(t)
2828
skip.UnderStress(t)
2929
skip.UnderRace(t)
30-
skip.WithIssue(t, 149977)
3130

3231
ctx := context.Background()
3332
ts := serverutils.StartServerOnly(t, base.TestServerArgs{
33+
DefaultTestTenant: base.TestTenantAlwaysEnabled,
3434
Knobs: base.TestingKnobs{
3535
JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(),
3636
},

0 commit comments

Comments
 (0)