Skip to content

[fix][evaluation]: retry-running-lock #539

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

Open
xueyizheng wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[fix][evaluation]: retry-running-lock #539

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5759b56
fix: align LogRun lock value with retry path so retry-items can read …
xueyizheng May 28, 2026
a51918f
fix: call RetryItems on retried branch so scheduler picks up appended…
xueyizheng May 29, 2026
510ea02
fix: scope retry-items idem key by item set so repeated retries can r…
xueyizheng Jun 1, 2026
b8b09e3
style: gofmt expt_run_scheduler_mode_impl_test.go
xueyizheng Jun 2, 2026
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
Next Next commit
fix: align LogRun lock value with retry path so retry-items can read … 
…runID
  • Loading branch information
@xueyizheng
xueyizheng committed Jun 1, 2026
commit 5759b5660d93565fa05e26679b14e573daecbf10
2 changes: 1 addition & 1 deletion backend/modules/evaluation/domain/service/expt_manage_execution_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ func (e *ExptMangerImpl) unlockCompletingRun(ctx context.Context, exptID, exptRu

func (e *ExptMangerImpl) LogRun(ctx context.Context, exptID, exptRunID int64, mode entity.ExptRunMode, spaceID int64, itemIDs []int64, session *entity.Session) error {
duration := time.Duration(e.configer.GetExptExecConf(ctx, spaceID).GetZombieIntervalSecond()) * time.Second
locked, err := e.mutex.LockBackoff(ctx, e.makeExptMutexLockKey(exptID), duration, time.Second)
locked, _, err := e.mutex.BackoffLockWithValue(ctx, e.makeExptMutexLockKey(exptID), strconv.FormatInt(exptRunID, 10), duration, time.Second)
if err != nil {
return err
}
Expand Down
16 changes: 8 additions & 8 deletions backend/modules/evaluation/domain/service/expt_manage_execution_impl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,8 @@ func TestExptMangerImpl_LogRun(t *testing.T) {
setup: func() {
mgr.mutex.(*lockMocks.MockILocker).
EXPECT().
LockBackoff(ctx, gomock.Any(), gomock.Any(), time.Second).
Return(true, nil)
BackoffLockWithValue(ctx, gomock.Any(), "456", gomock.Any(), time.Second).
Return(true, "", nil)

mgr.mtr.(*metricsMocks.MockExptMetric).
EXPECT().
Expand Down Expand Up @@ -595,8 +595,8 @@ func TestExptMangerImpl_LogRun(t *testing.T) {
setup: func() {
mgr.mutex.(*lockMocks.MockILocker).
EXPECT().
LockBackoff(ctx, gomock.Any(), gomock.Any(), time.Second).
Return(false, nil)
BackoffLockWithValue(ctx, gomock.Any(), "456", gomock.Any(), time.Second).
Return(false, "", nil)
},
wantErr: true,
},
Expand All @@ -609,8 +609,8 @@ func TestExptMangerImpl_LogRun(t *testing.T) {
setup: func() {
mgr.mutex.(*lockMocks.MockILocker).
EXPECT().
LockBackoff(ctx, gomock.Any(), gomock.Any(), time.Second).
Return(true, nil)
BackoffLockWithValue(ctx, gomock.Any(), "456", gomock.Any(), time.Second).
Return(true, "", nil)

mgr.mtr.(*metricsMocks.MockExptMetric).
EXPECT().
Expand All @@ -632,8 +632,8 @@ func TestExptMangerImpl_LogRun(t *testing.T) {
setup: func() {
mgr.mutex.(*lockMocks.MockILocker).
EXPECT().
LockBackoff(ctx, gomock.Any(), gomock.Any(), time.Second).
Return(true, nil)
BackoffLockWithValue(ctx, gomock.Any(), "456", gomock.Any(), time.Second).
Return(true, "", nil)

mgr.mtr.(*metricsMocks.MockExptMetric).
EXPECT().
Expand Down