Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor wait for completion logic (#1373)
Signed-off-by: Pablo Chico de Guzman <pchico83@gmail.com>
- Loading branch information
Showing
6 changed files
with
513 additions
and
194 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| // Copyright 2020 The Okteto Authors | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package syncthing | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/okteto/okteto/pkg/analytics" | ||
| "github.com/okteto/okteto/pkg/errors" | ||
| "github.com/okteto/okteto/pkg/log" | ||
| "github.com/okteto/okteto/pkg/model" | ||
| ) | ||
|
|
||
| // Completion represents the completion of a syncthing folder. | ||
| type Completion struct { | ||
| Completion float64 `json:"completion"` | ||
| GlobalBytes int64 `json:"globalBytes"` | ||
| NeedBytes int64 `json:"needBytes"` | ||
| GlobalItems int64 `json:"globalItems"` | ||
| NeedItems int64 `json:"needItems"` | ||
| NeedDeletes int64 `json:"needDeletes"` | ||
| } | ||
|
|
||
| //waitForCompletion represents a wait for completion iteration | ||
| type waitForCompletion struct { | ||
| localCompletion *Completion | ||
| remoteCompletion *Completion | ||
| previousLocalGlobalBytes int64 | ||
| previousRemoteGlobalBytes int64 | ||
| globalBytesRetries int64 | ||
| needDeletesRetries int64 | ||
| retries int64 | ||
| progress float64 | ||
| sy *Syncthing | ||
| hasBeenReset bool | ||
| } | ||
|
|
||
| // WaitForCompletion waits for the remote to be totally synched | ||
| func (s *Syncthing) WaitForCompletion(ctx context.Context, dev *model.Dev, reporter chan float64) error { | ||
| defer close(reporter) | ||
| ticker := time.NewTicker(250 * time.Millisecond) | ||
| wfc := &waitForCompletion{sy: s} | ||
| for { | ||
| select { | ||
| case <-ticker.C: | ||
| wfc.retries++ | ||
| if wfc.retries%50 == 0 { | ||
| log.Info("checking syncthing for error....") | ||
| if err := s.IsHealthy(ctx, false, 3); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| if err := s.Overwrite(ctx, dev); err != nil { | ||
| if err != errors.ErrBusySyncthing { | ||
| return err | ||
| } | ||
| } | ||
| if err := wfc.computeProgress(ctx); err != nil { | ||
| if err != errors.ErrBusySyncthing { | ||
| return err | ||
| } | ||
| continue | ||
| } | ||
|
|
||
| reporter <- wfc.progress | ||
|
|
||
| if wfc.needsDatabaseReset() { | ||
| err := wfc.resetDatabase(ctx, dev) | ||
| analytics.TrackResetDatabase(err == nil) | ||
| continue | ||
| } | ||
|
|
||
| if wfc.isCompleted() { | ||
| return nil | ||
| } | ||
|
|
||
| case <-ctx.Done(): | ||
| log.Info("call to syncthing.WaitForCompletion canceled") | ||
| return ctx.Err() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (wfc *waitForCompletion) computeProgress(ctx context.Context) error { | ||
| localCompletion, err := wfc.sy.GetCompletion(ctx, true, DefaultRemoteDeviceID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| wfc.localCompletion = localCompletion | ||
| log.Infof("syncthing status in local: globalBytes %d, needBytes %d, globalItems %d, needItems %d, needDeletes %d", localCompletion.GlobalBytes, localCompletion.NeedBytes, localCompletion.GlobalItems, localCompletion.NeedItems, localCompletion.NeedDeletes) | ||
|
|
||
| remoteCompletion, err := wfc.sy.GetCompletion(ctx, false, DefaultRemoteDeviceID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| wfc.remoteCompletion = remoteCompletion | ||
| log.Infof("syncthing status in remote: globalBytes %d, needBytes %d, globalItems %d, needItems %d, needDeletes %d", | ||
| remoteCompletion.GlobalBytes, | ||
| remoteCompletion.NeedBytes, | ||
| remoteCompletion.GlobalItems, | ||
| remoteCompletion.NeedItems, | ||
| remoteCompletion.NeedDeletes, | ||
| ) | ||
| if localCompletion.GlobalBytes == 0 { | ||
| wfc.progress = 100 | ||
| } else { | ||
| wfc.progress = (float64(localCompletion.GlobalBytes-localCompletion.NeedBytes) / float64(localCompletion.GlobalBytes)) * 100 | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (wfc *waitForCompletion) needsDatabaseReset() bool { | ||
| if wfc.localCompletion.GlobalBytes == wfc.remoteCompletion.GlobalBytes { | ||
| wfc.globalBytesRetries = 0 | ||
| wfc.previousLocalGlobalBytes = wfc.localCompletion.GlobalBytes | ||
| wfc.previousRemoteGlobalBytes = wfc.remoteCompletion.GlobalBytes | ||
| return false | ||
| } | ||
| log.Infof("local globalBytes %d, remote global bytes %d", wfc.localCompletion.GlobalBytes, wfc.remoteCompletion.GlobalBytes) | ||
| if wfc.localCompletion.GlobalBytes != wfc.previousLocalGlobalBytes { | ||
| log.Infof("local globalBytes has changed %d vs %d", wfc.localCompletion.GlobalBytes, wfc.previousLocalGlobalBytes) | ||
| wfc.previousLocalGlobalBytes = wfc.localCompletion.GlobalBytes | ||
| wfc.previousRemoteGlobalBytes = wfc.remoteCompletion.GlobalBytes | ||
| wfc.globalBytesRetries = 0 | ||
| return false | ||
| } | ||
| if wfc.remoteCompletion.GlobalBytes != wfc.previousRemoteGlobalBytes { | ||
| log.Infof("remote globalBytes has changed %d vs %d", wfc.remoteCompletion.GlobalBytes, wfc.previousRemoteGlobalBytes) | ||
| wfc.previousLocalGlobalBytes = wfc.localCompletion.GlobalBytes | ||
| wfc.previousRemoteGlobalBytes = wfc.remoteCompletion.GlobalBytes | ||
| wfc.globalBytesRetries = 0 | ||
| return false | ||
| } | ||
| wfc.globalBytesRetries++ | ||
| log.Infof("globalBytesRetries %d", wfc.globalBytesRetries) | ||
| return wfc.globalBytesRetries > 360 // 90 seconds | ||
| } | ||
|
|
||
| func (wfc *waitForCompletion) resetDatabase(ctx context.Context, dev *model.Dev) error { | ||
| if wfc.hasBeenReset { | ||
| return fmt.Errorf("inconsistent syncthing state") | ||
| } | ||
| log.Info("resetting syncthing database in wait for completion loop...") | ||
| if err := wfc.sy.ResetDatabase(ctx, dev); err != nil { | ||
| return err | ||
| } | ||
| wfc.hasBeenReset = true | ||
| wfc.globalBytesRetries = 0 | ||
| if err := wfc.sy.WaitForScanning(ctx, dev, true); err != nil { | ||
| return err | ||
| } | ||
| return wfc.sy.WaitForScanning(ctx, dev, false) | ||
| } | ||
|
|
||
| func (wfc *waitForCompletion) isCompleted() bool { | ||
| if wfc.localCompletion.NeedBytes > 0 { | ||
| return false | ||
| } | ||
| if wfc.localCompletion.GlobalBytes != wfc.remoteCompletion.GlobalBytes { | ||
| return false | ||
| } | ||
|
|
||
| if wfc.localCompletion.NeedDeletes > 0 { | ||
| wfc.needDeletesRetries++ | ||
| if wfc.needDeletesRetries < 50 { | ||
| log.Info("synced completed, but need deletes, retrying...") | ||
| return false | ||
| } | ||
| } | ||
| if !wfc.sy.IsAllOverwritten() { | ||
| log.Info("synced completed, but overwrites not sent, retrying...") | ||
| return false | ||
| } | ||
| return true | ||
| } |
Oops, something went wrong.