mirror of
https://github.com/rclone/rclone.git
synced 2024-11-23 00:43:49 +01:00
0d8bcc08da
This reverts commit 463a18aa07
.
In practice this caused Windows to have a max bandwidth limit of 8
MiB/s. This is because of the limited resolution (1ms) of the Windows
timer.
This needs fixing in a different way.
See: https://forum.rclone.org/t/bug-report-for-v1-54-0-beta-5133/22015
276 lines
7.2 KiB
Go
276 lines
7.2 KiB
Go
package accounting
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/pkg/errors"
|
|
"github.com/rclone/rclone/fs"
|
|
"github.com/rclone/rclone/fs/rc"
|
|
"golang.org/x/time/rate"
|
|
)
|
|
|
|
// TokenBucket holds the global token bucket limiter
|
|
var TokenBucket tokenBucket
|
|
|
|
// TokenBucketSlot is the type to select which token bucket to use
|
|
type TokenBucketSlot int
|
|
|
|
// Slots for the token bucket
|
|
const (
|
|
TokenBucketSlotAccounting TokenBucketSlot = iota
|
|
TokenBucketSlotTransportRx
|
|
TokenBucketSlotTransportTx
|
|
TokenBucketSlots
|
|
)
|
|
|
|
type buckets [TokenBucketSlots]*rate.Limiter
|
|
|
|
// tokenBucket holds info about the rate limiters in use
|
|
type tokenBucket struct {
|
|
mu sync.RWMutex // protects the token bucket variables
|
|
curr buckets
|
|
prev buckets
|
|
toggledOff bool
|
|
currLimitMu sync.Mutex // protects changes to the timeslot
|
|
currLimit fs.BwTimeSlot
|
|
}
|
|
|
|
// Return true if limit is disabled
|
|
//
|
|
// Call with lock held
|
|
func (bs *buckets) _isOff() bool {
|
|
return bs[0] == nil
|
|
}
|
|
|
|
// Disable the limits
|
|
//
|
|
// Call with lock held
|
|
func (bs *buckets) _setOff() {
|
|
for i := range bs {
|
|
bs[i] = nil
|
|
}
|
|
}
|
|
|
|
const maxBurstSize = 4 * 1024 * 1024 // must be bigger than the biggest request
|
|
|
|
// make a new empty token bucket with the bandwidth(s) given
|
|
func newTokenBucket(bandwidth fs.BwPair) (tbs buckets) {
|
|
bandwidthAccounting := fs.SizeSuffix(-1)
|
|
if bandwidth.Tx > 0 {
|
|
tbs[TokenBucketSlotTransportTx] = rate.NewLimiter(rate.Limit(bandwidth.Tx), maxBurstSize)
|
|
bandwidthAccounting = bandwidth.Tx
|
|
}
|
|
if bandwidth.Rx > 0 {
|
|
tbs[TokenBucketSlotTransportRx] = rate.NewLimiter(rate.Limit(bandwidth.Rx), maxBurstSize)
|
|
if bandwidth.Rx > bandwidthAccounting {
|
|
bandwidthAccounting = bandwidth.Rx
|
|
}
|
|
}
|
|
if bandwidthAccounting > 0 {
|
|
tbs[TokenBucketSlotAccounting] = rate.NewLimiter(rate.Limit(bandwidthAccounting), maxBurstSize)
|
|
}
|
|
for _, tb := range tbs {
|
|
if tb != nil {
|
|
// empty the bucket
|
|
err := tb.WaitN(context.Background(), maxBurstSize)
|
|
if err != nil {
|
|
fs.Errorf(nil, "Failed to empty token bucket: %v", err)
|
|
}
|
|
}
|
|
}
|
|
return tbs
|
|
}
|
|
|
|
// StartTokenBucket starts the token bucket if necessary
|
|
func (tb *tokenBucket) StartTokenBucket(ctx context.Context) {
|
|
tb.mu.Lock()
|
|
defer tb.mu.Unlock()
|
|
ci := fs.GetConfig(ctx)
|
|
tb.currLimit = ci.BwLimit.LimitAt(time.Now())
|
|
if tb.currLimit.Bandwidth.IsSet() {
|
|
tb.curr = newTokenBucket(tb.currLimit.Bandwidth)
|
|
fs.Infof(nil, "Starting bandwidth limiter at %vBytes/s", &tb.currLimit.Bandwidth)
|
|
|
|
// Start the SIGUSR2 signal handler to toggle bandwidth.
|
|
// This function does nothing in windows systems.
|
|
tb.startSignalHandler()
|
|
}
|
|
}
|
|
|
|
// StartTokenTicker creates a ticker to update the bandwidth limiter every minute.
|
|
func (tb *tokenBucket) StartTokenTicker(ctx context.Context) {
|
|
ci := fs.GetConfig(ctx)
|
|
// If the timetable has a single entry or was not specified, we don't need
|
|
// a ticker to update the bandwidth.
|
|
if len(ci.BwLimit) <= 1 {
|
|
return
|
|
}
|
|
|
|
ticker := time.NewTicker(time.Minute)
|
|
go func() {
|
|
for range ticker.C {
|
|
limitNow := ci.BwLimit.LimitAt(time.Now())
|
|
tb.currLimitMu.Lock()
|
|
|
|
if tb.currLimit.Bandwidth != limitNow.Bandwidth {
|
|
tb.mu.Lock()
|
|
|
|
// If bwlimit is toggled off, the change should only
|
|
// become active on the next toggle, which causes
|
|
// an exchange of tb.curr <-> tb.prev
|
|
var targetBucket *buckets
|
|
if tb.toggledOff {
|
|
targetBucket = &tb.prev
|
|
} else {
|
|
targetBucket = &tb.curr
|
|
}
|
|
|
|
// Set new bandwidth. If unlimited, set tokenbucket to nil.
|
|
if limitNow.Bandwidth.IsSet() {
|
|
*targetBucket = newTokenBucket(limitNow.Bandwidth)
|
|
if tb.toggledOff {
|
|
fs.Logf(nil, "Scheduled bandwidth change. "+
|
|
"Limit will be set to %vBytes/s when toggled on again.", &limitNow.Bandwidth)
|
|
} else {
|
|
fs.Logf(nil, "Scheduled bandwidth change. Limit set to %vBytes/s", &limitNow.Bandwidth)
|
|
}
|
|
} else {
|
|
targetBucket._setOff()
|
|
fs.Logf(nil, "Scheduled bandwidth change. Bandwidth limits disabled")
|
|
}
|
|
|
|
tb.currLimit = limitNow
|
|
tb.mu.Unlock()
|
|
}
|
|
tb.currLimitMu.Unlock()
|
|
}
|
|
}()
|
|
}
|
|
|
|
// LimitBandwidth sleeps for the correct amount of time for the passage
|
|
// of n bytes according to the current bandwidth limit
|
|
func (tb *tokenBucket) LimitBandwidth(i TokenBucketSlot, n int) {
|
|
tb.mu.RLock()
|
|
|
|
// Limit the transfer speed if required
|
|
if tb.curr[i] != nil {
|
|
err := tb.curr[i].WaitN(context.Background(), n)
|
|
if err != nil {
|
|
fs.Errorf(nil, "Token bucket error: %v", err)
|
|
}
|
|
}
|
|
|
|
tb.mu.RUnlock()
|
|
}
|
|
|
|
// SetBwLimit sets the current bandwidth limit
|
|
func (tb *tokenBucket) SetBwLimit(bandwidth fs.BwPair) {
|
|
tb.mu.Lock()
|
|
defer tb.mu.Unlock()
|
|
if bandwidth.IsSet() {
|
|
tb.curr = newTokenBucket(bandwidth)
|
|
fs.Logf(nil, "Bandwidth limit set to %v", bandwidth)
|
|
} else {
|
|
tb.curr._setOff()
|
|
fs.Logf(nil, "Bandwidth limit reset to unlimited")
|
|
}
|
|
}
|
|
|
|
// read and set the bandwidth limits
|
|
func (tb *tokenBucket) rcBwlimit(ctx context.Context, in rc.Params) (out rc.Params, err error) {
|
|
if in["rate"] != nil {
|
|
bwlimit, err := in.GetString("rate")
|
|
if err != nil {
|
|
return out, err
|
|
}
|
|
var bws fs.BwTimetable
|
|
err = bws.Set(bwlimit)
|
|
if err != nil {
|
|
return out, errors.Wrap(err, "bad bwlimit")
|
|
}
|
|
if len(bws) != 1 {
|
|
return out, errors.New("need exactly 1 bandwidth setting")
|
|
}
|
|
bw := bws[0]
|
|
tb.SetBwLimit(bw.Bandwidth)
|
|
}
|
|
tb.mu.RLock()
|
|
bytesPerSecond := int64(-1)
|
|
if tb.curr[TokenBucketSlotAccounting] != nil {
|
|
bytesPerSecond = int64(tb.curr[TokenBucketSlotAccounting].Limit())
|
|
}
|
|
var bp = fs.BwPair{Tx: -1, Rx: -1}
|
|
if tb.curr[TokenBucketSlotTransportTx] != nil {
|
|
bp.Tx = fs.SizeSuffix(tb.curr[TokenBucketSlotTransportTx].Limit())
|
|
}
|
|
if tb.curr[TokenBucketSlotTransportRx] != nil {
|
|
bp.Rx = fs.SizeSuffix(tb.curr[TokenBucketSlotTransportRx].Limit())
|
|
}
|
|
tb.mu.RUnlock()
|
|
out = rc.Params{
|
|
"rate": bp.String(),
|
|
"bytesPerSecond": bytesPerSecond,
|
|
"bytesPerSecondTx": int64(bp.Tx),
|
|
"bytesPerSecondRx": int64(bp.Rx),
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// Remote control for the token bucket
|
|
func init() {
|
|
rc.Add(rc.Call{
|
|
Path: "core/bwlimit",
|
|
Fn: func(ctx context.Context, in rc.Params) (out rc.Params, err error) {
|
|
return TokenBucket.rcBwlimit(ctx, in)
|
|
},
|
|
Title: "Set the bandwidth limit.",
|
|
Help: `
|
|
This sets the bandwidth limit to the string passed in. This should be
|
|
a single bandwidth limit entry or a pair of upload:download bandwidth.
|
|
|
|
Eg
|
|
|
|
rclone rc core/bwlimit rate=off
|
|
{
|
|
"bytesPerSecond": -1,
|
|
"bytesPerSecondTx": -1,
|
|
"bytesPerSecondRx": -1,
|
|
"rate": "off"
|
|
}
|
|
rclone rc core/bwlimit rate=1M
|
|
{
|
|
"bytesPerSecond": 1048576,
|
|
"bytesPerSecondTx": 1048576,
|
|
"bytesPerSecondRx": 1048576,
|
|
"rate": "1M"
|
|
}
|
|
rclone rc core/bwlimit rate=1M:100k
|
|
{
|
|
"bytesPerSecond": 1048576,
|
|
"bytesPerSecondTx": 1048576,
|
|
"bytesPerSecondRx": 131072,
|
|
"rate": "1M"
|
|
}
|
|
|
|
|
|
If the rate parameter is not supplied then the bandwidth is queried
|
|
|
|
rclone rc core/bwlimit
|
|
{
|
|
"bytesPerSecond": 1048576,
|
|
"bytesPerSecondTx": 1048576,
|
|
"bytesPerSecondRx": 1048576,
|
|
"rate": "1M"
|
|
}
|
|
|
|
The format of the parameter is exactly the same as passed to --bwlimit
|
|
except only one bandwidth may be specified.
|
|
|
|
In either case "rate" is returned as a human readable string, and
|
|
"bytesPerSecond" is returned as a number.
|
|
`,
|
|
})
|
|
}
|