mirror of
https://github.com/rclone/rclone.git
synced 2024-11-22 16:34:30 +01:00
dropbox: remove unused code (fixes issue reported by the unused linter)
This commit is contained in:
parent
6ef4bd8c45
commit
a1a8c21c70
@ -13,7 +13,6 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox/async"
|
|
||||||
"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox/files"
|
"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox/files"
|
||||||
"github.com/rclone/rclone/fs"
|
"github.com/rclone/rclone/fs"
|
||||||
"github.com/rclone/rclone/fs/fserrors"
|
"github.com/rclone/rclone/fs/fserrors"
|
||||||
@ -140,49 +139,6 @@ func (b *batcher) finishBatch(ctx context.Context, items []*files.UploadSessionF
|
|||||||
return complete, nil
|
return complete, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// finishBatchJobStatus waits for the batch to complete returning completed entries
|
|
||||||
func (b *batcher) finishBatchJobStatus(ctx context.Context, launchBatchStatus *files.UploadSessionFinishBatchLaunch) (complete *files.UploadSessionFinishBatchResult, err error) {
|
|
||||||
if launchBatchStatus.AsyncJobId == "" {
|
|
||||||
return nil, errors.New("wait for batch completion: empty job ID")
|
|
||||||
}
|
|
||||||
var batchStatus *files.UploadSessionFinishBatchJobStatus
|
|
||||||
sleepTime := 100 * time.Millisecond
|
|
||||||
const maxSleepTime = 1 * time.Second
|
|
||||||
startTime := time.Now()
|
|
||||||
try := 1
|
|
||||||
for {
|
|
||||||
remaining := time.Duration(b.f.opt.BatchCommitTimeout) - time.Since(startTime)
|
|
||||||
if remaining < 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
err = b.f.pacer.Call(func() (bool, error) {
|
|
||||||
batchStatus, err = b.f.srv.UploadSessionFinishBatchCheck(&async.PollArg{
|
|
||||||
AsyncJobId: launchBatchStatus.AsyncJobId,
|
|
||||||
})
|
|
||||||
return shouldRetry(ctx, err)
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
fs.Debugf(b.f, "Wait for batch: sleeping for %v after error: %v: try %d remaining %v", sleepTime, err, try, remaining)
|
|
||||||
} else {
|
|
||||||
if batchStatus.Tag == "complete" {
|
|
||||||
fs.Debugf(b.f, "Upload batch completed in %v", time.Since(startTime))
|
|
||||||
return batchStatus.Complete, nil
|
|
||||||
}
|
|
||||||
fs.Debugf(b.f, "Wait for batch: sleeping for %v after status: %q: try %d remaining %v", sleepTime, batchStatus.Tag, try, remaining)
|
|
||||||
}
|
|
||||||
time.Sleep(sleepTime)
|
|
||||||
sleepTime *= 2
|
|
||||||
if sleepTime > maxSleepTime {
|
|
||||||
sleepTime = maxSleepTime
|
|
||||||
}
|
|
||||||
try++
|
|
||||||
}
|
|
||||||
if err == nil {
|
|
||||||
err = errors.New("batch didn't complete")
|
|
||||||
}
|
|
||||||
return nil, fmt.Errorf("wait for batch failed after %d tries in %v: %w", try, time.Since(startTime), err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// commit a batch
|
// commit a batch
|
||||||
func (b *batcher) commitBatch(ctx context.Context, items []*files.UploadSessionFinishArg, results []chan<- batcherResponse) (err error) {
|
func (b *batcher) commitBatch(ctx context.Context, items []*files.UploadSessionFinishArg, results []chan<- batcherResponse) (err error) {
|
||||||
// If commit fails then signal clients if sync
|
// If commit fails then signal clients if sync
|
||||||
|
Loading…
Reference in New Issue
Block a user