diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-08-12 20:33:00 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-08-12 20:33:00 -0700 |
| commit | d1d1fc772c884ffae466d24a82ef3d634951243a (patch) | |
| tree | 2a0038155d07460f427c9622316904b1775cde15 /weed/server | |
| parent | 5571f4f70a2e304343e76638caacc3bd0338a8d1 (diff) | |
| download | seaweedfs-d1d1fc772c884ffae466d24a82ef3d634951243a.tar.xz seaweedfs-d1d1fc772c884ffae466d24a82ef3d634951243a.zip | |
move some volume lookup operations to grpc
jwt related lookup will come in next commit
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_server_handlers_read.go | 2 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_write.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index 8602b0854..29428730e 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/weed/server/volume_server_handlers_read.go @@ -65,7 +65,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) w.WriteHeader(http.StatusNotFound) return } - lookupResult, err := operation.Lookup(vs.GetMaster, volumeId.String()) + lookupResult, err := operation.LookupVolumeId(vs.GetMaster, vs.grpcDialOption, volumeId.String()) glog.V(2).Infoln("volume", volumeId, "found on", lookupResult, "error", err) if err != nil || len(lookupResult.Locations) <= 0 { glog.V(0).Infoln("lookup error:", err, r.URL.Path) diff --git a/weed/server/volume_server_handlers_write.go b/weed/server/volume_server_handlers_write.go index aeb7d6e65..bda8b986e 100644 --- a/weed/server/volume_server_handlers_write.go +++ b/weed/server/volume_server_handlers_write.go @@ -53,7 +53,7 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { } ret := operation.UploadResult{} - isUnchanged, writeError := topology.ReplicatedWrite(vs.GetMaster, vs.store, volumeId, reqNeedle, r) + isUnchanged, writeError := topology.ReplicatedWrite(vs.GetMaster, vs.grpcDialOption, vs.store, volumeId, reqNeedle, r) // http 204 status code does not allow body if writeError == nil && isUnchanged { @@ -146,7 +146,7 @@ func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { } } - _, err := topology.ReplicatedDelete(vs.GetMaster, vs.store, volumeId, n, r) + _, err := topology.ReplicatedDelete(vs.GetMaster, vs.grpcDialOption, vs.store, volumeId, n, r) writeDeleteResult(err, count, w, r) |
