Merge branch 'unstable' into keydbpro

Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
This commit is contained in:
John Sully committed 2020-05-24 14:41:53 -04:00
commit cece963cf3
95 files changed
+4535 -1335

No files matched your search

+11 -5
View File
@@ -1,6 +1,7 @@
#!/bin/bash
# Settings
BIN_PATH="../../src/"
CLUSTER_HOST=127.0.0.1
PORT=30000
TIMEOUT=2000
@@ -25,7 +26,11 @@ then
while [ $((PORT < ENDPORT)) != "0" ]; do
PORT=$((PORT+1))
echo "Starting $PORT"
<<<<<<< HEAD
../../src/keydb-pro-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/keydb-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}
>>>>>>> unstable
done
exit 0
fi
@@ -37,7 +42,7 @@ then
PORT=$((PORT+1))
HOSTS="$HOSTS $CLUSTER_HOST:$PORT"
done
../../src/keydb-cli --cluster create $HOSTS --cluster-replicas $REPLICAS
$BIN_PATH/keydb-cli --cluster create $HOSTS --cluster-replicas $REPLICAS
exit 0
fi
@@ -46,7 +51,7 @@ then
while [ $((PORT < ENDPORT)) != "0" ]; do
PORT=$((PORT+1))
echo "Stopping $PORT"
../../src/keydb-cli -p $PORT shutdown nosave
$BIN_PATH/keydb-cli -p $PORT shutdown nosave
done
exit 0
fi
@@ -57,7 +62,7 @@ then
while [ 1 ]; do
clear
date
../../src/keydb-cli -p $PORT cluster nodes | head -30
$BIN_PATH/keydb-cli -p $PORT cluster nodes | head -30
sleep 1
done
exit 0
@@ -81,7 +86,7 @@ if [ "$1" == "call" ]
then
while [ $((PORT < ENDPORT)) != "0" ]; do
PORT=$((PORT+1))
../../src/keydb-cli -p $PORT $2 $3 $4 $5 $6 $7 $8 $9
$BIN_PATH/keydb-cli -p $PORT $2 $3 $4 $5 $6 $7 $8 $9
done
exit 0
fi
@@ -101,7 +106,7 @@ then
exit 0
fi
echo "Usage: $0 [start|create|stop|watch|tail|clean]"
echo "Usage: $0 [start|create|stop|watch|tail|clean|call]"
echo "start -- Launch Redis Cluster instances."
echo "create -- Create a cluster using keydb-cli --cluster create."
echo "stop -- Stop Redis Cluster instances."
@@ -110,3 +115,4 @@ echo "tail <id> -- Run tail -f of instance at base port + ID."
echo "tailall -- Run tail -f for all the log files at once."
echo "clean -- Remove all instances data, logs, configs."
echo "clean-logs -- Remove just instances logs."
echo "call <cmd> -- Call a command (up to 7 arguments) on all nodes."