Use systemd timers to trigger updates

Author: hgreebe

cookbooks/aws-parallelcluster-computefleet/files/check_update/check-update.service

@@ -3,7 +3,7 @@ Description=Check for recent file modifications
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash -c 'cat /opt/slurm/etc/pcluster/.slurm_plugin/clustermgtd_heartbeat'
+ExecStart=/bin/bash -c 'if [ $(( $(date +%%s) - $(stat -c %%Y /home/testfile) )) -lt 60 ]; then /opt/parallelcluster/scripts/cfn-hup-update-action.sh; fi'
 
 [Install]
 WantedBy=multi-user.target

cookbooks/aws-parallelcluster-computefleet/recipes/config/config_check_update_systemd_service.rb

@@ -15,12 +15,11 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-cookbook_file '/etc/systemd/system/check-update.service' do
-  source 'check_update/check-update.service'
+template '/etc/systemd/system/check-update.service' do
+  source 'check_update/check-update.service.erb'
   owner 'root'
   group 'root'
   mode '0644'
-  action :create
 end
 
 cookbook_file '/etc/systemd/system/check-update.timer' do

cookbooks/aws-parallelcluster-computefleet/templates/check_update/check-update.service.erb

@@ -0,0 +1,9 @@
+[Unit]
+Description=Check for recent file modifications
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash -c 'if [ $(( $(date +%%s) - $(stat -c %%Y <%= node['cluster']['shared_update_path'] %>) )) -lt 60 ]; then <%= node['cluster']['scripts_dir'] %>/cfn-hup-update-action.sh; fi'
+
+[Install]
+WantedBy=multi-user.target

cookbooks/aws-parallelcluster-environment/resources/cfn_hup_configuration.rb

@@ -94,7 +94,8 @@
       mode '0700'
       variables(
         monitor_shared_dir: monitor_shared_dir,
-        launch_template_resource_id: node['cluster']['launch_template_id']
+        launch_template_resource_id: node['cluster']['launch_template_id'],
+        update_dir: node['cluster']['shared_update_path']
       )
     end
   end

cookbooks/aws-parallelcluster-environment/templates/cfn_hup_configuration/cfn-hook-update.conf.erb

@@ -3,9 +3,6 @@ triggers=post.update
 <% case node['cluster']['node_type'] -%>
 <% when 'HeadNode', 'LoginNode' -%>
 path=Resources.<%= @launch_template_resource_id %>.Metadata.AWS::CloudFormation::Init
-action=PATH=/usr/local/bin:/bin:/usr/bin:/opt/aws/bin; . /etc/parallelcluster/pcluster_cookbook_environment.sh; $CFN_BOOTSTRAP_VIRTUALENV_PATH/cfn-init -v --stack <%= @stack_id %> --resource <%= @launch_template_resource_id %> --configsets update --region <%= @region %> --url <%= @cloudformation_url %> --role <%= @cfn_init_role %>
-<% when 'ComputeFleet' -%>
-path=Resources.<%= @launch_template_resource_id %>
-action=timeout <%= @node_bootstrap_timeout %> <%= @update_hook_script_dir %>/cfn-hup-update-action.sh
+action=PATH=/usr/local/bin:/bin:/usr/bin:/opt/aws/bin; . /etc/parallelcluster/pcluster_cookbook_environment.sh; $CFN_BOOTSTRAP_VIRTUALENV_PATH/cfn-init -v --stack <%= @stack_id %> --resource <%= @launch_template_resource_id %> --configsets update --region <%= @region %> --url <%= @cloudformation_url %> --role <%= @cfn_init_role %>;  echo "Update triggered at $(date)" >> <%= @update_dir %>
 <% end %>
 runas=root

cookbooks/aws-parallelcluster-platform/templates/supervisord/parallelcluster_supervisord.conf.erb

@@ -1,7 +1,7 @@
 # Generated by Chef for AWS ParallelCluster <%= node['cluster']['node_type'] -%>
 # Local modifications could be overwritten.
-<%# HeadNode, ComputeFleet, LoginNode -%>
-<% if @cfnhup_enabled -%>
+<% case node['cluster']['node_type'] -%>
+<% when 'HeadNode'-%>
 [program:cfn-hup]
 command = <%= node['cluster']['scripts_dir']%>/cfn-hup-runner.sh
 autorestart = true

cookbooks/aws-parallelcluster-shared/attributes/cluster.rb

@@ -9,6 +9,9 @@
 default['cluster']['log_base_dir'] = '/var/log/parallelcluster'
 default['cluster']['etc_dir'] = '/etc/parallelcluster'
 
+# Shared file used to manage inplace updates
+default['cluster']['shared_update_path'] = "#{node['cluster']['shared_dir']}/check_update"
+
 # Slurm_plugin_dir is used by slurm cookbook and custom_actions recipe
 default['cluster']['slurm_plugin_dir'] = "#{node['cluster']['etc_dir']}/slurm_plugin"