From dccf4bc7597f1e49a7e971e5544beefc770e58f4 Mon Sep 17 00:00:00 2001 From: Jacob Buchanan Date: Mon, 7 Oct 2024 14:29:36 +0100 Subject: [PATCH 1/4] (PE-39429) Only restart puppetdb on non-legacy compilers --- plans/convert.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plans/convert.pp b/plans/convert.pp index 4d484f41..d5c6e774 100644 --- a/plans/convert.pp +++ b/plans/convert.pp @@ -305,9 +305,13 @@ # Restart cluster compiler services that are likely not restarted by our # final Puppet run to increase chance everything is functional upon plan # completion - run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service', + run_command('systemctl restart pe-puppetserver.service', $all_targets - $primary_target - $primary_postgresql_target - $replica_postgresql_target) + # PuppetDB is only found on modern compilers, not legacy ones + run_command('systemctl restart pe-puppetdb.service', + $all_targets - $primary_target - $primary_postgresql_target - $replica_postgresql_target - $legacy_compiler_targets) + # Run puppet on all targets again to ensure everything is fully up-to-date run_task('peadm::puppet_runonce', $all_targets) } From bb0f87cc8ded4d581df0371bfafa75605bf30d9e Mon Sep 17 00:00:00 2001 From: Jacob Buchanan Date: Mon, 14 Oct 2024 12:40:38 +0100 Subject: [PATCH 2/4] (PE-39429) Simplify targets for restarting compiler services --- plans/convert.pp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plans/convert.pp b/plans/convert.pp index d5c6e774..15681676 100644 --- a/plans/convert.pp +++ b/plans/convert.pp @@ -305,12 +305,10 @@ # Restart cluster compiler services that are likely not restarted by our # final Puppet run to increase chance everything is functional upon plan # completion - run_command('systemctl restart pe-puppetserver.service', - $all_targets - $primary_target - $primary_postgresql_target - $replica_postgresql_target) + run_command('systemctl restart pe-puppetserver.service', $legacy_compiler_targets) # PuppetDB is only found on modern compilers, not legacy ones - run_command('systemctl restart pe-puppetdb.service', - $all_targets - $primary_target - $primary_postgresql_target - $replica_postgresql_target - $legacy_compiler_targets) + run_command('systemctl restart pe-puppetdb.service pe-puppetserver.service', $compiler_hosts) # Run puppet on all targets again to ensure everything is fully up-to-date run_task('peadm::puppet_runonce', $all_targets) From 528d200d938df4a9b073076d913c52be635a97fb Mon Sep 17 00:00:00 2001 From: Jacob Buchanan Date: Mon, 14 Oct 2024 12:40:44 +0100 Subject: [PATCH 3/4] (maint) Fix pdk lint error --- types/convertsteps.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/convertsteps.pp b/types/convertsteps.pp index 7ab55a70..93cb099b 100644 --- a/types/convertsteps.pp +++ b/types/convertsteps.pp @@ -1,4 +1,4 @@ # # @summary type for the different steps where the peadm::convert plan can be started # -type Peadm::ConvertSteps = Enum[ 'modify-primary-certs', 'modify-infra-certs', 'convert-node-groups', 'finalize'] +type Peadm::ConvertSteps = Enum['modify-primary-certs', 'modify-infra-certs', 'convert-node-groups', 'finalize'] From 1ae13c499b0dbfff4912267cc2194debf22b8776 Mon Sep 17 00:00:00 2001 From: Jacob Buchanan Date: Mon, 14 Oct 2024 16:29:22 +0100 Subject: [PATCH 4/4] (PE-39429) Use correct targets and only run if those targets are non-empty. This fixes errors about run_command needing 3 args when no compilers are present --- plans/convert.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plans/convert.pp b/plans/convert.pp index 15681676..1ff1771a 100644 --- a/plans/convert.pp +++ b/plans/convert.pp @@ -305,10 +305,14 @@ # Restart cluster compiler services that are likely not restarted by our # final Puppet run to increase chance everything is functional upon plan # completion - run_command('systemctl restart pe-puppetserver.service', $legacy_compiler_targets) + if $legacy_compiler_targets { + run_command('systemctl restart pe-puppetserver.service', $legacy_compiler_targets) + } # PuppetDB is only found on modern compilers, not legacy ones - run_command('systemctl restart pe-puppetdb.service pe-puppetserver.service', $compiler_hosts) + if $compiler_targets { + run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service', $compiler_targets) + } # Run puppet on all targets again to ensure everything is fully up-to-date run_task('peadm::puppet_runonce', $all_targets)