gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce the scope of inFlightUploadDataLimitCond lock

Browse Source
This commit is contained in:
liubaojiang
2022-05-31 09:40:25 +08:00
parent 076e48a676
commit f0ee3e6f21
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
weed/server/volume_server_handlers.go
View File

@@ -58,31 +58,27 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque
case "PUT", "POST": case "PUT", "POST":
contentLength := getContentLength(r) contentLength := getContentLength(r)
startTime := time.Now()
vs.inFlightUploadDataLimitCond.L.Lock()
// exclude the replication from the concurrentUploadLimitMB // exclude the replication from the concurrentUploadLimitMB
if r.URL.Query().Get("type") != "replicate" { if r.URL.Query().Get("type") != "replicate" {
startTime := time.Now()
vs.inFlightUploadDataLimitCond.L.Lock()
for vs.concurrentUploadLimit != 0 && vs.inFlightUploadDataSize > vs.concurrentUploadLimit { for vs.concurrentUploadLimit != 0 && vs.inFlightUploadDataSize > vs.concurrentUploadLimit {
//wait timeout //wait timeout check
if startTime.Add(vs.inflightUploadDataTimeout).Before(time.Now()) { 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() vs.inFlightUploadDataLimitCond.L.Unlock()
err := fmt.Errorf("reject because inflight upload data %d > %d, and wait timeout", vs.inFlightUploadDataSize, vs.concurrentUploadLimit)
glog.V(1).Infof("too many requests: %v", err) glog.V(1).Infof("too many requests: %v", err)
writeJsonError(w, r, http.StatusTooManyRequests, err) writeJsonError(w, r, http.StatusTooManyRequests, err)
return return
} }
glog.V(4).Infof("wait because inflight upload data %d > %d", vs.inFlightUploadDataSize, vs.concurrentUploadLimit) glog.V(4).Infof("wait because inflight upload data %d > %d", vs.inFlightUploadDataSize, vs.concurrentUploadLimit)
vs.inFlightUploadDataLimitCond.Wait() vs.inFlightUploadDataLimitCond.Wait()
} }
vs.inFlightUploadDataLimitCond.L.Unlock()
} }
vs.inFlightUploadDataSize += contentLength atomic.AddInt64(&vs.inFlightUploadDataSize, contentLength)
vs.inFlightUploadDataLimitCond.L.Unlock()
defer func() { defer func() {
vs.inFlightUploadDataLimitCond.L.Lock() atomic.AddInt64(&vs.inFlightUploadDataSize, -contentLength)
vs.inFlightUploadDataSize -= contentLength
vs.inFlightUploadDataLimitCond.L.Unlock()
vs.inFlightUploadDataLimitCond.Signal() vs.inFlightUploadDataLimitCond.Signal()
}() }()