gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,356 Commits 1 Branch 0 Tags
Commit Graph

20927 Commits

Author SHA1 Message Date
zhaozhao.zz
2a8ee55176 donot free protected client in freeClientsInAsyncFreeQueue 
related #7234
 2020-06-09 11:53:01 +02:00
zhaozhao.zz
4846c0c8af donot free protected client in freeClientsInAsyncFreeQueue 
related #7234
 2020-06-09 11:53:01 +02:00
antirez
e286d3b4b6 Temporary fix for #7353 issue about EVAL during -BUSY. 2020-06-09 11:52:33 +02:00
antirez
cdad0e6485 Temporary fix for #7353 issue about EVAL during -BUSY. 2020-06-09 11:52:33 +02:00
hwware
44195a2047 fix server crash in STRALGO command 2020-06-08 23:36:01 -04:00
hwware
2a05fa0d48 fix server crash in STRALGO command 2020-06-08 23:36:01 -04:00
John Sully
8503b69bf9 Merge branch 'unstable' into keydbpro 
Former-commit-id: ca3a50537e987bd30aec38265be535d89bb260f3
 2020-06-08 16:51:16 -04:00
John Sully
e06d7d18e1 Merge branch 'unstable' into keydbpro 
Former-commit-id: ca3a50537e987bd30aec38265be535d89bb260f3
 2020-06-08 16:51:16 -04:00
John Sully
76070d51a6 Update gcov for C++ 
Former-commit-id: e8d4d095cc5268fb35170dd1f2cb56e25c3d2b69
 2020-06-08 16:48:44 -04:00
John Sully
f3e5c33a75 Update gcov for C++ 
Former-commit-id: e8d4d095cc5268fb35170dd1f2cb56e25c3d2b69
 2020-06-08 16:48:44 -04:00
Salvatore Sanfilippo
37b318c7e0 Merge pull request #7363 from xhebox/unstable 
return the correct proto version
 2020-06-08 12:54:15 +02:00
Salvatore Sanfilippo
48b2915c18
Merge pull request #7363 from xhebox/unstable 
return the correct proto version
 2020-06-08 12:54:15 +02:00
Salvatore Sanfilippo
5f1defa179 Merge pull request #7370 from oranagra/no_queue_in_aborted_multi 
Don't queue commands in an already aborted MULTI state
 2020-06-08 11:08:08 +02:00
Salvatore Sanfilippo
254f06c131
Merge pull request #7370 from oranagra/no_queue_in_aborted_multi 
Don't queue commands in an already aborted MULTI state
 2020-06-08 11:08:08 +02:00
Salvatore Sanfilippo
783735c915 Merge pull request #7369 from oranagra/no_reject_watch 
Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARD
 2020-06-08 11:04:26 +02:00
Salvatore Sanfilippo
8183a4ca7f
Merge pull request #7369 from oranagra/no_reject_watch 
Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARD
 2020-06-08 11:04:26 +02:00
Salvatore Sanfilippo
0c539f6497 Merge pull request #7357 from soloestoy/bugfix-aof-keepttl 
AOF: append origin SET if no expire option
 2020-06-08 11:02:00 +02:00
Salvatore Sanfilippo
265a7e7ec7
Merge pull request #7357 from soloestoy/bugfix-aof-keepttl 
AOF: append origin SET if no expire option
 2020-06-08 11:02:00 +02:00
Salvatore Sanfilippo
6fed3d8708 Merge pull request #7371 from oranagra/fix_disconnectSlaves 
fix disconnectSlaves, to try to free each slave.
 2020-06-08 10:43:51 +02:00
Salvatore Sanfilippo
cfffda83fb
Merge pull request #7371 from oranagra/fix_disconnectSlaves 
fix disconnectSlaves, to try to free each slave.
 2020-06-08 10:43:51 +02:00
Salvatore Sanfilippo
4ea93c04ff Merge pull request #7352 from soloestoy/donot-free-protected-client-when-blocking 
donot free protected client in freeClientsInAsyncFreeQueue()
 2020-06-08 10:43:17 +02:00
Salvatore Sanfilippo
74a203a050
Merge pull request #7352 from soloestoy/donot-free-protected-client-when-blocking 
donot free protected client in freeClientsInAsyncFreeQueue()
 2020-06-08 10:43:17 +02:00
Oran Agra
25ae9c15ce fix disconnectSlaves, to try to free each slave. 
the recent change in that loop (iteration rather than waiting for it to
be empty) was intended to avoid an endless loop in case some slave would
refuse to be freed.

but the lookup of the first client remained, which would have caused it
to try the first one again and again instead of moving on.
 2020-06-08 09:50:06 +03:00
Oran Agra
12504105c4 fix disconnectSlaves, to try to free each slave. 
the recent change in that loop (iteration rather than waiting for it to
be empty) was intended to avoid an endless loop in case some slave would
refuse to be freed.

but the lookup of the first client remained, which would have caused it
to try the first one again and again instead of moving on.
 2020-06-08 09:50:06 +03:00
Oran Agra
0bf6face8a Don't queue commands in an already aborted MULTI state 2020-06-08 09:43:10 +03:00
Oran Agra
2bb297b102 Don't queue commands in an already aborted MULTI state 2020-06-08 09:43:10 +03:00
Oran Agra
b64641f995 Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARD 
Much like MULTI/EXEC/DISCARD, the WATCH and UNWATCH are not actually
operating on the database or server state, but instead operate on the
client state. the client may send them all in one long pipeline and check
all the responses only at the end, so failing them may lead to a
mismatch between the client state on the server and the one on the
client end, and execute the wrong commands (ones that were meant to be
discarded)

