Skip to content

fix: call ListTaskEntries only for directory URLs in PreheatFile/StaFile #4712

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

Merged
gaius-qi merged 3 commits into from
Apr 13, 2026
+32 −42
Merged

fix: call ListTaskEntries only for directory URLs in PreheatFile/StaFile #4712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c60ed0
fix: call ListTaskEntries only for directory URLs in PreheatFile/Stat…
gaius-qi Apr 13, 2026
744c6fb
test(scheduler): remove ListTaskEntries mocks from PreheatFile tests
gaius-qi Apr 13, 2026
06b6a38
test(scheduler): fix StatFile test cases for non-directory URL handling
gaius-qi Apr 13, 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
54 changes: 26 additions & 28 deletions scheduler/service/service_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4713,22 +4713,21 @@ func (v *V2) PreheatFile(ctx context.Context, req *schedulerv2.PreheatFileReques
ctx, cancel := context.WithTimeout(ctx, req.GetTimeout().AsDuration())
defer cancel()

// For files preheating, we get entries from client first
listResp, err := v.job.ListTaskEntries(ctx, &internaljob.ListTaskEntriesRequest{
TaskID: idgen.TaskIDV2ByURLBased(req.GetUrl(), req.PieceLength, req.GetTag(), req.GetApplication(), req.FilteredQueryParams, ""),
Url: req.GetUrl(),
Timeout: req.GetTimeout(),
Header: req.GetHeader(),
CertificateChain: req.GetCertificateChain(),
ObjectStorage: req.GetObjectStorage(),
Hdfs: req.GetHdfs(),
}, log)
if err != nil {
return status.Errorf(codes.InvalidArgument, "failed to list task entries: %s", err)
}

var urls []string
if strings.HasSuffix(req.GetUrl(), "/") {
listResp, err := v.job.ListTaskEntries(ctx, &internaljob.ListTaskEntriesRequest{
TaskID: idgen.TaskIDV2ByURLBased(req.GetUrl(), req.PieceLength, req.GetTag(), req.GetApplication(), req.FilteredQueryParams, ""),
Url: req.GetUrl(),
Timeout: req.GetTimeout(),
Header: req.GetHeader(),
CertificateChain: req.GetCertificateChain(),
ObjectStorage: req.GetObjectStorage(),
Hdfs: req.GetHdfs(),
}, log)
if err != nil {
return status.Errorf(codes.InvalidArgument, "failed to list task entries: %s", err)
}

if len(listResp.Entries) == 0 {
return status.Errorf(codes.InvalidArgument, "preheat url is a directory, but with no entry: %s", req.GetUrl())
}
Expand Down Expand Up @@ -4840,21 +4839,21 @@ func (v *V2) StatFile(ctx context.Context, req *schedulerv2.StatFileRequest) (*s
ctx, cancel := context.WithTimeout(ctx, req.GetTimeout().AsDuration())
defer cancel()

listResp, err := v.job.ListTaskEntries(ctx, &internaljob.ListTaskEntriesRequest{
TaskID: idgen.TaskIDV2ByURLBased(req.GetUrl(), req.PieceLength, req.GetTag(), req.GetApplication(), req.FilteredQueryParams, ""),
Url: req.GetUrl(),
Timeout: req.GetTimeout(),
Header: req.GetHeader(),
CertificateChain: req.GetCertificateChain(),
ObjectStorage: req.GetObjectStorage(),
Hdfs: req.GetHdfs(),
}, log)
if err != nil {
return nil, status.Errorf(codes.InvalidArgument, "failed to list task entries: %s", err)
}

var urls []string
if strings.HasSuffix(req.GetUrl(), "/") {
listResp, err := v.job.ListTaskEntries(ctx, &internaljob.ListTaskEntriesRequest{
TaskID: idgen.TaskIDV2ByURLBased(req.GetUrl(), req.PieceLength, req.GetTag(), req.GetApplication(), req.FilteredQueryParams, ""),
Url: req.GetUrl(),
Timeout: req.GetTimeout(),
Header: req.GetHeader(),
CertificateChain: req.GetCertificateChain(),
ObjectStorage: req.GetObjectStorage(),
Hdfs: req.GetHdfs(),
}, log)
if err != nil {
return nil, status.Errorf(codes.InvalidArgument, "failed to list task entries: %s", err)
}

if len(listResp.Entries) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "stat url is a directory, but with no entry: %s", req.GetUrl())
}
Expand Down Expand Up @@ -4927,6 +4926,5 @@ func (v *V2) StatFile(ctx context.Context, req *schedulerv2.StatFileRequest) (*s
log.Infof("stat file for peer %s", peer.Ip)
}

log.Infof("stat file finished, total files: %d, total peers: %d", len(listResp.Entries), len(resp.Peers))
return resp, nil
}
20 changes: 6 additions & 14 deletions scheduler/service/service_v2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4163,10 +4163,6 @@ func TestServiceV2_PreheatFile(t *testing.T) {
Scope: "invalid-scope",
},
run: func(t *testing.T, svc *V2, req *schedulerv2.PreheatFileRequest, mj *jobmocks.MockJobMockRecorder) {
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{
Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}},
}, nil).Times(1)

