(PE-42079) Add timeouts around puppet run on db targets

davidmalloncares · davidmalloncares · commit 7e7708ba8694 · 2025-09-17T16:28:23.000+01:00
diff --git a/plans/subplans/install.pp b/plans/subplans/install.pp
@@ -407,7 +407,10 @@
   )
 
   $bg_db_run = background('database-targets') || {
-    run_task('peadm::puppet_runonce', $database_targets)
+    run_task('peadm::puppet_runonce', $database_targets, {
+        '_timeout' => 900,  # 15 minutes for puppet run
+        '_catch_errors' => true  # Don't fail the entire plan if this times out
+    })
   }
 
   parallelize($agent_installer_targets) |$target| {
@@ -429,7 +432,7 @@
     run_task('peadm::puppet_runonce', $target)
   }
 
-  wait([$bg_db_run])
+  wait([$bg_db_run], '_timeout' => 1200)
 
   # The puppetserver might be in the middle of a restart after the Puppet run,
   # so we check the status by calling the api and ensuring the puppetserver is

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,10 @@`
`407`	`407`	`)`
`408`	`408`
`409`	`409`	`$bg_db_run = background('database-targets') \|\| {`
`410`		`- run_task('peadm::puppet_runonce', $database_targets)`
	`410`	`+ run_task('peadm::puppet_runonce', $database_targets, {`
	`411`	`+ '_timeout' => 900, # 15 minutes for puppet run`
	`412`	`+ '_catch_errors' => true # Don't fail the entire plan if this times out`
	`413`	`+ })`
`411`	`414`	`}`
`412`	`415`
`413`	`416`	`parallelize($agent_installer_targets) \|$target\| {`
`@@ -429,7 +432,7 @@`
`429`	`432`	`run_task('peadm::puppet_runonce', $target)`
`430`	`433`	`}`
`431`	`434`
`432`		`- wait([$bg_db_run])`
	`435`	`+ wait([$bg_db_run], '_timeout' => 1200)`
`433`	`436`
`434`	`437`	`# The puppetserver might be in the middle of a restart after the Puppet run,`
`435`	`438`	`# so we check the status by calling the api and ensuring the puppetserver is`