diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2022-06-15 23:16:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-15 23:16:44 -0700 |
| commit | 82f3bcc65ebbd9514862dcf44a63dcc22603c701 (patch) | |
| tree | bbe76ee3e9b521a4b93ab9a51b0bd787c1b06412 /weed/server/volume_server.go | |
| parent | 40055211bd91744cf7a5f79d91eda10d4c7beaa7 (diff) | |
| parent | df0ce31a2ee87bf4550da20cf7c1095d154b24e3 (diff) | |
| download | seaweedfs-82f3bcc65ebbd9514862dcf44a63dcc22603c701.tar.xz seaweedfs-82f3bcc65ebbd9514862dcf44a63dcc22603c701.zip | |
Merge pull request #3081 from paochiang/volume_upload_limit_fix
exclude replication from the concurrentUploadLimitMB
Diffstat (limited to 'weed/server/volume_server.go')
| -rw-r--r-- | weed/server/volume_server.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go index 477a3709c..abb30229a 100644 --- a/weed/server/volume_server.go +++ b/weed/server/volume_server.go @@ -3,6 +3,7 @@ package weed_server import ( "net/http" "sync" + "time" "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" @@ -24,7 +25,9 @@ type VolumeServer struct { inFlightDownloadDataSize int64 concurrentUploadLimit int64 concurrentDownloadLimit int64 + inFlightUploadDataLimitCond *sync.Cond inFlightDownloadDataLimitCond *sync.Cond + inflightUploadDataTimeout time.Duration SeedMasterNodes []pb.ServerAddress currentMaster pb.ServerAddress @@ -60,6 +63,7 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, fileSizeLimitMB int, concurrentUploadLimit int64, concurrentDownloadLimit int64, + inflightUploadDataTimeout time.Duration, ) *VolumeServer { v := util.GetViper() @@ -84,9 +88,11 @@ 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, + inflightUploadDataTimeout: inflightUploadDataTimeout, } vs.SeedMasterNodes = masterNodes |