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

Revert "adjust conditions"

Browse Source 
This reverts commit e024586ff1.
This commit is contained in:
chrislu
2022-06-16 01:26:36 -07:00
parent e024586ff1
commit aaa9938353
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed/server/volume_server_handlers.go
View File

@@ -59,8 +59,7 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque
contentLength := getContentLength(r) contentLength := getContentLength(r)
// exclude the replication from the concurrentUploadLimitMB // exclude the replication from the concurrentUploadLimitMB
shouldWatchUploadLimit := r.URL.Query().Get("type") != "replicate" && vs.concurrentUploadLimit != 0 if r.URL.Query().Get("type") != "replicate" && vs.concurrentUploadLimit != 0 {
if shouldWatchUploadLimit {
startTime := time.Now() startTime := time.Now()
vs.inFlightUploadDataLimitCond.L.Lock() vs.inFlightUploadDataLimitCond.L.Lock()
for vs.inFlightUploadDataSize > vs.concurrentUploadLimit { for vs.inFlightUploadDataSize > vs.concurrentUploadLimit {
@@ -80,7 +79,7 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque
atomic.AddInt64(&vs.inFlightUploadDataSize, contentLength) atomic.AddInt64(&vs.inFlightUploadDataSize, contentLength)
defer func() { defer func() {
atomic.AddInt64(&vs.inFlightUploadDataSize, -contentLength) atomic.AddInt64(&vs.inFlightUploadDataSize, -contentLength)
if shouldWatchUploadLimit { if vs.concurrentUploadLimit != 0 {
vs.inFlightUploadDataLimitCond.Signal() vs.inFlightUploadDataLimitCond.Signal()
} }
}() }()