Bump downstairs repair service to version 2

This adds the debug /memory endpoint to the repair server.
It's not needed for repair, and none of the actual repair
protocol changed.

Author: leftwo

downstairs-api/src/lib.rs

@@ -23,6 +23,7 @@ api_versions!([
     // |  example for the next person.
     // v
     // (next_int, IDENT),
+    (2, MEMORY),
     (1, INITIAL),
 ]);
 
@@ -127,6 +128,7 @@ pub trait CrucibleDownstairsRepairApi {
     #[endpoint {
         method = GET,
         path = "/memory",
+        versions = VERSION_MEMORY..,
     }]
     async fn get_memory(
         rqctx: RequestContext<Self::Context>,

downstairs/src/repair.rs

@@ -5,8 +5,9 @@ use std::sync::Arc;
 use crucible_downstairs_api::*;
 use crucible_downstairs_types::repair::{ExtentFilePath, ExtentPath, FileType};
 use dropshot::{
-    Body, CompressionConfig, ConfigDropshot, HandlerTaskMode, HttpError,
-    HttpResponseOk, HttpServerStarter, Path, RequestContext,
+    Body, ClientSpecifiesVersionInHeader, CompressionConfig, ConfigDropshot,
+    HandlerTaskMode, HttpError, HttpResponseOk, Path, RequestContext,
+    VersionPolicy,
 };
 use hyper::{Response, StatusCode};
 
@@ -68,10 +69,17 @@ pub fn repair_main(
     /*
      * Set up the server.
      */
-    let server =
-        HttpServerStarter::new(&config_dropshot, api, context.into(), log)
-            .map_err(|error| format!("failed to create server: {}", error))?
-            .start();
+    let server = dropshot::ServerBuilder::new(api, context.into(), log.clone())
+        .config(config_dropshot)
+        .version_policy(VersionPolicy::Dynamic(Box::new(
+            ClientSpecifiesVersionInHeader::new(
+                omicron_common::api::VERSION_HEADER,
+                crucible_downstairs_api::latest_version(),
+            ),
+        )))
+        .build_starter()
+        .map_err(|error| format!("failed to create server: {}", error))?
+        .start();
     let local_addr = server.local_addr();
 
     let h = tokio::spawn(async move {

openapi/downstairs-repair/downstairs-repair-1.0.0-178638.json.gitstub

@@ -0,0 +1 @@
+ef04744d2a7ba34d6036ec7c39abcc49eeec25ef:openapi/downstairs-repair/downstairs-repair-1.0.0-178638.json

…pair/downstairs-repair-1.0.0-178638.json …pair/downstairs-repair-2.0.0-9f0059.jsonopenapi/downstairs-repair/downstairs-repair-1.0.0-178638.json renamed to openapi/downstairs-repair/downstairs-repair-2.0.0-9f0059.json openapi/downstairs-repair/downstairs-repair-1.0.0-178638.json renamed to openapi/downstairs-repair/downstairs-repair-2.0.0-9f0059.json

@@ -6,7 +6,7 @@
       "url": "https://oxide.computer",
       "email": "api@oxide.computer"
     },
-    "version": "1.0.0"
+    "version": "2.0.0"
   },
   "paths": {
     "/extent/{eid}/files": {
@@ -87,6 +87,30 @@
         }
       }
     },
+    "/memory": {
+      "get": {
+        "summary": "Memory usage report",
+        "operationId": "get_memory",
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MemoryReport"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "$ref": "#/components/responses/Error"
+          },
+          "5XX": {
+            "$ref": "#/components/responses/Error"
+          }
+        }
+      }
+    },
     "/newextent/{eid}/{file_type}": {
       "get": {
         "summary": "Get a specific extent file (data, database, or log files).",
@@ -219,6 +243,44 @@
           "value"
         ]
       },
+      "ConnectionMemoryReport": {
+        "description": "Per-connection memory report",
+        "type": "object",
+        "properties": {
+          "completed_ranges": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "completed_ranges_hwm": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "pending_jobs": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "pending_jobs_bytes": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "pending_jobs_capacity_hwm": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          }
+        },
+        "required": [
+          "completed_ranges",
+          "completed_ranges_hwm",
+          "pending_jobs",
+          "pending_jobs_bytes",
+          "pending_jobs_capacity_hwm"
+        ]
+      },
       "Error": {
         "description": "Error information from a response.",
         "type": "object",
@@ -238,6 +300,93 @@
           "request_id"
         ]
       },
+      "MemoryReport": {
+        "description": "Summary of downstairs memory usage",
+        "type": "object",
+        "properties": {
+          "active_connections": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "block_size": {
+            "type": "integer",
+            "format": "uint64",
+            "minimum": 0
+          },
+          "bytes_per_extent": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "connections": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConnectionMemoryReport"
+            }
+          },
+          "dirty_extent_count": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "extent_count": {
+            "type": "integer",
+            "format": "uint32",
+            "minimum": 0
+          },
+          "extent_meta_bytes": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "extent_size": {
+            "type": "integer",
+            "format": "uint64",
+            "minimum": 0
+          },
+          "rayon_threads": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "read_bytes_hwm": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "region_bytes": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "tokio_worker_threads": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          },
+          "write_bytes_hwm": {
+            "type": "integer",
+            "format": "uint",
+            "minimum": 0
+          }
+        },
+        "required": [
+          "active_connections",
+          "block_size",
+          "bytes_per_extent",
+          "connections",
+          "dirty_extent_count",
+          "extent_count",
+          "extent_meta_bytes",
+          "extent_size",
+          "rayon_threads",
+          "read_bytes_hwm",
+          "region_bytes",
+          "tokio_worker_threads",
+          "write_bytes_hwm"
+        ]
+      },
       "RegionDefinition": {
         "type": "object",
         "properties": {

openapi/downstairs-repair/downstairs-repair-latest.json

@@ -1 +1 @@
-downstairs-repair-1.0.0-178638.json
+downstairs-repair-2.0.0-9f0059.json