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

20983 Commits

Author SHA1 Message Date
antirez
bde1f0a8e2 RESP3: change streams items from maps to arrays. 
Streams items are similar to dictionaries, however they preserve both
the order, and allow for duplicated field names. So a map is not a
semantically sounding way to deal with this.

https://twitter.com/antirez/status/1248261087553880069
 2020-04-15 16:03:16 +02:00
antirez
340ee24704 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2020-04-15 16:01:56 +02:00
antirez
e8dd99fa53 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2020-04-15 16:01:56 +02:00
antirez
7547288a93 Fix HELLO reply in Sentinel mode, see #6160. 2020-04-15 15:59:52 +02:00
antirez
7f794a122f Fix HELLO reply in Sentinel mode, see #6160. 2020-04-15 15:59:52 +02:00
Salvatore Sanfilippo
f8aff04d0a Merge pull request #7078 from karelrooted/fix/geo-hash-edge-case 
FIX truncate max/min longitude,latitude related geo_point
 2020-04-15 10:23:23 +02:00
Salvatore Sanfilippo
dfd3ead90d
Merge pull request #7078 from karelrooted/fix/geo-hash-edge-case 
FIX truncate max/min longitude,latitude related geo_point
 2020-04-15 10:23:23 +02:00
John Sully
f69c169c04 Merge tag '6.0-rc3' into redis_6_merge 
Redis 6.0 RC3.


Former-commit-id: b2cb10de5f39b4d8e1ee19877c2bdaf19eefd9db
 2020-04-14 22:56:19 -04:00
John Sully
d3ebe3b6bd Merge tag '6.0-rc3' into redis_6_merge 
Redis 6.0 RC3.


Former-commit-id: b2cb10de5f39b4d8e1ee19877c2bdaf19eefd9db
 2020-04-14 22:56:19 -04:00
John Sully
f7a49753a8 Fix merge issues and move timeout to C++ 
Former-commit-id: 1005a725d498e3c9f8c708d3c8b013a402149bd8
 2020-04-14 22:37:26 -04:00
John Sully
8675bd3bde Fix merge issues and move timeout to C++ 
Former-commit-id: 1005a725d498e3c9f8c708d3c8b013a402149bd8
 2020-04-14 22:37:26 -04:00
John Sully
3e656bcb3f Merge commit '2a820251c8ffba152e00ef7b1ca5e7a477087d33' into redis_6_merge 
Former-commit-id: 50768cd242c0360c6e943c57f866789280d30dc0
 2020-04-14 22:25:44 -04:00
John Sully
68fd7c5c3d Merge commit 'c3b268a0bcded2d730790a772176483efb7c31fb' into redis_6_merge 
Former-commit-id: 50768cd242c0360c6e943c57f866789280d30dc0
 2020-04-14 22:25:44 -04:00
John Sully
ce54857237 Merge commit '454e12cb8961f21c9dd8502dc82ae6ffd7e22fe0' into redis_6_merge 
Former-commit-id: cc3ebbe5194e9744fb84ce490e90ac5fbe7f8716
 2020-04-14 22:19:29 -04:00
John Sully
02147b4be0 Merge commit '0f7dfc378ce5ab0524ac28b6142545bc41435386' into redis_6_merge 
Former-commit-id: cc3ebbe5194e9744fb84ce490e90ac5fbe7f8716
 2020-04-14 22:19:29 -04:00
John Sully
8750cb5a3b Merge commit '07c75f60f3fe0b300fd7913bab3d2d7e612afb03' into redis_6_merge 
Former-commit-id: 2941792a85653258a36f8eb02189132ec7835242
 2020-04-14 21:13:42 -04:00
John Sully
7a6933bb15 Merge commit 'e628f94436f2ffb38dd6305f18956f309838a8d6' into redis_6_merge 
Former-commit-id: 2941792a85653258a36f8eb02189132ec7835242
 2020-04-14 21:13:42 -04:00
John Sully
0725491043 Merge commit 'c609bf3f2c7f0982f632f82623ee4802868b8ef1' into redis_6_merge 
Former-commit-id: 320bc3c0329ff9e5a980b79426b719addae381cf
 2020-04-14 21:04:42 -04:00
John Sully
aa48225a76 Merge commit '76d57161d960f27ac92765118e3b80fef8847b8f' into redis_6_merge 
Former-commit-id: 320bc3c0329ff9e5a980b79426b719addae381cf
 2020-04-14 21:04:42 -04:00
John Sully
90cbdd5573 Merge commit 'c208956fbe077e8249d2965dec2ea1b9b7588d6d' into redis_6_merge 
Former-commit-id: 2825e515504cffcf6000be2e547ab1cbd86441bc
 2020-04-14 20:55:29 -04:00
