Skip to content

Commit

Permalink
Revert "fix CI"
Browse files Browse the repository at this point in the history
This reverts commit 8253d48.
  • Loading branch information
brother-jin committed Aug 14, 2024
1 parent 8253d48 commit 3ae7718
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions tests/integration/start_master_and_slave.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ cp ../conf/pika.conf ./pika_single.conf
cp ../conf/pika.conf ./pika_master.conf
cp ../conf/pika.conf ./pika_slave.conf
cp ../conf/pika.conf ./pika_rename.conf
cp ../conf/pika.conf ./pika_master_rename.conf
cp ../conf/pika.conf ./pika_slave_rename.conf
cp ../conf/pika.conf ./pika_acl_both_password.conf
cp ../conf/pika.conf ./pika_acl_only_admin_password.conf
cp ../conf/pika.conf ./pika_has_other_acl_user.conf
Expand Down Expand Up @@ -78,6 +80,7 @@ sed -i.bak \
-e 's|db-sync-path : ./dbsync/|db-sync-path : ./acl2_data/dbsync/|' \
-e 's|#daemonize : yes|daemonize : yes|' \
-e 's|timeout : 60|timeout : 500|' ./pika_acl_only_admin_password.conf

sed -i.bak \
-e 's|requirepass :|requirepass : requirepass|' \
-e 's|masterauth :|masterauth : requirepass|' \
Expand All @@ -93,6 +96,26 @@ sed -i.bak \
-e 's|timeout : 60|timeout : 500|' ./pika_has_other_acl_user.conf
echo -e '\nuser : limit on >limitpass ~* +@all &*' >> ./pika_has_other_acl_user.conf

sed -i '' \
-e 's|# rename-command : FLUSHDB 360flushdb|rename-command : FLUSHDB 360flushdb|' \
-e 's|port : 9221|port : 9291|' \
-e 's|log-path : ./log/|log-path : ./master_rename_data/log/|' \
-e 's|db-path : ./db/|db-path : ./master_rename_data/db/|' \
-e 's|dump-path : ./dump/|dump-path : ./master_rename_data/dump/|' \
-e 's|pidfile : ./pika.pid|pidfile : ./master_rename_data/pika.pid|' \
-e 's|db-sync-path : ./dbsync/|db-sync-path : ./master_rename_data/dbsync/|' \
-e 's|#daemonize : yes|daemonize : yes|' ./pika_master_rename.conf

sed -i '' \
-e 's|# rename-command : FLUSHDB 360flushdb|rename-command : FLUSHDB 360flushdb|' \
-e 's|port : 9221|port : 9301|' \
-e 's|log-path : ./log/|log-path : ./slave_rename_data/log/|' \
-e 's|db-path : ./db/|db-path : ./slave_rename_data/db/|' \
-e 's|dump-path : ./dump/|dump-path : ./slave_rename_data/dump/|' \
-e 's|pidfile : ./pika.pid|pidfile : ./slave_rename_data/pika.pid|' \
-e 's|db-sync-path : ./dbsync/|db-sync-path : ./slave_rename_data/dbsync/|' \
-e 's|#daemonize : yes|daemonize : yes|' ./pika_slave_rename.conf

# Start three nodes
./pika -c ./pika_single.conf
./pika -c ./pika_master.conf
Expand All @@ -101,5 +124,7 @@ echo -e '\nuser : limit on >limitpass ~* +@all &*' >> ./pika_has_other_acl_user.
./pika -c ./pika_acl_both_password.conf
./pika -c ./pika_acl_only_admin_password.conf
./pika -c ./pika_has_other_acl_user.conf
./pika -c ./pika_master_rename.conf
./pika -c ./pika_slave_rename.conf
#ensure both master and slave are ready
sleep 10

0 comments on commit 3ae7718

Please sign in to comment.