diff --git a/cmd/cc-backend/main.go b/cmd/cc-backend/main.go index 438c9ab..af0ce33 100644 --- a/cmd/cc-backend/main.go +++ b/cmd/cc-backend/main.go @@ -520,7 +520,7 @@ func main() { } if err != nil { - log.Warnf("Error while looking for retention jobs: %v", err) + log.Warnf("Error while looking for compression jobs: %v", err) } ar.Compress(jobs) }) diff --git a/internal/repository/job.go b/internal/repository/job.go index 762ba3f..e060551 100644 --- a/internal/repository/job.go +++ b/internal/repository/job.go @@ -801,9 +801,11 @@ func (r *JobRepository) FindJobsBetween(startTimeBegin int64, startTimeEnd int64 } if startTimeBegin == 0 { + log.Infof("Find jobs before %d", startTimeEnd) query = sq.Select(jobColumns...).From("job").Where(fmt.Sprintf( "job.start_time < %d", startTimeEnd)) } else { + log.Infof("Find jobs between %d and %d", startTimeBegin, startTimeEnd) query = sq.Select(jobColumns...).From("job").Where(fmt.Sprintf( "job.start_time BETWEEN %d AND %d", startTimeBegin, startTimeEnd)) } @@ -825,6 +827,7 @@ func (r *JobRepository) FindJobsBetween(startTimeBegin int64, startTimeEnd int64 jobs = append(jobs, job) } + log.Infof("Return job count %d", len(jobs)) return jobs, nil } diff --git a/internal/repository/migrations/sqlite3/04_add-constraints.up.sql b/internal/repository/migrations/sqlite3/04_add-constraints.up.sql index aec4898..06b1a9b 100644 --- a/internal/repository/migrations/sqlite3/04_add-constraints.up.sql +++ b/internal/repository/migrations/sqlite3/04_add-constraints.up.sql @@ -30,6 +30,8 @@ file_bw_avg REAL NOT NULL DEFAULT 0.0, file_data_vol_total REAL NOT NULL DEFAULT 0.0, UNIQUE (job_id, cluster, start_time)); + +UPDATE job SET job_state='cancelled' WHERE job_state='canceled'; INSERT INTO job_new SELECT * FROM job; DROP TABLE job; ALTER TABLE job_new RENAME TO job; diff --git a/pkg/archive/fsBackend.go b/pkg/archive/fsBackend.go index 0a9c224..b58891f 100644 --- a/pkg/archive/fsBackend.go +++ b/pkg/archive/fsBackend.go @@ -372,6 +372,7 @@ func (fsa *FsArchive) CompressLast(starttime int64) int64 { return starttime } + log.Infof("fsBackend Compress - start %d last %d", starttime, last) os.WriteFile(filename, []byte(fmt.Sprintf("%d", starttime)), 0644) return last }