delete old dashboard versions in multiple batches (#23348)

pkg/services/sqlstore/dashboard_version_test.go

@@ -131,7 +131,7 @@ func TestDeleteExpiredVersions(t *testing.T) {
 			So(query.Result[0].Version, ShouldEqual, versionsToWrite)
 		})
 
-		Convey("Don't delete anything if there're no expired versions", func() {
+		Convey("Don't delete anything if there are no expired versions", func() {
 			setting.DashboardVersionsToKeep = versionsToWrite
 
 			err := DeleteExpiredVersions(&models.DeleteExpiredVersionsCommand{})
@@ -144,15 +144,18 @@ func TestDeleteExpiredVersions(t *testing.T) {
 			So(len(query.Result), ShouldEqual, versionsToWrite)
 		})
 
-		Convey("Don't delete more than MAX_VERSIONS_TO_DELETE per iteration", func() {
-			versionsToWriteBigNumber := MAX_VERSIONS_TO_DELETE + versionsToWrite
+		Convey("Don't delete more than MAX_VERSIONS_TO_DELETE_PER_BATCH * MAX_VERSION_DELETION_BATCHES per iteration", func() {
+			perBatch := 10
+			maxBatches := 10
+
+			versionsToWriteBigNumber := perBatch*maxBatches + versionsToWrite
 			for i := 0; i < versionsToWriteBigNumber-versionsToWrite; i++ {
 				updateTestDashboard(savedDash, map[string]interface{}{
 					"tags": "different-tag",
 				})
 			}
 
-			err := DeleteExpiredVersions(&models.DeleteExpiredVersionsCommand{})
+			err := deleteExpiredVersions(&models.DeleteExpiredVersionsCommand{}, perBatch, maxBatches)
 			So(err, ShouldBeNil)
 
 			query := models.GetDashboardVersionsQuery{DashboardId: savedDash.Id, OrgId: 1, Limit: versionsToWriteBigNumber}
@@ -161,8 +164,8 @@ func TestDeleteExpiredVersions(t *testing.T) {
 
 			// Ensure we have at least versionsToKeep versions
 			So(len(query.Result), ShouldBeGreaterThanOrEqualTo, versionsToKeep)
-			// Ensure we haven't deleted more than MAX_VERSIONS_TO_DELETE rows
-			So(versionsToWriteBigNumber-len(query.Result), ShouldBeLessThanOrEqualTo, MAX_VERSIONS_TO_DELETE)
+			// Ensure we haven't deleted more than perBatch * maxBatches rows
+			So(versionsToWriteBigNumber-len(query.Result), ShouldBeLessThanOrEqualTo, perBatch*maxBatches)
 		})
 	})
 }