Revert "Add support for finding oxide processes on a sled (#7194)"

This reverts commit 1d19061.
oxidecomputer · Jan 7, 2025 · 48527ed · 48527ed
1 parent 1d19061
commit 48527ed
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 397 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/openapi/sled-agent.json b/openapi/sled-agent.json
@@ -715,48 +715,6 @@
         }
       }
     },
-    "/support/pargs-info": {
-      "get": {
-        "operationId": "support_pargs_info",
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "*/*": {
-                "schema": {}
-              }
-            }
-          },
-          "4XX": {
-            "$ref": "#/components/responses/Error"
-          },
-          "5XX": {
-            "$ref": "#/components/responses/Error"
-          }
-        }
-      }
-    },
-    "/support/pstack-info": {
-      "get": {
-        "operationId": "support_pstack_info",
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "*/*": {
-                "schema": {}
-              }
-            }
-          },
-          "4XX": {
-            "$ref": "#/components/responses/Error"
-          },
-          "5XX": {
-            "$ref": "#/components/responses/Error"
-          }
-        }
-      }
-    },
     "/support/zoneadm-info": {
       "get": {
         "operationId": "support_zoneadm_info",

diff --git a/sled-agent/api/src/lib.rs b/sled-agent/api/src/lib.rs
@@ -647,22 +647,6 @@ pub trait SledAgentApi {
     async fn support_dladm_info(
         request_context: RequestContext<Self::Context>,
     ) -> Result<HttpResponseOk<FreeformBody>, HttpError>;
-
-    #[endpoint {
-        method = GET,
-        path = "/support/pargs-info",
-    }]
-    async fn support_pargs_info(
-        request_context: RequestContext<Self::Context>,
-    ) -> Result<HttpResponseOk<FreeformBody>, HttpError>;
-
-    #[endpoint {
-        method = GET,
-        path = "/support/pstack-info",
-    }]
-    async fn support_pstack_info(
-        request_context: RequestContext<Self::Context>,
-    ) -> Result<HttpResponseOk<FreeformBody>, HttpError>;
 }
 
 #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]

diff --git a/sled-agent/src/http_entrypoints.rs b/sled-agent/src/http_entrypoints.rs
@@ -1001,36 +1001,4 @@ impl SledAgentApi for SledAgentImpl {
 
         Ok(HttpResponseOk(FreeformBody(output.into())))
     }
-
-    async fn support_pargs_info(
-        request_context: RequestContext<Self::Context>,
-    ) -> Result<HttpResponseOk<FreeformBody>, HttpError> {
-        let sa = request_context.context();
-        let output = sa
-            .support_pargs_info()
-            .await
-            .into_iter()
-            .map(|cmd| cmd.get_output())
-            .collect::<Vec<_>>()
-            .as_slice()
-            .join("\n\n");
-
-        Ok(HttpResponseOk(FreeformBody(output.into())))
-    }
-
-    async fn support_pstack_info(
-        request_context: RequestContext<Self::Context>,
-    ) -> Result<HttpResponseOk<FreeformBody>, HttpError> {
-        let sa = request_context.context();
-        let output = sa
-            .support_pstack_info()
-            .await
-            .into_iter()
-            .map(|cmd| cmd.get_output())
-            .collect::<Vec<_>>()
-            .as_slice()
-            .join("\n\n");
-
-        Ok(HttpResponseOk(FreeformBody(output.into())))
-    }
 }
diff --git a/sled-agent/src/sim/http_entrypoints.rs b/sled-agent/src/sim/http_entrypoints.rs
@@ -737,18 +737,6 @@ impl SledAgentApi for SledAgentSimImpl {
     ) -> Result<HttpResponseOk<FreeformBody>, HttpError> {
         method_unimplemented()
     }
-
-    async fn support_pargs_info(
-        _request_context: RequestContext<Self::Context>,
-    ) -> Result<HttpResponseOk<FreeformBody>, HttpError> {
-        method_unimplemented()
-    }
-
-    async fn support_pstack_info(
-        _request_context: RequestContext<Self::Context>,
-    ) -> Result<HttpResponseOk<FreeformBody>, HttpError> {
-        method_unimplemented()
-    }
 }
 
 fn method_unimplemented<T>() -> Result<T, HttpError> {

diff --git a/sled-agent/src/sled_agent.rs b/sled-agent/src/sled_agent.rs
@@ -1388,18 +1388,6 @@ impl SledAgent {
     ) -> Vec<Result<SledDiagnosticsCmdOutput, SledDiagnosticsCmdError>> {
         sled_diagnostics::dladm_info().await
     }
-
-    pub(crate) async fn support_pargs_info(
-        &self,
-    ) -> Vec<Result<SledDiagnosticsCmdOutput, SledDiagnosticsCmdError>> {
-        sled_diagnostics::pargs_oxide_processes(&self.log).await
-    }
-
-    pub(crate) async fn support_pstack_info(
-        &self,
-    ) -> Vec<Result<SledDiagnosticsCmdOutput, SledDiagnosticsCmdError>> {
-        sled_diagnostics::pstack_oxide_processes(&self.log).await
-    }
 }
 
 #[derive(From, thiserror::Error, Debug)]

diff --git a/sled-diagnostics/Cargo.toml b/sled-diagnostics/Cargo.toml
@@ -7,11 +7,7 @@ edition = "2021"
 workspace = true
 
 [dependencies]
-cfg-if.workspace = true
-fs-err.workspace = true
 futures.workspace = true
-libc.workspace = true
 omicron-workspace-hack.workspace = true
-slog.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full"] }
diff --git a/sled-diagnostics/src/contract.rs b/sled-diagnostics/src/contract.rs
diff --git a/sled-diagnostics/src/contract_stub.rs b/sled-diagnostics/src/contract_stub.rs