fix(fs): Fix concurrent race conditions, optimize segment upload status updates and temporary file processing

Author: Suyunmeng

drivers/123_open/driver.go

@@ -225,7 +225,7 @@ func (d *Open123) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 }
 
 // Preup 预上传
-func (d *Open123) Preup(c context.Context, srcobj model.Obj, req *reqres.PreupReq) (*model.PreupInfo, error) {
+func (d *Open123) Preup(ctx context.Context, srcobj model.Obj, req *reqres.PreupReq) (*model.PreupInfo, error) {
 	pid, err := strconv.ParseUint(srcobj.GetID(), 10, 64)
 	if err != nil {
 		return nil, err
@@ -256,8 +256,11 @@ func (d *Open123) Preup(c context.Context, srcobj model.Obj, req *reqres.PreupRe
 }
 
 // UploadSlice 上传分片
-func (d *Open123) SliceUpload(c context.Context, req *tables.SliceUpload, sliceno uint, fd io.Reader) error {
+func (d *Open123) SliceUpload(ctx context.Context, req *tables.SliceUpload, sliceno uint, fd io.Reader) error {
 	sh := strings.Split(req.SliceHash, ",")
+	if int(sliceno) >= len(sh) {
+		return fmt.Errorf("slice number %d out of range, total slices: %d", sliceno, len(sh))
+	}
 	r := &UploadSliceReq{
 		Name:        req.Name,
 		PreuploadID: req.PreupID,
@@ -270,7 +273,7 @@ func (d *Open123) SliceUpload(c context.Context, req *tables.SliceUpload, slicen
 }
 
 // UploadSliceComplete 分片上传完成
-func (d *Open123) UploadSliceComplete(c context.Context, su *tables.SliceUpload) error {
+func (d *Open123) UploadSliceComplete(ctx context.Context, su *tables.SliceUpload) error {
 
 	return d.sliceUpComplete(su.PreupID)
 }

drivers/baidu_netdisk/driver.go

@@ -18,7 +18,7 @@ import (
 	"github.com/OpenListTeam/OpenList/v4/drivers/base"
 	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
-	"github.com/OpenListTeam/OpenList/v4/internal/errs"
+	"github.com/OpenListTeam/OpenList/		err := d.uploadSlice(ctx, map[string]string{4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/OpenListTeam/OpenList/v4/internal/model/reqres"
 	"github.com/OpenListTeam/OpenList/v4/internal/model/tables"
@@ -378,7 +378,7 @@ func (d *BaiduNetdisk) uploadSlice(ctx context.Context, params map[string]string
 }
 
 // SliceUpload 上传分片
-func (d *BaiduNetdisk) SliceUpload(c context.Context, req *tables.SliceUpload, sliceno uint, fd io.Reader) error {
+func (d *BaiduNetdisk) SliceUpload(ctx context.Context, req *tables.SliceUpload, sliceno uint, fd io.Reader) error {
 	fp := filepath.Join(req.DstPath, req.Name)
 	if sliceno == 0 { //第一个分片需要先执行预上传
 		rtype := 1

internal/fs/fs.go

@@ -328,11 +328,14 @@ func UploadSlice(ctx context.Context, storage driver.Driver, req *reqres.UploadS
 	var msu *sliceup
 	var err error
 
-	sa, ok := sliceupMap.Load(req.UploadID)
-	if !ok {
+	// 使用 LoadOrStore 避免并发竞态条件
+	sa, loaded := sliceupMap.LoadOrStore(req.UploadID, nil)
+	if !loaded {
+		// 首次加载，需要从数据库获取
 		su, e := db.GetSliceUpload(map[string]any{"id": req.UploadID})
 		if e != nil {
 			log.Errorf("failed get slice upload [%d]: %+v", req.UploadID, e)
+			sliceupMap.Delete(req.UploadID) // 清理无效的 key
 			return e
 		}
 		msu = &sliceup{
@@ -346,7 +349,9 @@ func UploadSlice(ctx context.Context, storage driver.Driver, req *reqres.UploadS
 		if err != nil {
 			msu.Status = tables.SliceUploadStatusFailed
 			msu.Message = err.Error()
-			db.UpdateSliceUpload(msu.SliceUpload)
+			if updateErr := db.UpdateSliceUpload(msu.SliceUpload); updateErr != nil {
+				log.Errorf("Failed to update slice upload status: %v", updateErr)
+			}
 		}
 	}()
 
@@ -476,10 +481,20 @@ func SliceUpComplete(ctx context.Context, storage driver.Driver, uploadID uint)
 		if err != nil {
 			msu.Status = tables.SliceUploadStatusFailed
 			msu.Message = err.Error()
-			db.UpdateSliceUpload(msu.SliceUpload)
+			if updateErr := db.UpdateSliceUpload(msu.SliceUpload); updateErr != nil {
+				log.Errorf("Failed to update slice upload status: %v", updateErr)
+			}
 		}
+		// 确保资源清理
 		if msu.tmpFile != nil {
-			msu.tmpFile.Close()
+			if closeErr := msu.tmpFile.Close(); closeErr != nil {
+				log.Errorf("Failed to close tmp file: %v", closeErr)
+			}
+		}
+		if msu.TmpFile != "" {
+			if removeErr := os.Remove(msu.TmpFile); removeErr != nil && !os.IsNotExist(removeErr) {
+				log.Errorf("Failed to remove tmp file %s: %v", msu.TmpFile, removeErr)
+			}
 		}
 		sliceupMap.Delete(msu.ID)
 
@@ -499,9 +514,15 @@ func SliceUpComplete(ctx context.Context, storage driver.Driver, uploadID uint)
 		}
 		// 清理缓存及临时文件
 		if msu.tmpFile != nil {
-			msu.tmpFile.Close()
+			if closeErr := msu.tmpFile.Close(); closeErr != nil {
+				log.Errorf("Failed to close tmp file: %v", closeErr)
+			}
+		}
+		if msu.TmpFile != "" {
+			if removeErr := os.Remove(msu.TmpFile); removeErr != nil && !os.IsNotExist(removeErr) {
+				log.Errorf("Failed to remove tmp file %s: %v", msu.TmpFile, removeErr)
+			}
 		}
-		os.Remove(msu.TmpFile)
 
 		return rsp, nil
 
@@ -547,7 +568,11 @@ func SliceUpComplete(ctx context.Context, storage driver.Driver, uploadID uint)
 			log.Error("Put error", msu.SliceUpload, err)
 			return nil, err
 		}
-		os.Remove(msu.TmpFile)
+		if msu.TmpFile != "" {
+			if removeErr := os.Remove(msu.TmpFile); removeErr != nil && !os.IsNotExist(removeErr) {
+				log.Errorf("Failed to remove tmp file %s: %v", msu.TmpFile, removeErr)
+			}
+		}
 		return &reqres.UploadSliceCompleteResp{
 			Complete: 1,
 			UploadID: msu.ID,