Skip to content

Commit 90168d9

Browse files
lukeseawalkerdemartinofra
authored andcommitted
Move handler dir under a local directory
Move handler dir from a shared dir /home/scheduler-plugin to a local dir /opt/parallelcluster/scheduler-plugin. This to avoid concurrency when N nodes write on the same target file Signed-off-by: Luca Carrogu <[email protected]>
1 parent 22a3d9a commit 90168d9

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

attributes/default.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
default['cluster']['slurm']['user_id'] = node['cluster']['reserved_base_uid'] + 1
120120
default['cluster']['slurm']['group'] = node['cluster']['slurm']['user']
121121
default['cluster']['slurm']['group_id'] = node['cluster']['slurm']['user_id']
122-
# BYOS (Custom Scheduler) Configuration
122+
# Scheduler plugin Configuration
123123
default['cluster']['scheduler_plugin']['name'] = 'pcluster-scheduler-plugin'
124124
default['cluster']['scheduler_plugin']['user'] = default['cluster']['scheduler_plugin']['name']
125125
default['cluster']['scheduler_plugin']['user_id'] = node['cluster']['reserved_base_uid'] + 4
@@ -129,13 +129,13 @@
129129
default['cluster']['scheduler_plugin']['system_user_id_start'] = node['cluster']['reserved_base_uid'] + 10
130130
default['cluster']['scheduler_plugin']['system_group_id_start'] = default['cluster']['scheduler_plugin']['system_user_id_start']
131131

132-
# BYOS event handler
132+
# Scheduler plugin event handler
133133
default['cluster']['scheduler_plugin']['home'] = '/home/pcluster-scheduler-plugin'
134-
default['cluster']['scheduler_plugin']['handler_dir'] = '/home/pcluster-scheduler-plugin/.parallelcluster'
135134
default['cluster']['scheduler_plugin']['handler_log_out'] = '/var/log/parallelcluster/scheduler-plugin.out.log'
136135
default['cluster']['scheduler_plugin']['handler_log_err'] = '/var/log/parallelcluster/scheduler-plugin.err.log'
137136
default['cluster']['scheduler_plugin']['shared_dir'] = "#{node['cluster']['shared_dir']}/scheduler-plugin"
138137
default['cluster']['scheduler_plugin']['local_dir'] = "#{node['cluster']['base_dir']}/scheduler-plugin"
138+
default['cluster']['scheduler_plugin']['handler_dir'] = "#{node['cluster']['scheduler_plugin']['local_dir']}/.configs"
139139
default['cluster']['scheduler_plugin']['scheduler_plugin_substack_outputs_path'] = "#{node['cluster']['shared_dir']}/scheduler-plugin-substack-outputs.json"
140140
default['cluster']['scheduler_plugin']['python_version'] = '3.9.9'
141141
default['cluster']['scheduler_plugin']['virtualenv'] = 'scheduler_plugin_virtualenv'

cookbooks/aws-parallelcluster-scheduler-plugin/recipes/install.rb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,20 @@
2020
# setup Pyenv and Virtualenv
2121
include_recipe "aws-parallelcluster-scheduler-plugin::install_python"
2222

23-
# create e.g. /opt/parallelcluster/byos
2423
directory node['cluster']['scheduler_plugin']['local_dir'] do
2524
owner node['cluster']['scheduler_plugin']['user']
2625
group node['cluster']['scheduler_plugin']['user']
2726
mode '0755'
2827
action :create
2928
end
3029

31-
# create e.g. /opt/parallelcluster/shared/byos
30+
directory node['cluster']['scheduler_plugin']['handler_dir'] do
31+
owner node['cluster']['scheduler_plugin']['user']
32+
group node['cluster']['scheduler_plugin']['user']
33+
mode '0755'
34+
action :create
35+
end
36+
3237
directory node['cluster']['scheduler_plugin']['shared_dir'] do
3338
owner node['cluster']['scheduler_plugin']['user']
3439
group node['cluster']['scheduler_plugin']['user']

cookbooks/aws-parallelcluster-scheduler-plugin/recipes/install_user.rb

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
1616
# limitations under the License.
1717

18-
# Setup byos group
18+
# Setup scheduler-plugin group
1919
group node['cluster']['scheduler_plugin']['group'] do
2020
comment 'ParallelCluster scheduler plugin group'
2121
gid node['cluster']['scheduler_plugin']['group_id']
2222
system true
2323
end
2424

25-
# Setup byos user
25+
# Setup scheduler-plugin user
2626
user node['cluster']['scheduler_plugin']['user'] do
2727
comment 'ParallelCluster scheduler plugin user'
2828
uid node['cluster']['scheduler_plugin']['user_id']
@@ -41,11 +41,3 @@
4141
echo "export PATH" >> "#{node['cluster']['scheduler_plugin']['home']}/.bash_profile"
4242
PROFILE
4343
end
44-
45-
# create dir /home/byos/.parallelcluster
46-
directory node['cluster']['scheduler_plugin']['handler_dir'] do
47-
owner node['cluster']['scheduler_plugin']['user']
48-
group node['cluster']['scheduler_plugin']['user']
49-
mode '0755'
50-
action :create
51-
end

0 commit comments

Comments
 (0)