Fix udev rule for EBS mappings #98
Merged
Conversation
This file contains 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
yeazelm
approved these changes
Aug 19, 2024
bcressey
approved these changes
Aug 19, 2024
sources/ghostdog/src/main.rs
Outdated
Comment on lines
122
to
125
| Ok(String::from_utf8_lossy(device_name) | ||
| .replace("/dev/", "") | ||
| .trim_end() | ||
| .to_string()) |
There was a problem hiding this comment.
nit: it feels a bit loose not to anchor this to the start of the string:
Suggested change
| Ok(String::from_utf8_lossy(device_name) | |
| .replace("/dev/", "") | |
| .trim_end() | |
| .to_string()) | |
| Ok(String::from_utf8_lossy(device_name) | |
| .trim_start_matches("/dev/") | |
| .trim_end() | |
| .to_string()) |
sources/ghostdog/src/main.rs
Outdated
Comment on lines
247
to
250
| let mut device_info: Vec<u8> = vec![0; NVME_IDENTIFY_DATA_SIZE - 1024]; | ||
| let mut padding = vec![32; NVME_IDENTIFY_DATA_SIZE - device_info.len() - device_name.len()]; | ||
| device_info.append(&mut device_name); | ||
| device_info.append(&mut padding); |
There was a problem hiding this comment.
nit: could factor this into a helper function now that it's repeated
vigh-m
approved these changes
Aug 19, 2024
In certain workflows, EC2 adds `/dev/` to the device name. Remove it, otherwise the symlink created by `udev` will point to the wrong path. Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
Create the symlinks to the actual devices under `/dev/by-ebs-id` so that the names don't collide with actual devices created by the kernel. Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
arnaldo2792
force-pushed
the
fix-udev-rule
branch
from
96e0872
to
8472149
Compare
|
(addressed nits on ghostdog) |
bcressey
approved these changes
Aug 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue number:
#97
Description of changes:
With this change, symlinks to the underlying EBS volumes will be created under
/dev/by-ebs-idinstead of the root of/dev. This will help prevent collisions with actual devices created by the kernel (as described in this amazonlinux/amazon-ec2-utils#37).As part of this change,
/dev/will be removed from the device name if it is found after querying the device identifier, so that only the device id is returned to udev.Testing done:
I ran my change in an EC2 instance, and confirmed that the devices are listed under
/dev/by-ebs-idwhen the mapping is added:I confirmed that in the workflow that prepends the device ID with
/dev/, this prefix is removed and the symlink is created under/dev/by-ebs-id/Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.