aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--weed/command/scaffold.go6
-rw-r--r--weed/server/filer_server.go1
-rw-r--r--weed/server/filer_server_handlers.go34
-rw-r--r--weed/server/master_server_handlers.go61
4 files changed, 65 insertions, 37 deletions
diff --git a/weed/command/scaffold.go b/weed/command/scaffold.go
index b37254bb5..5d1ccb13f 100644
--- a/weed/command/scaffold.go
+++ b/weed/command/scaffold.go
@@ -21,9 +21,9 @@ var cmdScaffold = &Command{
For example, the filer.toml mysql password can be overwritten by environment variable
export WEED_MYSQL_PASSWORD=some_password
Environment variable rules:
- * Prefix the variable name with "WEED_"
- * Uppercase the reset of variable name.
- * Replace '.' with '_'
+ * Prefix the variable name with "WEED_".
+ * Uppercase the rest of the variable name.
+ * Replace '.' with '_'.
`,
}
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go
index d8b2ad8dc..a04fd1910 100644
--- a/weed/server/filer_server.go
+++ b/weed/server/filer_server.go
@@ -171,6 +171,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption)
}
if defaultMux != readonlyMux {
handleStaticResources(readonlyMux)
+ readonlyMux.HandleFunc("/healthz", fs.filerHealthzHandler)
readonlyMux.HandleFunc("/", fs.readonlyFilerHandler)
}
diff --git a/weed/server/filer_server_handlers.go b/weed/server/filer_server_handlers.go
index ac66514f2..b5e070fb2 100644
--- a/weed/server/filer_server_handlers.go
+++ b/weed/server/filer_server_handlers.go
@@ -1,6 +1,7 @@
package weed_server
import (
+ "context"
"errors"
"net/http"
"os"
@@ -9,7 +10,9 @@ import (
"sync/atomic"
"time"
+ "github.com/seaweedfs/seaweedfs/weed/filer"
"github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/seaweedfs/weed/security"
"github.com/seaweedfs/seaweedfs/weed/util"
@@ -44,7 +47,7 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Access-Control-Allow-Methods", "PUT, POST, GET, DELETE, OPTIONS")
}
- if r.Method == "OPTIONS" {
+ if r.Method == http.MethodOptions {
OptionsHandler(w, r, false)
return
}
@@ -66,7 +69,7 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) {
stats.FilerRequestHistogram.WithLabelValues(r.Method).Observe(time.Since(start).Seconds())
}()
- isReadHttpCall := r.Method == "GET" || r.Method == "HEAD"
+ isReadHttpCall := r.Method == http.MethodGet || r.Method == http.MethodHead
if !fs.maybeCheckJwtAuthorization(r, !isReadHttpCall) {
writeJsonError(w, r, http.StatusUnauthorized, errors.New("wrong jwt"))
return
@@ -75,17 +78,15 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION)
switch r.Method {
- case "GET":
+ case http.MethodGet, http.MethodHead:
fs.GetOrHeadHandler(w, r)
- case "HEAD":
- fs.GetOrHeadHandler(w, r)
- case "DELETE":
+ case http.MethodDelete:
if _, ok := r.URL.Query()["tagging"]; ok {
fs.DeleteTaggingHandler(w, r)
} else {
fs.DeleteHandler(w, r)
}
- case "POST", "PUT":
+ case http.MethodPost, http.MethodPut:
// wait until in flight data is less than the limit
contentLength := getContentLength(r)
fs.inFlightDataLimitCond.L.Lock()
@@ -102,7 +103,7 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) {
fs.inFlightDataLimitCond.Signal()
}()
- if r.Method == "PUT" {
+ if r.Method == http.MethodPut {
if _, ok := r.URL.Query()["tagging"]; ok {
fs.PutTaggingHandler(w, r)
} else {
@@ -111,6 +112,8 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) {
} else { // method == "POST"
fs.PostHandler(w, r, contentLength)
}
+ default:
+ w.WriteHeader(http.StatusMethodNotAllowed)
}
}
@@ -149,7 +152,7 @@ func (fs *FilerServer) readonlyFilerHandler(w http.ResponseWriter, r *http.Reque
stats.FilerRequestHistogram.WithLabelValues(r.Method).Observe(time.Since(start).Seconds())
}()
// We handle OPTIONS first because it never should be authenticated
- if r.Method == "OPTIONS" {
+ if r.Method == http.MethodOptions {
OptionsHandler(w, r, true)
return
}
@@ -162,10 +165,10 @@ func (fs *FilerServer) readonlyFilerHandler(w http.ResponseWriter, r *http.Reque
w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION)
switch r.Method {
- case "GET":
- fs.GetOrHeadHandler(w, r)
- case "HEAD":
+ case http.MethodGet, http.MethodHead:
fs.GetOrHeadHandler(w, r)
+ default:
+ w.WriteHeader(http.StatusMethodNotAllowed)
}
}
@@ -220,5 +223,10 @@ func (fs *FilerServer) maybeCheckJwtAuthorization(r *http.Request, isWrite bool)
func (fs *FilerServer) filerHealthzHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION)
- w.WriteHeader(http.StatusOK)
+ if _, err := fs.filer.Store.FindEntry(context.Background(), filer.TopicsDir); err != nil && err != filer_pb.ErrNotFound {
+ glog.Warningf("filerHealthzHandler FindEntry: %+v", err)
+ w.WriteHeader(http.StatusServiceUnavailable)
+ } else {
+ w.WriteHeader(http.StatusOK)
+ }
}
diff --git a/weed/server/master_server_handlers.go b/weed/server/master_server_handlers.go
index 6ade9402f..ccfb2e0c7 100644
--- a/weed/server/master_server_handlers.go
+++ b/weed/server/master_server_handlers.go
@@ -6,6 +6,7 @@ import (
"net/http"
"strconv"
"strings"
+ "time"
"github.com/seaweedfs/seaweedfs/weed/operation"
"github.com/seaweedfs/seaweedfs/weed/security"
@@ -119,34 +120,52 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request)
vl := ms.Topo.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl, option.DiskType)
- fid, count, dnList, shouldGrow, err := ms.Topo.PickForWrite(requestedCount, option, vl)
- if shouldGrow && !vl.HasGrowRequest() {
- // if picked volume is almost full, trigger a volume-grow request
- glog.V(0).Infof("dirAssign volume growth %v from %v", option.String(), r.RemoteAddr)
- if ms.Topo.AvailableSpaceFor(option) <= 0 {
- writeJsonQuiet(w, r, http.StatusNotFound, operation.AssignResult{Error: "No free volumes left for " + option.String()})
- return
- }
+ var (
+ lastErr error
+ maxTimeout = time.Second * 10
+ startTime = time.Now()
+ )
- errCh := make(chan error, 1)
- vl.AddGrowRequest()
- ms.vgCh <- &topology.VolumeGrowRequest{
- Option: option,
- Count: writableVolumeCount,
- ErrCh: errCh,
+ for time.Now().Sub(startTime) < maxTimeout {
+ fid, count, dnList, shouldGrow, err := ms.Topo.PickForWrite(requestedCount, option, vl)
+ if shouldGrow && !vl.HasGrowRequest() {
+ // if picked volume is almost full, trigger a volume-grow request
+ glog.V(0).Infof("dirAssign volume growth %v from %v", option.String(), r.RemoteAddr)
+ if ms.Topo.AvailableSpaceFor(option) <= 0 {
+ writeJsonQuiet(w, r, http.StatusNotFound, operation.AssignResult{Error: "No free volumes left for " + option.String()})
+ return
+ }
+
+ errCh := make(chan error, 1)
+ vl.AddGrowRequest()
+ ms.vgCh <- &topology.VolumeGrowRequest{
+ Option: option,
+ Count: writableVolumeCount,
+ ErrCh: errCh,
+ }
+ if err := <-errCh; err != nil {
+ writeJsonError(w, r, http.StatusInternalServerError, fmt.Errorf("cannot grow volume group! %v", err))
+ return
+ }
}
- if err := <-errCh; err != nil {
- writeJsonError(w, r, http.StatusInternalServerError, fmt.Errorf("cannot grow volume group! %v", err))
+ if err != nil {
+ // glog.Warningf("PickForWrite %+v: %v", req, err)
+ lastErr = err
+ time.Sleep(200 * time.Millisecond)
+ continue
+ } else {
+ ms.maybeAddJwtAuthorization(w, fid, true)
+ dn := dnList.Head()
+
+ writeJsonQuiet(w, r, http.StatusOK, operation.AssignResult{Fid: fid, Url: dn.Url(), PublicUrl: dn.PublicUrl, Count: count})
return
}
}
- if err == nil {
- ms.maybeAddJwtAuthorization(w, fid, true)
- dn := dnList.Head()
- writeJsonQuiet(w, r, http.StatusOK, operation.AssignResult{Fid: fid, Url: dn.Url(), PublicUrl: dn.PublicUrl, Count: count})
+ if lastErr != nil {
+ writeJsonQuiet(w, r, http.StatusNotAcceptable, operation.AssignResult{Error: lastErr.Error()})
} else {
- writeJsonQuiet(w, r, http.StatusNotAcceptable, operation.AssignResult{Error: err.Error()})
+ writeJsonQuiet(w, r, http.StatusRequestTimeout, operation.AssignResult{Error: "request timeout"})
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 13:01:08 +0000