John Sully
b20093e2f3 Merge commit 'e74e68c84f5eba8013769087c9a46cab811b8417' into redis_6_merge 
Former-commit-id: 2825e515504cffcf6000be2e547ab1cbd86441bc
 2020-04-14 20:55:29 -04:00
John Sully
4d4a7d656b Merge commit '00e53fb140fb67d329aff6cd2200f1eaf9e80cf5' into redis_6_merge 
Former-commit-id: cbdd47d0569cd7dd5d45fa764f3f966a9bf7aee9
 2020-04-14 20:44:27 -04:00
John Sully
1a661c81fe Merge commit 'baaf869fc3e138cfcb4cfda09f09fd3c87c8f924' into redis_6_merge 
Former-commit-id: cbdd47d0569cd7dd5d45fa764f3f966a9bf7aee9
 2020-04-14 20:44:27 -04:00
John Sully
4f56e9c3b0 Merge commit 'e91ca9fee9c56ef319b407b104afc435be0c53cb' into redis_6_merge 
Former-commit-id: 516c8c6e231cdfc87a3db5be401407cb7afa3937
 2020-04-14 20:42:48 -04:00
John Sully
07005cc187 Merge commit 'be4bc1a5be26a7fde2fd05acd8187f5f0ed59f25' into redis_6_merge 
Former-commit-id: 516c8c6e231cdfc87a3db5be401407cb7afa3937
 2020-04-14 20:42:48 -04:00
John Sully
68c50ae876 Merge commit '6718d5d37517bd927635649708913affb98f67c9' into redis_6_merge 
Former-commit-id: ef1236b6009ebd7b00f6dd2f43df57ad95e51253
 2020-04-14 20:19:48 -04:00
John Sully
f27524674a Merge commit '973297336fc05a601e17be70aba88e5dca6480ae' into redis_6_merge 
Former-commit-id: ef1236b6009ebd7b00f6dd2f43df57ad95e51253
 2020-04-14 20:19:48 -04:00
John Sully
2c049c16a2 Merge commit '79e8b17d7b44c793d8b22668b8583a297ee1b387' into redis_6_merge 
Former-commit-id: 28cbed1d13961c5568f2bdc50c6a23107d3434d0
 2020-04-14 20:09:53 -04:00
John Sully
d57fa7c8f9 Merge commit '349aa24511253b3e323064b95cefb4414f31726c' into redis_6_merge 
Former-commit-id: 28cbed1d13961c5568f2bdc50c6a23107d3434d0
 2020-04-14 20:09:53 -04:00
John Sully
d48ea996e7 Merge commit '13fbdf970660b15011c4312f31137e58bbda5b2c' into redis_6_merge 
Former-commit-id: cde199a7973ad63317b68f581df607321e12bf46
 2020-04-14 19:43:04 -04:00
John Sully
12999c17dd Merge commit 'df83892760d19b1b7e92d76e72daf4834ad2df6c' into redis_6_merge 
Former-commit-id: cde199a7973ad63317b68f581df607321e12bf46
 2020-04-14 19:43:04 -04:00
John Sully
6df76a3bfa Merge commit 'a8e2bbe8f6a3f4833f286cc5049e6b52c87de1a9' into redis_6_merge 
Former-commit-id: 5589a0a69ca6f5798b750a6a79f7e9b44d20e136
 2020-04-14 19:22:44 -04:00
John Sully
947bf289a5 Merge commit 'f42ce57d0f7eee6705fb0a81714cabe97a4f2c0a' into redis_6_merge 
Former-commit-id: 5589a0a69ca6f5798b750a6a79f7e9b44d20e136
 2020-04-14 19:22:44 -04:00
John Sully
2038fa270a Merge commit '491949ee5bf4ffbfc746ea4ed5a6d673b0e2fb81' into redis_6_merge 
Former-commit-id: 09e8fb17cd0889ad17461e48446221b3955f5a8f
 2020-04-14 18:44:42 -04:00
John Sully
5dbcd55669 Merge commit '51c1a9f8fbc12a9276489178242e498bb6ccbdba' into redis_6_merge 
Former-commit-id: 09e8fb17cd0889ad17461e48446221b3955f5a8f
 2020-04-14 18:44:42 -04:00
John Sully
9039879f80 Merge commit '2ad427f862084e0e18fbd6c313af35ccdb6c68f7' into redis_6_merge 
Former-commit-id: d71c4c221580221c2c31b5e3b5d23bab50a544dc
 2020-04-14 18:30:26 -04:00
John Sully
bd73ec5f1e Merge commit '6fe55c2f299bbb306533af39cb28346bf5d473d3' into redis_6_merge 
Former-commit-id: d71c4c221580221c2c31b5e3b5d23bab50a544dc
 2020-04-14 18:30:26 -04:00
