reintroduce dist-server

 dist-worker was not correct

Author: drahnr

.github/workflows/ci.yml

@@ -192,10 +192,10 @@ jobs:
         include:
           - os: ubuntu-20.04
             target: x86_64-unknown-linux-musl
-            extra_args: --features="dist-worker"
+            extra_args: --features="dist-server"
           - os: ubuntu-20.04
             binary: cachepot-dist
-            extra_args: --features="dist-worker"
+            extra_args: --features="dist-server"
             target: x86_64-unknown-linux-musl
           - os: ubuntu-20.04
             target: aarch64-unknown-linux-musl

Cargo.toml

@@ -22,7 +22,7 @@ path = "src/main.rs"
 
 [[bin]]
 name = "cachepot-dist"
-required-features = ["dist-worker"]
+required-features = ["dist-server"]
 path = "src/bin/cachepot-dist/main.rs"
 
 [dependencies]
@@ -96,7 +96,7 @@ zstd = "0.6"
 structopt = "0.3.25"
 strum = { version = "0.23.0", features = ["derive"] }
 
-# dist-worker only
+# dist-server only
 crossbeam-utils = { version = "0.8", optional = true }
 libmount = { version = "0.1.10", optional = true }
 nix = { version = "0.19", optional = true }
@@ -134,7 +134,7 @@ features = [
 
 [features]
 default = ["all"]
-all = ["dist-worker", "dist-client", "redis", "s3", "memcached", "gcs", "azure"]
+all = ["dist-server", "dist-client", "redis", "s3", "memcached", "gcs", "azure"]
 azure = ["chrono", "hyper", "hyperx", "url", "hmac", "md-5", "sha2"]
 s3 = ["chrono", "hyper", "hyper-tls", "hyperx", "reqwest", "rusoto_core", "rusoto_s3", "hmac", "sha-1"]
 gcs = ["chrono", "hyper", "hyperx", "percent-encoding", "reqwest", "ring", "untrusted", "url"]
@@ -145,11 +145,11 @@ unstable = []
 # Enables distributed support in the cachepot client
 dist-client = ["ar", "flate2", "hyper", "hyperx", "reqwest/stream", "url", "sha2", "tokio/fs"]
 # Enables the cachepot-dist binary
-dist-worker = ["chrono", "crossbeam-utils", "jsonwebtoken", "flate2", "hyperx", "libmount", "nix", "reqwest", "rouille", "sha2", "syslog", "void", "version-compare"]
+dist-server = ["chrono", "crossbeam-utils", "jsonwebtoken", "flate2", "hyperx", "libmount", "nix", "reqwest", "rouille", "sha2", "syslog", "void", "version-compare"]
 # Enables dist tests with external requirements
-dist-tests = ["dist-client", "dist-worker"]
+dist-tests = ["dist-client", "dist-server"]
 # Run JWK token crypto against openssl ref impl
-vs_openssl = ["openssl", "dist-worker"]
+vs_openssl = ["openssl", "dist-server"]
 
 # Make sure to always optimize big integer calculations as this cuts down
 # certificate generation time by two orders of magnitude (down to ~0.1s)

docs/book/src/dist/dist.md

@@ -290,5 +290,5 @@ certificate will be requested from the scheduler.
 Until these binaries [are included in releases](https://github.com/paritytech/cachepot/issues/393) I've put together a Docker container that can be used to easily build a release binary:
 
 ```toml
-docker run -ti --rm -v $PWD:/cachepot luser/cachepot-musl-build:0.1 /bin/bash -c "cd /cachepot; cargo build --release --target x86_64-unknown-linux-musl --features=dist-worker && strip target/x86_64-unknown-linux-musl/release/cachepot-dist && cd target/x86_64-unknown-linux-musl/release/ && tar czf cachepot-dist.tar.gz cachepot-dist"
+docker run -ti --rm -v $PWD:/cachepot luser/cachepot-musl-build:0.1 /bin/bash -c "cd /cachepot; cargo build --release --target x86_64-unknown-linux-musl --features=dist-server && strip target/x86_64-unknown-linux-musl/release/cachepot-dist && cd target/x86_64-unknown-linux-musl/release/ && tar czf cachepot-dist.tar.gz cachepot-dist"
 ```

docs/book/src/dist/quickstart.md

@@ -5,10 +5,10 @@ macOS and Windows clients are supported but have seen significantly less testing
 
 ## Get cachepot binaries
 
-Either download pre-built cachepot binaries (not currently available), or build cachepot locally with the `dist-client` and `dist-worker` features enabled:
+Either download pre-built cachepot binaries (not currently available), or build cachepot locally with the `dist-client` and `dist-server` features enabled:
 
 ```sh
-cargo build --release --features="dist-client dist-worker"
+cargo build --release --features="dist-client dist-server"
 ```
 
 The `target/release/cachepot` binary will be used on the client, and the `target/release/cachepot-dist` binary will be used on the scheduler and build server.

scripts/extratest.sh

@@ -24,36 +24,36 @@ wintarget() {
 # all-windows doesn't work as redis-rs build.rs has issues (checks for cfg!(unix))
 
 if [ "$1" = checkall ]; then
-    $CARGO check --target $target --all-targets --features 'all dist-client dist-worker dist-tests'
-    $CARGO check --target $target --all-targets --features 'all dist-client dist-worker'
+    $CARGO check --target $target --all-targets --features 'all dist-client dist-server dist-tests'
+    $CARGO check --target $target --all-targets --features 'all dist-client dist-server'
     $CARGO check --target $target --all-targets --features 'all dist-client dist-tests'
-    $CARGO check --target $target --all-targets --features 'all dist-worker dist-tests'
+    $CARGO check --target $target --all-targets --features 'all dist-server dist-tests'
     $CARGO check --target $target --all-targets --features 'all dist-client'
-    $CARGO check --target $target --all-targets --features 'all dist-worker'
+    $CARGO check --target $target --all-targets --features 'all dist-server'
     $CARGO check --target $target --all-targets --features 'all dist-tests'
     $CARGO check --target $target --all-targets --features 'all'
-    $CARGO check --target $target --all-targets --features 'dist-client dist-worker dist-tests'
-    $CARGO check --target $target --all-targets --features 'dist-client dist-worker'
+    $CARGO check --target $target --all-targets --features 'dist-client dist-server dist-tests'
+    $CARGO check --target $target --all-targets --features 'dist-client dist-server'
     $CARGO check --target $target --all-targets --features 'dist-client dist-tests'
-    $CARGO check --target $target --all-targets --features 'dist-worker dist-tests'
+    $CARGO check --target $target --all-targets --features 'dist-server dist-tests'
     $CARGO check --target $target --all-targets --features 'dist-client'
-    $CARGO check --target $target --all-targets --features 'dist-worker'
+    $CARGO check --target $target --all-targets --features 'dist-server'
     $CARGO check --target $target --all-targets --features 'dist-tests'
     $CARGO check --target $target --all-targets --features ''
-    $CARGO check --target $target --all-targets --no-default-features --features 'all dist-client dist-worker dist-tests'
-    $CARGO check --target $target --all-targets --no-default-features --features 'all dist-client dist-worker'
+    $CARGO check --target $target --all-targets --no-default-features --features 'all dist-client dist-server dist-tests'
+    $CARGO check --target $target --all-targets --no-default-features --features 'all dist-client dist-server'
     $CARGO check --target $target --all-targets --no-default-features --features 'all dist-client dist-tests'
-    $CARGO check --target $target --all-targets --no-default-features --features 'all dist-worker dist-tests'
+    $CARGO check --target $target --all-targets --no-default-features --features 'all dist-server dist-tests'
     $CARGO check --target $target --all-targets --no-default-features --features 'all dist-client'
-    $CARGO check --target $target --all-targets --no-default-features --features 'all dist-worker'
+    $CARGO check --target $target --all-targets --no-default-features --features 'all dist-server'
     $CARGO check --target $target --all-targets --no-default-features --features 'all dist-tests'
     $CARGO check --target $target --all-targets --no-default-features --features 'all'
-    $CARGO check --target $target --all-targets --no-default-features --features 'dist-client dist-worker dist-tests'
-    $CARGO check --target $target --all-targets --no-default-features --features 'dist-client dist-worker'
+    $CARGO check --target $target --all-targets --no-default-features --features 'dist-client dist-server dist-tests'
+    $CARGO check --target $target --all-targets --no-default-features --features 'dist-client dist-server'
     $CARGO check --target $target --all-targets --no-default-features --features 'dist-client dist-tests'
-    $CARGO check --target $target --all-targets --no-default-features --features 'dist-worker dist-tests'
+    $CARGO check --target $target --all-targets --no-default-features --features 'dist-server dist-tests'
     $CARGO check --target $target --all-targets --no-default-features --features 'dist-client'
-    $CARGO check --target $target --all-targets --no-default-features --features 'dist-worker'
+    $CARGO check --target $target --all-targets --no-default-features --features 'dist-server'
     $CARGO check --target $target --all-targets --no-default-features --features 'dist-tests'
     $CARGO check --target $target --all-targets --no-default-features --features ''
     wintarget
@@ -89,7 +89,7 @@ elif [ "$1" = test ]; then
     fi
     set -x
 
-    RUST_BACKTRACE=1 $CARGO test $NORUN --target $target --features 'all dist-client dist-worker dist-tests' $VERBOSE -- $NOCAPTURE $TESTTHREADS test_dist_nobuilder
+    RUST_BACKTRACE=1 $CARGO test $NORUN --target $target --features 'all dist-client dist-server dist-tests' $VERBOSE -- $NOCAPTURE $TESTTHREADS test_dist_nobuilder
 
 else
     echo invalid command

src/config.rs

@@ -16,7 +16,7 @@ use crate::util::fs::{self, File};
 use directories::ProjectDirs;
 use regex::Regex;
 use serde::de::{Deserialize, DeserializeOwned, Deserializer};
-#[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+#[cfg(any(feature = "dist-client", feature = "dist-server"))]
 use serde::ser::{Serialize, Serializer};
 use std::collections::HashMap;
 use std::env;
@@ -88,10 +88,10 @@ pub fn parse_size(val: &str) -> Option<u64> {
         })
 }
 
-#[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+#[cfg(any(feature = "dist-client", feature = "dist-server"))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct HTTPUrl(reqwest::Url);
-#[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+#[cfg(any(feature = "dist-client", feature = "dist-server"))]
 impl Serialize for HTTPUrl {
     fn serialize<S>(&self, serializer: S) -> StdResult<S::Ok, S::Error>
     where
@@ -100,7 +100,7 @@ impl Serialize for HTTPUrl {
         serializer.serialize_str(self.0.as_str())
     }
 }
-#[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+#[cfg(any(feature = "dist-client", feature = "dist-server"))]
 impl<'a> Deserialize<'a> for HTTPUrl {
     fn deserialize<D>(deserializer: D) -> StdResult<Self, D::Error>
     where
@@ -112,7 +112,7 @@ impl<'a> Deserialize<'a> for HTTPUrl {
         Ok(HTTPUrl(url))
     }
 }
-#[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+#[cfg(any(feature = "dist-client", feature = "dist-server"))]
 fn parse_http_url(url: &str) -> Result<reqwest::Url> {
     use std::net::SocketAddr;
     let url = if let Ok(sa) = url.parse::<SocketAddr>() {
@@ -130,7 +130,7 @@ fn parse_http_url(url: &str) -> Result<reqwest::Url> {
     }
     Ok(url)
 }
-#[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+#[cfg(any(feature = "dist-client", feature = "dist-server"))]
 impl HTTPUrl {
     pub fn from_url(u: reqwest::Url) -> Self {
         HTTPUrl(u)
@@ -379,9 +379,9 @@ impl Default for DistAuth {
 #[serde(deny_unknown_fields)]
 pub struct DistConfig {
     pub auth: DistAuth,
-    #[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+    #[cfg(any(feature = "dist-client", feature = "dist-server"))]
     pub scheduler_url: Option<HTTPUrl>,
-    #[cfg(not(any(feature = "dist-client", feature = "dist-worker")))]
+    #[cfg(not(any(feature = "dist-client", feature = "dist-server")))]
     pub scheduler_url: Option<String>,
     pub cache_dir: PathBuf,
     pub toolchains: Vec<DistToolchainConfig>,
@@ -693,7 +693,7 @@ impl CachedConfig {
     }
 }
 
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub mod scheduler {
     use std::net::SocketAddr;
     use std::path::Path;
@@ -748,7 +748,7 @@ pub mod scheduler {
     }
 }
 
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub mod coordinator {
     use super::HTTPUrl;
     use std::net::SocketAddr;
@@ -972,13 +972,13 @@ public = false
                 auth: DistAuth::Token {
                     token: "secrettoken".to_owned()
                 },
-                #[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+                #[cfg(any(feature = "dist-client", feature = "dist-server"))]
                 scheduler_url: Some(
                     parse_http_url("http://1.2.3.4:10600")
                         .map(|url| { HTTPUrl::from_url(url) })
                         .expect("Scheduler url must be valid url str")
                 ),
-                #[cfg(not(any(feature = "dist-client", feature = "dist-worker")))]
+                #[cfg(not(any(feature = "dist-client", feature = "dist-server")))]
                 scheduler_url: Some("http://1.2.3.4:10600".to_owned()),
                 cache_dir: PathBuf::from("/home/user/.cache/cachepot-dist-client"),
                 toolchains: vec![],

src/dist/http.rs

@@ -13,17 +13,17 @@
 // limitations under the License.
 #[cfg(feature = "dist-client")]
 pub use self::client::Client;
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub use self::worker::Worker;
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub use self::worker::{
     CoordinatorAuthCheck, CoordinatorVisibleMsg, Scheduler, WorkerAuthCheck, HEARTBEAT_TIMEOUT,
 };
 
 mod common {
-    #[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+    #[cfg(any(feature = "dist-client", feature = "dist-server"))]
     use hyperx::header;
-    #[cfg(feature = "dist-worker")]
+    #[cfg(feature = "dist-server")]
     use std::collections::HashMap;
     use std::fmt;
 
@@ -69,7 +69,7 @@ mod common {
         }
     }
 
-    #[cfg(feature = "dist-worker")]
+    #[cfg(feature = "dist-server")]
     pub fn bincode_req<T: serde::de::DeserializeOwned + 'static>(
         req: reqwest::blocking::RequestBuilder,
     ) -> Result<T> {
@@ -136,7 +136,7 @@ mod common {
         },
     }
     impl AllocJobHttpResponse {
-        #[cfg(feature = "dist-worker")]
+        #[cfg(feature = "dist-server")]
         pub fn from_alloc_job_result(
             res: dist::AllocJobResult,
             certs: &HashMap<dist::WorkerId, (Vec<u8>, Vec<u8>)>,
@@ -264,7 +264,7 @@ pub mod urls {
     }
 }
 
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 mod worker {
     use crate::jwt;
     use byteorder::{BigEndian, ReadBytesExt};

src/dist/mod.rs

@@ -21,21 +21,21 @@ use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
 use std::process;
 use std::str::FromStr;
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 use std::sync::Mutex;
 
 use crate::errors::*;
 
-#[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+#[cfg(any(feature = "dist-client", feature = "dist-server"))]
 mod cache;
 #[cfg(feature = "dist-client")]
 pub mod client_auth;
-#[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+#[cfg(any(feature = "dist-client", feature = "dist-server"))]
 pub mod http;
 #[cfg(test)]
 mod test;
 
-#[cfg(any(feature = "dist-client", feature = "dist-worker"))]
+#[cfg(any(feature = "dist-client", feature = "dist-server"))]
 pub use crate::dist::cache::TcCache;
 
 // TODO: paths (particularly outputs, which are accessed by an unsandboxed program)
@@ -472,7 +472,7 @@ impl From<ProcessOutput> for process::Output {
 #[serde(deny_unknown_fields)]
 pub struct OutputData(Vec<u8>, u64);
 impl OutputData {
-    #[cfg(any(feature = "dist-worker", all(feature = "dist-client", test)))]
+    #[cfg(any(feature = "dist-server", all(feature = "dist-client", test)))]
     pub fn try_from_reader<R: Read>(r: R) -> io::Result<Self> {
         use flate2::read::ZlibEncoder as ZlibReadEncoder;
         use flate2::Compression;
@@ -619,10 +619,10 @@ impl<'a> Read for InputsReader<'a> {
     }
 }
 
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 type ExtResult<T, E> = ::std::result::Result<T, E>;
 
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub trait SchedulerOutgoing {
     // To Server
     fn do_assign_job(
@@ -634,20 +634,20 @@ pub trait SchedulerOutgoing {
     ) -> Result<AssignJobResult>;
 }
 
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub trait ServerOutgoing {
     // To Scheduler
     fn do_update_job_state(&self, job_id: JobId, state: JobState) -> Result<UpdateJobStateResult>;
 }
 
 // Trait to handle the creation and verification of job authorization tokens
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub trait JobAuthorizer: Send {
     fn generate_token(&self, job_id: JobId) -> Result<String>;
     fn verify_token(&self, job_id: JobId, token: &str) -> Result<()>;
 }
 
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub trait SchedulerIncoming: Send + Sync {
     // From Client
     fn handle_alloc_job(
@@ -674,7 +674,7 @@ pub trait SchedulerIncoming: Send + Sync {
     fn handle_status(&self) -> ExtResult<SchedulerStatusResult, Error>;
 }
 
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub trait WorkerIncoming: Send + Sync {
     // From Scheduler
     fn handle_assign_job(&self, job_id: JobId, tc: Toolchain) -> ExtResult<AssignJobResult, Error>;
@@ -696,7 +696,7 @@ pub trait WorkerIncoming: Send + Sync {
     ) -> ExtResult<RunJobResult, Error>;
 }
 
-#[cfg(feature = "dist-worker")]
+#[cfg(feature = "dist-server")]
 pub trait BuilderIncoming: Send + Sync {
     // From Server
     fn run_build(

systemd/Dockerfile.build.cachepot-dist

@@ -11,7 +11,7 @@ RUN cd /bubblewrap-0.3.1 && \
 FROM rust:1.52-buster as cachepot-build
 RUN git clone https://github.com/paritytech/cachepot.git --depth=1 && \
     cd cachepot && \
-    cargo build --bin cachepot-dist --release --features="dist-worker"
+    cargo build --bin cachepot-dist --release --features="dist-server"
 
 FROM ubuntu:20.04
 RUN apt-get update && \

tests/dist.rs

@@ -1,4 +1,4 @@
-#![cfg(all(feature = "dist-client", feature = "dist-worker"))]
+#![cfg(all(feature = "dist-client", feature = "dist-server"))]
 
 extern crate assert_cmd;
 #[macro_use]