fix(objectnode): fix superfluous writeheader

Signed-off-by: tangdeyi <[email protected]>
sejust · Aug 31, 2023 · b24525a · b24525a
1 parent 14f0f67
commit b24525a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/objectnode/api_handler_object.go b/objectnode/api_handler_object.go
@@ -651,13 +651,13 @@ func (o *ObjectNode) deleteObjectsHandler(w http.ResponseWriter, r *http.Request
 		if err = rateLimit.AcquireLimitResource(vol.owner, DELETE_OBJECT); err != nil {
 			return
 		}
-		if err = vol.DeletePath(object.Key); err != nil {
+		if err1 := vol.DeletePath(object.Key); err1 != nil {
 			log.LogErrorf("deleteObjectsHandler: delete object failed: requestID(%v) volume(%v) path(%v) err(%v)",
-				GetRequestID(r), vol.Name(), object.Key, err)
-			if err != AccessDenied {
-				deletedErrors = append(deletedErrors, Error{Key: object.Key, Code: "InternalError", Message: err.Error()})
+				GetRequestID(r), vol.Name(), object.Key, err1)
+			if err1 != AccessDenied {
+				deletedErrors = append(deletedErrors, Error{Key: object.Key, Code: "InternalError", Message: err1.Error()})
 			} else {
-				deletedErrors = append(deletedErrors, Error{Key: object.Key, Code: "AccessDenied", Message: err.Error()})
+				deletedErrors = append(deletedErrors, Error{Key: object.Key, Code: "AccessDenied", Message: err1.Error()})
 			}
 		} else {
 			log.LogDebugf("deleteObjectsHandler: delete object success: requestID(%v) volume(%v) path(%v)",

diff --git a/objectnode/fs_volume.go b/objectnode/fs_volume.go
@@ -904,7 +904,7 @@ func (v *Volume) DeletePath(path string) (err error) {
 			return
 		}
 	}
-	log.LogWarnf("DeletePath: delete: volume(%v) path(%v) inode(%v)", v.name, path, ino)
+	log.LogInfof("DeletePath: delete: volume(%v) path(%v) inode(%v)", v.name, path, ino)
 
 	// delete dentry with condition when objectlock is open
 	if objetLock != nil {
@@ -924,7 +924,7 @@ func (v *Volume) DeletePath(path string) (err error) {
 	deleteDentryCache(parent, name, v.name)
 	deleteAttrCache(parent, v.name)
 
-	log.LogWarnf("DeletePath: evict: volume(%v) path(%v) inode(%v)", v.name, path, ino)
+	log.LogInfof("DeletePath: evict: volume(%v) path(%v) inode(%v)", v.name, path, ino)
 	// Evict inode
 	if err = v.mw.Evict(ino); err != nil {
 		log.LogWarnf("DeletePath Evict: path(%v) inode(%v)", path, ino)