Address review comments.

gardener · Feb 10, 2023 · 4478894 · 4478894
1 parent aab027c
commit 4478894
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/pkg/snapshot/snapshotter/snapshotter.go b/pkg/snapshot/snapshotter/snapshotter.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"path"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -792,10 +793,14 @@ func (ssr *Snapshotter) GetFullSnapshotMaxTimeWindow(fullSnapScheduleSpec string
 		return defaultFullSnapMaxTimeWindow
 	}
 
-	if schedule[dayOfMonth] == "*" && schedule[dayOfWeek] == "*" {
+	if schedule[dayOfMonth] == "*" && schedule[dayOfWeek] == "*" && !strings.Contains(schedule[hour], "/") {
 		return defaultFullSnapMaxTimeWindow
 	} else if schedule[dayOfWeek] != "*" {
 		return defaultFullSnapMaxTimeWindow * 7
+	} else if schedule[dayOfMonth] == "*" && schedule[dayOfWeek] == "*" && strings.Contains(schedule[hour], "/") {
+		if timeWindow, err := strconv.ParseFloat(schedule[hour][strings.Index(schedule[hour], "/")+1:], 64); err == nil {
+			return timeWindow
+		}
 	}
 
 	return defaultFullSnapMaxTimeWindow

diff --git a/pkg/snapshot/snapshotter/snapshotter_test.go b/pkg/snapshot/snapshotter/snapshotter_test.go
@@ -738,6 +738,22 @@ var _ = Describe("Snapshotter", func() {
 				Expect(timeWindow).Should(Equal(fullSnapshotTimeWindow * 7))
 			})
 		})
+
+		Context("Full snapshot schedule for every 4 hours", func() {
+			It("should return 4 hours of timeWindow", func() {
+				// every 4 hour
+				scheduleHour := 4
+				snapshotterConfig := &brtypes.SnapshotterConfig{
+					FullSnapshotSchedule: fmt.Sprintf("%d */%d * * *", 0, scheduleHour),
+				}
+
+				ssr, err = NewSnapshotter(logger, snapshotterConfig, store, etcdConnectionConfig, compressionConfig, healthConfig, snapstoreConfig)
+				Expect(err).ShouldNot(HaveOccurred())
+
+				timeWindow := ssr.GetFullSnapshotMaxTimeWindow(snapshotterConfig.FullSnapshotSchedule)
+				Expect(timeWindow).Should(Equal(float64(scheduleHour)))
+			})
+		})
 	})
 
 })