diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-10-30 19:27:25 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-10-30 19:27:25 -0700 |
| commit | 24858507cca1429bb499c2bdb13236f9ef98d599 (patch) | |
| tree | 8d7479c2427627ae85adea220aee052165ab7bef /weed/server | |
| parent | f5824f369c2bb29d6a50c0da55cc2b77c2f18630 (diff) | |
| download | seaweedfs-24858507cca1429bb499c2bdb13236f9ef98d599.tar.xz seaweedfs-24858507cca1429bb499c2bdb13236f9ef98d599.zip | |
rename API to avoid confusion
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_grpc_server_remote.go | 4 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_read.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/weed/server/filer_grpc_server_remote.go b/weed/server/filer_grpc_server_remote.go index 3c7fef90a..d3730a3ff 100644 --- a/weed/server/filer_grpc_server_remote.go +++ b/weed/server/filer_grpc_server_remote.go @@ -17,7 +17,7 @@ import ( "time" ) -func (fs *FilerServer) DownloadToLocal(ctx context.Context, req *filer_pb.DownloadToLocalRequest) (*filer_pb.DownloadToLocalResponse, error) { +func (fs *FilerServer) CacheRemoteObjectToLocalCluster(ctx context.Context, req *filer_pb.CacheRemoteObjectToLocalClusterRequest) (*filer_pb.CacheRemoteObjectToLocalClusterResponse, error) { // load all mappings mappingEntry, err := fs.filer.FindEntry(ctx, util.JoinPath(filer.DirectoryEtcRemote, filer.REMOTE_STORAGE_MOUNT_FILE)) @@ -57,7 +57,7 @@ func (fs *FilerServer) DownloadToLocal(ctx context.Context, req *filer_pb.Downlo return nil, err } - resp := &filer_pb.DownloadToLocalResponse{} + resp := &filer_pb.CacheRemoteObjectToLocalClusterResponse{} if entry.Remote == nil || entry.Remote.RemoteSize == 0 { return resp, nil } diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index 80b72bdef..86e4af586 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -169,11 +169,11 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) chunks := entry.Chunks if entry.IsInRemoteOnly() { dir, name := entry.FullPath.DirAndName() - if resp, err := fs.DownloadToLocal(context.Background(), &filer_pb.DownloadToLocalRequest{ + if resp, err := fs.CacheRemoteObjectToLocalCluster(context.Background(), &filer_pb.CacheRemoteObjectToLocalClusterRequest{ Directory: dir, Name: name, }); err != nil { - glog.Errorf("DownloadToLocal %s: %v", entry.FullPath, err) + glog.Errorf("CacheRemoteObjectToLocalCluster %s: %v", entry.FullPath, err) return fmt.Errorf("cache %s: %v", entry.FullPath, err) } else { chunks = resp.Entry.Chunks |