Merge pull request #146 from lmilleri/actix-web-ds

Http server: configurable num of worker threads

Author: lmilleri

integration-tests/src/common.rs

@@ -202,6 +202,8 @@ impl TestHarness {
                 certificate: None,
                 insecure_http: true,
                 payload_request_size: 2,
+                worker_count: Some(4),
+            
             },
             admin: AdminConfig {
                 auth_public_key: None,

kbs/docs/config.md

@@ -19,13 +19,14 @@ The following sections list the KBS properties which can be set through the conf
 
 The following properties can be set under the `[http_server]` section.
 
-| Property               | Type         | Description                                      | Required | Default              |
-|------------------------|--------------|--------------------------------------------------|----------|----------------------|
-| `sockets`              | String array | One or more sockets to listen on.                | No       | `["127.0.0.1:8080"]` |
-| `insecure_http`        | Boolean      | Don't use TLS for the KBS HTTP endpoint.         | No       | `false`              |
-| `private_key`          | String       | Path to a private key file to be used for HTTPS. | No       | None                 |
-| `certificate`          | String       | Path to a certificate file to be used for HTTPS. | No       | None                 |
-| `payload_request_size` | Integer      | Request payload size in mega bytes.              | No       | 2                    |
+| Property               | Type         | Description                                      |  Required | Default                  |
+|------------------------|--------------|--------------------------------------------------|----------|--------------------------|
+| `sockets`              | String array | One or more sockets to listen on.                | No       | `["127.0.0.1:8080"]`     |
+| `insecure_http`        | Boolean      | Don't use TLS for the KBS HTTP endpoint.         | No       | `false`                  |
+| `private_key`          | String       | Path to a private key file to be used for HTTPS. | No       | None                     |
+| `certificate`          | String       | Path to a certificate file to be used for HTTPS. | No       | None                     |
+| `payload_request_size` | Integer      | Request payload size in mega bytes.              | No       | 2                        |
+| `worker_count`         | Integer      | Number of HTTP actix worker threads              | No       | Num of logical CPU cores |
 
 ### Attestation Token Configuration
 

kbs/src/api_server.rs

@@ -114,7 +114,7 @@ impl ApiServer {
         let http_config = self.config.http_server.clone();
 
         #[allow(clippy::redundant_closure)]
-        let http_server = HttpServer::new({
+        let mut http_server = HttpServer::new({
             move || {
                 let api_server = self.clone();
                 App::new()
@@ -137,6 +137,10 @@ impl ApiServer {
             }
         });
 
+        if let Some(worker_count) = http_config.worker_count {
+            http_server = http_server.workers(worker_count);
+        }
+
         if !http_config.insecure_http {
             let tls_server = http_server
                 .bind_openssl(

kbs/src/config.rs

@@ -34,6 +34,10 @@ pub struct HttpServerConfig {
 
     /// Request payload size in MB
     pub payload_request_size: u32,
+
+    /// Number of worker threads for the actix-web server.
+    /// If not specified, defaults to the number of logical CPU cores.
+    pub worker_count: Option<usize>,
 }
 
 impl Default for HttpServerConfig {
@@ -44,6 +48,7 @@ impl Default for HttpServerConfig {
             certificate: None,
             insecure_http: DEFAULT_INSECURE_HTTP,
             payload_request_size: DEFAULT_PAYLOAD_REQUEST_SIZE,
+            worker_count: None,
         }
     }
 }
@@ -165,6 +170,7 @@ mod tests {
             certificate: Some("/etc/kbs-cert.pem".into()),
             insecure_http: false,
             payload_request_size: DEFAULT_PAYLOAD_REQUEST_SIZE,
+            worker_count: None,
         },
         admin: AdminConfig {
             auth_public_key: Some(PathBuf::from("/etc/kbs-admin.pub")),
@@ -214,6 +220,7 @@ mod tests {
             certificate: None,
             insecure_http: DEFAULT_INSECURE_HTTP,
             payload_request_size: DEFAULT_PAYLOAD_REQUEST_SIZE,
+            worker_count: None,
         },
         admin: AdminConfig {
             auth_public_key: None,
@@ -251,6 +258,7 @@ mod tests {
             certificate: Some("/etc/kbs-cert.pem".into()),
             insecure_http: false,
             payload_request_size: DEFAULT_PAYLOAD_REQUEST_SIZE,
+            worker_count: None,
         },
         admin: AdminConfig {
             auth_public_key: Some(PathBuf::from("/etc/kbs-admin.pub")),
@@ -289,6 +297,7 @@ mod tests {
             certificate: None,
             insecure_http: true,
             payload_request_size: DEFAULT_PAYLOAD_REQUEST_SIZE,
+            worker_count: None,
         },
         admin: AdminConfig {
             auth_public_key: Some(PathBuf::from("/opt/confidential-containers/kbs/user-keys/public.pub")),
@@ -330,6 +339,7 @@ mod tests {
             certificate: None,
             insecure_http: true,
             payload_request_size: DEFAULT_PAYLOAD_REQUEST_SIZE,
+            worker_count: None,
         },
         admin: AdminConfig {
             auth_public_key: Some("/kbs/kbs.pem".into()),
@@ -365,6 +375,7 @@ mod tests {
             certificate: None,
             insecure_http: true,
             payload_request_size: DEFAULT_PAYLOAD_REQUEST_SIZE,
+            worker_count: None,
         },
         admin: AdminConfig {
             auth_public_key: Some("/kbs/kbs.pem".into()),