Merge branch 'master' into sendToGitHub/floating-grpcio-dependency

armadaproject · Nov 14, 2024 · 980416d · 980416d
2 parents 0bd6a7b + c988811
commit 980416d
Show file tree

Hide file tree

Showing 10 changed files with 744 additions and 475 deletions.
diff --git a/internal/scheduler/database/db.go b/internal/scheduler/database/db.go
diff --git a/internal/scheduler/database/executor_repository.go b/internal/scheduler/database/executor_repository.go
@@ -107,7 +107,7 @@ func (r *PostgresExecutorRepository) GetExecutorSettings(ctx *armadacontext.Cont
 	executorSettings := make([]*schedulerobjects.ExecutorSettings, len(results))
 	for i, result := range results {
 		settings := &schedulerobjects.ExecutorSettings{
-			ExecutorId:   result.ExecutorId,
+			ExecutorId:   result.ExecutorID,
 			Cordoned:     result.Cordoned,
 			CordonReason: result.CordonReason,
 			SetByUser:    result.SetByUser,

diff --git a/internal/scheduler/database/migrations/017_amend_executor_settings_columns.sql b/internal/scheduler/database/migrations/017_amend_executor_settings_columns.sql
@@ -0,0 +1,14 @@
+ALTER TABLE executor_settings
+  ALTER COLUMN cordon_reason TYPE text USING (COALESCE(cordon_reason, ''))
+  , ALTER COLUMN cordon_reason SET DEFAULT ''
+  , ALTER COLUMN cordon_reason SET NOT NULL;
+
+ALTER TABLE executor_settings
+  ALTER COLUMN set_by_user TYPE text USING (COALESCE(set_by_user, ''))
+  , ALTER COLUMN set_by_user SET DEFAULT ''
+  , ALTER COLUMN set_by_user SET NOT NULL;
+
+ALTER TABLE executor_settings
+  ALTER COLUMN set_at_time TYPE timestamptz USING (COALESCE(set_at_time, '2024-11-12 09:00:00 UTC'::timestamptz))
+  , ALTER COLUMN set_at_time SET DEFAULT NOW()
+  , ALTER COLUMN set_at_time SET NOT NULL;
diff --git a/internal/scheduler/database/models.go b/internal/scheduler/database/models.go