diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-01-24 03:15:19 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-01-24 03:15:19 -0800 |
| commit | 6ca10725b81fd20d8bce2f582f1b93b047d0a4c3 (patch) | |
| tree | 21e481993e3188a8a7680caf4cc3fde34e61717b /weed/server/webdav_server.go | |
| parent | 096e088d7bb2a5dce7573b24c2d3006d1cb6f9ec (diff) | |
| download | seaweedfs-6ca10725b81fd20d8bce2f582f1b93b047d0a4c3.tar.xz seaweedfs-6ca10725b81fd20d8bce2f582f1b93b047d0a4c3.zip | |
Revert "mount: when outside cluster network, use filer as proxy to access volume servers"
This reverts commit 096e088d7bb2a5dce7573b24c2d3006d1cb6f9ec.
Diffstat (limited to 'weed/server/webdav_server.go')
| -rw-r--r-- | weed/server/webdav_server.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/weed/server/webdav_server.go b/weed/server/webdav_server.go index 5bd92a136..2b238e534 100644 --- a/weed/server/webdav_server.go +++ b/weed/server/webdav_server.go @@ -123,6 +123,9 @@ func (fs *WebDavFileSystem) WithFilerClient(fn func(filer_pb.SeaweedFilerClient) }, fs.option.FilerGrpcAddress, fs.option.GrpcDialOption) } +func (fs *WebDavFileSystem) AdjustedUrl(location *filer_pb.Location) string { + return location.Url +} func clearName(name string) (string, error) { slashed := strings.HasSuffix(name, "/") @@ -520,7 +523,7 @@ func (f *WebDavFile) Read(p []byte) (readSize int, err error) { } if f.reader == nil { chunkViews := filer.ViewFromVisibleIntervals(f.entryViewCache, 0, math.MaxInt64) - f.reader = filer.NewChunkReaderAtFromClient(filer.LookupFn(f.fs), chunkViews, f.fs.chunkCache, fileSize) + f.reader = filer.NewChunkReaderAtFromClient(f.fs, chunkViews, f.fs.chunkCache, fileSize) } readSize, err = f.reader.ReadAt(p, f.off) |