diff options
| author | Chris Lu <chris.lu@gmail.com> | 2014-10-25 18:10:32 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2014-10-25 18:10:32 -0700 |
| commit | 30bcda7136f847b59ac6e6610a40829dc10ec8cd (patch) | |
| tree | 04a91da085ccc50a1bc0874518ed3be47edc7cb5 | |
| parent | b85eb293feda0c4b2c322a3d07d17df566df02a4 (diff) | |
| download | seaweedfs-30bcda7136f847b59ac6e6610a40829dc10ec8cd.tar.xz seaweedfs-30bcda7136f847b59ac6e6610a40829dc10ec8cd.zip | |
fix typo
| -rw-r--r-- | go/topology/topology.go | 2 | ||||
| -rw-r--r-- | go/weed/weed_server/master_server_handlers.go | 4 | ||||
| -rw-r--r-- | go/weed/weed_server/master_server_handlers_admin.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/go/topology/topology.go b/go/topology/topology.go index c90e8de0b..a81829bb6 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) HasWriableVolume(option *VolumeGrowOption) bool { +func (t *Topology) hasWritableVolume(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 93e9e7d9a..be2a7ca7e 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.HasWriableVolume(option) { + if !ms.Topo.hasWritableVolume(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.HasWriableVolume(option) { + if !ms.Topo.hasWritableVolume(option) { if _, err = ms.vg.AutomaticGrowByType(option, ms.Topo); err != nil { writeJsonQuiet(w, r, operation.AssignResult{Error: "Cannot grow volume group! " + err.Error()}) return diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index c9a8020c2..080405e54 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -143,7 +143,7 @@ func (ms *MasterServer) deleteFromMasterServerHandler(w http.ResponseWriter, r * } } -func (ms *MasterServer) hasWriableVolume(option *topology.VolumeGrowOption) bool { +func (ms *MasterServer) hasWritableVolume(option *topology.VolumeGrowOption) bool { vl := ms.Topo.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl) return vl.GetActiveVolumeCount(option) > 0 } |