Skip to content

Commit b5a05cb

Browse files
committed
fix(upload): 优化全局分片上传管理器的初始化逻辑,移除冗余函数
1 parent 9d3d11b commit b5a05cb

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

internal/fs/fs.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,13 @@ func PutURL(ctx context.Context, path, dstName, urlStr string) error {
191191
}
192192

193193
func Preup(c context.Context, s driver.Driver, actualPath string, req *reqres.PreupReq) (*reqres.PreupResp, error) {
194-
return getGlobalSliceManager().CreateSession(c, s, actualPath, req)
194+
return globalSliceManager.CreateSession(c, s, actualPath, req)
195195
}
196196

197197
func UploadSlice(ctx context.Context, storage driver.Driver, req *reqres.UploadSliceReq, reader io.Reader) error {
198-
return getGlobalSliceManager().UploadSlice(ctx, storage, req, reader)
198+
return globalSliceManager.UploadSlice(ctx, storage, req, reader)
199199
}
200200

201201
func SliceUpComplete(ctx context.Context, storage driver.Driver, taskID string) (*reqres.UploadSliceCompleteResp, error) {
202-
return getGlobalSliceManager().CompleteUpload(ctx, storage, taskID)
202+
return globalSliceManager.CompleteUpload(ctx, storage, taskID)
203203
}

internal/fs/sliceup.go

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ type SliceUploadSession struct {
3838
mutex sync.Mutex
3939
}
4040

41-
// NewSliceUploadManager 创建分片上传管理器
42-
func NewSliceUploadManager() *SliceUploadManager {
43-
manager := &SliceUploadManager{}
44-
go manager.cleanupIncompleteUploads()
45-
return manager
46-
}
47-
4841
// CreateSession 创建新的上传会话
4942
func (m *SliceUploadManager) CreateSession(ctx context.Context, storage driver.Driver, actualPath string, req *reqres.PreupReq) (*reqres.PreupResp, error) {
5043
srcobj, err := op.Get(ctx, storage, actualPath)
@@ -190,11 +183,11 @@ func (m *SliceUploadManager) UploadSlice(ctx context.Context, storage driver.Dri
190183
switch s := storage.(type) {
191184
case driver.ISliceUpload:
192185
if err := s.SliceUpload(ctx, session.SliceUpload, req.SliceNum, reader); err != nil {
193-
log.Errorf("Native slice upload failed - TaskID: %s, SliceNum: %d, Error: %v",
186+
log.Errorf("Native slice upload failed - TaskID: %s, SliceNum: %d, Error: %v",
194187
req.TaskID, req.SliceNum, err)
195188
return errors.WithMessagef(err, "slice %d upload failed", req.SliceNum)
196189
}
197-
log.Debugf("Native slice upload success - TaskID: %s, SliceNum: %d",
190+
log.Debugf("Native slice upload success - TaskID: %s, SliceNum: %d",
198191
req.TaskID, req.SliceNum)
199192

200193
default:
@@ -410,19 +403,11 @@ func (s *SliceUploadSession) cleanup() {
410403

411404
// 全局管理器实例使用延迟初始化
412405
var globalSliceManager *SliceUploadManager
413-
var globalSliceManagerOnce sync.Once
414406

415407
func InitSliceUploadManager() {
416408
log.Info("Initializing slice upload manager...")
417-
getGlobalSliceManager()
418-
}
419-
420-
// getGlobalSliceManager 获取全局分片上传管理器(延迟初始化)
421-
func getGlobalSliceManager() *SliceUploadManager {
422-
globalSliceManagerOnce.Do(func() {
423-
globalSliceManager = NewSliceUploadManager()
424-
})
425-
return globalSliceManager
409+
globalSliceManager = &SliceUploadManager{}
410+
go globalSliceManager.cleanupIncompleteUploads()
426411
}
427412

428413
// sliceWriter 分片写入器 - 保持原始实现

0 commit comments

Comments
 (0)