assert := assert.New(t)
assert.ErrorIs(svc.PreheatFile(context.Background(), req), status.Errorf(codes.InvalidArgument, "unsupported preheat scope: invalid-scope"))
},
Expand All @@ -4182,7 +4178,6 @@ func TestServiceV2_PreheatFile(t *testing.T) {
defer wg.Wait()

gomock.InOrder(
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
mj.PreheatSingleSeedPeer(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(nil, nil).Times(1),
)

Expand All @@ -4202,9 +4197,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
defer wg.Wait()

gomock.InOrder(
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
mj.PreheatSingleSeedPeer(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(nil, nil).Times(1),
)

assert := assert.New(t)
assert.NoError(svc.PreheatFile(context.Background(), req))
},
Expand All @@ -4221,9 +4216,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
defer wg.Wait()

gomock.InOrder(
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
mj.PreheatSingleSeedPeer(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(nil, nil).Times(1),
)

assert := assert.New(t)
assert.NoError(svc.PreheatFile(context.Background(), req))
},
Expand All @@ -4240,9 +4235,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
defer wg.Wait()

gomock.InOrder(
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
mj.PreheatAllSeedPeers(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(&internaljob.PreheatResponse{SuccessTasks: make([]*internaljob.PreheatSuccessTask, 0), FailureTasks: make([]*internaljob.PreheatFailureTask, 0)}, nil).Times(1),
)

assert := assert.New(t)
assert.NoError(svc.PreheatFile(context.Background(), req))
},
Expand All @@ -4259,9 +4254,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
defer wg.Wait()

gomock.InOrder(
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
mj.PreheatAllSeedPeers(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(&internaljob.PreheatResponse{SuccessTasks: make([]*internaljob.PreheatSuccessTask, 0), FailureTasks: make([]*internaljob.PreheatFailureTask, 0)}, nil).Times(1),
)

assert := assert.New(t)
assert.NoError(svc.PreheatFile(context.Background(), req))
},
Expand All @@ -4278,9 +4273,9 @@ func TestServiceV2_PreheatFile(t *testing.T) {
defer wg.Wait()

gomock.InOrder(
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
mj.PreheatAllPeers(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(&internaljob.PreheatResponse{SuccessTasks: make([]*internaljob.PreheatSuccessTask, 0), FailureTasks: make([]*internaljob.PreheatFailureTask, 0)}, nil).Times(1),
)

assert := assert.New(t)
assert.NoError(svc.PreheatFile(context.Background(), req))
},
Expand All @@ -4297,7 +4292,6 @@ func TestServiceV2_PreheatFile(t *testing.T) {
defer wg.Wait()

gomock.InOrder(
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
mj.PreheatAllPeers(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.PreheatRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(&internaljob.PreheatResponse{SuccessTasks: make([]*internaljob.PreheatSuccessTask, 0), FailureTasks: make([]*internaljob.PreheatFailureTask, 0)}, nil).Times(1),
)

Expand Down Expand Up @@ -4334,7 +4328,7 @@ func TestServiceV2_StatFile(t *testing.T) {
{
name: "list task entries failed",
req: &schedulerv2.StatFileRequest{
Url: "https://example.com/file.txt",
Url: "https://example.com/dir/",
},
run: func(t *testing.T, svc *V2, req *schedulerv2.StatFileRequest, mj *jobmocks.MockJobMockRecorder) {
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("list task entries failed")).Times(1)
Expand All @@ -4356,7 +4350,6 @@ func TestServiceV2_StatFile(t *testing.T) {
defer wg.Wait()

gomock.InOrder(
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
mj.GetTask(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.GetTaskRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(nil, errors.New("get task failed")).Times(1),
)

Expand All @@ -4377,7 +4370,6 @@ func TestServiceV2_StatFile(t *testing.T) {
defer wg.Wait()

gomock.InOrder(
mj.ListTaskEntries(gomock.Any(), gomock.Any(), gomock.Any()).Return(&internaljob.ListTaskEntriesResponse{Entries: []*dfdaemonv2.Entry{{Url: "https://example.com/file.txt"}}}, nil).Times(1),
mj.GetTask(gomock.Any(), gomock.Any(), gomock.Any()).Do(func(context.Context, *internaljob.GetTaskRequest, *logger.SugaredLoggerOnWith) { wg.Done() }).Return(&internaljob.GetTaskResponse{Peers: []*internaljob.Peer{{IP: "127.0.0.1", Hostname: "peer-1"}}}, nil).Times(1),
)

Expand Down
Loading