[MM-63314] Fix ClaimJob in HA environments (#30383)

* ClaimJob now returns newly claimed job

* internal code affected by change

* test changes required

* two branches: for mysql, use transaction; for postgres, use returning

* two branches: for mysql, use transaction; for postgres, use returning

* use same millis value for LastActivityAt and StartAt

* blank commit

---------

Co-authored-by: Mattermost Build <build@mattermost.com>

server/channels/store/storetest/job_store.go

@@ -600,9 +600,9 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, rctx request.CT
 
 	time.Sleep(2 * time.Millisecond)
 
-	updated, err := ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusInProgress, model.JobStatusSuccess)
+	updatedJob, err := ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusInProgress, model.JobStatusSuccess)
 	require.NoError(t, err)
-	require.False(t, updated)
+	require.Nil(t, updatedJob)
 
 	received, err = ss.Job().Get(rctx, job.Id)
 	require.NoError(t, err)
@@ -612,30 +612,26 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, rctx request.CT
 
 	time.Sleep(2 * time.Millisecond)
 
-	updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusPending, model.JobStatusInProgress)
+	updatedJob, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusPending, model.JobStatusInProgress)
 	require.NoError(t, err)
-	require.True(t, updated, "should have succeeded")
+	require.NotNil(t, updatedJob, "should have succeeded")
 
 	var startAtSet int64
-	received, err = ss.Job().Get(rctx, job.Id)
-	require.NoError(t, err)
-	require.Equal(t, model.JobStatusInProgress, received.Status)
-	require.NotEqual(t, 0, received.StartAt)
-	require.Greater(t, received.LastActivityAt, lastUpdateAt)
-	lastUpdateAt = received.LastActivityAt
-	startAtSet = received.StartAt
+	require.Equal(t, model.JobStatusInProgress, updatedJob.Status)
+	require.NotEqual(t, 0, updatedJob.StartAt)
+	require.Greater(t, updatedJob.LastActivityAt, lastUpdateAt)
+	lastUpdateAt = updatedJob.LastActivityAt
+	startAtSet = updatedJob.StartAt
 
 	time.Sleep(2 * time.Millisecond)
 
-	updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusInProgress, model.JobStatusSuccess)
+	updatedJob, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusInProgress, model.JobStatusSuccess)
 	require.NoError(t, err)
-	require.True(t, updated, "should have succeeded")
+	require.NotNil(t, updatedJob, "should have succeeded")
 
-	received, err = ss.Job().Get(rctx, job.Id)
-	require.NoError(t, err)
-	require.Equal(t, model.JobStatusSuccess, received.Status)
-	require.Equal(t, startAtSet, received.StartAt)
-	require.Greater(t, received.LastActivityAt, lastUpdateAt)
+	require.Equal(t, model.JobStatusSuccess, updatedJob.Status)
+	require.Equal(t, startAtSet, updatedJob.StartAt)
+	require.Greater(t, updatedJob.LastActivityAt, lastUpdateAt)
 }
 
 func testJobDelete(t *testing.T, rctx request.CTX, ss store.Store) {

server/channels/store/storetest/mocks/JobStore.go

@@ -478,22 +478,24 @@ func (_m *JobStore) UpdateStatus(id string, status string) (*model.Job, error) {
 }
 
 // UpdateStatusOptimistically provides a mock function with given fields: id, currentStatus, newStatus
-func (_m *JobStore) UpdateStatusOptimistically(id string, currentStatus string, newStatus string) (bool, error) {
+func (_m *JobStore) UpdateStatusOptimistically(id string, currentStatus string, newStatus string) (*model.Job, error) {
 	ret := _m.Called(id, currentStatus, newStatus)
 
 	if len(ret) == 0 {
 		panic("no return value specified for UpdateStatusOptimistically")
 	}
 
-	var r0 bool
+	var r0 *model.Job
 	var r1 error
-	if rf, ok := ret.Get(0).(func(string, string, string) (bool, error)); ok {
+	if rf, ok := ret.Get(0).(func(string, string, string) (*model.Job, error)); ok {
 		return rf(id, currentStatus, newStatus)
 	}
-	if rf, ok := ret.Get(0).(func(string, string, string) bool); ok {
+	if rf, ok := ret.Get(0).(func(string, string, string) *model.Job); ok {
 		r0 = rf(id, currentStatus, newStatus)
 	} else {
-		r0 = ret.Get(0).(bool)
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*model.Job)
+		}
 	}
 
 	if rf, ok := ret.Get(1).(func(string, string, string) error); ok {