aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2022-07-11 00:20:34 -0700
committerchrislu <chris.lu@gmail.com>2022-07-11 00:20:34 -0700
commitf5a76f67c14c0216a5f6862f1b7212983aefb941 (patch)
treec0554a9c02ef181e0d086f377be2815bbc6874ab
parent1112dab4f325ec594353b687d9b73a3d9f9c06de (diff)
parenta77c2232bef52235f5cde008026948053e77bc85 (diff)
downloadseaweedfs-f5a76f67c14c0216a5f6862f1b7212983aefb941.tar.xz
seaweedfs-f5a76f67c14c0216a5f6862f1b7212983aefb941.zip
Merge branch 'master' into messaging
-rw-r--r--weed/filer/read_write.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/weed/filer/read_write.go b/weed/filer/read_write.go
index e34034eb6..8d0e6567b 100644
--- a/weed/filer/read_write.go
+++ b/weed/filer/read_write.go
@@ -2,9 +2,10 @@ package filer
import (
"bytes"
+ "time"
+
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/wdclient"
- "time"
)
func ReadEntry(masterClient *wdclient.MasterClient, filerClient filer_pb.SeaweedFilerClient, dir, name string, byteBuffer *bytes.Buffer) error {
@@ -60,7 +61,7 @@ func SaveInsideFiler(client filer_pb.SeaweedFilerClient, dir, name string, conte
},
Content: content,
},
- SkipCheckParentDirectory: true,
+ SkipCheckParentDirectory: false,
})
} else if err == nil {
entry := resp.Entry