aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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