diff options
| author | bmcquee <bmcqueen@walmartlabs.com> | 2014-10-19 23:08:01 -0700 |
|---|---|---|
| committer | bmcquee <bmcqueen@walmartlabs.com> | 2014-10-19 23:08:01 -0700 |
| commit | bd664def45925d81dfae9c7edfb244d2367170ca (patch) | |
| tree | 5af13c9ebb0d98ee577c0dcd94fe60f1090eb124 | |
| parent | 02ae8b98a579dda3dd22d97a48a2890aec84cb62 (diff) | |
| download | seaweedfs-bd664def45925d81dfae9c7edfb244d2367170ca.tar.xz seaweedfs-bd664def45925d81dfae9c7edfb244d2367170ca.zip | |
Revert "fix func name HasWriableVolume"
This reverts commit bff7b71389557235c8573a77b0c030765c85fd1f.
| -rw-r--r-- | go/topology/topology.go | 2 | ||||
| -rw-r--r-- | go/weed/weed_server/master_server_handlers.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/go/topology/topology.go b/go/topology/topology.go index 876b7c418..c90e8de0b 100644 --- a/go/topology/topology.go +++ b/go/topology/topology.go @@ -109,7 +109,7 @@ func (t *Topology) NextVolumeId() storage.VolumeId { return next } -func (t *Topology) HasWriteableVolume(option *VolumeGrowOption) bool { +func (t *Topology) HasWriableVolume(option *VolumeGrowOption) bool { vl := t.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl) return vl.GetActiveVolumeCount(option) > 0 } diff --git a/go/weed/weed_server/master_server_handlers.go b/go/weed/weed_server/master_server_handlers.go index 7d54521d9..93e9e7d9a 100644 --- a/go/weed/weed_server/master_server_handlers.go +++ b/go/weed/weed_server/master_server_handlers.go @@ -78,7 +78,7 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) return } - if !ms.Topo.HasWriteableVolume(option) { + if !ms.Topo.HasWriableVolume(option) { if ms.Topo.FreeSpace() <= 0 { w.WriteHeader(http.StatusNotFound) writeJsonQuiet(w, r, operation.AssignResult{Error: "No free volumes left!"}) @@ -86,7 +86,7 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) } else { ms.vgLock.Lock() defer ms.vgLock.Unlock() - if !ms.Topo.HasWriteableVolume(option) { + if !ms.Topo.HasWriableVolume(option) { if _, err = ms.vg.AutomaticGrowByType(option, ms.Topo); err != nil { writeJsonQuiet(w, r, operation.AssignResult{Error: "Cannot grow volume group! " + err.Error()}) return |