Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jobs: Clear out claim info when pausing #89014

Merged
merged 1 commit into from
Sep 30, 2022
+28 −1
Merged

jobs: Clear out claim info when pausing #89014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/jobs/adopt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,9 @@ const pauseAndCancelUpdate = `
ELSE status
END,
num_runs = 0,
last_run = NULL
last_run = NULL,
claim_session_id = NULL,
claim_instance_id = NULL
WHERE (status IN ('` + string(StatusPauseRequested) + `', '` + string(StatusCancelRequested) + `'))
AND ((claim_session_id = $1) AND (claim_instance_id = $2))
RETURNING id, status
Expand Down
25 changes: 25 additions & 0 deletions pkg/jobs/jobs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3138,9 +3138,31 @@ func TestPauseReason(t *testing.T) {
_, err := registry.CreateAdoptableJobWithTxn(ctx, rec, jobID, nil /* txn */)
require.NoError(t, err)

countRowsWithClaimInfo := func() int {
t.Helper()
n := 0
tdb.QueryRow(t,
"SELECT count(*) FROM system.jobs "+
"WHERE id = $1 AND (claim_session_id IS NOT NULL OR claim_instance_id IS NOT NULL)",
jobID).Scan(&n)
return n
}
mustNotHaveClaim := func() {
require.Equal(t, 0, countRowsWithClaimInfo())
}
mustHaveClaim := func() {
testutils.SucceedsSoon(t, func() error {
if countRowsWithClaimInfo() == 1 {
return nil
}
return errors.New("still waiting for claim info")
})
}

// First wait until the job is running
q := fmt.Sprintf("SELECT status FROM system.jobs WHERE id = %d", jobID)
tdb.CheckQueryResultsRetry(t, q, [][]string{{"running"}})
mustHaveClaim()

getStatusAndPayload := func(t *testing.T, id jobspb.JobID) (string, jobspb.Payload) {
var payloadBytes []byte
Expand All @@ -3164,6 +3186,7 @@ func TestPauseReason(t *testing.T) {
require.NoError(t, registry.PauseRequested(ctx, nil, jobID, "for testing"))
tdb.CheckQueryResultsRetry(t, q, [][]string{{"paused"}})
checkStatusAndPauseReason(t, jobID, "paused", "for testing")
mustNotHaveClaim()
}

{
Expand All @@ -3172,12 +3195,14 @@ func TestPauseReason(t *testing.T) {
tdb.CheckQueryResultsRetry(t, q, [][]string{{"running"}})

checkStatusAndPauseReason(t, jobID, "running", "for testing")
mustHaveClaim()
}
{
// Pause the job again with a different reason. Verify that the job is paused with the reason.
require.NoError(t, registry.PauseRequested(ctx, nil, jobID, "second time"))
tdb.CheckQueryResultsRetry(t, q, [][]string{{"paused"}})
checkStatusAndPauseReason(t, jobID, "paused", "second time")
mustNotHaveClaim()
}
}

Expand Down