[volume] refactor and add metrics for flight upload and download data limit condition (#6920)
* refactor concurrentDownloadLimit * fix loop * fix cmdServer * fix: resolve conversation pr 6920 * Changes logging function (#6919) * updated logging methods for stores * updated logging methods for stores * updated logging methods for filer * updated logging methods for uploader and http_util * updated logging methods for weed server --------- Co-authored-by: akosov <a.kosov@kryptonite.ru> * Improve lock ring (#6921) * fix flaky lock ring test * add more tests * fix: build * fix: rm import util/version * fix: serverOptions * refactoring --------- Co-authored-by: Aleksey Kosov <rusyak777@list.ru> Co-authored-by: akosov <a.kosov@kryptonite.ru> Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com> Co-authored-by: chrislu <chris.lu@gmail.com>
This commit is contained in:
committed by
GitHub
parent
1db7c2b8aa
commit
93007c1842
32
weed/util/cond_wait.go
Normal file
32
weed/util/cond_wait.go
Normal file
@@ -0,0 +1,32 @@
|
||||
package util
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
const HttpStatusCancelled = 499
|
||||
|
||||
func WaitWithTimeout(ctx context.Context, cond *sync.Cond, timer *time.Timer) int {
|
||||
waitDone := make(chan struct{})
|
||||
|
||||
go func() {
|
||||
cond.L.Lock()
|
||||
defer cond.L.Unlock()
|
||||
cond.Wait()
|
||||
defer close(waitDone)
|
||||
}()
|
||||
|
||||
select {
|
||||
case <-waitDone:
|
||||
return http.StatusOK
|
||||
case <-timer.C:
|
||||
cond.Broadcast()
|
||||
return http.StatusTooManyRequests
|
||||
case <-ctx.Done():
|
||||
cond.Broadcast()
|
||||
return HttpStatusCancelled
|
||||
}
|
||||
}
|
||||
@@ -6,8 +6,6 @@ import (
|
||||
"github.com/seaweedfs/seaweedfs/weed/util"
|
||||
)
|
||||
|
||||
const HttpStatusCancelled = 499
|
||||
|
||||
var (
|
||||
MAJOR_VERSION = int32(3)
|
||||
MINOR_VERSION = int32(92)
|
||||
|
||||
Reference in New Issue
Block a user