summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Experimental: new keyspace and expire algorithm.new-keyspaceantirez2019-06-1834-758/+998
| | | | | | | | | This is an alpha quality implementation of a new keyspace representation and a new expire algorithm for Redis. This work is described here: https://gist.github.com/antirez/b2eb293819666ee104c7fcad71986eb7
* Merge pull request #6100 from chrizel/typo-fixesSalvatore Sanfilippo2019-05-151-2/+2
|\ | | | | Typo fixes in CONTRIBUTING
| * Typo fixes in CONTRIBUTINGChristian Zeller2019-05-151-2/+2
|/
* Update CONTRIBUTING with present info.antirez2019-05-151-5/+15
|
* Narrow the effects of PR #6029 to the exact state.antirez2019-05-151-5/+17
| | | | | | | | | | CLIENT PAUSE may be used, in other contexts, for a long time making all the slaves time out. Better for now to be more specific about what should disable senidng PINGs. An alternative to that would be to virtually refresh the slave interactions when clients are paused, however for now I went for this more conservative solution.
* Merge pull request #6029 from chendq8/clientpauseSalvatore Sanfilippo2019-05-151-1/+1
|\ | | | | fix cluster failover time out
| * stop ping when client pausechendianqiang2019-04-171-1/+1
| |
* | Test: fix slowlog test false positive.antirez2019-05-141-1/+3
| | | | | | | | | | | | | | | | | | In fast systems "SLOWLOG RESET" is fast enough to don't be logged even when the time limit is "1" sometimes. Leading to false positives such as: [err]: SLOWLOG - can be disabled in tests/unit/slowlog.tcl Expected '1' to be equal to '0'
* | Make comment in getClientOutputBufferMemoryUsage() describing the present.antirez2019-05-131-8/+1
| |
* | Fix test false positive introduced by threaded I/O.antirez2019-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now clients that are ready to be terminated asynchronously are processed more often in beforeSleep() instead of being processed in serverCron(). This means that the test will not be able to catch the moment the client was terminated, also note that the 'omem' figure now changes in big steps, because of the new client output buffers layout. So we have to change the test range in order to accomodate for that. Yet the test is useful enough to be worth taking, even if its precision is reduced by this commit. Probably if we get more problems, a thing that makes sense is just to check that the limit is < 200k. That's more than enough actually.
* | Merge pull request #6053 from soloestoy/enhance-aof-fsync-everysecSalvatore Sanfilippo2019-05-102-3/+32
|\ \ | | | | | | aof: enhance AOF_FSYNC_EVERYSEC, more details in #5985
| * | aof: enhance AOF_FSYNC_EVERYSEC, more details in #5985zhaozhao.zz2019-04-292-3/+32
| | |
* | | Merge pull request #6074 from trevor211/fixActiveExpireSalvatore Sanfilippo2019-05-101-4/+6
|\ \ \ | | | | | | | | Do not active expire keys in the background when the switch is off.
| * | | Do not active expire keys in the background when the switch is off.WuYunlong2019-05-061-4/+6
| | | |
* | | | Merge pull request #6080 from soloestoy/fix-makefileSalvatore Sanfilippo2019-05-101-1/+1
|\ \ \ \ | | | | | | | | | | Makefile: 1TD -> STD
| * | | | Makefile: 1TD -> STDzhaozhao.zz2019-05-071-1/+1
| | | | |
* | | | | Merge pull request #6073 from yossigo/fix/blocked-client-idSalvatore Sanfilippo2019-05-101-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Preserve client->id for blocked clients.
| * | | | | Preserve client->id for blocked clients.Yossi Gottlieb2019-05-051-1/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #6081 from Happy4Code/mod_commentsSalvatore Sanfilippo2019-05-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | change the comments there may have a mis type
| * | | | | change the comments there may have a mis typestan0112019-05-071-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #6077 from zltl/patch-7Salvatore Sanfilippo2019-05-101-2/+0
|\ \ \ \ \ | | | | | | | | | | | | delete sdsTest() from REDIS_TEST in server.c to fix build failed
| * | | | | delete sdsTest() from REDIS_TESTliaotonglang2019-05-061-2/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | sdsTest() defined in sds.c dit not match the call in server.c. remove it from REDIS_TEST, since test-sds defined in Makefile.
* | | | | Merge pull request #6083 from tangquanawj/fix-inappropriate-add-operation-codeSalvatore Sanfilippo2019-05-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix-inappropriate-add-operation-code
| * | | | | Update ziplist.c唐权2019-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi, @antirez In the code, to get the size of ziplist, "unsigned int bytes = ZIPLIST_HEADER_SIZE+1;" is correct, but why not make it more readable and easy to understand
* | | | | | Merge pull request #6086 from yongman/fix-uint64-in-defragSalvatore Sanfilippo2019-05-101-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix uint64_t hash value in active defrag
| * | | | | | Fix uint64_t hash value in active defragyongman2019-05-081-3/+3
| |/ / / / /
* | | | | | Merge pull request #6087 from AngusP/linux-build-warningsSalvatore Sanfilippo2019-05-102-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [Minor] Fix build warnings on Linux
| * | | | | | Enlarge error buffer in redis-check-aof.c to remove compiler warning of ↵Angus Pearson2019-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | output truncation through snprintf format string
| * | | | | | Add <strings.h> include to deps/hiredis/read.c to fix Implicit Declaration ↵Angus Pearson2019-05-081-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | of strcasecmp warning
* | | | | | Merge pull request #6091 from soloestoy/fix-test-skip-tillSalvatore Sanfilippo2019-05-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | test cases: skiptill -> skip-till
| * | | | | test cases: skiptill -> skip-tillzhaozhao.zz2019-05-101-1/+1
|/ / / / /
* | | | | Merge pull request #6082 from soloestoy/fix-config-rewrite-memleakSalvatore Sanfilippo2019-05-071-4/+3
|\ \ \ \ \ | |_|/ / / |/| | | | fix memory leak when rewrite config file
| * | | | fix memory leak when rewrite config filezhaozhao.zz2019-05-071-4/+3
|/ / / /
* | | | Merge pull request #6070 from oranagra/stabilize_repl_testsSalvatore Sanfilippo2019-05-063-4/+34
|\ \ \ \ | | | | | | | | | | make replication tests more stable on slow machines
| * | | | make replication tests more stable on slow machinesOran Agra2019-05-053-4/+34
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | solving few replication related tests race conditions which fail on slow machines bugfix in slave buffers test: since the test is executed twice, each time with a different commands count, the threshold for the delta can't be a constant.
* | | | Threaded IO: handleClientsWithPendingReadsUsingThreads top comment.antirez2019-05-061-0/+6
| | | |
* | | | Threaded IO: configuration directive for turning on/off reads.antirez2019-05-061-0/+6
| | | |
* | | | Threaded IO: ability to disable reads from threaded path.antirez2019-05-063-1/+5
| | | |
* | | | Threaded IO: put fflush() inside tio_debug conditional.antirez2019-05-061-2/+2
| | | |
* | | | Threaded IO: parsing WIP 2: refactoring to parse from thread.antirez2019-05-062-28/+60
| | | |
* | | | Threaded IO: parsing WIP 1: set current_client in a better scoped way.antirez2019-05-061-11/+12
| | | |
* | | | Threaded IO: logging should be safe in I/O threads.antirez2019-05-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Potentially it is possible that we get interleaved writes, even if serverLog() makes sure to write into a buffer and then use printf(), so even this should be ok. However in general POSIX guarantees that writing to the same file pointer object from multiple threads is safe. Anyway currently we *reopen* the file at each call, but for the standard output logging. The logging functions actually also access global configuration while performing the log (for instance in order to check the log level, the log filename and so forth), however dunring the I/O threads execution we cannot alter such shared state in any way.
* | | | Threaded IO: process read queue before stopping threads.antirez2019-05-061-1/+6
| | | |
* | | | Threaded IO: read side WIP 3.antirez2019-05-063-6/+55
| | | |
* | | | Threaded IO: read side WIP 2.antirez2019-05-061-7/+23
| | | |
* | | | Threaded IO: read side WIP.antirez2019-05-064-46/+75
| | | |
* | | | Threaded IO: hide more debugging printfs under conditional.antirez2019-05-061-2/+2
| | | |
* | | | Threaded IO: make num of I/O threads configurable.antirez2019-05-064-2/+10
| | | |
* | | | Threaded IO: use main thread if num of threads is 1.antirez2019-05-061-2/+11
| | | |
* | | | Threaded IO: stop threads when no longer needed + C11 in Makefile.Ubuntu2019-05-064-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | Now threads are stopped even when the connections drop immediately to zero, not allowing the networking code to detect the condition and stop the threads. serverCron() will handle that.