Pull support-bundle/queries into a standalone crate #7193
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
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
smklein
approved these changes
Dec 10, 2024
Comment on lines
+19
to
22
| pub trait SledDiagnosticsCommandHttpOutput { | ||
| fn get_output(self) -> String; | ||
| } | ||
|
|
There was a problem hiding this comment.
I know this isn't new in this PR, but since we're exposing it from a crate API, we may want to revisit this trait name.
- The name is a little redundant with the crate
- The
HttpOutputbit is especially confusing now, since this trait also has nothing to do with HTTP
There was a problem hiding this comment.
I left this as is because I knew it would be addressed in a PR on top of this PR.
The updated output type can be found in #7228
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
papertigers
deleted the
spr/papertigers/pull-support-bundlequeries-into-a-standalone-crate
branch
papertigers
added a commit
that referenced
this pull request
Jan 7, 2025
This PR adds support for finding all oxide processes via libcontract and
relying on the fact that we deploy oxide services with the fmri prefix
svc:/oxide/ or svc:/system/illumos. This allows us to find every pid started via smf even if
the smf script uses ctrun.
You can see this for yourself by running pfexec ctstat -av on a
helios/illumos based system:
```
205 1 process owned 2492 0 - -
cookie: 0
informative event set: core
critical event set: hwerr empty
fatal event set: hwerr
parameter set: noorphan regent
member processes: 2497
inherited contracts: none
service fmri: svc:/oxide/wicketd:default
service fmri ctid: 204
creator: ctrun
aux:
249 1 process owned 1334 0 - -
cookie: 0x20
informative event set: none
critical event set: hwerr empty
fatal event set: none
parameter set: inherit regent
member processes: 2794
inherited contracts: none
service fmri: svc:/oxide/dendrite:default
service fmri ctid: 249
creator: svc.startd
aux: start
254 1 process owned 1334 0 - -
cookie: 0x20
informative event set: none
critical event set: hwerr empty
fatal event set: none
parameter set: inherit regent
member processes: 2802
inherited contracts: none
service fmri: svc:/oxide/lldpd:default
service fmri ctid: 254
creator: svc.startd
aux: start
```
This PR is on top of:
- #7193
papertigers
added a commit
that referenced
this pull request
Jan 8, 2025
This PR adds support for finding all oxide processes via libcontract and
relying on the fact that we deploy oxide services with the fmri prefix
svc:/oxide/ or svc:/system/illumos. This allows us to find every pid
started via smf even if the smf script uses ctrun.
You can see this for yourself by running pfexec ctstat -av on a
helios/illumos based system:
```
205 1 process owned 2492 0 - -
cookie: 0
informative event set: core
critical event set: hwerr empty
fatal event set: hwerr
parameter set: noorphan regent
member processes: 2497
inherited contracts: none
service fmri: svc:/oxide/wicketd:default
service fmri ctid: 204
creator: ctrun
aux:
249 1 process owned 1334 0 - -
cookie: 0x20
informative event set: none
critical event set: hwerr empty
fatal event set: none
parameter set: inherit regent
member processes: 2794
inherited contracts: none
service fmri: svc:/oxide/dendrite:default
service fmri ctid: 249
creator: svc.startd
aux: start
254 1 process owned 1334 0 - -
cookie: 0x20
informative event set: none
critical event set: hwerr empty
fatal event set: none
parameter set: inherit regent
member processes: 2802
inherited contracts: none
service fmri: svc:/oxide/lldpd:default
service fmri ctid: 254
creator: svc.startd
aux: start
```
This PR is on top of:
- #7193
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.
This pulls out sled-agent/support-bundle/queries from Omicron into a standalone sled-diagnostics crate that can be reused outside of sled-agent.