From 866193b01cfe908f9d46c149883929475a88a485 Mon Sep 17 00:00:00 2001
From: Simon Mo <simon.mo@hey.com>
Date: Tue, 13 Oct 2020 19:30:18 -0700
Subject: [PATCH] Fix cluster yaml for serve benchmarks (#11383)

- Separate out single node and multiple node yamls
- Remove cluster_synced_files, somehow it breaks for me
---
 python/ray/serve/benchmarks/cluster.yaml |  9 +------
 python/ray/serve/benchmarks/single.yaml  | 33 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 python/ray/serve/benchmarks/single.yaml

diff --git a/python/ray/serve/benchmarks/cluster.yaml b/python/ray/serve/benchmarks/cluster.yaml
index 70e6d9df4..831f0f1ff 100644
--- a/python/ray/serve/benchmarks/cluster.yaml
+++ b/python/ray/serve/benchmarks/cluster.yaml
@@ -24,14 +24,10 @@ head_node:
                 VolumeSize: 100
 worker_nodes:
     InstanceType: m5.xlarge
-file_mounts: {}
-cluster_synced_files:
-    - /tmp/ray_tmp_mount/~/blank-serve-test
-file_mounts_sync_continuously: true
 initialization_commands: []
 setup_commands:
     - apt-get install build-essential libssl-dev git -y
-    - 'rm -r wrk || true && git clone https://github.com/wg/wrk.git wrk && cd wrk && make && cp wrk /usr/local/bin'
+    - 'rm -r wrk || true && git clone https://github.com/wg/wrk.git wrk && cd wrk && make -j && cp wrk /usr/local/bin'
 head_setup_commands: []
 worker_setup_commands: []
 head_start_ray_commands:
@@ -40,6 +36,3 @@ head_start_ray_commands:
 worker_start_ray_commands:
     - ray stop
     - 'ulimit -n 65536; ray start --address=$RAY_HEAD_IP:6379 --object-manager-port=8076'
-metadata:
-    anyscale:
-        working_dir: ~/blank-serve-test
diff --git a/python/ray/serve/benchmarks/single.yaml b/python/ray/serve/benchmarks/single.yaml
new file mode 100644
index 000000000..b93577fca
--- /dev/null
+++ b/python/ray/serve/benchmarks/single.yaml
@@ -0,0 +1,33 @@
+cluster_name: default
+
+docker:
+    image: 'anyscale/ray-ml:latest'
+    container_name: ray_container
+    pull_before_run: true
+
+provider:
+    type: aws
+    region: us-west-2
+    availability_zone: us-west-2a
+auth:
+    ssh_user: ubuntu
+head_node:
+    InstanceType: m5.16xlarge
+    BlockDeviceMappings:
+        -
+            DeviceName: /dev/sda1
+            Ebs:
+                VolumeSize: 100
+
+initialization_commands: []
+setup_commands:
+    - apt-get install build-essential libssl-dev git -y
+    - 'rm -r wrk || true && git clone https://github.com/wg/wrk.git wrk && cd wrk && make -j && cp wrk /usr/local/bin'
+head_setup_commands: []
+worker_setup_commands: []
+head_start_ray_commands:
+    - ray stop
+    - ulimit -n 65536; ray start --head --port=6379 --object-manager-port=8076 --autoscaling-config=~/ray_bootstrap_config.yaml
+worker_start_ray_commands:
+    - ray stop
+    - 'ulimit -n 65536; ray start --address=$RAY_HEAD_IP:6379 --object-manager-port=8076'