| @@ -451,9 +451,11 @@ func DeleteModelFile(ctx *context.Context) { | |||||
| if model.ModelType == MODEL_LOCAL_TYPE { | if model.ModelType == MODEL_LOCAL_TYPE { | ||||
| if model.Type == models.TypeCloudBrainOne { | if model.Type == models.TypeCloudBrainOne { | ||||
| bucketName := setting.Attachment.Minio.Bucket | bucketName := setting.Attachment.Minio.Bucket | ||||
| log.Info("bucket=" + bucketName + " path=" + model.Path[len(bucketName)+1:] + fileName) | |||||
| objectName := model.Path[len(bucketName)+1:] + fileName | |||||
| log.Info("delete bucket=" + bucketName + " path=" + objectName) | |||||
| if strings.HasPrefix(model.Path, bucketName+"/"+Model_prefix) { | if strings.HasPrefix(model.Path, bucketName+"/"+Model_prefix) { | ||||
| err := storage.Attachments.DeleteDir(model.Path[len(bucketName)+1:] + fileName) | |||||
| totalSize := storage.MinioGetFilesSize(bucketName, []string{objectName}) | |||||
| err := storage.Attachments.DeleteDir(objectName) | |||||
| if err != nil { | if err != nil { | ||||
| log.Info("Failed to delete model. id=" + id) | log.Info("Failed to delete model. id=" + id) | ||||
| re := map[string]string{ | re := map[string]string{ | ||||
| @@ -463,13 +465,17 @@ func DeleteModelFile(ctx *context.Context) { | |||||
| ctx.JSON(200, re) | ctx.JSON(200, re) | ||||
| return | return | ||||
| } else { | } else { | ||||
| UpdateModelSize(id) | |||||
| log.Info("delete minio file size is:" + fmt.Sprint(totalSize)) | |||||
| models.ModifyModelSize(id, model.Size-totalSize) | |||||
| } | } | ||||
| } | } | ||||
| } else if model.Type == models.TypeCloudBrainTwo { | } else if model.Type == models.TypeCloudBrainTwo { | ||||
| log.Info("bucket=" + setting.Bucket + " path=" + model.Path[len(setting.Bucket)+1:] + fileName) | |||||
| if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) { | |||||
| err := storage.ObsRemoveObject(setting.Bucket, model.Path[len(setting.Bucket)+1:]+fileName) | |||||
| bucketName := setting.Bucket | |||||
| objectName := model.Path[len(setting.Bucket)+1:] + fileName | |||||
| log.Info("delete bucket=" + setting.Bucket + " path=" + objectName) | |||||
| if strings.HasPrefix(model.Path, bucketName+"/"+Model_prefix) { | |||||
| totalSize := storage.ObsGetFilesSize(bucketName, []string{objectName}) | |||||
| err := storage.ObsRemoveObject(bucketName, objectName) | |||||
| if err != nil { | if err != nil { | ||||
| log.Info("Failed to delete model. id=" + id) | log.Info("Failed to delete model. id=" + id) | ||||
| re := map[string]string{ | re := map[string]string{ | ||||
| @@ -479,7 +485,8 @@ func DeleteModelFile(ctx *context.Context) { | |||||
| ctx.JSON(200, re) | ctx.JSON(200, re) | ||||
| return | return | ||||
| } else { | } else { | ||||
| UpdateModelSize(id) | |||||
| log.Info("delete obs file size is:" + fmt.Sprint(totalSize)) | |||||
| models.ModifyModelSize(id, model.Size-totalSize) | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||