John Sully
c198d81582 Merge commit 'dff5370c8be0dcef1728b95b17906d2494ce9bf2' into redis_6_merge 
Former-commit-id: 8e33c2d30116ea469238c340ed367f0182856454
 2020-04-14 18:05:10 -04:00
John Sully
e751664909 Merge commit 'cbabf779c24fd107ca8e4fe6369e4677ad0eda10' into redis_6_merge 
Former-commit-id: 8e33c2d30116ea469238c340ed367f0182856454
 2020-04-14 18:05:10 -04:00
antirez
910db44fc5 Jump to right label on AOF parsing error. 
Related to #6054.


Former-commit-id: c7159d58f118e840a3b9f72160d1abf3e8a86b3d
 2020-04-14 18:03:22 -04:00
antirez
eafcca9f29 Jump to right label on AOF parsing error. 
Related to #6054.


Former-commit-id: c7159d58f118e840a3b9f72160d1abf3e8a86b3d
 2020-04-14 18:03:22 -04:00
antirez
c38bc83f47 PSYNC2: meaningful offset implemented. 
A very commonly signaled operational problem with Redis master-replicas
sets is that, once the master becomes unavailable for some reason,
especially because of network problems, many times it wont be able to
perform a partial resynchronization with the new master, once it rejoins
the partition, for the following reason:

1. The master becomes isolated, however it keeps sending PINGs to the
replicas. Such PINGs will never be received since the link connection is
actually already severed.
2. On the other side, one of the replicas will turn into the new master,
setting its secondary replication ID offset to the one of the last
command received from the old master: this offset will not include the
PINGs sent by the master once the link was already disconnected.
3. When the master rejoins the partion and is turned into a replica, its
offset will be too advanced because of the PINGs, so a PSYNC will fail,
and a full synchronization will be required.

Related to issue #7002 and other discussion we had in the past around
this problem.


Former-commit-id: 5d6e8fe3e3e43162f0c57f580b6e8432274fca30
 2020-04-14 17:56:09 -04:00
antirez
0fac746f0e PSYNC2: meaningful offset implemented. 
A very commonly signaled operational problem with Redis master-replicas
sets is that, once the master becomes unavailable for some reason,
especially because of network problems, many times it wont be able to
perform a partial resynchronization with the new master, once it rejoins
the partition, for the following reason:

1. The master becomes isolated, however it keeps sending PINGs to the
replicas. Such PINGs will never be received since the link connection is
actually already severed.
2. On the other side, one of the replicas will turn into the new master,
setting its secondary replication ID offset to the one of the last
command received from the old master: this offset will not include the
PINGs sent by the master once the link was already disconnected.
3. When the master rejoins the partion and is turned into a replica, its
offset will be too advanced because of the PINGs, so a PSYNC will fail,
and a full synchronization will be required.

Related to issue #7002 and other discussion we had in the past around
this problem.


Former-commit-id: 5d6e8fe3e3e43162f0c57f580b6e8432274fca30
 2020-04-14 17:56:09 -04:00
Oran Agra
031d5044bf reduce repeated calls to use_diskless_load 
this function possibly iterates on the module list


Former-commit-id: 99762dac23e26a217fcd66531ee4ca9b4d13a7ac
 2020-04-14 17:34:36 -04:00
Oran Agra
10a7bfe3a2 reduce repeated calls to use_diskless_load 
this function possibly iterates on the module list


Former-commit-id: 99762dac23e26a217fcd66531ee4ca9b4d13a7ac
 2020-04-14 17:34:36 -04:00
John Sully
c168ae6cfe Fix merge conflicts from cherry-pick 
Former-commit-id: 57956b3fd2d05581c976f58d07e245896d3a515b
 2020-04-14 17:33:54 -04:00
John Sully
f084ee6f17 Fix merge conflicts from cherry-pick 
Former-commit-id: 57956b3fd2d05581c976f58d07e245896d3a515b
 2020-04-14 17:33:54 -04:00
antirez
f7e8240900 Remove RDB files used for replication in persistence-less instances. 
Former-commit-id: b323645227a3e2cc5928e649586221aba508b10d
 2020-04-14 17:27:05 -04:00
antirez
34f7c653d5 Remove RDB files used for replication in persistence-less instances. 
Former-commit-id: b323645227a3e2cc5928e649586221aba508b10d
 2020-04-14 17:27:05 -04:00
Johannes Truschnigg
0ef7e8e0b2 Signal systemd readiness atfer Partial Resync 
"Partial Resynchronization" is a special variant of replication success
that we have to tell systemd about if it is managing redis-server via a
Type=Notify service unit.


Former-commit-id: dd9502f373eb7e32aee69a30dcb521bea3ccd3ad
 2020-04-14 17:22:30 -04:00