diff options
| author | liubaojiang <1838095916@qq.com> | 2022-05-20 14:33:47 +0800 |
|---|---|---|
| committer | liubaojiang <1838095916@qq.com> | 2022-05-20 14:40:05 +0800 |
| commit | 1a41691b4c17b36b8ad39491ce579547e1ee4c04 (patch) | |
| tree | c2aa8976af3bf0323d3e654405b0c15789dae2e7 | |
| parent | 3a8dadcc2d5bfc5edb63395bbfb4f502c8333114 (diff) | |
| download | seaweedfs-1a41691b4c17b36b8ad39491ce579547e1ee4c04.tar.xz seaweedfs-1a41691b4c17b36b8ad39491ce579547e1ee4c04.zip | |
exclude replication from the concurrentUploadLimitMB
| -rw-r--r-- | weed/server/volume_server.go | 2 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers.go | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go index 477a3709c..e557cf76b 100644 --- a/weed/server/volume_server.go +++ b/weed/server/volume_server.go @@ -24,6 +24,7 @@ type VolumeServer struct { inFlightDownloadDataSize int64 concurrentUploadLimit int64 concurrentDownloadLimit int64 + inFlightUploadDataLimitCond *sync.Cond inFlightDownloadDataLimitCond *sync.Cond SeedMasterNodes []pb.ServerAddress @@ -84,6 +85,7 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, fileSizeLimitBytes: int64(fileSizeLimitMB) * 1024 * 1024, isHeartbeating: true, stopChan: make(chan bool), + inFlightUploadDataLimitCond: sync.NewCond(new(sync.Mutex)), inFlightDownloadDataLimitCond: sync.NewCond(new(sync.Mutex)), concurrentUploadLimit: concurrentUploadLimit, concurrentDownloadLimit: concurrentDownloadLimit, diff --git a/weed/server/volume_server_handlers.go b/weed/server/volume_server_handlers.go index 49bc297fb..afd32fed4 100644 --- a/weed/server/volume_server_handlers.go +++ b/weed/server/volume_server_handlers.go @@ -1,7 +1,6 @@ package weed_server import ( - "fmt" "net/http" "strconv" "strings" @@ -60,13 +59,15 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque contentLength := getContentLength(r) // exclude the replication from the concurrentUploadLimitMB - if vs.concurrentUploadLimit != 0 && r.URL.Query().Get("type") != "replicate" && - atomic.LoadInt64(&vs.inFlightUploadDataSize) > vs.concurrentUploadLimit { - err := fmt.Errorf("reject because inflight upload data %d > %d", vs.inFlightUploadDataSize, vs.concurrentUploadLimit) - glog.V(1).Infof("too many requests: %v", err) - writeJsonError(w, r, http.StatusTooManyRequests, err) - return + if r.URL.Query().Get("type") != "replicate" { //Non-Replication + vs.inFlightUploadDataLimitCond.L.Lock() + for vs.concurrentUploadLimit != 0 && atomic.LoadInt64(&vs.inFlightUploadDataSize) > vs.concurrentUploadLimit { + glog.V(4).Infof("wait because inflight upload data %d > %d", vs.inFlightUploadDataSize, vs.concurrentUploadLimit) + vs.inFlightUploadDataLimitCond.Wait() + } + vs.inFlightUploadDataLimitCond.L.Unlock() } + atomic.AddInt64(&vs.inFlightUploadDataSize, contentLength) defer func() { atomic.AddInt64(&vs.inFlightUploadDataSize, -contentLength) |