mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
healthz check to avoid drain pod with last replicas
This commit is contained in:
parent
b394380a36
commit
9ea09cc41c
|
@ -98,6 +98,7 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string,
|
|||
|
||||
handleStaticResources(adminMux)
|
||||
adminMux.HandleFunc("/status", vs.statusHandler)
|
||||
adminMux.HandleFunc("/healthz", vs.healthzHandler)
|
||||
if signingKey == "" || enableUiAccess {
|
||||
// only expose the volume server details for safe environments
|
||||
adminMux.HandleFunc("/ui/index.html", vs.uiStatusHandler)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package weed_server
|
||||
|
||||
import (
|
||||
"github.com/chrislusf/seaweedfs/weed/topology"
|
||||
"net/http"
|
||||
"path/filepath"
|
||||
|
||||
|
@ -9,6 +10,24 @@ import (
|
|||
"github.com/chrislusf/seaweedfs/weed/util"
|
||||
)
|
||||
|
||||
func (vs *VolumeServer) healthzHandler(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Server", "SeaweedFS Volume "+util.VERSION)
|
||||
volumeInfos := vs.store.VolumeInfos()
|
||||
for _, vinfo := range volumeInfos {
|
||||
if len(vinfo.Collection) == 0 {
|
||||
continue
|
||||
}
|
||||
if vinfo.ReplicaPlacement.GetCopyCount() > 1 {
|
||||
_, err := topology.GetWritableRemoteReplications(vs.store, vs.grpcDialOption, vinfo.Id, vs.GetMaster)
|
||||
if err != nil {
|
||||
w.WriteHeader(http.StatusServiceUnavailable)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
w.WriteHeader(http.StatusOK)
|
||||
}
|
||||
|
||||
func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Server", "SeaweedFS Volume "+util.VERSION)
|
||||
m := make(map[string]interface{})
|
||||
|
|
|
@ -29,7 +29,7 @@ func ReplicatedWrite(masterFn operation.GetMasterFn, grpcDialOption grpc.DialOpt
|
|||
var remoteLocations []operation.Location
|
||||
if r.FormValue("type") != "replicate" {
|
||||
// this is the initial request
|
||||
remoteLocations, err = getWritableRemoteReplications(s, grpcDialOption, volumeId, masterFn)
|
||||
remoteLocations, err = GetWritableRemoteReplications(s, grpcDialOption, volumeId, masterFn)
|
||||
if err != nil {
|
||||
glog.V(0).Infoln(err)
|
||||
return
|
||||
|
@ -114,7 +114,7 @@ func ReplicatedDelete(masterFn operation.GetMasterFn, grpcDialOption grpc.DialOp
|
|||
|
||||
var remoteLocations []operation.Location
|
||||
if r.FormValue("type") != "replicate" {
|
||||
remoteLocations, err = getWritableRemoteReplications(store, grpcDialOption, volumeId, masterFn)
|
||||
remoteLocations, err = GetWritableRemoteReplications(store, grpcDialOption, volumeId, masterFn)
|
||||
if err != nil {
|
||||
glog.V(0).Infoln(err)
|
||||
return
|
||||
|
@ -174,7 +174,7 @@ func DistributedOperation(locations []operation.Location, op func(location opera
|
|||
return ret.Error()
|
||||
}
|
||||
|
||||
func getWritableRemoteReplications(s *storage.Store, grpcDialOption grpc.DialOption, volumeId needle.VolumeId, masterFn operation.GetMasterFn) (remoteLocations []operation.Location, err error) {
|
||||
func GetWritableRemoteReplications(s *storage.Store, grpcDialOption grpc.DialOption, volumeId needle.VolumeId, masterFn operation.GetMasterFn) (remoteLocations []operation.Location, err error) {
|
||||
|
||||
v := s.GetVolume(volumeId)
|
||||
if v != nil && v.ReplicaPlacement.GetCopyCount() == 1 {
|
||||
|
|
Loading…
Reference in a new issue