From a29f8ff8ada9fdbe3472a466da939b3f820b75af Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Wed, 8 Jan 2025 12:32:55 -0500 Subject: [PATCH] fix awsim myjobs initializers (#276) --- .../initializers/ood_appkit_pitzer_exp_fix.rb | 13 ++++---- .../workflow_presubmit_validation.rb | 30 ++++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/apps.awesim.org/apps/myjobs/initializers/ood_appkit_pitzer_exp_fix.rb b/apps.awesim.org/apps/myjobs/initializers/ood_appkit_pitzer_exp_fix.rb index f48f7923..5d51d98e 100644 --- a/apps.awesim.org/apps/myjobs/initializers/ood_appkit_pitzer_exp_fix.rb +++ b/apps.awesim.org/apps/myjobs/initializers/ood_appkit_pitzer_exp_fix.rb @@ -1,7 +1,8 @@ -Rails.application.configure do |config| - ActiveSupport.on_load(:active_record) do - Workflow.where(batch_host: 'pitzer-exp').update_all(batch_host: 'pitzer') - Workflow.where(batch_host: 'owens-slurm').update_all(batch_host: 'owens') - end if Configuration.production_database_path.file? +Rails.application.config.after_initialize do + Rails.application.configure do |config| + ActiveSupport.on_load(:active_record) do + Workflow.where(batch_host: 'pitzer-exp').update_all(batch_host: 'pitzer') + Workflow.where(batch_host: 'owens-slurm').update_all(batch_host: 'owens') + end if Configuration.production_database_path.file? + end end - diff --git a/apps.awesim.org/apps/myjobs/initializers/workflow_presubmit_validation.rb b/apps.awesim.org/apps/myjobs/initializers/workflow_presubmit_validation.rb index 0f5d6e56..d385a27c 100644 --- a/apps.awesim.org/apps/myjobs/initializers/workflow_presubmit_validation.rb +++ b/apps.awesim.org/apps/myjobs/initializers/workflow_presubmit_validation.rb @@ -1,20 +1,22 @@ -# array_ids is not currently exported automatically from ood_core -require 'ood_core/job/array_ids' -require 'workflow' +Rails.application.config.after_initialize do + # array_ids is not currently exported automatically from ood_core + require 'ood_core/job/array_ids' + require 'workflow' -class Workflow - validate :task_count_may_not_exceed_max_job_array_tasks - MAX_JOB_ARRAY_TASKS = 1000 + class Workflow + validate :task_count_may_not_exceed_max_job_array_tasks + MAX_JOB_ARRAY_TASKS = 1000 - def task_count_may_not_exceed_max_job_array_tasks - if ! task_count_ok? - errors.add(:job_array_request, "must result in less than #{Workflow::MAX_JOB_ARRAY_TASKS} tasks.") + def task_count_may_not_exceed_max_job_array_tasks + if ! task_count_ok? + errors.add(:job_array_request, "must result in less than #{Workflow::MAX_JOB_ARRAY_TASKS} tasks.") + end end - end - def task_count_ok? - return true if (job_array_request.nil? || job_array_request.empty?) + def task_count_ok? + return true if (job_array_request.nil? || job_array_request.empty?) - OodCore::Job::ArrayIds.new(job_array_request).ids.size <= Workflow::MAX_JOB_ARRAY_TASKS + OodCore::Job::ArrayIds.new(job_array_request).ids.size <= Workflow::MAX_JOB_ARRAY_TASKS + end end -end +end \ No newline at end of file