Merge changes from release branch into Develop #2928
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Hanwen <hanwenli@amazon.com>
`cp -p` fails with the following error on Ubuntu 24: ``` STDERR: cp: preserving permissions for ‘/local/home/ubuntu/.ssh/authorized_keys’: Operation not supported ``` Signed-off-by: Hanwen <hanwenli@amazon.com>
…ernet check This commit saves time because the os won't retry on unsupported ipv6 and optional Internet connection Signed-off-by: Hanwen <hanwenli@amazon.com>
Co-authored-by: Himani Anil Deshpande <himanidp@amazon.com>
* Adding Ubuntu24 for kitchen tests for storage * Adding Rocky9, rhel9 and al2023 --------- Co-authored-by: Himani Anil Deshpande <himanidp@amazon.com>
Co-authored-by: Himani Anil Deshpande <himanidp@amazon.com>
Co-authored-by: Himani Anil Deshpande <himanidp@amazon.com>
The conditional statement avoids cleaning if the `/etc/resolv.conf` is a symbolic link. It is a symbolic link when it is managed by other systems. Cleaning the `/etc/resolv.conf` speed up instance launch because it wouldn't try to use name server from the AMI creation environment. The delay was shown in `/var/log/cloud-init.log`: ``` 2025-03-19 16:00:07,721 - util.py[DEBUG]: Resolving URL: http://169.254.169.254 took 40.099 seconds 2025-03-19 16:00:07,721 - util.py[DEBUG]: Resolving URL: http://[fd00:ec2::254] took 0.000 seconds 2025-03-19 16:00:17,731 - util.py[DEBUG]: Resolving URL: http://instance-data.:8773 took 10.010 seconds ``` Example content of `/etc/resolv.conf`: ``` cat /etc/resolv.conf # Generated by NetworkManager search ec2.internal nameserver 192.168.0.2 ``` Signed-off-by: Hanwen <hanwenli@amazon.com>
The conditional statement avoids cleaning if the `/etc/resolv.conf` is a symbolic link. It is a symbolic link when it is managed by other systems. Cleaning the `/etc/resolv.conf` speeds up instance launch because it wouldn't try to use name server from the AMI creation environment. The delay was shown in `/var/log/cloud-init.log`: ``` 2025-03-19 16:00:07,721 - util.py[DEBUG]: Resolving URL: http://169.254.169.254 took 40.099 seconds 2025-03-19 16:00:07,721 - util.py[DEBUG]: Resolving URL: http://[fd00:ec2::254] took 0.000 seconds 2025-03-19 16:00:17,731 - util.py[DEBUG]: Resolving URL: http://instance-data.:8773 took 10.010 seconds ``` Example content of `/etc/resolv.conf`: ``` cat /etc/resolv.conf # Generated by NetworkManager search ec2.internal nameserver 192.168.0.2 ``` Signed-off-by: Hanwen <hanwenli@amazon.com>
1. Only cleanup resolv conf during official AMI build. In the future, we will evaluate to apply this improvement to all AMI builds. 2. Also clean up `/run/systemd/resolve/resolv.conf `. This file exists on Ubuntu Signed-off-by: Hanwen <hanwenli@amazon.com>
Co-authored-by: Himani Anil Deshpande <himanidp@amazon.com>
Signed-off-by: Hanwen <hanwenli@amazon.com>
hehe7318
approved these changes
Apr 2, 2025
gmarciani
approved these changes
Apr 3, 2025
Contributor
Author
|
Previous run shows the system tests passed https://github.com/aws/aws-parallelcluster-cookbook/pull/2928/checks?check_run_id=39881157747 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
References
Checklist
developadd the branch name as prefix in the PR title (e.g.[release-3.6]).Please review the guidelines for contributing and Pull Request Instructions.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.