From 0a07ce9d6ddf610c86c3e474fd87a07019f70f7b Mon Sep 17 00:00:00 2001 From: John Sully Date: Tue, 4 Feb 2020 00:30:13 -0500 Subject: [PATCH] rename to pro binary Former-commit-id: a8854bfd83de72d6aa418ee6d9b44fae1f622787 --- .gitignore | 2 +- README.md | 12 +++++------ deps/hiredis/Makefile | 4 ++-- keydb.conf | 2 +- src/Makefile | 2 +- src/debug.cpp | 2 +- src/server.cpp | 24 +++++++++++----------- tests/cluster/tests/06-slave-stop-cond.tcl | 2 +- utils/install_server.sh | 4 ++-- utils/redis_init_script | 2 +- utils/speed-regression.tcl | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index c54671d59..a2d8033da 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ keydb-cli redis-sentinel keydb-sentinel redis-server -keydb-server +keydb-pro-server doc-tools release misc/* diff --git a/README.md b/README.md index c06a32d6c..e081ed024 100644 --- a/README.md +++ b/README.md @@ -158,19 +158,19 @@ Running KeyDB To run KeyDB with the default configuration just type: % cd src - % ./keydb-server + % ./keydb-pro-server If you want to provide your keydb.conf, you have to run it using an additional parameter (the path of the configuration file): % cd src - % ./keydb-server /path/to/keydb.conf + % ./keydb-pro-server /path/to/keydb.conf It is possible to alter the KeyDB configuration by passing parameters directly as options using the command line. Examples: - % ./keydb-server --port 9999 --replicaof 127.0.0.1 6379 - % ./keydb-server /etc/keydb/6379.conf --loglevel debug + % ./keydb-pro-server --port 9999 --replicaof 127.0.0.1 6379 + % ./keydb-pro-server /etc/keydb/6379.conf --loglevel debug All the options in keydb.conf are also supported as options using the command line, with exactly the same name. @@ -178,7 +178,7 @@ line, with exactly the same name. Playing with KeyDB ------------------ -You can use keydb-cli to play with KeyDB. Start a keydb-server instance, +You can use keydb-cli to play with KeyDB. Start a keydb-pro-server instance, then in another terminal try the following: % cd src @@ -243,7 +243,7 @@ Simply make a directory you would like to have the latest binaries dumped in, th ``` $ docker run -it --rm -v /path-to-dump-binaries:/keydb_bin eqalpha/keydb-build-bin ``` -You should receive the following files: keydb-benchmark, keydb-check-aof, keydb-check-rdb, keydb-cli, keydb-sentinel, keydb-server +You should receive the following files: keydb-benchmark, keydb-check-aof, keydb-check-rdb, keydb-cli, keydb-sentinel, keydb-pro-server If you are looking to enable flash support with the build (make MALLOC=memkind) then use the following command: ``` diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile index 841990d5c..c231a9b93 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile @@ -29,9 +29,9 @@ INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH) INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH) INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH) -# keydb-server configuration used for testing +# keydb-pro-server configuration used for testing REDIS_PORT=56379 -REDIS_SERVER=keydb-server +REDIS_SERVER=keydb-pro-server define REDIS_TEST_CONFIG daemonize yes pidfile /tmp/hiredis-test-redis.pid diff --git a/keydb.conf b/keydb.conf index 896528241..32442744c 100644 --- a/keydb.conf +++ b/keydb.conf @@ -3,7 +3,7 @@ # Note that in order to read the configuration file, KeyDB must be # started with the file path as first argument: # -# ./keydb-server /path/to/keydb.conf +# ./keydb-pro-server /path/to/keydb.conf # Note on units: when memory size is needed, it is possible to specify # it in the usual form of 1k 5GB 4M and so forth: diff --git a/src/Makefile b/src/Makefile index 7548c6a1d..45c70f6d6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -319,7 +319,7 @@ else endif @touch $@ -# keydb-server +# keydb-pro-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/rocksdb/librocksdb.a $(FINAL_LIBS) diff --git a/src/debug.cpp b/src/debug.cpp index 99e7a0950..b054ed403 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -1542,7 +1542,7 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) { "\n=== KEYDB BUG REPORT END. Make sure to include from START to END. ===\n\n" " Please report the crash by opening an issue on github:\n\n" " https://github.com/JohnSully/KeyDB/issues\n\n" -" Suspect RAM error? Use keydb-server --test-memory to verify it.\n\n" +" Suspect RAM error? Use keydb-pro-server --test-memory to verify it.\n\n" ); /* free(messages); Don't call free() with possibly corrupted memory. */ diff --git a/src/server.cpp b/src/server.cpp index 5c6a2873f..382d98c08 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -4969,19 +4969,19 @@ void version(void) { } void usage(void) { - fprintf(stderr,"Usage: ./keydb-server [/path/to/keydb.conf] [options]\n"); - fprintf(stderr," ./keydb-server - (read config from stdin)\n"); - fprintf(stderr," ./keydb-server -v or --version\n"); - fprintf(stderr," ./keydb-server -h or --help\n"); - fprintf(stderr," ./keydb-server --test-memory \n\n"); + fprintf(stderr,"Usage: ./keydb-pro-server [/path/to/keydb.conf] [options]\n"); + fprintf(stderr," ./keydb-pro-server - (read config from stdin)\n"); + fprintf(stderr," ./keydb-pro-server -v or --version\n"); + fprintf(stderr," ./keydb-pro-server -h or --help\n"); + fprintf(stderr," ./keydb-pro-server --test-memory \n\n"); fprintf(stderr,"Examples:\n"); - fprintf(stderr," ./keydb-server (run the server with default conf)\n"); - fprintf(stderr," ./keydb-server /etc/redis/6379.conf\n"); - fprintf(stderr," ./keydb-server --port 7777\n"); - fprintf(stderr," ./keydb-server --port 7777 --replicaof 127.0.0.1 8888\n"); - fprintf(stderr," ./keydb-server /etc/mykeydb.conf --loglevel verbose\n\n"); + fprintf(stderr," ./keydb-pro-server (run the server with default conf)\n"); + fprintf(stderr," ./keydb-pro-server /etc/redis/6379.conf\n"); + fprintf(stderr," ./keydb-pro-server --port 7777\n"); + fprintf(stderr," ./keydb-pro-server --port 7777 --replicaof 127.0.0.1 8888\n"); + fprintf(stderr," ./keydb-pro-server /etc/mykeydb.conf --loglevel verbose\n\n"); fprintf(stderr,"Sentinel mode:\n"); - fprintf(stderr," ./keydb-server /etc/sentinel.conf --sentinel\n"); + fprintf(stderr," ./keydb-pro-server /etc/sentinel.conf --sentinel\n"); exit(1); } @@ -5475,7 +5475,7 @@ int main(int argc, char **argv) { exit(0); } else { fprintf(stderr,"Please specify the amount of memory to test in megabytes.\n"); - fprintf(stderr,"Example: ./keydb-server --test-memory 4096\n\n"); + fprintf(stderr,"Example: ./keydb-pro-server --test-memory 4096\n\n"); exit(1); } } diff --git a/tests/cluster/tests/06-slave-stop-cond.tcl b/tests/cluster/tests/06-slave-stop-cond.tcl index f2e67050b..52110856d 100644 --- a/tests/cluster/tests/06-slave-stop-cond.tcl +++ b/tests/cluster/tests/06-slave-stop-cond.tcl @@ -65,7 +65,7 @@ test "Slave #5 is reachable and alive" { test "Slave #5 should not be able to failover" { after 10000 - assert {[RI 5 role] eq {slave}} + assert_equal {slave} [RI 5 role] } test "Cluster should be down" { diff --git a/utils/install_server.sh b/utils/install_server.sh index a1574a2fa..2e3ee9d4a 100755 --- a/utils/install_server.sh +++ b/utils/install_server.sh @@ -37,7 +37,7 @@ # REDIS_CONFIG_FILE=/etc/redis/1234.conf \ # REDIS_LOG_FILE=/var/log/redis_1234.log \ # REDIS_DATA_DIR=/var/lib/redis/1234 \ -# REDIS_EXECUTABLE=`command -v keydb-server` ./utils/install_server.sh +# REDIS_EXECUTABLE=`command -v keydb-pro-server` ./utils/install_server.sh # # This generates a redis config file and an /etc/init.d script, and installs them. # @@ -129,7 +129,7 @@ fi if [ ! -x "$REDIS_EXECUTABLE" ] ; then _MANUAL_EXECUTION=true #get the redis executable path - _REDIS_EXECUTABLE=`command -v keydb-server` + _REDIS_EXECUTABLE=`command -v keydb-pro-server` read -p "Please select the redis executable path [$_REDIS_EXECUTABLE] " REDIS_EXECUTABLE if [ ! -x "$REDIS_EXECUTABLE" ] ; then REDIS_EXECUTABLE=$_REDIS_EXECUTABLE diff --git a/utils/redis_init_script b/utils/redis_init_script index bee5545ef..589792ee3 100755 --- a/utils/redis_init_script +++ b/utils/redis_init_script @@ -12,7 +12,7 @@ ### END INIT INFO REDISPORT=6379 -EXEC=/usr/local/bin/keydb-server +EXEC=/usr/local/bin/keydb-pro-server CLIEXEC=/usr/local/bin/keydb-cli PIDFILE=/var/run/redis_${REDISPORT}.pid diff --git a/utils/speed-regression.tcl b/utils/speed-regression.tcl index 8d5220c75..073f01a19 100755 --- a/utils/speed-regression.tcl +++ b/utils/speed-regression.tcl @@ -27,8 +27,8 @@ proc run-tests branches { } # Start the Redis server - puts " starting the server... [exec ./keydb-server -v]" - set pids [exec echo "port $::port\nloglevel warning\n" | ./keydb-server - > /dev/null 2> /dev/null &] + puts " starting the server... [exec ./keydb-pro-server -v]" + set pids [exec echo "port $::port\nloglevel warning\n" | ./keydb-pro-server - > /dev/null 2> /dev/null &] puts " pids: $pids" after 1000 puts " running the benchmark"