@@ -821,13 +821,8 @@ void clientsCron(void) {
821821 * a macro is used: run_with_period(milliseconds) { .... }
822822 */
823823
824- /* Using the following macro you can run code inside serverCron() with the
825- * specified period, specified in milliseconds.
826- * The actual resolution depends on REDIS_HZ. */
827- #define run_with_period (_ms_ ) if (!(loops % ((_ms_)/(1000/REDIS_HZ))))
828-
829824int serverCron (struct aeEventLoop * eventLoop , long long id , void * clientData ) {
830- int j , loops = server . cronloops ;
825+ int j ;
831826 REDIS_NOTUSED (eventLoop );
832827 REDIS_NOTUSED (id );
833828 REDIS_NOTUSED (clientData );
@@ -896,11 +891,14 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
896891 }
897892
898893 /* Show information about connected clients */
899- run_with_period (5000 ) {
900- redisLog (REDIS_VERBOSE ,"%d clients connected (%d slaves), %zu bytes in use" ,
901- listLength (server .clients )- listLength (server .slaves ),
902- listLength (server .slaves ),
903- zmalloc_used_memory ());
894+ if (!server .sentinel_mode ) {
895+ run_with_period (5000 ) {
896+ redisLog (REDIS_VERBOSE ,
897+ "%d clients connected (%d slaves), %zu bytes in use" ,
898+ listLength (server .clients )- listLength (server .slaves ),
899+ listLength (server .slaves ),
900+ zmalloc_used_memory ());
901+ }
904902 }
905903
906904 /* We need to do a few operations on clients asynchronously. */
@@ -985,6 +983,11 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
985983 if (server .cluster_enabled ) clusterCron ();
986984 }
987985
986+ /* Run the sentinel timer if we are in sentinel mode. */
987+ run_with_period (100 ) {
988+ if (server .sentinel_mode ) sentinelTimer ();
989+ }
990+
988991 server .cronloops ++ ;
989992 return 1000 /REDIS_HZ ;
990993}
@@ -2444,21 +2447,26 @@ void usage() {
24442447 fprintf (stderr ," ./redis-server /etc/redis/6379.conf\n" );
24452448 fprintf (stderr ," ./redis-server --port 7777\n" );
24462449 fprintf (stderr ," ./redis-server --port 7777 --slaveof 127.0.0.1 8888\n" );
2447- fprintf (stderr ," ./redis-server /etc/myredis.conf --loglevel verbose\n" );
2450+ fprintf (stderr ," ./redis-server /etc/myredis.conf --loglevel verbose\n\n" );
2451+ fprintf (stderr ,"Sentinel mode:\n" );
2452+ fprintf (stderr ," ./redis-server /etc/sentinel.conf --sentinel\n" );
24482453 exit (1 );
24492454}
24502455
24512456void redisAsciiArt (void ) {
24522457#include "asciilogo.h"
24532458 char * buf = zmalloc (1024 * 16 );
2459+ char * mode = "stand alone" ;
2460+
2461+ if (server .cluster_enabled ) mode = "cluster" ;
2462+ else if (server .sentinel_mode ) mode = "sentinel" ;
24542463
24552464 snprintf (buf ,1024 * 16 ,ascii_logo ,
24562465 REDIS_VERSION ,
24572466 redisGitSHA1 (),
24582467 strtol (redisGitDirty (),NULL ,10 ) > 0 ,
24592468 (sizeof (long ) == 8 ) ? "64" : "32" ,
2460- server .cluster_enabled ? "cluster" : "stand alone" ,
2461- server .port ,
2469+ mode , server .port ,
24622470 (long ) getpid ()
24632471 );
24642472 redisLogRaw (REDIS_NOTICE |REDIS_LOG_RAW ,buf );
@@ -2496,17 +2504,53 @@ void setupSignalHandlers(void) {
24962504
24972505void memtest (size_t megabytes , int passes );
24982506
2507+ /* Returns 1 if there is --sentinel among the arguments or if
2508+ * argv[0] is exactly "redis-sentinel". */
2509+ int checkForSentinelMode (int argc , char * * argv ) {
2510+ int j ;
2511+
2512+ if (strstr (argv [0 ],"redis-sentinel" ) != NULL ) return 1 ;
2513+ for (j = 1 ; j < argc ; j ++ )
2514+ if (!strcmp (argv [j ],"--sentinel" )) return 1 ;
2515+ return 0 ;
2516+ }
2517+
2518+ /* Function called at startup to load RDB or AOF file in memory. */
2519+ void loadDataFromDisk (void ) {
2520+ long long start = ustime ();
2521+ if (server .aof_state == REDIS_AOF_ON ) {
2522+ if (loadAppendOnlyFile (server .aof_filename ) == REDIS_OK )
2523+ redisLog (REDIS_NOTICE ,"DB loaded from append only file: %.3f seconds" ,(float )(ustime ()- start )/1000000 );
2524+ } else {
2525+ if (rdbLoad (server .rdb_filename ) == REDIS_OK ) {
2526+ redisLog (REDIS_NOTICE ,"DB loaded from disk: %.3f seconds" ,
2527+ (float )(ustime ()- start )/1000000 );
2528+ } else if (errno != ENOENT ) {
2529+ redisLog (REDIS_WARNING ,"Fatal error loading the DB. Exiting." );
2530+ exit (1 );
2531+ }
2532+ }
2533+ }
2534+
24992535int main (int argc , char * * argv ) {
2500- long long start ;
25012536 struct timeval tv ;
25022537
25032538 /* We need to initialize our libraries, and the server configuration. */
25042539 zmalloc_enable_thread_safeness ();
25052540 srand (time (NULL )^getpid ());
25062541 gettimeofday (& tv ,NULL );
25072542 dictSetHashFunctionSeed (tv .tv_sec ^tv .tv_usec ^getpid ());
2543+ server .sentinel_mode = checkForSentinelMode (argc ,argv );
25082544 initServerConfig ();
25092545
2546+ /* We need to init sentinel right now as parsing the configuration file
2547+ * in sentinel mode will have the effect of populating the sentinel
2548+ * data structures with master nodes to monitor. */
2549+ if (server .sentinel_mode ) {
2550+ initSentinelConfig ();
2551+ initSentinel ();
2552+ }
2553+
25102554 if (argc >= 2 ) {
25112555 int j = 1 ; /* First option to parse in argv[] */
25122556 sds options = sdsempty ();
@@ -2558,27 +2602,20 @@ int main(int argc, char **argv) {
25582602 initServer ();
25592603 if (server .daemonize ) createPidFile ();
25602604 redisAsciiArt ();
2561- redisLog (REDIS_WARNING ,"Server started, Redis version " REDIS_VERSION );
2562- #ifdef __linux__
2563- linuxOvercommitMemoryWarning ();
2564- #endif
2565- start = ustime ();
2566- if (server .aof_state == REDIS_AOF_ON ) {
2567- if (loadAppendOnlyFile (server .aof_filename ) == REDIS_OK )
2568- redisLog (REDIS_NOTICE ,"DB loaded from append only file: %.3f seconds" ,(float )(ustime ()- start )/1000000 );
2569- } else {
2570- if (rdbLoad (server .rdb_filename ) == REDIS_OK ) {
2571- redisLog (REDIS_NOTICE ,"DB loaded from disk: %.3f seconds" ,
2572- (float )(ustime ()- start )/1000000 );
2573- } else if (errno != ENOENT ) {
2574- redisLog (REDIS_WARNING ,"Fatal error loading the DB. Exiting." );
2575- exit (1 );
2576- }
2605+
2606+ if (!server .sentinel_mode ) {
2607+ /* Things only needed when not runnign in Sentinel mode. */
2608+ redisLog (REDIS_WARNING ,"Server started, Redis version " REDIS_VERSION );
2609+ #ifdef __linux__
2610+ linuxOvercommitMemoryWarning ();
2611+ #endif
2612+ loadDataFromDisk ();
2613+ if (server .ipfd > 0 )
2614+ redisLog (REDIS_NOTICE ,"The server is now ready to accept connections on port %d" , server .port );
2615+ if (server .sofd > 0 )
2616+ redisLog (REDIS_NOTICE ,"The server is now ready to accept connections at %s" , server .unixsocket );
25772617 }
2578- if (server .ipfd > 0 )
2579- redisLog (REDIS_NOTICE ,"The server is now ready to accept connections on port %d" , server .port );
2580- if (server .sofd > 0 )
2581- redisLog (REDIS_NOTICE ,"The server is now ready to accept connections at %s" , server .unixsocket );
2618+
25822619 aeSetBeforeSleepProc (server .el ,beforeSleep );
25832620 aeMain (server .el );
25842621 aeDeleteEventLoop (server .el );
0 commit comments