fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-12 08:41:21 +00:00
Code Issues Projects Releases Wiki Activity

RDMF (Redis/Disque merge friendlyness) refactoring WIP 1.

Browse Source
This commit is contained in:
antirez
2015-07-26 15:14:57 +02:00
parent b684e2dad1
commit cef054e868
37 changed files with 178 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sentinel.c
View File

@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "redis.h"
#include "server.h"
#include "hiredis.h"
#include "async.h"
@ -1840,7 +1840,7 @@ void sentinelFlushConfig(void) {
int saved_hz = server.hz;
int rewrite_status;
server.hz = REDIS_DEFAULT_HZ;
server.hz = CONFIG_DEFAULT_HZ;
rewrite_status = rewriteConfig(server.configfile);
server.hz = saved_hz;
@ -4288,6 +4288,6 @@ void sentinelTimer(void) {
* exactly continue to stay synchronized asking to be voted at the
* same time again and again (resulting in nobody likely winning the
* election because of split brain voting). */
server.hz = REDIS_DEFAULT_HZ + rand() % REDIS_DEFAULT_HZ;
server.hz = CONFIG_DEFAULT_HZ + rand() % CONFIG_DEFAULT_HZ;
}