the watched keys are not actually stored in the client struct, but they
are in fact part of the client state. for instance, they're not cleared
or moved in SWAPDB or FLUSHDB.
 2020-06-08 09:16:32 +03:00
Oran Agra
2fa077b0e9 Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARD 
Much like MULTI/EXEC/DISCARD, the WATCH and UNWATCH are not actually
operating on the database or server state, but instead operate on the
client state. the client may send them all in one long pipeline and check
all the responses only at the end, so failing them may lead to a
mismatch between the client state on the server and the one on the
client end, and execute the wrong commands (ones that were meant to be
discarded)

the watched keys are not actually stored in the client struct, but they
are in fact part of the client state. for instance, they're not cleared
or moved in SWAPDB or FLUSHDB.
 2020-06-08 09:16:32 +03:00
John Sully
ad4d76422c Some valgrind fixes 
Former-commit-id: ba974c9810dc30b6b5bd21c4bcc6cc5b219f7ea4
 2020-06-07 23:20:10 -04:00
John Sully
66e9afe49c Some valgrind fixes 
Former-commit-id: ba974c9810dc30b6b5bd21c4bcc6cc5b219f7ea4
 2020-06-07 23:20:10 -04:00
John Sully
f252cc9e41 fix valgrind false error 
Former-commit-id: 9817db7eddf06becd151e5fef7cc6808777c49cb
 2020-06-07 20:17:47 -04:00
John Sully
a41672672b fix valgrind false error 
Former-commit-id: 9817db7eddf06becd151e5fef7cc6808777c49cb
 2020-06-07 20:17:47 -04:00
John Sully
27f454bafc fix valgrind false error 
Former-commit-id: 887d8bdd110e04b30ffb215726e8aade39f0387a
 2020-06-07 20:17:32 -04:00
John Sully
cc16e74f8b fix valgrind false error 
Former-commit-id: 887d8bdd110e04b30ffb215726e8aade39f0387a
 2020-06-07 20:17:32 -04:00
John Sully
46f14ffc54 Merge branch 'keydbpro' into PRO_RELEASE_6 
Former-commit-id: 3106f60e0ebdba5db944e704d4b148ea81c806f6
 2020-06-07 17:05:00 -04:00
John Sully
2faa1f5771 Merge branch 'keydbpro' into PRO_RELEASE_6 
Former-commit-id: 3106f60e0ebdba5db944e704d4b148ea81c806f6
 2020-06-07 17:05:00 -04:00
John Sully
3004ca80a4 Fix merge bug 
Former-commit-id: cc03c32271997d26ce7f07f96588f126c5939e69
 2020-06-07 17:04:46 -04:00
John Sully
a6195bbd43 Fix merge bug 
Former-commit-id: cc03c32271997d26ce7f07f96588f126c5939e69
 2020-06-07 17:04:46 -04:00
John Sully
00ae6d58a9 Bump version 
Former-commit-id: 4a3e1f3b9b164ec0f19ca2a67c8003792a5ccc5c
 2020-06-07 16:43:07 -04:00
John Sully
eda1bd2082 Bump version 
Former-commit-id: 4a3e1f3b9b164ec0f19ca2a67c8003792a5ccc5c
 2020-06-07 16:43:07 -04:00
John Sully
d0d24e04f0 Ensure CRON jobs run in a clean environment 
Former-commit-id: b0e14683b2e655dc3aeb2f19b9227fc7fa24cc73
 2020-06-07 16:43:07 -04:00
John Sully
9427b52a48 Ensure CRON jobs run in a clean environment 
Former-commit-id: b0e14683b2e655dc3aeb2f19b9227fc7fa24cc73
 2020-06-07 16:43:07 -04:00
John Sully
e2cd106d2d Undecorated new is OK to use 
Former-commit-id: 8d5cc4cf0c9d05f0d68cffec2b87b5c3dcb562ba
 2020-06-07 16:43:07 -04:00
John Sully
5eab79c4bf Undecorated new is OK to use 
Former-commit-id: 8d5cc4cf0c9d05f0d68cffec2b87b5c3dcb562ba
 2020-06-07 16:43:07 -04:00
John Sully
16f86db5e4 Bump version 
Former-commit-id: 52a0556ba15b26d84ca9b5c804eb8fe438c9c888
 2020-06-07 16:41:59 -04:00
John Sully
d6c972a55f Bump version 
Former-commit-id: 52a0556ba15b26d84ca9b5c804eb8fe438c9c888
 2020-06-07 16:41:59 -04:00
John Sully
8c24082f87 Merge branch 'keydbpro' into PRO_RELEASE_6 
Former-commit-id: 6495fe1c7878f96dffa25a2879cb2b825c9e10b2
 2020-06-07 16:41:36 -04:00
John Sully
9a22fb489a Merge branch 'keydbpro' into PRO_RELEASE_6 
Former-commit-id: 6495fe1c7878f96dffa25a2879cb2b825c9e10b2
 2020-06-07 16:41:36 -04:00
John Sully
4001a99481 Merge branch 'unstable' into keydbpro 
Former-commit-id: 461eea07260a31cd75753d5b7be691f5793a6f1b
 2020-06-07 16:41:21 -04:00
John Sully
067382bb8c Merge branch 'unstable' into keydbpro 
Former-commit-id: 461eea07260a31cd75753d5b7be691f5793a6f1b
 2020-06-07 16:41:21 -04:00