From c5e3d135ae640027d388a4d98bc16cf0b5dbf789 Mon Sep 17 00:00:00 2001
From: Binbin <binloveplay1314@qq.com>
Date: Mon, 7 Feb 2022 13:58:15 +0800
Subject: [PATCH] create-cluster clean now will clean appendonlydir (#10223)
In #9788, now we stores all persistent append-only files in
a dedicated directory. The name of the directory is determined
by the appenddirname configuration parameter in redis.conf.
Now each node have a separate folder.
Update create-cluster clean to clean this default directory.
---
utils/create-cluster/create-cluster | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/utils/create-cluster/create-cluster b/utils/create-cluster/create-cluster
index 729666830..d97ee2b9c 100755
--- a/utils/create-cluster/create-cluster
+++ b/utils/create-cluster/create-cluster
@@ -28,7 +28,7 @@ then
while [ $((PORT < ENDPORT)) != "0" ]; do
PORT=$((PORT+1))
echo "Starting $PORT"
- $BIN_PATH/redis-server --port $PORT --protected-mode $PROTECTED_MODE --cluster-enabled yes --cluster-config-file nodes-${PORT}.conf --cluster-node-timeout $TIMEOUT --appendonly yes --appendfilename appendonly-${PORT}.aof --dbfilename dump-${PORT}.rdb --logfile ${PORT}.log --daemonize yes ${ADDITIONAL_OPTIONS}
+ $BIN_PATH/redis-server --port $PORT --protected-mode $PROTECTED_MODE --cluster-enabled yes --cluster-config-file nodes-${PORT}.conf --cluster-node-timeout $TIMEOUT --appendonly yes --appendfilename appendonly-${PORT}.aof --appenddirname appendonlydir-${PORT} --dbfilename dump-${PORT}.rdb --logfile ${PORT}.log --daemonize yes ${ADDITIONAL_OPTIONS}
done
exit 0
fi
@@ -95,20 +95,25 @@ fi
if [ "$1" == "clean" ]
then
+ echo "Cleaning *.log"
rm -rf *.log
- rm -rf appendonly*.aof
- rm -rf dump*.rdb
- rm -rf nodes*.conf
+ echo "Cleaning appendonlydir-*"
+ rm -rf appendonlydir-*
+ echo "Cleaning dump-*.rdb"
+ rm -rf dump-*.rdb
+ echo "Cleaning nodes-*.conf"
+ rm -rf nodes-*.conf
exit 0
fi
if [ "$1" == "clean-logs" ]
then
+ echo "Cleaning *.log"
rm -rf *.log
exit 0
fi
-echo "Usage: $0 [start|create|stop|watch|tail|clean|call]"
+echo "Usage: $0 [start|create|stop|watch|tail|tailall|clean|clean-logs|call]"
echo "start -- Launch Redis Cluster instances."
echo "create [-f] -- Create a cluster using redis-cli --cluster create."
echo "stop -- Stop Redis Cluster instances."