Skip to content

Thheinen/efs accesspoints #1

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

Open
wants to merge 9 commits into
base: thheinen/efs-accesspoints
Choose a base branch
from

Conversation

mapk-amazon
Copy link

Description of changes

Added missing configuration

cjmakin and others added 7 commits July 23, 2024 14:55
* Update platform cookbook to support DCV on login nodes

* Updated `dcv.rb` to activate dcv on the login node.
* Updated `supervisord_config` to set `dcv_installed?` to be true when dcv is enabled on a login node.
* Updated `parallelcluster_supervisord.conf.erb` to include `pcluster_dcv_authenticator` when dcv is configured on a login node.

* Modify _dcv_common to support DCV on login node

* Update cloudwatch config DCV logs to include login nodes

* Allow DCV instance metadata access when enabled on login node

* Rename the DCV sessionID file to be the instance hostname

This is required to have multiple session files within the shared directory.

* Update supervisord_config_spec to test DCV on login node

* Update kitchen test and spec tests for login node dcv

* Added `dcv_enabled` attribute to the login node log rotation in `kitchen.platform-config.yml`.
* Updated `log_rotation_spec` to include dcv logs for login nodes.

* Update CHANGELOG
Before this commit, pcluster CW config is not loaded when CW agent is running on the custom AMI, causing the lack of logs on CloudWatch.

This commit appends pcluster CW config regardless of whether the CW agent is running. Therefore, CW config in the custom AMI will be preserved in addition to pcluster CW config. If there are conflicting parameters, the parameters in pcluster CW config overwrites the config from custom AMI.

Signed-off-by: Hanwen <[email protected]>
`append-config` merges config, but fails when there are conflicting parameters:
```
    2024/08/07 19:45:32 Under path : /metrics/metrics_collected/mem | Error : Different values are specified for mem
    2024/08/07 19:45:32 Under path : /metrics/metrics_collected/disk | Error : Different values are specified for disk
    2024/08/07 19:45:32 Under path : /metrics/append_dimensions | Error : Different values are specified for append_dimensions
    2024/08/07 19:45:32 Under path : /metrics/metrics_collected/mem | Error : Different values are specified for mem
    2024/08/07 19:45:32 Under path : /metrics/metrics_collected/disk | Error : Different values are specified for disk
    2024/08/07 19:45:32 Under path : /metrics/append_dimensions | Error : Different values are specified for append_dimensions
```

`fetch-config` overwrites config.

This commit makes the code to try merging the config first. If it fails, overwrite the config.

Signed-off-by: Hanwen <[email protected]>
@mapk-amazon mapk-amazon force-pushed the thheinen/efs-accesspoints branch from c54273f to 572cd4b Compare August 14, 2024 18:32
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.

4 participants