mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-01-23 05:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): fixed scheduling of snapshots with Ignoring Identical Snapshots (#2141)

Browse Source 
Related #2036
Fixes #2138
This commit is contained in:
Jarek Kowalski
2022-07-04 22:58:20 -07:00
committed by GitHub
parent 4271b5a0f3
commit a8717bbcd2
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/server/source_manager.go
View File

@@ -66,6 +66,8 @@ type sourceManager struct {
paused bool
// +checklocks:sourceMutex
currentTask string
// +checklocks:sourceMutex
lastAttemptedSnapshotTime time.Time
isReadOnly bool
progress *snapshotfs.CountingUploadProgress
@@ -358,9 +360,10 @@ func (s *sourceManager) snapshotInternal(ctx context.Context, ctrl uitask.Contro
onUpload := func(int64) {}
s.sourceMutex.RLock()
s.sourceMutex.Lock()
manifestsSinceLastCompleteSnapshot := append([]*snapshot.Manifest(nil), s.manifestsSinceLastCompleteSnapshot...)
s.sourceMutex.RUnlock()
s.lastAttemptedSnapshotTime = clock.Now()
s.sourceMutex.Unlock()
// nolint:wrapcheck
return repo.WriteSession(ctx, s.rep, repo.WriteSessionOptions{
@@ -424,12 +427,17 @@ func (s *sourceManager) snapshotInternal(ctx context.Context, ctrl uitask.Contro
// +checklocksread:s.sourceMutex
func (s *sourceManager) findClosestNextSnapshotTimeReadLocked() *time.Time {
var lastCompleteSnapshotTime time.Time
var previousSnapshotTime time.Time
if lcs := s.lastCompleteSnapshot; lcs != nil {
lastCompleteSnapshotTime = lcs.StartTime
previousSnapshotTime = lcs.StartTime
}
t, ok := s.pol.NextSnapshotTime(lastCompleteSnapshotTime, clock.Now())
// consider attempted snapshots even if they did not end up writing snapshot manifests.
if s.lastAttemptedSnapshotTime.After(previousSnapshotTime) {
previousSnapshotTime = s.lastAttemptedSnapshotTime
}
t, ok := s.pol.NextSnapshotTime(previousSnapshotTime, clock.Now())
if !ok {
return nil
}