aboutsummaryrefslogtreecommitdiff
path: root/go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2014-10-25 23:45:31 -0700
committerChris Lu <chris.lu@gmail.com>2014-10-25 23:45:31 -0700
commitf527fc1d5ee975fd29e49bf542d893a2d433a491 (patch)
treef81aade45d484bd633f1a000aa5c28ec58973f2c /go
parent30bcda7136f847b59ac6e6610a40829dc10ec8cd (diff)
downloadseaweedfs-f527fc1d5ee975fd29e49bf542d893a2d433a491.tar.xz
seaweedfs-f527fc1d5ee975fd29e49bf542d893a2d433a491.zip
adjust visibility
Diffstat (limited to 'go')
-rw-r--r--go/topology/topology.go2
-rw-r--r--go/weed/weed_server/master_server_handlers.go4
-rw-r--r--go/weed/weed_server/master_server_handlers_admin.go2
3 files changed, 4 insertions, 4 deletions
diff --git a/go/topology/topology.go b/go/topology/topology.go
index a81829bb6..cfce0c9a8 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) hasWritableVolume(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 be2a7ca7e..d7f1f4ce3 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.hasWritableVolume(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.hasWritableVolume(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 080405e54..1a2c6b8e0 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) hasWritableVolume(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
}