Skip to content

3.0: Merge wip/pcluster3 into develop #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 14, 2021

Conversation

enrico-usai
Copy link
Contributor

@enrico-usai enrico-usai commented Jul 12, 2021

This patch includes all the changes from wip/pcluster3 branch plus the following changes:

Cherry-pick: Use subprocess based method to read shared files - see 22c7e21

  • common.py
  • computemgtd.py (partial)
  • test_common.py
  • test_computemgtd.py

Cherry pick: computemgtd: do not fail on config reload - see eb1cf0d

  • computemgtd.py (partial)

enrico-usai and others added 21 commits April 28, 2021 10:13
* Remove jobwatcher, sqswatcher and nodewatcher code.
* Remove nodewatcher, sqswatcher, jobwatcher references.
* Remove ASG utilities.

Signed-off-by: Enrico Usai <[email protected]>
Signed-off-by: Enrico Usai <[email protected]>
* Change tag prefix from 'aws-parallelcluster-' to 'parallelcluster:'

Signed-off-by: Rex <[email protected]>
custom-bucket  # bucket selected by user for custom artifacts
└── parallelcluster
    └── 3.0.0 # new folder
        ├── cli # uploaded by uploadCLI.sh script
        │   └── aws-parallelcluster-3.0.0.tgz
        ├── cookbooks  # uploaded by uploadCookbok.sh script
        │   └── aws-parallelcluster-cookbook-3.0.0.*
        └── node  # uploaded by uploadNode.sh script
            └── aws-parallelcluster-node-3.0.0.*

Signed-off-by: Enrico Usai <[email protected]>
The benefit of this change is that TerminateInstances permissions do not
need to be included in the instance profile attached to compute nodes.

In order for this to work instances must be configured to terminate upon
instance-initiated shutdown (as opposed to stopping, which is the
default behavior).

Signed-off-by: Tim Lane <[email protected]>
Signed-off-by: chenwany <[email protected]>
Signed-off-by: chenwany <[email protected]>
Apply rename tag ClusterName to parallelcluster:cluster-name
Apply change tag prefix to 'parallelcluster:'

Signed-off-by: chenwany <[email protected]>
Apply the changes in "Drop deprecated features and use inclusive language" after clustermgtd refactor

Signed-off-by: chenwany <[email protected]>
@codecov
Copy link

codecov bot commented Jul 12, 2021

Codecov Report

Merging #316 (5004513) into develop (22c7e21) will increase coverage by 15.89%.
The diff coverage is 93.97%.

Impacted file tree graph

@@             Coverage Diff              @@
##           develop     #316       +/-   ##
============================================
+ Coverage    61.98%   77.88%   +15.89%     
============================================
  Files           23       12       -11     
  Lines         2533     1605      -928     
============================================
- Hits          1570     1250      -320     
+ Misses         963      355      -608     
Impacted Files Coverage Δ
src/slurm_plugin/computemgtd.py 61.29% <80.00%> (+4.83%) ⬆️
src/common/utils.py 58.47% <90.90%> (-1.45%) ⬇️
src/slurm_plugin/instance_manager.py 92.10% <92.10%> (ø)
src/slurm_plugin/slurm_resources.py 92.68% <92.68%> (ø)
src/slurm_plugin/clustermgtd.py 92.50% <96.21%> (+0.80%) ⬆️
src/common/schedulers/slurm_commands.py 88.40% <100.00%> (-2.46%) ⬇️
src/slurm_plugin/common.py 62.00% <100.00%> (-23.52%) ⬇️
src/slurm_plugin/resume.py 70.96% <100.00%> (+0.63%) ⬆️
src/slurm_plugin/suspend.py 51.21% <100.00%> (+1.21%) ⬆️
src/common/schedulers/converters.py 0.00% <0.00%> (-96.88%) ⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 22c7e21...5004513. Read the comment docs.

@enrico-usai enrico-usai force-pushed the wip/pcluster3-merge branch 2 times, most recently from 0924488 to 80ad27c Compare July 13, 2021 08:45
@enrico-usai enrico-usai force-pushed the wip/pcluster3-merge branch from 80ad27c to cd5f577 Compare July 13, 2021 09:38
Signed-off-by: Enrico Usai <[email protected]>

# Conflicts:
#	CHANGELOG.md
#	amis/build_ami.sh
#	amis/packer_alinux2.json
#	amis/packer_centos7.json
#	amis/packer_centos8.json
#	amis/packer_ubuntu1804.json
#	amis/packer_ubuntu2004.json
#	amis/packer_variables.json
#	attributes/conditions.rb
#	attributes/default.rb
#	files/default/configure-pat.sh
#	libraries/helpers.rb
#	metadata.rb
#	recipes/cluster_admin_user_install.rb
#	recipes/fsx_mount.rb
#	recipes/sge_install.rb
#	recipes/slurm_install.rb
#	recipes/tests.rb
#	templates/default/compute_ready.erb
#	templates/default/slurm/slurm.conf.erb
@enrico-usai enrico-usai force-pushed the wip/pcluster3-merge branch from cd5f577 to 5004513 Compare July 13, 2021 09:42
@enrico-usai enrico-usai merged commit a36da19 into aws:develop Jul 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants