~axino/redis/+git/trunk:slave-script-timeout

Last commit made on 2018-08-31
Get this branch:
git clone -b slave-script-timeout https://git.launchpad.net/~axino/redis/+git/trunk

Branch merges

Branch information

Name:
slave-script-timeout
Repository:
lp:~axino/redis/+git/trunk

Recent commits

593ce5b... by antirez <email address hidden>

Test: processing of master stream in slave -BUSY state.

See #5297.

f2739ca... by antirez <email address hidden>

After slave Lua script leaves busy state, re-process the master buffer.

Technically speaking we don't really need to put the master client in
the clients that need to be processed, since in practice the PING
commands from the master will take care, however it is conceptually more
sane to do so.

e8d3580... by antirez <email address hidden>

While the slave is busy, just accumulate master input.

Processing command from the master while the slave is in busy state is
not correct, however we cannot, also, just reply -BUSY to the
replication stream commands from the master. The correct solution is to
stop processing data from the master, but just accumulate the stream
into the buffers and resume the processing later.

Related to #5297.

4b68dbc... by antirez <email address hidden>

Allow scripts to timeout even if from the master instance.

However the master scripts will be impossible to kill.

Related to #5297.

17b0d99... by antirez <email address hidden>

Allow scripts to timeout on slaves as well.

See reasoning in #5297.

476eea9... by Salvatore Sanfilippo <email address hidden>

Merge pull request #4216 from lamby/did-not-received-typos

Correct "did not received" -> "did not receive" typos/grammar.

bd9259d... by Salvatore Sanfilippo <email address hidden>

Merge pull request #5282 from soloestoy/remove-duplicate-bind-in-sentinel.conf

remove duplicate bind in sentinel.conf

ed5cc77... by Salvatore Sanfilippo <email address hidden>

Merge pull request #5296 from soloestoy/command-script-flag2

Supplement to PR #4835, just take info/memory/command as random commands

7d39c14... by "zhaozhao.zz" <email address hidden>

Supplement to PR #4835, just take info/memory/command as random commands

0e21efd... by Salvatore Sanfilippo <email address hidden>

Merge pull request #4835 from soloestoy/command-script-flag

some commands' flags should be set correctly, issue #4834