aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortiaoxizhan <tiaoxizhan@outlook.com>2025-03-06 22:36:33 +0800
committerGitHub <noreply@github.com>2025-03-06 06:36:33 -0800
commit533b675ec821c663418154d1b097e4acc35fffef (patch)
treec63359f8bdb27b1d67aa6cc2d944aa421f54bdcf
parent3ed52662df50e1c4da1031c39a8e288c91ee6cc3 (diff)
downloadseaweedfs-533b675ec821c663418154d1b097e4acc35fffef.tar.xz
seaweedfs-533b675ec821c663418154d1b097e4acc35fffef.zip
fix: fix the wrong error return value (#6603)
-rw-r--r--weed/server/filer_server_handlers_write_merge.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/server/filer_server_handlers_write_merge.go b/weed/server/filer_server_handlers_write_merge.go
index b3ccd4cc1..2110f485a 100644
--- a/weed/server/filer_server_handlers_write_merge.go
+++ b/weed/server/filer_server_handlers_write_merge.go
@@ -58,7 +58,7 @@ func (fs *FilerServer) mergeChunks(so *operation.StorageOption, inputChunks []*f
if err != nil {
glog.Errorf("Failed to resolve old entry chunks when delete old entry chunks. new: %s, old: %s",
mergedChunks, inputChunks)
- return
+ return mergedChunks, err
}
fs.filer.DeleteChunksNotRecursive(garbage)
return