gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

re-label keydb-pro-server to keydb-server

Browse Source 
Former-commit-id: eb6f61ad372f0f4e573b9b731eac6c7f2ada0d9f
This commit is contained in:
benschermel 2021-03-16 01:57:26 +00:00
parent 8de2349fd6
commit 3adcc6efc7
15 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -10,9 +10,9 @@ core
!**/keydb-sentinel.service.d
*.log
dump.rdb
src/keydb-pro-server
**/bin/keydb-pro-server
**/app/keydb-pro-server
src/keydb-server
**/bin/keydb-server
**/app/keydb-server
*.deb
*.rpm
src/keydb-cli

12
README.md
View File

@ -185,19 +185,19 @@ Running KeyDB
To run KeyDB with the default configuration, just type:
% cd src
% ./keydb-pro-server
% ./keydb-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-pro-server /path/to/keydb.conf
% ./keydb-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-pro-server --port 9999 --replicaof 127.0.0.1 6379
% ./keydb-pro-server /etc/keydb/6379.conf --loglevel debug
% ./keydb-server --port 9999 --replicaof 127.0.0.1 6379
% ./keydb-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.
@ -213,7 +213,7 @@ how to use Redis with TLS.
Playing with KeyDB
------------------
You can use keydb-cli to play with KeyDB. Start a keydb-pro-server instance,
You can use keydb-cli to play with KeyDB. Start a keydb-server instance,
then in another terminal try the following:
% cd src
@ -278,7 +278,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-pro-server
You should receive the following files: keydb-benchmark, keydb-check-aof, keydb-check-rdb, keydb-cli, keydb-sentinel, keydb-server
If you are looking to enable flash support with the build (make MALLOC=memkind) then use the following command:
```

4
deps/hiredis/Makefile vendored
View File

@ -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-pro-server configuration used for testing
# keydb-server configuration used for testing
REDIS_PORT=56379
REDIS_SERVER=keydb-pro-server
REDIS_SERVER=keydb-server
define REDIS_TEST_CONFIG
daemonize yes
pidfile /tmp/hiredis-test-redis.pid

4
src/Makefile
View File

@ -310,7 +310,7 @@ QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(EN
QUIET_INSTALL = @printf ' %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
endif
REDIS_SERVER_NAME=keydb-pro-server$(PROG_SUFFIX)
REDIS_SERVER_NAME=keydb-server$(PROG_SUFFIX)
REDIS_SENTINEL_NAME=keydb-sentinel$(PROG_SUFFIX)
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/rocksdb.o storage/rocksdbfactory.o storage/teststorageprovider.o keydbutils.o StorageCache.o $(ASM_OBJ)
REDIS_CLI_NAME=keydb-cli$(PROG_SUFFIX)
@ -368,7 +368,7 @@ else
endif
@touch $@
# keydb-pro-server
# keydb-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)

2
src/asciilogo.h
View File

@ -32,7 +32,7 @@ const char *ascii_logo =
" _ \n"
" _-(+)-_ \n"
" _-- / \\ --_ \n"
" _-- / \\ --_ KeyDB Pro %s (%s/%d) %s bit \n"
" _-- / \\ --_ KeyDB Enterprise %s (%s/%d) %s bit \n"
" __-- / \\ --__ \n"
" (+) _ / \\ _ (+) Running in %s mode\n"
" | -- / \\ -- | Port: %d\n"

2
src/debug.cpp
View File

@ -1817,7 +1817,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-pro-server --test-memory to verify it.\n\n"
" Suspect RAM error? Use keydb-server --test-memory to verify it.\n\n"
);
/* free(messages); Don't call free() with possibly corrupted memory. */

1
src/keydb-pro-server.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
39d678ef2074bab53ae57cbcd3ed3bf5ffba5aed

26
src/server.cpp
View File

@ -5660,19 +5660,19 @@ void version(void) {
}
void usage(void) {
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 <megabytes>\n\n");
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 <megabytes>\n\n");
fprintf(stderr,"Examples:\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," ./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,"Sentinel mode:\n");
fprintf(stderr," ./keydb-pro-server /etc/sentinel.conf --sentinel\n");
fprintf(stderr," ./keydb-server /etc/sentinel.conf --sentinel\n");
exit(1);
}
@ -5717,7 +5717,7 @@ void redisAsciiArt(void) {
if (cserver.license_key == nullptr && !g_pserver->sentinel_mode)
{
#ifndef NO_LICENSE_CHECK
serverLog(LL_WARNING, "!!!! KeyDB Pro is being run in trial mode !!!!");
serverLog(LL_WARNING, "!!!! KeyDB Enterprise is being run in trial mode !!!!");
serverLog(LL_WARNING, "!!!! Execution will terminate in %d minutes !!!!", cserver.trial_timeout);
#endif
}
@ -6260,7 +6260,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-pro-server --test-memory 4096\n\n");
fprintf(stderr,"Example: ./keydb-server --test-memory 4096\n\n");
exit(1);
}
}

2
tests/instances.tcl
View File

@ -41,7 +41,7 @@ if {[catch {cd tmp}]} {
# the provided configuration file. Returns the PID of the process.
proc exec_instance {type dirname cfgfile} {
if {$type eq "redis"} {
set prgname keydb-pro-server
set prgname keydb-server
} elseif {$type eq "sentinel"} {
set prgname keydb-sentinel
} else {

6
tests/support/server.tcl
View File

@ -178,11 +178,11 @@ proc create_server_config_file {filename config} {
proc spawn_server {config_file stdout stderr} {
if {$::valgrind} {
set pid [exec valgrind --track-origins=yes --trace-children=yes --suppressions=[pwd]/src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/keydb-pro-server $config_file >> $stdout 2>> $stderr &]
set pid [exec valgrind --track-origins=yes --trace-children=yes --suppressions=[pwd]/src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/keydb-server $config_file >> $stdout 2>> $stderr &]
} elseif ($::stack_logging) {
set pid [exec /usr/bin/env MallocStackLogging=1 MallocLogFile=/tmp/malloc_log.txt src/keydb-pro-server $config_file >> $stdout 2>> $stderr &]
set pid [exec /usr/bin/env MallocStackLogging=1 MallocLogFile=/tmp/malloc_log.txt src/keydb-server $config_file >> $stdout 2>> $stderr &]
} else {
set pid [exec src/keydb-pro-server $config_file >> $stdout 2>> $stderr &]
set pid [exec src/keydb-server $config_file >> $stdout 2>> $stderr &]
}
if {$::wait_server} {

2
tests/support/test.tcl
View File

@ -187,7 +187,7 @@ proc test {name code {okpattern undefined} {options undefined}} {
}
if {$::traceleaks} {
set output [exec leaks keydb-pro-server]
set output [exec leaks keydb-server]
if {![string match {*0 leaks*} $output]} {
send_data_packet $::test_server_fd err "Detected a memory leak in test '$name': $output"
}

2
utils/create-cluster/create-cluster
View File

@ -26,7 +26,7 @@ then
while [ $((PORT < ENDPORT)) != "0" ]; do
PORT=$((PORT+1))
echo "Starting $PORT"
$BIN_PATH/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}
done
exit 0
fi

5
utils/install_server.sh
View File

@ -1,3 +1,4 @@
#!/bin/sh
# Copyright 2011 Dvir Volk <dvirsk at gmail dot com>. All rights reserved.
@ -37,7 +38,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-pro-server` ./utils/install_server.sh
# REDIS_EXECUTABLE=`command -v keydb-server` ./utils/install_server.sh
#
# This generates a redis config file and an /etc/init.d script, and installs them.
#
@ -129,7 +130,7 @@ fi
if [ ! -x "$REDIS_EXECUTABLE" ] ; then
_MANUAL_EXECUTION=true
#get the redis executable path
_REDIS_EXECUTABLE=`command -v keydb-pro-server`
_REDIS_EXECUTABLE=`command -v keydb-server`
read -p "Please select the redis executable path [$_REDIS_EXECUTABLE] " REDIS_EXECUTABLE
if [ ! -x "$REDIS_EXECUTABLE" ] ; then
REDIS_EXECUTABLE=$_REDIS_EXECUTABLE

2
utils/redis_init_script
View File

@ -12,7 +12,7 @@
### END INIT INFO
REDISPORT=6379
EXEC=/usr/local/bin/keydb-pro-server
EXEC=/usr/local/bin/keydb-server
CLIEXEC=/usr/local/bin/keydb-cli
PIDFILE=/var/run/redis_${REDISPORT}.pid

4
utils/speed-regression.tcl
View File

@ -27,8 +27,8 @@ proc run-tests branches {
}
# Start the Redis server
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 " starting the server... [exec ./keydb-server -v]"
set pids [exec echo "port $::port\nloglevel warning\n" | ./keydb-server - > /dev/null 2> /dev/null &]
puts " pids: $pids"
after 1000
puts " running the benchmark"