212 Commits

Author SHA1 Message Date
John Sully
eccb4c6d34 If no rdb file is specified and no s3 file is specified use the default RDB filename. If only S3 is specified use diskless sync
Former-commit-id: 770bb8ef5f52e804a00730ac2aa95a0107c52bab
2019-03-27 22:59:12 -04:00
John Sully
714bad8d63 SIGALRM should happen on a worker thread to make our tests happy
Former-commit-id: 10a4b35bc5870aef898d298366f415b163c89efb
2019-03-26 20:39:30 -04:00
John Sully
ff470686df OS X build fixes
Former-commit-id: 1dff223c713cba0b336f34328d223ddd675a3781
2019-03-24 18:06:57 -04:00
John Sully
ccb9cb8b01 Active Replica Support
Former-commit-id: a7aa2b074049a130761bc0a98d47130b6a0ff817
2019-03-24 15:39:10 -04:00
John Sully
f11840f6b2 Merge branch 'unstable' of https://github.com/antirez/redis into unstable
Former-commit-id: 9322d604eea7b48df3feff47ce2c04f82291228f
2019-03-21 20:15:59 -04:00
John Sully
fbe1a6c52a Add debugging stats to the INFO command
Former-commit-id: ac80a5c6a6676f45ac7d460a9cfb02fef8b48d78
2019-03-19 22:04:33 -04:00
John Sully
c0fbc6d2d9 clang build failure
Former-commit-id: 3d93ca1bf699cbd399faf4a37e78d8d5d9f1b253
2019-03-19 19:55:03 -04:00
John Sully
6702b89166 Merge branch 'unstable' of https://github.com/antirez/redis into unstable
Lots of fixes and improvements from upstream.


Former-commit-id: 261cf24efc8bedec7ee76a8897b9a800a4d663e2
2019-03-13 18:08:22 -04:00
John Sully
d0de467103 Implement load database dumps from S3. We already save.
Former-commit-id: a45f212693956a6fb1aacf465d88e940bbbfd56f
2019-03-13 16:53:37 -04:00
John Sully
38fd0476d5 Merge branch 'unstable' into RELEASE_0_9
Former-commit-id: 0bc586933ff91fd07128d5419b06303f05d16f2e
2019-03-07 19:13:33 -05:00
John Sully
2d19319915 Limit server-threads to cores in the machine
Former-commit-id: be3ba1d53eb070719fd84c7573f665277a35b6f4
2019-03-06 16:39:02 -05:00
John Sully
d1c93ee8e1 port server.c to server.cpp
Former-commit-id: 09e6a4fee09b1a61e6d2ac83a2c8fec9978474ec
2019-03-06 16:29:30 -05:00