Merge pull request '解决分片信息失效导致数据集上传失败的问题' (#259) from fix-50 into V202108

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/259

models/file_chunk.go

@@ -87,7 +87,7 @@ func InsertFileChunk(fileChunk *FileChunk) (_ *FileChunk, err error) {
 	return fileChunk, nil
 }
 
-// UpdateAttachment updates the given attachment in database
+// UpdateFileChunk updates the given file_chunk in database
 func UpdateFileChunk(fileChunk *FileChunk) error {
 	return updateFileChunk(x, fileChunk)
 }
@@ -98,3 +98,13 @@ func updateFileChunk(e Engine, fileChunk *FileChunk) error {
 	_, err := sess.Cols("is_uploaded").Update(fileChunk)
 	return err
 }
+
+// DeleteFileChunk delete the given file_chunk in database
+func DeleteFileChunk(fileChunk *FileChunk) error {
+	return deleteFileChunk(x, fileChunk)
+}
+
+func deleteFileChunk(e Engine, fileChunk *FileChunk) error {
+	_, err := e.ID(fileChunk.ID).Delete(fileChunk)
+	return err
+}

routers/repo/attachment.go

@@ -483,16 +483,25 @@ func GetSuccessChunks(ctx *context.Context) {
 		if typeCloudBrain == models.TypeCloudBrainOne {
 			chunks, err = storage.GetPartInfos(fileChunk.UUID, fileChunk.UploadID)
 			if err != nil {
-				ctx.ServerError("GetPartInfos failed", err)
-				return
+				log.Error("GetPartInfos failed:%v", err.Error())
 			}
 		} else {
 			chunks, err = storage.GetObsPartInfos(fileChunk.UUID, fileChunk.UploadID)
 			if err != nil {
-				ctx.ServerError("GetObsPartInfos failed", err)
-				return
+				log.Error("GetObsPartInfos failed:%v", err.Error())
 			}
 		}
+
+		if err != nil {
+			models.DeleteFileChunk(fileChunk)
+			ctx.JSON(200, map[string]string{
+				"uuid":     "",
+				"uploaded": "0",
+				"uploadID": "",
+				"chunks":   "",
+			})
+			return
+		}
 	}
 
 	var attachID int64