lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-23 03:23:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add inflight upload data wait timeout

Browse Source
This commit is contained in:
liubaojiang
2022-05-20 18:18:20 +08:00
parent 71b2e6223e
commit 076e48a676
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
weed/server/volume_server_handlers.go
View File

@@ -1,10 +1,12 @@
package weed_server
import (
"fmt"
"net/http"
"strconv"
"strings"
"sync/atomic"
"time"
"github.com/chrislusf/seaweedfs/weed/util"
@@ -55,22 +57,32 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque
vs.guard.WhiteList(vs.DeleteHandler)(w, r)
case "PUT", "POST":
// wait until in flight data is less than the limit
contentLength := getContentLength(r)
startTime := time.Now()
vs.inFlightUploadDataLimitCond.L.Lock()
// exclude the replication from the concurrentUploadLimitMB
if r.URL.Query().Get("type") != "replicate" { //Non-Replication
vs.inFlightUploadDataLimitCond.L.Lock()
for vs.concurrentUploadLimit != 0 && atomic.LoadInt64(&vs.inFlightUploadDataSize) > vs.concurrentUploadLimit {
if r.URL.Query().Get("type") != "replicate" {
for vs.concurrentUploadLimit != 0 && vs.inFlightUploadDataSize > vs.concurrentUploadLimit {
//wait timeout
if startTime.Add(vs.inflightUploadDataTimeout).Before(time.Now()) {
err := fmt.Errorf("reject because inflight upload data %d > %d, and wait timeout", vs.inFlightUploadDataSize, vs.concurrentUploadLimit)
vs.inFlightUploadDataLimitCond.L.Unlock()
glog.V(1).Infof("too many requests: %v", err)
writeJsonError(w, r, http.StatusTooManyRequests, err)
return
}
glog.V(4).Infof("wait because inflight upload data %d > %d", vs.inFlightUploadDataSize, vs.concurrentUploadLimit)
vs.inFlightUploadDataLimitCond.Wait()
}
vs.inFlightUploadDataLimitCond.L.Unlock()
}
vs.inFlightUploadDataSize += contentLength
vs.inFlightUploadDataLimitCond.L.Unlock()
atomic.AddInt64(&vs.inFlightUploadDataSize, contentLength)
defer func() {
atomic.AddInt64(&vs.inFlightUploadDataSize, -contentLength)
vs.inFlightUploadDataLimitCond.L.Lock()
vs.inFlightUploadDataSize -= contentLength
vs.inFlightUploadDataLimitCond.L.Unlock()
vs.inFlightUploadDataLimitCond.Signal()
}()