anonfunc/upload-baker
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update upload rate

Browse Source
This commit is contained in:
Giovanni Harting
2022-07-05 00:54:34 +02:00
parent eee1141dd3
commit e77e8a3966
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
main.go
View File

@@ -61,7 +61,7 @@ func (m UploadManager) Upload() (int, error) {
} }
} }
func (m UploadManager) SetUpload(upload int) error { func (m UploadManager) SetUpload(upload int) (int, error) {
m.clearTC() m.clearTC()
args := []string{"qdisc", "add", "dev", conf.UploadInterface, "root", "cake", "bandwidth", fmt.Sprintf("%dMbit", upload)} args := []string{"qdisc", "add", "dev", conf.UploadInterface, "root", "cake", "bandwidth", fmt.Sprintf("%dMbit", upload)}
args = append(args, strings.Split(conf.CakeOptions, " ")...) args = append(args, strings.Split(conf.CakeOptions, " ")...)
@@ -70,9 +70,9 @@ func (m UploadManager) SetUpload(upload int) error {
out, err := tcCmd.CombinedOutput() out, err := tcCmd.CombinedOutput()
if err != nil { if err != nil {
log.Debugf("[TC] executing %s failed with: %v (%s)", tcCmd.String(), err, out) log.Debugf("[TC] executing %s failed with: %v (%s)", tcCmd.String(), err, out)
return err return 0, err
} }
return nil return upload, nil
} }
func (m UploadManager) clearTC() { func (m UploadManager) clearTC() {
@@ -132,7 +132,7 @@ func (m UploadManager) pingWorker() error {
if stats.AvgRtt.Milliseconds() >= conf.ThrottlePingThreshold { if stats.AvgRtt.Milliseconds() >= conf.ThrottlePingThreshold {
log.Infof("extended ping %s, adjusting upload TC %d->%d", stats.AvgRtt, up, up-conf.Bandwidth.Step) log.Infof("extended ping %s, adjusting upload TC %d->%d", stats.AvgRtt, up, up-conf.Bandwidth.Step)
err = m.SetUpload(up - conf.Bandwidth.Step) up, err = m.SetUpload(up - conf.Bandwidth.Step)
if err != nil { if err != nil {
return err return err
} }
@@ -147,11 +147,28 @@ func (m UploadManager) pingWorker() error {
} }
if m.isBWInRange(up + conf.Bandwidth.Step) { if m.isBWInRange(up + conf.Bandwidth.Step) {
log.Infof("Short ping %s, trying to increase upload TC %d->%d", stats.AvgRtt, up, up+conf.Bandwidth.Step) log.Infof("Short ping %s, trying to increase upload TC %d->%d", stats.AvgRtt, up, up+conf.Bandwidth.Step)
err = m.SetUpload(up + conf.Bandwidth.Step) up, err = m.SetUpload(up + conf.Bandwidth.Step)
if err != nil { if err != nil {
return err return err
} }
m.LastOver = time.Now() m.LastOver = time.Now()
stats, err = doPing(conf.Host, conf.ConformationPPP, time.Second)
if err != nil {
log.Warningf("ping to %s failed: %v", conf.Host, err)
time.Sleep(time.Duration(conf.Interval) * time.Minute)
continue
}
if stats.AvgRtt.Milliseconds() >= conf.ThrottlePingThreshold {
log.Infof("increase failed with %s ping, reverting to %d", stats.AvgRtt, up-conf.Bandwidth.Step)
_, err = m.SetUpload(up - conf.Bandwidth.Step)
if err != nil {
return err
}
} else {
log.Infof("Extended ping %s seems stable", stats.AvgRtt)
}
} }
} }
time.Sleep(time.Duration(conf.Interval) * time.Minute) time.Sleep(time.Duration(conf.Interval) * time.Minute)