api: nomad debug new /agent/host
#8325
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
This change forwardMonitorClient and forwardProfileClient to use findClientConn, which was cribbed from the common parts of those funcs.
langmartin
commented
Jul 1, 2020
b564e61 to
67c17ae
Compare
drewbailey
reviewed
Jul 1, 2020
67c17ae to
41a06a6
Compare
81d430a to
163b5da
Compare
drewbailey
reviewed
Jul 1, 2020
drewbailey
reviewed
Jul 1, 2020
langmartin
commented
Jul 1, 2020
schmichael
requested changes
Jul 1, 2020
Comment on lines
+11
to
+42
| // mountedPaths produces a list of mounts | ||
| func mountedPaths() []string { | ||
| fh, err := os.Open("/proc/mounts") | ||
| if err != nil { | ||
| return []string{err.Error()} | ||
| } | ||
| rd := bufio.NewReader(fh) | ||
|
|
||
| var paths []string | ||
| for { | ||
| str, err := rd.ReadString('\n') | ||
| if err != nil { | ||
| break | ||
| } | ||
|
|
||
| ln := strings.Split(str, " ") | ||
| switch ln[2] { | ||
| case "autofs", "binfmt_misc", "cgroup", "debugfs", | ||
| "devpts", "devtmpfs", | ||
| "fusectl", "fuse.lxcfs", | ||
| "hugetlbfs", "mqueue", | ||
| "proc", "pstore", "rpc_pipefs", "securityfs", | ||
| "sysfs", "tmpfs", "vboxsf": | ||
| continue | ||
| default: | ||
| } | ||
|
|
||
| paths = append(paths, ln[1]) | ||
| } | ||
|
|
||
| return paths | ||
| } |
There was a problem hiding this comment.
I think this is our 3rd implementation of mount point enumeration:
- Used in
/v1/client/stats- https://github.com/hashicorp/nomad/blob/v0.12.0-beta2/client/stats/host.go#L183-L209 - Used in client node fingerprinting - https://github.com/hashicorp/nomad/blob/v0.12.0-beta2/client/fingerprint/storage_unix.go#L16
We don't have to fix this up for 0.12.0, but would you mind investigating if there's an opportunity to share code here and file an issue if so?
Comment on lines
+24
to
+26
| for _, c := range "ABCDEFGHIJKLMNOPQRSTUVWXYZ" { | ||
| d := string(c) + ":\\" | ||
| _, err := os.Stat(d) |
There was a problem hiding this comment.
Enumerating mount points on Windows is as simple as a b c 1 2 3 you and ... 🎶
facdd50 to
c4f59b8
Compare
schmichael
approved these changes
Jul 1, 2020
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
/agent/hostis a new API endpoint that provides debug information about the agent's host environment from the perspective of the nomad process. #8306