Merge branch 'master' into messaging

This commit is contained in:
chrislu 2022-07-11 00:20:34 -07:00
commit f5a76f67c1

View file

@ -2,9 +2,10 @@ package filer
import ( import (
"bytes" "bytes"
"time"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/wdclient" "github.com/chrislusf/seaweedfs/weed/wdclient"
"time"
) )
func ReadEntry(masterClient *wdclient.MasterClient, filerClient filer_pb.SeaweedFilerClient, dir, name string, byteBuffer *bytes.Buffer) error { 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, Content: content,
}, },
SkipCheckParentDirectory: true, SkipCheckParentDirectory: false,
}) })
} else if err == nil { } else if err == nil {
entry := resp.Entry entry := resp.Entry