Fix review comments

Author: hladush

internal/pkg/janitor/job.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	_ "embed"
 	"fmt"
+	"time"
 
 	"github.com/go-faster/errors"
 	"github.com/hladush/go-telemetry/pkg/telemetry"
@@ -223,8 +224,10 @@ func (j *Janitor) cleanupFinishedJobs() error {
 	}
 	defer sess.Close()
 
+	retentionTimestamp := time.Now().AddDate(0, 0, -j.FinishedJobRetentionDays).Unix()
+	
 	// get biggest ID of old jobs
-	row, err := sess.QueryRow(queryOldJobsBiggestID, j.FinishedJobRetentionDays)
+	row, err := sess.QueryRow(queryOldJobsBiggestID, retentionTimestamp)
 	if err != nil {
 		return fmt.Errorf("failed to get biggest ID of old jobs: %w", err)
 	}
@@ -236,15 +239,21 @@ func (j *Janitor) cleanupFinishedJobs() error {
 		}
 		return fmt.Errorf("failed to get biggest ID of old jobs: %w", err)
 	}
-	
+
 	if !biggestID.Valid || biggestID.Int64 == 0 {
 		return nil
 	}
 
 	// remove old jobs data
 	for _, q := range queriesForOldJobsCleanup {
-		if _, err := sess.Exec(q, biggestID.Int64); err != nil {
-			return err
+		for {
+			affectedRows, err := sess.Exec(q, biggestID.Int64)
+			if err != nil {
+				return err
+			}
+			if affectedRows == 0 {
+				break
+			}
 		}
 	}
 

internal/pkg/janitor/queries/old_job_biggest_id.sql

@@ -1 +1,5 @@
-SELECT MAX(system_job_id) FROM jobs WHERE updated_at < extract(epoch FROM now() - ($1 || ' days')::interval)::int;
+SELECT system_job_id 
+FROM jobs 
+WHERE updated_at < $1
+ORDER BY updated_at desc 
+LIMIT 1

internal/pkg/janitor/queries/old_jobs_cluster_tags_delete.sql

@@ -3,5 +3,5 @@ WHERE system_job_id IN (
   SELECT system_job_id
   FROM job_cluster_tags
   WHERE system_job_id <= $1
-  LIMIT 1000
+  LIMIT 100
 );

internal/pkg/janitor/queries/old_jobs_command_tags_delete.sql

@@ -4,5 +4,5 @@ WHERE system_job_id IN (
   SELECT system_job_id
   FROM job_command_tags
   WHERE system_job_id <= $1
-  LIMIT 1000
+  LIMIT 100
 );

internal/pkg/janitor/queries/old_jobs_delete.sql

@@ -4,5 +4,5 @@ WHERE system_job_id IN (
   SELECT system_job_id
   FROM jobs
   WHERE system_job_id <= $1
-  LIMIT 1000
+  LIMIT 100
 );

internal/pkg/janitor/queries/old_jobs_tags_delete.sql

@@ -3,5 +3,5 @@ WHERE system_job_id IN (
   SELECT system_job_id
   FROM job_tags
   WHERE system_job_id <= $1
-  LIMIT 1000
+  LIMIT 100
 );