From 67922ee5ebabf09decf81a0b7b335ff9173dc226 Mon Sep 17 00:00:00 2001 From: Hao Xin Date: Tue, 3 May 2022 01:41:54 +0800 Subject: [PATCH 1/5] docs: using the latest version of openssl docs --- ballista/docs/dev-env.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballista/docs/dev-env.md b/ballista/docs/dev-env.md index f02d156d1ec8..b63e1574a0b7 100644 --- a/ballista/docs/dev-env.md +++ b/ballista/docs/dev-env.md @@ -23,7 +23,7 @@ You will need a standard Rust development environment. The easiest way to achiev ## Install OpenSSL -Follow instructions for [setting up OpenSSL](https://docs.rs/openssl/0.10.28/openssl/). For Ubuntu users, the following +Follow instructions for [setting up OpenSSL](https://docs.rs/openssl/latest/openssl/). For Ubuntu users, the following command works. ```bash From 93e4d9cbe809886c69cb6654fde98b366dd65ce5 Mon Sep 17 00:00:00 2001 From: Hao Xin Date: Tue, 3 May 2022 01:55:15 +0800 Subject: [PATCH 2/5] Add MacOS instructions --- ballista/docs/dev-env.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ballista/docs/dev-env.md b/ballista/docs/dev-env.md index b63e1574a0b7..a116d9e6374e 100644 --- a/ballista/docs/dev-env.md +++ b/ballista/docs/dev-env.md @@ -30,6 +30,12 @@ command works. sudo apt-get install pkg-config libssl-dev ``` +For MacOS users, the following command works. + +```bash +brew install openssl@1.1 +``` + ## Install CMake You'll need cmake in order to compile some of ballista's dependencies. Ubuntu users can use the following command: @@ -37,3 +43,9 @@ You'll need cmake in order to compile some of ballista's dependencies. Ubuntu us ```bash sudo apt-get install cmake ``` + +MacOS users cau use the follow command: + +```bash +brew install cmake +``` From 839599e9aaecd60536ac3fb8ecb52a6b629d462d Mon Sep 17 00:00:00 2001 From: Hao Xin Date: Tue, 3 May 2022 02:14:37 +0800 Subject: [PATCH 3/5] clean up docs --- ballista/ui/scheduler/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ballista/ui/scheduler/README.md b/ballista/ui/scheduler/README.md index 3fee499ead9c..78d9d11d9111 100644 --- a/ballista/ui/scheduler/README.md +++ b/ballista/ui/scheduler/README.md @@ -51,9 +51,7 @@ $ RUST_LOG=info cargo run --release ```shell $ cd ui/scheduler $ yarn -yarn install v1.22.10 -[1/4] 🔍 Resolving packages... -... +Resolving packages... $ yarn start Starting the development server... ``` From 2bb2f84b4f3ae59b852979a4ee42248a885ee9f1 Mon Sep 17 00:00:00 2001 From: Hao Xin Date: Tue, 3 May 2022 02:23:22 +0800 Subject: [PATCH 4/5] clean up --- ballista/ui/scheduler/README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ballista/ui/scheduler/README.md b/ballista/ui/scheduler/README.md index 78d9d11d9111..9f93143bb5f1 100644 --- a/ballista/ui/scheduler/README.md +++ b/ballista/ui/scheduler/README.md @@ -30,9 +30,7 @@ $ cd rust/scheduler $ RUST_LOG=info cargo run --release ... Finished release [optimized] target(s) in 11.92s - Running `/path-to-project/target/release/ballista-scheduler` -[2021-05-02T05:11:17Z INFO ballista_scheduler] Ballista v0.5.0-SNAPSHOT Scheduler listening on 0.0.0.0:50050 -[2021-05-02T05:14:10Z INFO ballista_scheduler] Received get_executors_metadata request + Running `/path-to-project/target/release/ballista-scheduler` ``` and run executor in new terminal: @@ -41,9 +39,7 @@ and run executor in new terminal: $ cd rust/executor $ RUST_LOG=info cargo run --release Finished release [optimized] target(s) in 0.09s - Running `/path-to-project/target/release/ballista-executor` -[2021-05-02T05:11:30Z INFO ballista_executor] Running with config: ExecutorConfig { host: "localhost", port: 50051, work_dir: "/var/folders/y8/fc61kyjd4n53tn444n72rjrm0000gn/T/.tmpAZ0rn4", concurrent_tasks: 4 } -[2021-05-02T05:11:30Z INFO ballista_executor] Ballista v0.5.0-SNAPSHOT Rust Executor listening on 0.0.0.0:50051 + Running `/path-to-project/target/release/ballista-executor` ``` ### Run Client project From ef4485c436617043c23de71075943d54c189622e Mon Sep 17 00:00:00 2001 From: Hao Xin Date: Tue, 3 May 2022 02:34:03 +0800 Subject: [PATCH 5/5] fix typo Co-authored-by: Andy Grove --- ballista/docs/dev-env.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballista/docs/dev-env.md b/ballista/docs/dev-env.md index a116d9e6374e..1c8605a06e5a 100644 --- a/ballista/docs/dev-env.md +++ b/ballista/docs/dev-env.md @@ -44,7 +44,7 @@ You'll need cmake in order to compile some of ballista's dependencies. Ubuntu us sudo apt-get install cmake ``` -MacOS users cau use the follow command: +MacOS users can use the following command: ```bash brew install cmake