Skip to content

[Scaling] Add logs in share_compute_fleet_dna.py #2884

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.

Sign up for GitHub

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 1 commit into from
Feb 20, 2025
Merged

[Scaling] Add logs in share_compute_fleet_dna.py #2884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...ks/aws-parallelcluster-environment/files/cfn_hup_configuration/share_compute_fleet_dna.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ def get_compute_launch_template_ids(lt_config_file_name):
"""
lt_config = None
try:
logger.info("Getting LaunchTemplate ID and versions from %s", lt_config_file_name)
with open(lt_config_file_name, "r", encoding="utf-8") as file:
lt_config = json.loads(file.read())
except Exception as err:
Expand Down Expand Up @@ -117,6 +118,7 @@ def get_user_data(lt_id, lt_version, region_name):
proxy_config = parse_proxy_config()

ec2_client = boto3.client("ec2", region_name=region_name, config=proxy_config)
logger.info("Running EC2 DescribeLaunchTemplateVersions API for %s version %s", lt_id, lt_version)
response = ec2_client.describe_launch_template_versions(
LaunchTemplateId=lt_id,
Versions=[
Expand All @@ -139,6 +141,7 @@ def get_write_directives_section(user_data):
write_directives_section = None
try:
data = message_from_string(user_data)
logger.info("Parsing UserData to get write_files section")
for cloud_config_section in data.walk():
if cloud_config_section.get_content_type() == "text/cloud-config":
write_directives_section = yaml.safe_load(cloud_config_section._payload).get("write_files")
Expand All @@ -160,6 +163,7 @@ def write_dna_files(write_files_section, shared_storage_loc):
for data in write_files_section:
if data["path"] in ["/tmp/dna.json"]: # nosec B108
with open(file_path, "w", encoding="utf-8") as file:
logger.info("Writing %s", file_path)
file.write(json.dumps(json.loads(data["content"]), indent=4))
except Exception as err:
if hasattr(err, "message"):
Expand Down Expand Up @@ -190,6 +194,7 @@ def cleanup(directory_loc):
f_path = os.path.join(directory_loc, f)
try:
if os.path.isfile(f_path):
logger.info("Cleaning up %s", f_path)
os.remove(f_path)
except Exception as err:
logger.warning("Unable to delete %s due to %s", f_path, err)
Expand Down Expand Up @@ -238,6 +243,8 @@ def main():
)
raise SystemExit(0)

logger.info("All dna.json files have been shared!")


if __name__ == "__main__":
main()
5 changes: 4 additions & 1 deletion cookbooks/aws-parallelcluster-environment/resources/cfn_hup_configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,14 @@
group 'root'
mode '0400'
variables(
# Common variable
launch_template_resource_id: node['cluster']['launch_template_id'],
# HeadNode and LoginNode specific variables
stack_id: node['cluster']['stack_arn'],
region: node['cluster']['region'],
cloudformation_url: cloudformation_url,
cfn_init_role: instance_role_name,
launch_template_resource_id: node['cluster']['launch_template_id'],
# ComputeFleet specific variables
update_hook_script_dir: node['cluster']['scripts_dir'],
node_bootstrap_timeout: node['cluster']['compute_node_bootstrap_timeout'] || node['cluster']['Timeout']
)
Expand Down
Loading