This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 1ce8621 RATIS-1319. Fix vagrant for TLP (#428). Contributed by Hui
Fei
1ce8621 is described below
commit 1ce8621b295678c780ad7adaf5621d8114fdefc3
Author: Hui Fei <[email protected]>
AuthorDate: Mon Feb 22 23:24:01 2021 +0800
RATIS-1319. Fix vagrant for TLP (#428). Contributed by Hui Fei
---
dev-support/vagrant/README.md | 2 +-
dev-support/vagrant/Vagrantfile | 2 +-
dev-support/vagrant/bin/start_ratis_load_gen.sh | 2 +-
dev-support/vagrant/bin/start_ratis_server.sh | 2 +-
dev-support/vagrant/screenrcs/namazu_hdd_screenrc | 6 +++---
dev-support/vagrant/screenrcs/ratis_ratis-hdd-slowdown_screenrc | 8 ++++----
dev-support/vagrant/screenrcs/ratis_ratis-server_screenrc | 8 ++++----
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dev-support/vagrant/README.md b/dev-support/vagrant/README.md
index 9f51805..dcb3195 100644
--- a/dev-support/vagrant/README.md
+++ b/dev-support/vagrant/README.md
@@ -13,7 +13,7 @@
-->
# What is this?
-This is a series of scripts for [Vagrant](https://vagrantup.com) to stand-up
and test [Apache (Incubating) Ratis](https://ratis.incubator.apache.org/)
servers and clients. One needs to have Vagrant and
[VirtualBox](https://virtualbox.org) installed to stand-up these tests
environments.
+This is a series of scripts for [Vagrant](https://vagrantup.com) to stand-up
and test [Apache Ratis](https://ratis.apache.org/) servers and clients. One
needs to have Vagrant and [VirtualBox](https://virtualbox.org) installed to
stand-up these tests environments.
# What is provided?
diff --git a/dev-support/vagrant/Vagrantfile b/dev-support/vagrant/Vagrantfile
index 78a00c8..692e121 100644
--- a/dev-support/vagrant/Vagrantfile
+++ b/dev-support/vagrant/Vagrantfile
@@ -21,7 +21,7 @@
VAGRANT_HOME = '/home/vagrant/'
TEST_DATA = ::File.join(VAGRANT_HOME, 'test_data')
-RATIS_PATH = ::File.join(VAGRANT_HOME, 'incubator-ratis')
+RATIS_PATH = ::File.join(VAGRANT_HOME, 'ratis')
SCREEN_RC_PATH = ::File.join(RATIS_PATH, 'dev-support/vagrant/screenrcs')
# Settings common to all VMs
diff --git a/dev-support/vagrant/bin/start_ratis_load_gen.sh
b/dev-support/vagrant/bin/start_ratis_load_gen.sh
index d1310ff..4868f59 100755
--- a/dev-support/vagrant/bin/start_ratis_load_gen.sh
+++ b/dev-support/vagrant/bin/start_ratis_load_gen.sh
@@ -19,7 +19,7 @@
HOME=/home/vagrant
peers=$1
-cd ${HOME}/incubator-ratis
+cd ${HOME}/ratis
export QUORUM_OPTS="--peers $peers"
# run the load generator
diff --git a/dev-support/vagrant/bin/start_ratis_server.sh
b/dev-support/vagrant/bin/start_ratis_server.sh
index e0e39b6..b429d3ec 100755
--- a/dev-support/vagrant/bin/start_ratis_server.sh
+++ b/dev-support/vagrant/bin/start_ratis_server.sh
@@ -22,6 +22,6 @@ storage=$1
id=$2
peers=$3
-cd ${HOME}/incubator-ratis/
+cd ${HOME}/ratis/
./ratis-examples/src/main/bin/server.sh filestore server --storage $storage
--id $id --peers $peers 2>&1 | \
tee ${HOME}/server_${id}.log
diff --git a/dev-support/vagrant/screenrcs/namazu_hdd_screenrc
b/dev-support/vagrant/screenrcs/namazu_hdd_screenrc
index 90281dc..2ceadea 100644
--- a/dev-support/vagrant/screenrcs/namazu_hdd_screenrc
+++ b/dev-support/vagrant/screenrcs/namazu_hdd_screenrc
@@ -20,9 +20,9 @@ defscrollback 50000
startup_message off
# default windows
-screen -t Disk0 0 /home/vagrant/namazu/bin/nmz inspectors fs -original-dir
/home/vagrant/test_data/data0 -mount-point
/home/vagrant/test_data/data0_slowed/ -autopilot
/home/vagrant/incubator-ratis/dev-support/vagrant/namazu_configs/hdd_config.toml
-screen -t Disk1 0 /home/vagrant/namazu/bin/nmz inspectors fs -original-dir
/home/vagrant/test_data/data1 -mount-point
/home/vagrant/test_data/data1_slowed/ -autopilot
/home/vagrant/incubator-ratis/dev-support/vagrant/namazu_configs/hdd_config.toml
-screen -t Disk2 0 /home/vagrant/namazu/bin/nmz inspectors fs -original-dir
/home/vagrant/test_data/data2 -mount-point
/home/vagrant/test_data/data2_slowed/ -autopilot
/home/vagrant/incubator-ratis/dev-support/vagrant/namazu_configs/hdd_config.toml
+screen -t Disk0 0 /home/vagrant/namazu/bin/nmz inspectors fs -original-dir
/home/vagrant/test_data/data0 -mount-point
/home/vagrant/test_data/data0_slowed/ -autopilot
/home/vagrant/ratis/dev-support/vagrant/namazu_configs/hdd_config.toml
+screen -t Disk1 0 /home/vagrant/namazu/bin/nmz inspectors fs -original-dir
/home/vagrant/test_data/data1 -mount-point
/home/vagrant/test_data/data1_slowed/ -autopilot
/home/vagrant/ratis/dev-support/vagrant/namazu_configs/hdd_config.toml
+screen -t Disk2 0 /home/vagrant/namazu/bin/nmz inspectors fs -original-dir
/home/vagrant/test_data/data2 -mount-point
/home/vagrant/test_data/data2_slowed/ -autopilot
/home/vagrant/ratis/dev-support/vagrant/namazu_configs/hdd_config.toml
autodetach on
detach
diff --git a/dev-support/vagrant/screenrcs/ratis_ratis-hdd-slowdown_screenrc
b/dev-support/vagrant/screenrcs/ratis_ratis-hdd-slowdown_screenrc
index c51091d..263e7e4 100644
--- a/dev-support/vagrant/screenrcs/ratis_ratis-hdd-slowdown_screenrc
+++ b/dev-support/vagrant/screenrcs/ratis_ratis-hdd-slowdown_screenrc
@@ -20,10 +20,10 @@ defscrollback 50000
startup_message off
# default windows
-screen -t Server0 0
/home/vagrant/incubator-ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data0_slowed n0
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
-screen -t Server1 1
/home/vagrant/incubator-ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data1_slowed n1
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
-screen -t Server2 2
/home/vagrant/incubator-ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data2_slowed n2
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
-screen -t LoadGen 3
/home/vagrant/incubator-ratis/dev-support/vagrant/bin/start_ratis_load_gen.sh
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
+screen -t Server0 0
/home/vagrant/ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data0_slowed n0
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
+screen -t Server1 1
/home/vagrant/ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data1_slowed n1
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
+screen -t Server2 2
/home/vagrant/ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data2_slowed n2
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
+screen -t LoadGen 3
/home/vagrant/ratis/dev-support/vagrant/bin/start_ratis_load_gen.sh
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
autodetach on
detach
diff --git a/dev-support/vagrant/screenrcs/ratis_ratis-server_screenrc
b/dev-support/vagrant/screenrcs/ratis_ratis-server_screenrc
index 1829f1e..eae71c8 100644
--- a/dev-support/vagrant/screenrcs/ratis_ratis-server_screenrc
+++ b/dev-support/vagrant/screenrcs/ratis_ratis-server_screenrc
@@ -20,10 +20,10 @@ defscrollback 50000
startup_message off
# default windows
-screen -t Server0 0
/home/vagrant/incubator-ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data0 n0
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
-screen -t Server1 1
/home/vagrant/incubator-ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data1 n1
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
-screen -t Server2 2
/home/vagrant/incubator-ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data2 n2
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
-screen -t LoadGen 3
/home/vagrant/incubator-ratis/dev-support/vagrant/bin/start_ratis_load_gen.sh
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
+screen -t Server0 0
/home/vagrant/ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data0 n0
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
+screen -t Server1 1
/home/vagrant/ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data1 n1
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
+screen -t Server2 2
/home/vagrant/ratis/dev-support/vagrant/bin/start_ratis_server.sh
/home/vagrant/test_data/data2 n2
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
+screen -t LoadGen 3
/home/vagrant/ratis/dev-support/vagrant/bin/start_ratis_load_gen.sh
n0:127.0.0.1:6000,n1:127.0.0.1:6001,n2:127.0.0.1:6002
autodetach on
detach
