diff options
| author | liubaojiang <1838095916@qq.com> | 2022-06-16 09:58:44 +0800 |
|---|---|---|
| committer | liubaojiang <1838095916@qq.com> | 2022-06-16 09:58:44 +0800 |
| commit | 3076ac101ead13d58e7b6c065af65437e3aff9cd (patch) | |
| tree | a0bf7f40ebf692dc8b99e962c2be5e9b7e5db3d9 /weed/server/volume_server_handlers.go | |
| parent | f0ee3e6f2129eb2637ea0fdb18540f18147bf474 (diff) | |
| download | seaweedfs-3076ac101ead13d58e7b6c065af65437e3aff9cd.tar.xz seaweedfs-3076ac101ead13d58e7b6c065af65437e3aff9cd.zip | |
move vs.concurrentUploadLimit != 0 out of the lock
Diffstat (limited to 'weed/server/volume_server_handlers.go')
| -rw-r--r-- | weed/server/volume_server_handlers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/volume_server_handlers.go b/weed/server/volume_server_handlers.go index 7e4c11fed..ef37b48f5 100644 --- a/weed/server/volume_server_handlers.go +++ b/weed/server/volume_server_handlers.go @@ -59,10 +59,10 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque contentLength := getContentLength(r) // exclude the replication from the concurrentUploadLimitMB - if r.URL.Query().Get("type") != "replicate" { + if r.URL.Query().Get("type") != "replicate" && vs.concurrentUploadLimit != 0 { startTime := time.Now() vs.inFlightUploadDataLimitCond.L.Lock() - for vs.concurrentUploadLimit != 0 && vs.inFlightUploadDataSize > vs.concurrentUploadLimit { + for vs.inFlightUploadDataSize > vs.concurrentUploadLimit { //wait timeout check if startTime.Add(vs.inflightUploadDataTimeout).Before(time.Now()) { vs.inFlightUploadDataLimitCond.L.Unlock() |