2013-12-03 11:43:53 -05:00
|
|
|
/* blocked.c - generic support for blocking operations like BLPOP & WAIT.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
|
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
|
|
* this list of conditions and the following disclaimer.
|
|
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* * Neither the name of Redis nor the names of its contributors may be used
|
|
|
|
* to endorse or promote products derived from this software without
|
|
|
|
* specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
2013-12-03 12:03:15 -05:00
|
|
|
*
|
|
|
|
* ---------------------------------------------------------------------------
|
|
|
|
*
|
|
|
|
* API:
|
|
|
|
*
|
2015-07-27 03:41:48 -04:00
|
|
|
* blockClient() set the CLIENT_BLOCKED flag in the client, and set the
|
|
|
|
* specified block type 'btype' filed to one of BLOCKED_* macros.
|
2013-12-03 12:03:15 -05:00
|
|
|
*
|
|
|
|
* unblockClient() unblocks the client doing the following:
|
|
|
|
* 1) It calls the btype-specific function to cleanup the state.
|
2015-07-27 03:41:48 -04:00
|
|
|
* 2) It unblocks the client by unsetting the CLIENT_BLOCKED flag.
|
2013-12-03 12:03:15 -05:00
|
|
|
* 3) It puts the client into a list of just unblocked clients that are
|
|
|
|
* processed ASAP in the beforeSleep() event loop callback, so that
|
|
|
|
* if there is some query buffer to process, we do it. This is also
|
|
|
|
* required because otherwise there is no 'readable' event fired, we
|
2015-07-27 03:41:48 -04:00
|
|
|
* already read the pending commands. We also set the CLIENT_UNBLOCKED
|
2013-12-03 12:03:15 -05:00
|
|
|
* flag to remember the client is in the unblocked_clients list.
|
|
|
|
*
|
|
|
|
* processUnblockedClients() is called inside the beforeSleep() function
|
|
|
|
* to process the query buffer from unblocked clients and remove the clients
|
|
|
|
* from the blocked_clients queue.
|
|
|
|
*
|
|
|
|
* replyToBlockedClientTimedOut() is called by the cron function when
|
|
|
|
* a client blocked reaches the specified timeout (if the timeout is set
|
|
|
|
* to 0, no timeout is processed).
|
|
|
|
* It usually just needs to send a reply to the client.
|
|
|
|
*
|
Squash merging 125 typo/grammar/comment/doc PRs (#7773)
List of squashed commits or PRs
===============================
commit 66801ea
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Jan 13 00:54:31 2020 -0500
typo fix in acl.c
commit 46f55db
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun Sep 6 18:24:11 2020 +0300
Updates a couple of comments
Specifically:
* RM_AutoMemory completed instead of pointing to docs
* Updated link to custom type doc
commit 61a2aa0
Author: xindoo <xindoo@qq.com>
Date: Tue Sep 1 19:24:59 2020 +0800
Correct errors in code comments
commit a5871d1
Author: yz1509 <pro-756@qq.com>
Date: Tue Sep 1 18:36:06 2020 +0800
fix typos in module.c
commit 41eede7
Author: bookug <bookug@qq.com>
Date: Sat Aug 15 01:11:33 2020 +0800
docs: fix typos in comments
commit c303c84
Author: lazy-snail <ws.niu@outlook.com>
Date: Fri Aug 7 11:15:44 2020 +0800
fix spelling in redis.conf
commit 1eb76bf
Author: zhujian <zhujianxyz@gmail.com>
Date: Thu Aug 6 15:22:10 2020 +0800
add a missing 'n' in comment
commit 1530ec2
Author: Daniel Dai <764122422@qq.com>
Date: Mon Jul 27 00:46:35 2020 -0400
fix spelling in tracking.c
commit e517b31
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:32 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit c300eff
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:23 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit 4c058a8
Author: 陈浩鹏 <chenhaopeng@heytea.com>
Date: Thu Jun 25 19:00:56 2020 +0800
Grammar fix and clarification
commit 5fcaa81
Author: bodong.ybd <bodong.ybd@alibaba-inc.com>
Date: Fri Jun 19 10:09:00 2020 +0800
Fix typos
commit 4caca9a
Author: Pruthvi P <pruthvi@ixigo.com>
Date: Fri May 22 00:33:22 2020 +0530
Fix typo eviciton => eviction
commit b2a25f6
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Sun May 17 12:39:59 2020 -0400
Fix a typo.
commit 12842ae
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun May 3 17:16:59 2020 -0400
fix spelling in redis conf
commit ddba07c
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat May 2 23:25:34 2020 +0100
Correct a "conflicts" spelling error.
commit 8fc7bf2
Author: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
Date: Thu Apr 30 10:25:27 2020 +0900
docs: fix EXPIRE_FAST_CYCLE_DURATION to ACTIVE_EXPIRE_CYCLE_FAST_DURATION
commit 9b2b67a
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Fri Apr 24 11:46:22 2020 -0400
Fix a typo.
commit 0746f10
Author: devilinrust <63737265+devilinrust@users.noreply.github.com>
Date: Thu Apr 16 00:17:53 2020 +0200
Fix typos in server.c
commit 92b588d
Author: benjessop12 <56115861+benjessop12@users.noreply.github.com>
Date: Mon Apr 13 13:43:55 2020 +0100
Fix spelling mistake in lazyfree.c
commit 1da37aa
Merge: 2d4ba28 af347a8
Author: hwware <wen.hui.ware@gmail.com>
Date: Thu Mar 5 22:41:31 2020 -0500
Merge remote-tracking branch 'upstream/unstable' into expiretypofix
commit 2d4ba28
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Mar 2 00:09:40 2020 -0500
fix typo in expire.c
commit 1a746f7
Author: SennoYuki <minakami1yuki@gmail.com>
Date: Thu Feb 27 16:54:32 2020 +0800
fix typo
commit 8599b1a
Author: dongheejeong <donghee950403@gmail.com>
Date: Sun Feb 16 20:31:43 2020 +0000
Fix typo in server.c
commit f38d4e8
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun Feb 2 22:58:38 2020 -0500
fix typo in evict.c
commit fe143fc
Author: Leo Murillo <leonardo.murillo@gmail.com>
Date: Sun Feb 2 01:57:22 2020 -0600
Fix a few typos in redis.conf
commit 1ab4d21
Author: viraja1 <anchan.viraj@gmail.com>
Date: Fri Dec 27 17:15:58 2019 +0530
Fix typo in Latency API docstring
commit ca1f70e
Author: gosth <danxuedexing@qq.com>
Date: Wed Dec 18 15:18:02 2019 +0800
fix typo in sort.c
commit a57c06b
Author: ZYunH <zyunhjob@163.com>
Date: Mon Dec 16 22:28:46 2019 +0800
fix-zset-typo
commit b8c92b5
Author: git-hulk <hulk.website@gmail.com>
Date: Mon Dec 16 15:51:42 2019 +0800
FIX: typo in cluster.c, onformation->information
commit 9dd981c
Author: wujm2007 <jim.wujm@gmail.com>
Date: Mon Dec 16 09:37:52 2019 +0800
Fix typo
commit e132d7a
Author: Sebastien Williams-Wynn <s.williamswynn.mail@gmail.com>
Date: Fri Nov 15 00:14:07 2019 +0000
Minor typo change
commit 47f44d5
Author: happynote3966 <01ssrmikururudevice01@gmail.com>
Date: Mon Nov 11 22:08:48 2019 +0900
fix comment typo in redis-cli.c
commit b8bdb0d
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 18:00:17 2019 +0800
Fix a spelling mistake of comments in defragDictBucketCallback
commit 0def46a
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 13:09:27 2019 +0800
fix some spelling mistakes of comments in defrag.c
commit f3596fd
Author: Phil Rajchgot <tophil@outlook.com>
Date: Sun Oct 13 02:02:32 2019 -0400
Typo and grammar fixes
Redis and its documentation are great -- just wanted to submit a few corrections in the spirit of Hacktoberfest. Thanks for all your work on this project. I use it all the time and it works beautifully.
commit 2b928cd
Author: KangZhiDong <worldkzd@gmail.com>
Date: Sun Sep 1 07:03:11 2019 +0800
fix typos
commit 33aea14
Author: Axlgrep <axlgrep@gmail.com>
Date: Tue Aug 27 11:02:18 2019 +0800
Fixed eviction spelling issues
commit e282a80
Author: Simen Flatby <simen@oms.no>
Date: Tue Aug 20 15:25:51 2019 +0200
Update comments to reflect prop name
In the comments the prop is referenced as replica-validity-factor,
but it is really named cluster-replica-validity-factor.
commit 74d1f9a
Author: Jim Green <jimgreen2013@qq.com>
Date: Tue Aug 20 20:00:31 2019 +0800
fix comment error, the code is ok
commit eea1407
Author: Liao Tonglang <liaotonglang@gmail.com>
Date: Fri May 31 10:16:18 2019 +0800
typo fix
fix cna't to can't
commit 0da553c
Author: KAWACHI Takashi <tkawachi@gmail.com>
Date: Wed Jul 17 00:38:16 2019 +0900
Fix typo
commit 7fc8fb6
Author: Michael Prokop <mika@grml.org>
Date: Tue May 28 17:58:42 2019 +0200
Typo fixes
s/familar/familiar/
s/compatiblity/compatibility/
s/ ot / to /
s/itsef/itself/
commit 5f46c9d
Author: zhumoing <34539422+zhumoing@users.noreply.github.com>
Date: Tue May 21 21:16:50 2019 +0800
typo-fixes
typo-fixes
commit 321dfe1
Author: wxisme <850885154@qq.com>
Date: Sat Mar 16 15:10:55 2019 +0800
typo fix
commit b4fb131
Merge: 267e0e6 3df1eb8
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Fri Feb 8 22:55:45 2019 +0200
Merge branch 'unstable' of antirez/redis into unstable
commit 267e0e6
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Wed Jan 30 21:26:04 2019 +0200
Minor typo fix
commit 30544e7
Author: inshal96 <39904558+inshal96@users.noreply.github.com>
Date: Fri Jan 4 16:54:50 2019 +0500
remove an extra 'a' in the comments
commit 337969d
Author: BrotherGao <yangdongheng11@gmail.com>
Date: Sat Dec 29 12:37:29 2018 +0800
fix typo in redis.conf
commit 9f4b121
Merge: 423a030 e504583
Author: BrotherGao <yangdongheng@xiaomi.com>
Date: Sat Dec 29 11:41:12 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 423a030
Merge: 42b02b7 46a51cd
Author: 杨东衡 <yangdongheng@xiaomi.com>
Date: Tue Dec 4 23:56:11 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 42b02b7
Merge: 68c0e6e b8febe6
Author: Dongheng Yang <yangdongheng11@gmail.com>
Date: Sun Oct 28 15:54:23 2018 +0800
Merge pull request #1 from antirez/unstable
update local data
commit 714b589
Author: Christian <crifei93@gmail.com>
Date: Fri Dec 28 01:17:26 2018 +0100
fix typo "resulution"
commit e23259d
Author: garenchan <1412950785@qq.com>
Date: Wed Dec 26 09:58:35 2018 +0800
fix typo: segfauls -> segfault
commit a9359f8
Author: xjp <jianping_xie@aliyun.com>
Date: Tue Dec 18 17:31:44 2018 +0800
Fixed REDISMODULE_H spell bug
commit a12c3e4
Author: jdiaz <jrd.palacios@gmail.com>
Date: Sat Dec 15 23:39:52 2018 -0600
Fixes hyperloglog hash function comment block description
commit 770eb11
Author: 林上耀 <1210tom@163.com>
Date: Sun Nov 25 17:16:10 2018 +0800
fix typo
commit fd97fbb
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Fri Nov 23 17:14:01 2018 +0100
Correct "unsupported" typo.
commit a85522d
Author: Jungnam Lee <jungnam.lee@oracle.com>
Date: Thu Nov 8 23:01:29 2018 +0900
fix typo in test comments
commit ade8007
Author: Arun Kumar <palerdot@users.noreply.github.com>
Date: Tue Oct 23 16:56:35 2018 +0530
Fixed grammatical typo
Fixed typo for word 'dictionary'
commit 869ee39
Author: Hamid Alaei <hamid.a85@gmail.com>
Date: Sun Aug 12 16:40:02 2018 +0430
fix documentations: (ThreadSafeContextStart/Stop -> ThreadSafeContextLock/Unlock), minor typo
commit f89d158
Author: Mayank Jain <mayankjain255@gmail.com>
Date: Tue Jul 31 23:01:21 2018 +0530
Updated README.md with some spelling corrections.
Made correction in spelling of some misspelled words.
commit 892198e
Author: dsomeshwar <someshwar.dhayalan@gmail.com>
Date: Sat Jul 21 23:23:04 2018 +0530
typo fix
commit 8a4d780
Author: Itamar Haber <itamar@redislabs.com>
Date: Mon Apr 30 02:06:52 2018 +0300
Fixes some typos
commit e3acef6
Author: Noah Rosamilia <ivoahivoah@gmail.com>
Date: Sat Mar 3 23:41:21 2018 -0500
Fix typo in /deps/README.md
commit 04442fb
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:32:42 2018 +0800
Fix typo in readSyncBulkPayload() comment.
commit 9f36880
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:20:37 2018 +0800
replication.c comment: run_id -> replid.
commit f866b4a
Author: Francesco 'makevoid' Canessa <makevoid@gmail.com>
Date: Thu Feb 22 22:01:56 2018 +0000
fix comment typo in server.c
commit 0ebc69b
Author: 줍 <jubee0124@gmail.com>
Date: Mon Feb 12 16:38:48 2018 +0900
Fix typo in redis.conf
Fix `five behaviors` to `eight behaviors` in [this sentence ](antirez/redis@unstable/redis.conf#L564)
commit b50a620
Author: martinbroadhurst <martinbroadhurst@users.noreply.github.com>
Date: Thu Dec 28 12:07:30 2017 +0000
Fix typo in valgrind.sup
commit 7d8f349
Author: Peter Boughton <peter@sorcerersisle.com>
Date: Mon Nov 27 19:52:19 2017 +0000
Update CONTRIBUTING; refer doc updates to redis-doc repo.
commit 02dec7e
Author: Klauswk <klauswk1@hotmail.com>
Date: Tue Oct 24 16:18:38 2017 -0200
Fix typo in comment
commit e1efbc8
Author: chenshi <baiwfg2@gmail.com>
Date: Tue Oct 3 18:26:30 2017 +0800
Correct two spelling errors of comments
commit 93327d8
Author: spacewander <spacewanderlzx@gmail.com>
Date: Wed Sep 13 16:47:24 2017 +0800
Update the comment for OBJ_ENCODING_EMBSTR_SIZE_LIMIT's value
The value of OBJ_ENCODING_EMBSTR_SIZE_LIMIT is 44 now instead of 39.
commit 63d361f
Author: spacewander <spacewanderlzx@gmail.com>
Date: Tue Sep 12 15:06:42 2017 +0800
Fix <prevlen> related doc in ziplist.c
According to the definition of ZIP_BIG_PREVLEN and other related code,
the guard of single byte <prevlen> should be 254 instead of 255.
commit ebe228d
Author: hanael80 <hanael80@gmail.com>
Date: Tue Aug 15 09:09:40 2017 +0900
Fix typo
commit 6b696e6
Author: Matt Robenolt <matt@ydekproductions.com>
Date: Mon Aug 14 14:50:47 2017 -0700
Fix typo in LATENCY DOCTOR output
commit a2ec6ae
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 15 14:15:16 2017 +0800
Fix a typo: form => from
commit 3ab7699
Author: caosiyang <caosiyang@qiyi.com>
Date: Thu Aug 10 18:40:33 2017 +0800
Fix a typo: replicationFeedSlavesFromMaster() => replicationFeedSlavesFromMasterStream()
commit 72d43ef
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 8 15:57:25 2017 +0800
fix a typo: servewr => server
commit 707c958
Author: Bo Cai <charpty@gmail.com>
Date: Wed Jul 26 21:49:42 2017 +0800
redis-cli.c typo: conut -> count.
Signed-off-by: Bo Cai <charpty@gmail.com>
commit b9385b2
Author: JackDrogon <jack.xsuperman@gmail.com>
Date: Fri Jun 30 14:22:31 2017 +0800
Fix some spell problems
commit 20d9230
Author: akosel <aaronjkosel@gmail.com>
Date: Sun Jun 4 19:35:13 2017 -0500
Fix typo
commit b167bfc
Author: Krzysiek Witkowicz <krzysiekwitkowicz@gmail.com>
Date: Mon May 22 21:32:27 2017 +0100
Fix #4008 small typo in comment
commit 2b78ac8
Author: Jake Clarkson <jacobwclarkson@gmail.com>
Date: Wed Apr 26 15:49:50 2017 +0100
Correct typo in tests/unit/hyperloglog.tcl
commit b0f1cdb
Author: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed Apr 19 14:25:18 2017 -0700
Fix typo
commit a90b0f9
Author: charsyam <charsyam@naver.com>
Date: Thu Mar 16 18:19:53 2017 +0900
fix typos
fix typos
fix typos
commit 8430a79
Author: Richard Hart <richardhart92@gmail.com>
Date: Mon Mar 13 22:17:41 2017 -0400
Fixed log message typo in listenToPort.
commit 481a1c2
Author: Vinod Kumar <kumar003vinod@gmail.com>
Date: Sun Jan 15 23:04:51 2017 +0530
src/db.c: Correct "save" -> "safe" typo
commit 586b4d3
Author: wangshaonan <wshn13@gmail.com>
Date: Wed Dec 21 20:28:27 2016 +0800
Fix typo they->the in helloworld.c
commit c1c4b5e
Author: Jenner <hypxm@qq.com>
Date: Mon Dec 19 16:39:46 2016 +0800
typo error
commit 1ee1a3f
Author: tielei <43289893@qq.com>
Date: Mon Jul 18 13:52:25 2016 +0800
fix some comments
commit 11a41fb
Author: Otto Kekäläinen <otto@seravo.fi>
Date: Sun Jul 3 10:23:55 2016 +0100
Fix spelling in documentation and comments
commit 5fb5d82
Author: francischan <f1ancis621@gmail.com>
Date: Tue Jun 28 00:19:33 2016 +0800
Fix outdated comments about redis.c file.
It should now refer to server.c file.
commit 6b254bc
Author: lmatt-bit <lmatt123n@gmail.com>
Date: Thu Apr 21 21:45:58 2016 +0800
Refine the comment of dictRehashMilliseconds func
SLAVECONF->REPLCONF in comment - by andyli029
commit ee9869f
Author: clark.kang <charsyam@naver.com>
Date: Tue Mar 22 11:09:51 2016 +0900
fix typos
commit f7b3b11
Author: Harisankar H <harisankarh@gmail.com>
Date: Wed Mar 9 11:49:42 2016 +0530
Typo correction: "faield" --> "failed"
Typo correction: "faield" --> "failed"
commit 3fd40fc
Author: Itamar Haber <itamar@redislabs.com>
Date: Thu Feb 25 10:31:51 2016 +0200
Fixes a typo in comments
commit 621c160
Author: Prayag Verma <prayag.verma@gmail.com>
Date: Mon Feb 1 12:36:20 2016 +0530
Fix typo in Readme.md
Spelling mistakes -
`eviciton` > `eviction`
`familar` > `familiar`
commit d7d07d6
Author: WonCheol Lee <toctoc21c@gmail.com>
Date: Wed Dec 30 15:11:34 2015 +0900
Typo fixed
commit a4dade7
Author: Felix Bünemann <buenemann@louis.info>
Date: Mon Dec 28 11:02:55 2015 +0100
[ci skip] Improve supervised upstart config docs
This mentions that "expect stop" is required for supervised upstart
to work correctly. See http://upstart.ubuntu.com/cookbook/#expect-stop
for an explanation.
commit d9caba9
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:30:03 2015 +1100
README: Remove trailing whitespace
commit 72d42e5
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:32 2015 +1100
README: Fix typo. th => the
commit dd6e957
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:20 2015 +1100
README: Fix typo. familar => familiar
commit 3a12b23
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:28:54 2015 +1100
README: Fix typo. eviciton => eviction
commit 2d1d03b
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:21:45 2015 +1100
README: Fix typo. sever => server
commit 3973b06
Author: Itamar Haber <itamar@garantiadata.com>
Date: Sat Dec 19 17:01:20 2015 +0200
Typo fix
commit 4f2e460
Author: Steve Gao <fu@2token.com>
Date: Fri Dec 4 10:22:05 2015 +0800
Update README - fix typos
commit b21667c
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:48:37 2015 +0800
delete redundancy color judge in sdscatcolor
commit 88894c7
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:14:42 2015 +0800
the example output shoule be HelloWorld
commit 2763470
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 17:41:39 2015 +0800
modify error word keyevente
Signed-off-by: binyan <binbin.yan@nokia.com>
commit 0847b3d
Author: Bruno Martins <bscmartins@gmail.com>
Date: Wed Nov 4 11:37:01 2015 +0000
typo
commit bbb9e9e
Author: dawedawe <dawedawe@gmx.de>
Date: Fri Mar 27 00:46:41 2015 +0100
typo: zimap -> zipmap
commit 5ed297e
Author: Axel Advento <badwolf.bloodseeker.rev@gmail.com>
Date: Tue Mar 3 15:58:29 2015 +0800
Fix 'salve' typos to 'slave'
commit edec9d6
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Wed Jun 12 14:12:47 2019 +0200
Update README.md
Co-Authored-By: Qix <Qix-@users.noreply.github.com>
commit 692a7af
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Tue May 28 14:32:04 2019 +0200
grammar
commit d962b0a
Author: Nick Frost <nickfrostatx@gmail.com>
Date: Wed Jul 20 15:17:12 2016 -0700
Minor grammar fix
commit 24fff01aaccaf5956973ada8c50ceb1462e211c6 (typos)
Author: Chad Miller <chadm@squareup.com>
Date: Tue Sep 8 13:46:11 2020 -0400
Fix faulty comment about operation of unlink()
commit 3cd5c1f3326c52aa552ada7ec797c6bb16452355
Author: Kevin <kevin.xgr@gmail.com>
Date: Wed Nov 20 00:13:50 2019 +0800
Fix typo in server.c.
From a83af59 Mon Sep 17 00:00:00 2001
From: wuwo <wuwo@wacai.com>
Date: Fri, 17 Mar 2017 20:37:45 +0800
Subject: [PATCH] falure to failure
From c961896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E6=87=B6?= <veficos@gmail.com>
Date: Sat, 27 May 2017 15:33:04 +0800
Subject: [PATCH] fix typo
From e600ef2 Mon Sep 17 00:00:00 2001
From: "rui.zou" <rui.zou@yunify.com>
Date: Sat, 30 Sep 2017 12:38:15 +0800
Subject: [PATCH] fix a typo
From c7d07fa Mon Sep 17 00:00:00 2001
From: Alexandre Perrin <alex@kaworu.ch>
Date: Thu, 16 Aug 2018 10:35:31 +0200
Subject: [PATCH] deps README.md typo
From b25cb67 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 10:55:37 +0300
Subject: [PATCH 1/2] fix typos in header
From ad28ca6 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 11:02:36 +0300
Subject: [PATCH 2/2] fix typos
commit 34924cdedd8552466fc22c1168d49236cb7ee915
Author: Adrian Lynch <adi_ady_ade@hotmail.com>
Date: Sat Apr 4 21:59:15 2015 +0100
Typos fixed
commit fd2a1e7
Author: Jan <jsteemann@users.noreply.github.com>
Date: Sat Oct 27 19:13:01 2018 +0200
Fix typos
Fix typos
commit e14e47c1a234b53b0e103c5f6a1c61481cbcbb02
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:30:07 2019 -0500
Fix multiple misspellings of "following"
commit 79b948ce2dac6b453fe80995abbcaac04c213d5a
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:24:28 2019 -0500
Fix misspelling of create-cluster
commit 1fffde52666dc99ab35efbd31071a4c008cb5a71
Author: Andy Lester <andy@petdance.com>
Date: Wed Jul 31 17:57:56 2019 -0500
Fix typos
commit 204c9ba9651e9e05fd73936b452b9a30be456cfe
Author: Xiaobo Zhu <xiaobo.zhu@shopee.com>
Date: Tue Aug 13 22:19:25 2019 +0800
fix typos
Squashed commit of the following:
commit 1d9aaf8
Author: danmedani <danmedani@gmail.com>
Date: Sun Aug 2 11:40:26 2015 -0700
README typo fix.
Squashed commit of the following:
commit 32bfa7c
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Jul 6 21:15:08 2015 +0200
Fixed grammer
Squashed commit of the following:
commit b24f69c
Author: Sisir Koppaka <sisir.koppaka@gmail.com>
Date: Mon Mar 2 22:38:45 2015 -0500
utils/hashtable/rehashing.c: Fix typos
Squashed commit of the following:
commit 4e04082
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Mar 23 08:22:21 2015 +0000
Small config file documentation improvements
Squashed commit of the following:
commit acb8773
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:52:48 2015 -0700
Typo and grammar fixes in readme
commit 2eb75b6
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:36:18 2015 -0700
fixed redis.conf comment
Squashed commit of the following:
commit a8249a2
Author: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Fri Dec 11 11:39:52 2015 +0530
Revise correction of typos.
Squashed commit of the following:
commit 3c02028
Author: zhaojun11 <zhaojun11@jd.com>
Date: Wed Jan 17 19:05:28 2018 +0800
Fix typos include two code typos in cluster.c and latency.c
Squashed commit of the following:
commit 9dba47c
Author: q191201771 <191201771@qq.com>
Date: Sat Jan 4 11:31:04 2020 +0800
fix function listCreate comment in adlist.c
Update src/server.c
commit 2c7c2cb536e78dd211b1ac6f7bda00f0f54faaeb
Author: charpty <charpty@gmail.com>
Date: Tue May 1 23:16:59 2018 +0800
server.c typo: modules system dictionary type comment
Signed-off-by: charpty <charpty@gmail.com>
commit a8395323fb63cb59cb3591cb0f0c8edb7c29a680
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun May 6 00:25:18 2018 +0300
Updates test_helper.tcl's help with undocumented options
Specifically:
* Host
* Port
* Client
commit bde6f9ced15755cd6407b4af7d601b030f36d60b
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 15:19:19 2018 +0800
fix comments in deps files
commit 3172474ba991532ab799ee1873439f3402412331
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 14:33:49 2018 +0800
fix some comments
commit 01b6f2b6858b5cf2ce4ad5092d2c746e755f53f0
Author: Thor Juhasz <thor@juhasz.pro>
Date: Sun Nov 18 14:37:41 2018 +0100
Minor fixes to comments
Found some parts a little unclear on a first read, which prompted me to have a better look at the file and fix some minor things I noticed.
Fixing minor typos and grammar. There are no changes to configuration options.
These changes are only meant to help the user better understand the explanations to the various configuration options
2020-09-10 06:43:38 -04:00
|
|
|
* When implementing a new type of blocking operation, the implementation
|
2013-12-03 12:03:15 -05:00
|
|
|
* should modify unblockClient() and replyToBlockedClientTimedOut() in order
|
|
|
|
* to handle the btype-specific behavior of this two functions.
|
2015-03-24 06:07:10 -04:00
|
|
|
* If the blocking operation waits for certain keys to change state, the
|
|
|
|
* clusterRedirectBlockedClientIfNeeded() function should also be updated.
|
2013-12-03 11:43:53 -05:00
|
|
|
*/
|
|
|
|
|
2015-07-26 09:14:57 -04:00
|
|
|
#include "server.h"
|
2021-01-29 08:38:30 -05:00
|
|
|
#include "slowlog.h"
|
|
|
|
#include "latency.h"
|
|
|
|
#include "monotonic.h"
|
2013-12-03 11:43:53 -05:00
|
|
|
|
2020-10-08 01:33:17 -04:00
|
|
|
int serveClientBlockedOnList(client *receiver, robj *key, robj *dstkey, redisDb *db, robj *value, int wherefrom, int whereto);
|
|
|
|
int getListPositionFromObjectOrReply(client *c, robj *arg, int *position);
|
2017-09-06 09:43:28 -04:00
|
|
|
|
2020-04-08 06:55:57 -04:00
|
|
|
/* This structure represents the blocked key information that we store
|
|
|
|
* in the client structure. Each client blocked on keys, has a
|
|
|
|
* client->bpop.keys hash table. The keys of the hash table are Redis
|
|
|
|
* keys pointers to 'robj' structures. The value is this structure.
|
|
|
|
* The structure has two goals: firstly we store the list node that this
|
|
|
|
* client uses to be listed in the database "blocked clients for this key"
|
|
|
|
* list, so we can later unblock in O(1) without a list scan.
|
|
|
|
* Secondly for certain blocking types, we have additional info. Right now
|
|
|
|
* the only use for additional info we have is when clients are blocked
|
|
|
|
* on streams, as we have to remember the ID it blocked for. */
|
|
|
|
typedef struct bkinfo {
|
|
|
|
listNode *listnode; /* List node for db->blocking_keys[key] list. */
|
|
|
|
streamID stream_id; /* Stream ID if we blocked in a stream. */
|
|
|
|
} bkinfo;
|
|
|
|
|
2015-07-27 03:41:48 -04:00
|
|
|
/* Block a client for the specific operation type. Once the CLIENT_BLOCKED
|
2013-12-03 11:43:53 -05:00
|
|
|
* flag is set client query buffer is not longer processed, but accumulated,
|
|
|
|
* and will be processed when the client is unblocked. */
|
2015-07-26 09:20:46 -04:00
|
|
|
void blockClient(client *c, int btype) {
|
2015-07-27 03:41:48 -04:00
|
|
|
c->flags |= CLIENT_BLOCKED;
|
2013-12-03 11:43:53 -05:00
|
|
|
c->btype = btype;
|
2017-09-09 05:10:59 -04:00
|
|
|
server.blocked_clients++;
|
|
|
|
server.blocked_clients_by_type[btype]++;
|
2020-03-26 11:02:26 -04:00
|
|
|
addClientToTimeoutTable(c);
|
2021-01-08 02:36:54 -05:00
|
|
|
if (btype == BLOCKED_PAUSE) {
|
|
|
|
listAddNodeTail(server.paused_clients, c);
|
|
|
|
c->paused_list_node = listLast(server.paused_clients);
|
|
|
|
/* Mark this client to execute its command */
|
|
|
|
c->flags |= CLIENT_PENDING_COMMAND;
|
|
|
|
}
|
2013-12-03 11:43:53 -05:00
|
|
|
}
|
|
|
|
|
2021-01-29 08:38:30 -05:00
|
|
|
/* This function is called after a client has finished a blocking operation
|
|
|
|
* in order to update the total command duration, log the command into
|
|
|
|
* the Slow log if needed, and log the reply duration event if needed. */
|
|
|
|
void updateStatsOnUnblock(client *c, long blocked_us, long reply_us){
|
|
|
|
const ustime_t total_cmd_duration = c->duration + blocked_us + reply_us;
|
|
|
|
c->lastcmd->microseconds += total_cmd_duration;
|
2021-03-16 01:00:29 -04:00
|
|
|
|
2021-01-29 08:38:30 -05:00
|
|
|
/* Log the command into the Slow log if needed. */
|
2021-03-16 01:00:29 -04:00
|
|
|
if (!(c->lastcmd->flags & CMD_SKIP_SLOWLOG) &&
|
|
|
|
!(c->flags & CLIENT_PREVENT_LOGGING))
|
|
|
|
{
|
2021-01-29 08:38:30 -05:00
|
|
|
slowlogPushEntryIfNeeded(c,c->argv,c->argc,total_cmd_duration);
|
|
|
|
/* Log the reply duration event. */
|
|
|
|
latencyAddSampleIfNeeded("command-unblocking",reply_us/1000);
|
|
|
|
}
|
2021-03-16 01:00:29 -04:00
|
|
|
|
|
|
|
/* Always clear the prevent logging field now. */
|
|
|
|
if (c->flags & CLIENT_PREVENT_LOGGING) {
|
|
|
|
c->flags &= ~CLIENT_PREVENT_LOGGING;
|
|
|
|
}
|
2021-01-29 08:38:30 -05:00
|
|
|
}
|
|
|
|
|
2013-12-03 11:43:53 -05:00
|
|
|
/* This function is called in the beforeSleep() function of the event loop
|
|
|
|
* in order to process the pending input buffer of clients that were
|
|
|
|
* unblocked after a blocking operation. */
|
|
|
|
void processUnblockedClients(void) {
|
|
|
|
listNode *ln;
|
2015-07-26 09:20:46 -04:00
|
|
|
client *c;
|
2013-12-03 11:43:53 -05:00
|
|
|
|
|
|
|
while (listLength(server.unblocked_clients)) {
|
|
|
|
ln = listFirst(server.unblocked_clients);
|
2015-07-26 09:29:53 -04:00
|
|
|
serverAssert(ln != NULL);
|
2013-12-03 11:43:53 -05:00
|
|
|
c = ln->value;
|
|
|
|
listDelNode(server.unblocked_clients,ln);
|
2015-07-27 03:41:48 -04:00
|
|
|
c->flags &= ~CLIENT_UNBLOCKED;
|
2013-12-03 11:43:53 -05:00
|
|
|
|
2015-05-05 10:35:44 -04:00
|
|
|
/* Process remaining data in the input buffer, unless the client
|
|
|
|
* is blocked again. Actually processInputBuffer() checks that the
|
|
|
|
* client is not blocked before to proceed, but things may change and
|
|
|
|
* the code is conceptually more correct this way. */
|
2015-07-27 03:41:48 -04:00
|
|
|
if (!(c->flags & CLIENT_BLOCKED)) {
|
2021-01-08 02:36:54 -05:00
|
|
|
/* If we have a queued command, execute it now. */
|
|
|
|
if (processPendingCommandsAndResetClient(c) == C_ERR) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* Then process client if it has more data in it's buffer. */
|
2015-05-05 10:35:44 -04:00
|
|
|
if (c->querybuf && sdslen(c->querybuf) > 0) {
|
Keep track of meaningful replication offset in replicas too
Now both master and replicas keep track of the last replication offset
that contains meaningful data (ignoring the tailing pings), and both
trim that tail from the replication backlog, and the offset with which
they try to use for psync.
the implication is that if someone missed some pings, or even have
excessive pings that the promoted replica has, it'll still be able to
psync (avoid full sync).
the downside (which was already committed) is that replicas running old
code may fail to psync, since the promoted replica trims pings form it's
backlog.
This commit adds a test that reproduces several cases of promotions and
demotions with stale and non-stale pings
Background:
The mearningful offset on the master was added recently to solve a problem were
the master is left all alone, injecting PINGs into it's backlog when no one is
listening and then gets demoted and tries to replicate from a replica that didn't
have any of the PINGs (or at least not the last ones).
however, consider this case:
master A has two replicas (B and C) replicating directly from it.
there's no traffic at all, and also no network issues, just many pings in the
tail of the backlog. now B gets promoted, A becomes a replica of B, and C
remains a replica of A. when A gets demoted, it trims the pings from its
backlog, and successfully replicate from B. however, C is still aware of
these PINGs, when it'll disconnect and re-connect to A, it'll ask for something
that's not in the backlog anymore (since A trimmed the tail of it's backlog),
and be forced to do a full sync (something it didn't have to do before the
meaningful offset fix).
Besides that, the psync2 test was always failing randomly here and there, it
turns out the reason were PINGs. Investigating it shows the following scenario:
cycle 1: redis #1 is master, and all the rest are direct replicas of #1
cycle 2: redis #2 is promoted to master, #1 is a replica of #2 and #3 is replica of #1
now we see that when #1 is demoted it prints:
17339:S 21 Apr 2020 11:16:38.523 * Using the meaningful offset 3929963 instead of 3929977 to exclude the final PINGs (14 bytes difference)
17339:S 21 Apr 2020 11:16:39.391 * Trying a partial resynchronization (request e2b3f8817735fdfe5fa4626766daa938b61419e5:3929964).
17339:S 21 Apr 2020 11:16:39.392 * Successful partial resynchronization with master.
and when #3 connects to the demoted #2, #2 says:
17339:S 21 Apr 2020 11:16:40.084 * Partial resynchronization not accepted: Requested offset for secondary ID was 3929978, but I can reply up to 3929964
so the issue here is that the meaningful offset feature saved the day for the
demoted master (since it needs to sync from a replica that didn't get the last
ping), but it didn't help one of the other replicas which did get the last ping.
2020-04-23 08:04:42 -04:00
|
|
|
processInputBuffer(c);
|
2015-05-05 10:35:44 -04:00
|
|
|
}
|
2013-12-03 11:43:53 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-03 12:39:18 -04:00
|
|
|
/* This function will schedule the client for reprocessing at a safe time.
|
|
|
|
*
|
Squash merging 125 typo/grammar/comment/doc PRs (#7773)
List of squashed commits or PRs
===============================
commit 66801ea
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Jan 13 00:54:31 2020 -0500
typo fix in acl.c
commit 46f55db
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun Sep 6 18:24:11 2020 +0300
Updates a couple of comments
Specifically:
* RM_AutoMemory completed instead of pointing to docs
* Updated link to custom type doc
commit 61a2aa0
Author: xindoo <xindoo@qq.com>
Date: Tue Sep 1 19:24:59 2020 +0800
Correct errors in code comments
commit a5871d1
Author: yz1509 <pro-756@qq.com>
Date: Tue Sep 1 18:36:06 2020 +0800
fix typos in module.c
commit 41eede7
Author: bookug <bookug@qq.com>
Date: Sat Aug 15 01:11:33 2020 +0800
docs: fix typos in comments
commit c303c84
Author: lazy-snail <ws.niu@outlook.com>
Date: Fri Aug 7 11:15:44 2020 +0800
fix spelling in redis.conf
commit 1eb76bf
Author: zhujian <zhujianxyz@gmail.com>
Date: Thu Aug 6 15:22:10 2020 +0800
add a missing 'n' in comment
commit 1530ec2
Author: Daniel Dai <764122422@qq.com>
Date: Mon Jul 27 00:46:35 2020 -0400
fix spelling in tracking.c
commit e517b31
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:32 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit c300eff
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:23 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit 4c058a8
Author: 陈浩鹏 <chenhaopeng@heytea.com>
Date: Thu Jun 25 19:00:56 2020 +0800
Grammar fix and clarification
commit 5fcaa81
Author: bodong.ybd <bodong.ybd@alibaba-inc.com>
Date: Fri Jun 19 10:09:00 2020 +0800
Fix typos
commit 4caca9a
Author: Pruthvi P <pruthvi@ixigo.com>
Date: Fri May 22 00:33:22 2020 +0530
Fix typo eviciton => eviction
commit b2a25f6
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Sun May 17 12:39:59 2020 -0400
Fix a typo.
commit 12842ae
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun May 3 17:16:59 2020 -0400
fix spelling in redis conf
commit ddba07c
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat May 2 23:25:34 2020 +0100
Correct a "conflicts" spelling error.
commit 8fc7bf2
Author: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
Date: Thu Apr 30 10:25:27 2020 +0900
docs: fix EXPIRE_FAST_CYCLE_DURATION to ACTIVE_EXPIRE_CYCLE_FAST_DURATION
commit 9b2b67a
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Fri Apr 24 11:46:22 2020 -0400
Fix a typo.
commit 0746f10
Author: devilinrust <63737265+devilinrust@users.noreply.github.com>
Date: Thu Apr 16 00:17:53 2020 +0200
Fix typos in server.c
commit 92b588d
Author: benjessop12 <56115861+benjessop12@users.noreply.github.com>
Date: Mon Apr 13 13:43:55 2020 +0100
Fix spelling mistake in lazyfree.c
commit 1da37aa
Merge: 2d4ba28 af347a8
Author: hwware <wen.hui.ware@gmail.com>
Date: Thu Mar 5 22:41:31 2020 -0500
Merge remote-tracking branch 'upstream/unstable' into expiretypofix
commit 2d4ba28
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Mar 2 00:09:40 2020 -0500
fix typo in expire.c
commit 1a746f7
Author: SennoYuki <minakami1yuki@gmail.com>
Date: Thu Feb 27 16:54:32 2020 +0800
fix typo
commit 8599b1a
Author: dongheejeong <donghee950403@gmail.com>
Date: Sun Feb 16 20:31:43 2020 +0000
Fix typo in server.c
commit f38d4e8
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun Feb 2 22:58:38 2020 -0500
fix typo in evict.c
commit fe143fc
Author: Leo Murillo <leonardo.murillo@gmail.com>
Date: Sun Feb 2 01:57:22 2020 -0600
Fix a few typos in redis.conf
commit 1ab4d21
Author: viraja1 <anchan.viraj@gmail.com>
Date: Fri Dec 27 17:15:58 2019 +0530
Fix typo in Latency API docstring
commit ca1f70e
Author: gosth <danxuedexing@qq.com>
Date: Wed Dec 18 15:18:02 2019 +0800
fix typo in sort.c
commit a57c06b
Author: ZYunH <zyunhjob@163.com>
Date: Mon Dec 16 22:28:46 2019 +0800
fix-zset-typo
commit b8c92b5
Author: git-hulk <hulk.website@gmail.com>
Date: Mon Dec 16 15:51:42 2019 +0800
FIX: typo in cluster.c, onformation->information
commit 9dd981c
Author: wujm2007 <jim.wujm@gmail.com>
Date: Mon Dec 16 09:37:52 2019 +0800
Fix typo
commit e132d7a
Author: Sebastien Williams-Wynn <s.williamswynn.mail@gmail.com>
Date: Fri Nov 15 00:14:07 2019 +0000
Minor typo change
commit 47f44d5
Author: happynote3966 <01ssrmikururudevice01@gmail.com>
Date: Mon Nov 11 22:08:48 2019 +0900
fix comment typo in redis-cli.c
commit b8bdb0d
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 18:00:17 2019 +0800
Fix a spelling mistake of comments in defragDictBucketCallback
commit 0def46a
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 13:09:27 2019 +0800
fix some spelling mistakes of comments in defrag.c
commit f3596fd
Author: Phil Rajchgot <tophil@outlook.com>
Date: Sun Oct 13 02:02:32 2019 -0400
Typo and grammar fixes
Redis and its documentation are great -- just wanted to submit a few corrections in the spirit of Hacktoberfest. Thanks for all your work on this project. I use it all the time and it works beautifully.
commit 2b928cd
Author: KangZhiDong <worldkzd@gmail.com>
Date: Sun Sep 1 07:03:11 2019 +0800
fix typos
commit 33aea14
Author: Axlgrep <axlgrep@gmail.com>
Date: Tue Aug 27 11:02:18 2019 +0800
Fixed eviction spelling issues
commit e282a80
Author: Simen Flatby <simen@oms.no>
Date: Tue Aug 20 15:25:51 2019 +0200
Update comments to reflect prop name
In the comments the prop is referenced as replica-validity-factor,
but it is really named cluster-replica-validity-factor.
commit 74d1f9a
Author: Jim Green <jimgreen2013@qq.com>
Date: Tue Aug 20 20:00:31 2019 +0800
fix comment error, the code is ok
commit eea1407
Author: Liao Tonglang <liaotonglang@gmail.com>
Date: Fri May 31 10:16:18 2019 +0800
typo fix
fix cna't to can't
commit 0da553c
Author: KAWACHI Takashi <tkawachi@gmail.com>
Date: Wed Jul 17 00:38:16 2019 +0900
Fix typo
commit 7fc8fb6
Author: Michael Prokop <mika@grml.org>
Date: Tue May 28 17:58:42 2019 +0200
Typo fixes
s/familar/familiar/
s/compatiblity/compatibility/
s/ ot / to /
s/itsef/itself/
commit 5f46c9d
Author: zhumoing <34539422+zhumoing@users.noreply.github.com>
Date: Tue May 21 21:16:50 2019 +0800
typo-fixes
typo-fixes
commit 321dfe1
Author: wxisme <850885154@qq.com>
Date: Sat Mar 16 15:10:55 2019 +0800
typo fix
commit b4fb131
Merge: 267e0e6 3df1eb8
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Fri Feb 8 22:55:45 2019 +0200
Merge branch 'unstable' of antirez/redis into unstable
commit 267e0e6
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Wed Jan 30 21:26:04 2019 +0200
Minor typo fix
commit 30544e7
Author: inshal96 <39904558+inshal96@users.noreply.github.com>
Date: Fri Jan 4 16:54:50 2019 +0500
remove an extra 'a' in the comments
commit 337969d
Author: BrotherGao <yangdongheng11@gmail.com>
Date: Sat Dec 29 12:37:29 2018 +0800
fix typo in redis.conf
commit 9f4b121
Merge: 423a030 e504583
Author: BrotherGao <yangdongheng@xiaomi.com>
Date: Sat Dec 29 11:41:12 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 423a030
Merge: 42b02b7 46a51cd
Author: 杨东衡 <yangdongheng@xiaomi.com>
Date: Tue Dec 4 23:56:11 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 42b02b7
Merge: 68c0e6e b8febe6
Author: Dongheng Yang <yangdongheng11@gmail.com>
Date: Sun Oct 28 15:54:23 2018 +0800
Merge pull request #1 from antirez/unstable
update local data
commit 714b589
Author: Christian <crifei93@gmail.com>
Date: Fri Dec 28 01:17:26 2018 +0100
fix typo "resulution"
commit e23259d
Author: garenchan <1412950785@qq.com>
Date: Wed Dec 26 09:58:35 2018 +0800
fix typo: segfauls -> segfault
commit a9359f8
Author: xjp <jianping_xie@aliyun.com>
Date: Tue Dec 18 17:31:44 2018 +0800
Fixed REDISMODULE_H spell bug
commit a12c3e4
Author: jdiaz <jrd.palacios@gmail.com>
Date: Sat Dec 15 23:39:52 2018 -0600
Fixes hyperloglog hash function comment block description
commit 770eb11
Author: 林上耀 <1210tom@163.com>
Date: Sun Nov 25 17:16:10 2018 +0800
fix typo
commit fd97fbb
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Fri Nov 23 17:14:01 2018 +0100
Correct "unsupported" typo.
commit a85522d
Author: Jungnam Lee <jungnam.lee@oracle.com>
Date: Thu Nov 8 23:01:29 2018 +0900
fix typo in test comments
commit ade8007
Author: Arun Kumar <palerdot@users.noreply.github.com>
Date: Tue Oct 23 16:56:35 2018 +0530
Fixed grammatical typo
Fixed typo for word 'dictionary'
commit 869ee39
Author: Hamid Alaei <hamid.a85@gmail.com>
Date: Sun Aug 12 16:40:02 2018 +0430
fix documentations: (ThreadSafeContextStart/Stop -> ThreadSafeContextLock/Unlock), minor typo
commit f89d158
Author: Mayank Jain <mayankjain255@gmail.com>
Date: Tue Jul 31 23:01:21 2018 +0530
Updated README.md with some spelling corrections.
Made correction in spelling of some misspelled words.
commit 892198e
Author: dsomeshwar <someshwar.dhayalan@gmail.com>
Date: Sat Jul 21 23:23:04 2018 +0530
typo fix
commit 8a4d780
Author: Itamar Haber <itamar@redislabs.com>
Date: Mon Apr 30 02:06:52 2018 +0300
Fixes some typos
commit e3acef6
Author: Noah Rosamilia <ivoahivoah@gmail.com>
Date: Sat Mar 3 23:41:21 2018 -0500
Fix typo in /deps/README.md
commit 04442fb
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:32:42 2018 +0800
Fix typo in readSyncBulkPayload() comment.
commit 9f36880
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:20:37 2018 +0800
replication.c comment: run_id -> replid.
commit f866b4a
Author: Francesco 'makevoid' Canessa <makevoid@gmail.com>
Date: Thu Feb 22 22:01:56 2018 +0000
fix comment typo in server.c
commit 0ebc69b
Author: 줍 <jubee0124@gmail.com>
Date: Mon Feb 12 16:38:48 2018 +0900
Fix typo in redis.conf
Fix `five behaviors` to `eight behaviors` in [this sentence ](antirez/redis@unstable/redis.conf#L564)
commit b50a620
Author: martinbroadhurst <martinbroadhurst@users.noreply.github.com>
Date: Thu Dec 28 12:07:30 2017 +0000
Fix typo in valgrind.sup
commit 7d8f349
Author: Peter Boughton <peter@sorcerersisle.com>
Date: Mon Nov 27 19:52:19 2017 +0000
Update CONTRIBUTING; refer doc updates to redis-doc repo.
commit 02dec7e
Author: Klauswk <klauswk1@hotmail.com>
Date: Tue Oct 24 16:18:38 2017 -0200
Fix typo in comment
commit e1efbc8
Author: chenshi <baiwfg2@gmail.com>
Date: Tue Oct 3 18:26:30 2017 +0800
Correct two spelling errors of comments
commit 93327d8
Author: spacewander <spacewanderlzx@gmail.com>
Date: Wed Sep 13 16:47:24 2017 +0800
Update the comment for OBJ_ENCODING_EMBSTR_SIZE_LIMIT's value
The value of OBJ_ENCODING_EMBSTR_SIZE_LIMIT is 44 now instead of 39.
commit 63d361f
Author: spacewander <spacewanderlzx@gmail.com>
Date: Tue Sep 12 15:06:42 2017 +0800
Fix <prevlen> related doc in ziplist.c
According to the definition of ZIP_BIG_PREVLEN and other related code,
the guard of single byte <prevlen> should be 254 instead of 255.
commit ebe228d
Author: hanael80 <hanael80@gmail.com>
Date: Tue Aug 15 09:09:40 2017 +0900
Fix typo
commit 6b696e6
Author: Matt Robenolt <matt@ydekproductions.com>
Date: Mon Aug 14 14:50:47 2017 -0700
Fix typo in LATENCY DOCTOR output
commit a2ec6ae
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 15 14:15:16 2017 +0800
Fix a typo: form => from
commit 3ab7699
Author: caosiyang <caosiyang@qiyi.com>
Date: Thu Aug 10 18:40:33 2017 +0800
Fix a typo: replicationFeedSlavesFromMaster() => replicationFeedSlavesFromMasterStream()
commit 72d43ef
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 8 15:57:25 2017 +0800
fix a typo: servewr => server
commit 707c958
Author: Bo Cai <charpty@gmail.com>
Date: Wed Jul 26 21:49:42 2017 +0800
redis-cli.c typo: conut -> count.
Signed-off-by: Bo Cai <charpty@gmail.com>
commit b9385b2
Author: JackDrogon <jack.xsuperman@gmail.com>
Date: Fri Jun 30 14:22:31 2017 +0800
Fix some spell problems
commit 20d9230
Author: akosel <aaronjkosel@gmail.com>
Date: Sun Jun 4 19:35:13 2017 -0500
Fix typo
commit b167bfc
Author: Krzysiek Witkowicz <krzysiekwitkowicz@gmail.com>
Date: Mon May 22 21:32:27 2017 +0100
Fix #4008 small typo in comment
commit 2b78ac8
Author: Jake Clarkson <jacobwclarkson@gmail.com>
Date: Wed Apr 26 15:49:50 2017 +0100
Correct typo in tests/unit/hyperloglog.tcl
commit b0f1cdb
Author: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed Apr 19 14:25:18 2017 -0700
Fix typo
commit a90b0f9
Author: charsyam <charsyam@naver.com>
Date: Thu Mar 16 18:19:53 2017 +0900
fix typos
fix typos
fix typos
commit 8430a79
Author: Richard Hart <richardhart92@gmail.com>
Date: Mon Mar 13 22:17:41 2017 -0400
Fixed log message typo in listenToPort.
commit 481a1c2
Author: Vinod Kumar <kumar003vinod@gmail.com>
Date: Sun Jan 15 23:04:51 2017 +0530
src/db.c: Correct "save" -> "safe" typo
commit 586b4d3
Author: wangshaonan <wshn13@gmail.com>
Date: Wed Dec 21 20:28:27 2016 +0800
Fix typo they->the in helloworld.c
commit c1c4b5e
Author: Jenner <hypxm@qq.com>
Date: Mon Dec 19 16:39:46 2016 +0800
typo error
commit 1ee1a3f
Author: tielei <43289893@qq.com>
Date: Mon Jul 18 13:52:25 2016 +0800
fix some comments
commit 11a41fb
Author: Otto Kekäläinen <otto@seravo.fi>
Date: Sun Jul 3 10:23:55 2016 +0100
Fix spelling in documentation and comments
commit 5fb5d82
Author: francischan <f1ancis621@gmail.com>
Date: Tue Jun 28 00:19:33 2016 +0800
Fix outdated comments about redis.c file.
It should now refer to server.c file.
commit 6b254bc
Author: lmatt-bit <lmatt123n@gmail.com>
Date: Thu Apr 21 21:45:58 2016 +0800
Refine the comment of dictRehashMilliseconds func
SLAVECONF->REPLCONF in comment - by andyli029
commit ee9869f
Author: clark.kang <charsyam@naver.com>
Date: Tue Mar 22 11:09:51 2016 +0900
fix typos
commit f7b3b11
Author: Harisankar H <harisankarh@gmail.com>
Date: Wed Mar 9 11:49:42 2016 +0530
Typo correction: "faield" --> "failed"
Typo correction: "faield" --> "failed"
commit 3fd40fc
Author: Itamar Haber <itamar@redislabs.com>
Date: Thu Feb 25 10:31:51 2016 +0200
Fixes a typo in comments
commit 621c160
Author: Prayag Verma <prayag.verma@gmail.com>
Date: Mon Feb 1 12:36:20 2016 +0530
Fix typo in Readme.md
Spelling mistakes -
`eviciton` > `eviction`
`familar` > `familiar`
commit d7d07d6
Author: WonCheol Lee <toctoc21c@gmail.com>
Date: Wed Dec 30 15:11:34 2015 +0900
Typo fixed
commit a4dade7
Author: Felix Bünemann <buenemann@louis.info>
Date: Mon Dec 28 11:02:55 2015 +0100
[ci skip] Improve supervised upstart config docs
This mentions that "expect stop" is required for supervised upstart
to work correctly. See http://upstart.ubuntu.com/cookbook/#expect-stop
for an explanation.
commit d9caba9
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:30:03 2015 +1100
README: Remove trailing whitespace
commit 72d42e5
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:32 2015 +1100
README: Fix typo. th => the
commit dd6e957
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:20 2015 +1100
README: Fix typo. familar => familiar
commit 3a12b23
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:28:54 2015 +1100
README: Fix typo. eviciton => eviction
commit 2d1d03b
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:21:45 2015 +1100
README: Fix typo. sever => server
commit 3973b06
Author: Itamar Haber <itamar@garantiadata.com>
Date: Sat Dec 19 17:01:20 2015 +0200
Typo fix
commit 4f2e460
Author: Steve Gao <fu@2token.com>
Date: Fri Dec 4 10:22:05 2015 +0800
Update README - fix typos
commit b21667c
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:48:37 2015 +0800
delete redundancy color judge in sdscatcolor
commit 88894c7
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:14:42 2015 +0800
the example output shoule be HelloWorld
commit 2763470
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 17:41:39 2015 +0800
modify error word keyevente
Signed-off-by: binyan <binbin.yan@nokia.com>
commit 0847b3d
Author: Bruno Martins <bscmartins@gmail.com>
Date: Wed Nov 4 11:37:01 2015 +0000
typo
commit bbb9e9e
Author: dawedawe <dawedawe@gmx.de>
Date: Fri Mar 27 00:46:41 2015 +0100
typo: zimap -> zipmap
commit 5ed297e
Author: Axel Advento <badwolf.bloodseeker.rev@gmail.com>
Date: Tue Mar 3 15:58:29 2015 +0800
Fix 'salve' typos to 'slave'
commit edec9d6
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Wed Jun 12 14:12:47 2019 +0200
Update README.md
Co-Authored-By: Qix <Qix-@users.noreply.github.com>
commit 692a7af
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Tue May 28 14:32:04 2019 +0200
grammar
commit d962b0a
Author: Nick Frost <nickfrostatx@gmail.com>
Date: Wed Jul 20 15:17:12 2016 -0700
Minor grammar fix
commit 24fff01aaccaf5956973ada8c50ceb1462e211c6 (typos)
Author: Chad Miller <chadm@squareup.com>
Date: Tue Sep 8 13:46:11 2020 -0400
Fix faulty comment about operation of unlink()
commit 3cd5c1f3326c52aa552ada7ec797c6bb16452355
Author: Kevin <kevin.xgr@gmail.com>
Date: Wed Nov 20 00:13:50 2019 +0800
Fix typo in server.c.
From a83af59 Mon Sep 17 00:00:00 2001
From: wuwo <wuwo@wacai.com>
Date: Fri, 17 Mar 2017 20:37:45 +0800
Subject: [PATCH] falure to failure
From c961896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E6=87=B6?= <veficos@gmail.com>
Date: Sat, 27 May 2017 15:33:04 +0800
Subject: [PATCH] fix typo
From e600ef2 Mon Sep 17 00:00:00 2001
From: "rui.zou" <rui.zou@yunify.com>
Date: Sat, 30 Sep 2017 12:38:15 +0800
Subject: [PATCH] fix a typo
From c7d07fa Mon Sep 17 00:00:00 2001
From: Alexandre Perrin <alex@kaworu.ch>
Date: Thu, 16 Aug 2018 10:35:31 +0200
Subject: [PATCH] deps README.md typo
From b25cb67 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 10:55:37 +0300
Subject: [PATCH 1/2] fix typos in header
From ad28ca6 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 11:02:36 +0300
Subject: [PATCH 2/2] fix typos
commit 34924cdedd8552466fc22c1168d49236cb7ee915
Author: Adrian Lynch <adi_ady_ade@hotmail.com>
Date: Sat Apr 4 21:59:15 2015 +0100
Typos fixed
commit fd2a1e7
Author: Jan <jsteemann@users.noreply.github.com>
Date: Sat Oct 27 19:13:01 2018 +0200
Fix typos
Fix typos
commit e14e47c1a234b53b0e103c5f6a1c61481cbcbb02
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:30:07 2019 -0500
Fix multiple misspellings of "following"
commit 79b948ce2dac6b453fe80995abbcaac04c213d5a
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:24:28 2019 -0500
Fix misspelling of create-cluster
commit 1fffde52666dc99ab35efbd31071a4c008cb5a71
Author: Andy Lester <andy@petdance.com>
Date: Wed Jul 31 17:57:56 2019 -0500
Fix typos
commit 204c9ba9651e9e05fd73936b452b9a30be456cfe
Author: Xiaobo Zhu <xiaobo.zhu@shopee.com>
Date: Tue Aug 13 22:19:25 2019 +0800
fix typos
Squashed commit of the following:
commit 1d9aaf8
Author: danmedani <danmedani@gmail.com>
Date: Sun Aug 2 11:40:26 2015 -0700
README typo fix.
Squashed commit of the following:
commit 32bfa7c
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Jul 6 21:15:08 2015 +0200
Fixed grammer
Squashed commit of the following:
commit b24f69c
Author: Sisir Koppaka <sisir.koppaka@gmail.com>
Date: Mon Mar 2 22:38:45 2015 -0500
utils/hashtable/rehashing.c: Fix typos
Squashed commit of the following:
commit 4e04082
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Mar 23 08:22:21 2015 +0000
Small config file documentation improvements
Squashed commit of the following:
commit acb8773
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:52:48 2015 -0700
Typo and grammar fixes in readme
commit 2eb75b6
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:36:18 2015 -0700
fixed redis.conf comment
Squashed commit of the following:
commit a8249a2
Author: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Fri Dec 11 11:39:52 2015 +0530
Revise correction of typos.
Squashed commit of the following:
commit 3c02028
Author: zhaojun11 <zhaojun11@jd.com>
Date: Wed Jan 17 19:05:28 2018 +0800
Fix typos include two code typos in cluster.c and latency.c
Squashed commit of the following:
commit 9dba47c
Author: q191201771 <191201771@qq.com>
Date: Sat Jan 4 11:31:04 2020 +0800
fix function listCreate comment in adlist.c
Update src/server.c
commit 2c7c2cb536e78dd211b1ac6f7bda00f0f54faaeb
Author: charpty <charpty@gmail.com>
Date: Tue May 1 23:16:59 2018 +0800
server.c typo: modules system dictionary type comment
Signed-off-by: charpty <charpty@gmail.com>
commit a8395323fb63cb59cb3591cb0f0c8edb7c29a680
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun May 6 00:25:18 2018 +0300
Updates test_helper.tcl's help with undocumented options
Specifically:
* Host
* Port
* Client
commit bde6f9ced15755cd6407b4af7d601b030f36d60b
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 15:19:19 2018 +0800
fix comments in deps files
commit 3172474ba991532ab799ee1873439f3402412331
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 14:33:49 2018 +0800
fix some comments
commit 01b6f2b6858b5cf2ce4ad5092d2c746e755f53f0
Author: Thor Juhasz <thor@juhasz.pro>
Date: Sun Nov 18 14:37:41 2018 +0100
Minor fixes to comments
Found some parts a little unclear on a first read, which prompted me to have a better look at the file and fix some minor things I noticed.
Fixing minor typos and grammar. There are no changes to configuration options.
These changes are only meant to help the user better understand the explanations to the various configuration options
2020-09-10 06:43:38 -04:00
|
|
|
* This is useful when a client was blocked for some reason (blocking operation,
|
2018-09-03 12:39:18 -04:00
|
|
|
* CLIENT PAUSE, or whatever), because it may end with some accumulated query
|
|
|
|
* buffer that needs to be processed ASAP:
|
|
|
|
*
|
|
|
|
* 1. When a client is blocked, its readable handler is still active.
|
|
|
|
* 2. However in this case it only gets data into the query buffer, but the
|
|
|
|
* query is not parsed or executed once there is enough to proceed as
|
|
|
|
* usually (because the client is blocked... so we can't execute commands).
|
|
|
|
* 3. When the client is unblocked, without this function, the client would
|
|
|
|
* have to write some query in order for the readable handler to finally
|
|
|
|
* call processQueryBuffer*() on it.
|
|
|
|
* 4. With this function instead we can put the client in a queue that will
|
|
|
|
* process it for queries ready to be executed at a safe time.
|
|
|
|
*/
|
|
|
|
void queueClientForReprocessing(client *c) {
|
|
|
|
/* The client may already be into the unblocked list because of a previous
|
|
|
|
* blocking operation, don't add back it into the list multiple times. */
|
|
|
|
if (!(c->flags & CLIENT_UNBLOCKED)) {
|
|
|
|
c->flags |= CLIENT_UNBLOCKED;
|
|
|
|
listAddNodeTail(server.unblocked_clients,c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-03 11:43:53 -05:00
|
|
|
/* Unblock a client calling the right function depending on the kind
|
|
|
|
* of operation the client is blocking for. */
|
2015-07-26 09:20:46 -04:00
|
|
|
void unblockClient(client *c) {
|
2018-04-29 19:10:42 -04:00
|
|
|
if (c->btype == BLOCKED_LIST ||
|
|
|
|
c->btype == BLOCKED_ZSET ||
|
|
|
|
c->btype == BLOCKED_STREAM) {
|
2013-12-03 11:43:53 -05:00
|
|
|
unblockClientWaitingData(c);
|
2015-07-27 03:41:48 -04:00
|
|
|
} else if (c->btype == BLOCKED_WAIT) {
|
2013-12-04 09:52:20 -05:00
|
|
|
unblockClientWaitingReplicas(c);
|
2016-10-07 05:55:35 -04:00
|
|
|
} else if (c->btype == BLOCKED_MODULE) {
|
2019-10-31 06:35:05 -04:00
|
|
|
if (moduleClientIsBlockedOnKeys(c)) unblockClientWaitingData(c);
|
2016-10-07 05:55:35 -04:00
|
|
|
unblockClientFromModule(c);
|
2021-01-08 02:36:54 -05:00
|
|
|
} else if (c->btype == BLOCKED_PAUSE) {
|
|
|
|
listDelNode(server.paused_clients,c->paused_list_node);
|
|
|
|
c->paused_list_node = NULL;
|
2013-12-03 11:43:53 -05:00
|
|
|
} else {
|
2015-07-27 03:41:48 -04:00
|
|
|
serverPanic("Unknown btype in unblockClient().");
|
2013-12-03 11:43:53 -05:00
|
|
|
}
|
|
|
|
/* Clear the flags, and put the client in the unblocked list so that
|
|
|
|
* we'll process new commands in its query buffer ASAP. */
|
2017-09-09 05:10:59 -04:00
|
|
|
server.blocked_clients--;
|
|
|
|
server.blocked_clients_by_type[c->btype]--;
|
2015-07-27 03:41:48 -04:00
|
|
|
c->flags &= ~CLIENT_BLOCKED;
|
|
|
|
c->btype = BLOCKED_NONE;
|
2020-03-27 06:13:38 -04:00
|
|
|
removeClientFromTimeoutTable(c);
|
2018-09-03 12:39:18 -04:00
|
|
|
queueClientForReprocessing(c);
|
2013-12-03 11:43:53 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This function gets called when a blocked client timed out in order to
|
2016-10-07 05:55:35 -04:00
|
|
|
* send it a reply of some kind. After this function is called,
|
|
|
|
* unblockClient() will be called with the same client as argument. */
|
2015-07-26 09:20:46 -04:00
|
|
|
void replyToBlockedClientTimedOut(client *c) {
|
2018-04-29 19:10:42 -04:00
|
|
|
if (c->btype == BLOCKED_LIST ||
|
|
|
|
c->btype == BLOCKED_ZSET ||
|
|
|
|
c->btype == BLOCKED_STREAM) {
|
2018-11-30 10:36:55 -05:00
|
|
|
addReplyNullArray(c);
|
2015-07-27 03:41:48 -04:00
|
|
|
} else if (c->btype == BLOCKED_WAIT) {
|
2013-12-04 09:52:20 -05:00
|
|
|
addReplyLongLong(c,replicationCountAcksByOffset(c->bpop.reploffset));
|
2016-10-07 05:55:35 -04:00
|
|
|
} else if (c->btype == BLOCKED_MODULE) {
|
|
|
|
moduleBlockedClientTimedOut(c);
|
2013-12-03 11:43:53 -05:00
|
|
|
} else {
|
2015-07-27 03:41:48 -04:00
|
|
|
serverPanic("Unknown btype in replyToBlockedClientTimedOut().");
|
2013-12-03 11:43:53 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Replication: disconnect blocked clients when switching to slave role.
Bug as old as Redis and blocking operations. It's hard to trigger since
only happens on instance role switch, but the results are quite bad
since an inconsistency between master and slave is created.
How to trigger the bug is a good description of the bug itself.
1. Client does "BLPOP mylist 0" in master.
2. Master is turned into slave, that replicates from New-Master.
3. Client does "LPUSH mylist foo" in New-Master.
4. New-Master propagates write to slave.
5. Slave receives the LPUSH, the blocked client get served.
Now Master "mylist" key has "foo", Slave "mylist" key is empty.
Highlights:
* At step "2" above, the client remains attached, basically escaping any
check performed during command dispatch: read only slave, in that case.
* At step "5" the slave (that was the master), serves the blocked client
consuming a list element, which is not consumed on the master side.
This scenario is technically likely to happen during failovers, however
since Redis Sentinel already disconnects clients using the CLIENT
command when changing the role of the instance, the bug is avoided in
Sentinel deployments.
Closes #2473.
2015-03-24 11:00:09 -04:00
|
|
|
/* Mass-unblock clients because something changed in the instance that makes
|
|
|
|
* blocking no longer safe. For example clients blocked in list operations
|
|
|
|
* in an instance which turns from master to slave is unsafe, so this function
|
|
|
|
* is called when a master turns into a slave.
|
|
|
|
*
|
|
|
|
* The semantics is to send an -UNBLOCKED error to the client, disconnecting
|
|
|
|
* it at the same time. */
|
|
|
|
void disconnectAllBlockedClients(void) {
|
|
|
|
listNode *ln;
|
|
|
|
listIter li;
|
|
|
|
|
|
|
|
listRewind(server.clients,&li);
|
|
|
|
while((ln = listNext(&li))) {
|
2015-07-26 09:20:46 -04:00
|
|
|
client *c = listNodeValue(ln);
|
Replication: disconnect blocked clients when switching to slave role.
Bug as old as Redis and blocking operations. It's hard to trigger since
only happens on instance role switch, but the results are quite bad
since an inconsistency between master and slave is created.
How to trigger the bug is a good description of the bug itself.
1. Client does "BLPOP mylist 0" in master.
2. Master is turned into slave, that replicates from New-Master.
3. Client does "LPUSH mylist foo" in New-Master.
4. New-Master propagates write to slave.
5. Slave receives the LPUSH, the blocked client get served.
Now Master "mylist" key has "foo", Slave "mylist" key is empty.
Highlights:
* At step "2" above, the client remains attached, basically escaping any
check performed during command dispatch: read only slave, in that case.
* At step "5" the slave (that was the master), serves the blocked client
consuming a list element, which is not consumed on the master side.
This scenario is technically likely to happen during failovers, however
since Redis Sentinel already disconnects clients using the CLIENT
command when changing the role of the instance, the bug is avoided in
Sentinel deployments.
Closes #2473.
2015-03-24 11:00:09 -04:00
|
|
|
|
2015-07-27 03:41:48 -04:00
|
|
|
if (c->flags & CLIENT_BLOCKED) {
|
2021-01-09 13:22:20 -05:00
|
|
|
/* PAUSED clients are an exception, when they'll be unblocked, the
|
|
|
|
* command processing will start from scratch, and the command will
|
|
|
|
* be either executed or rejected. (unlike LIST blocked clients for
|
|
|
|
* which the command is already in progress in a way. */
|
|
|
|
if (c->btype == BLOCKED_PAUSE)
|
|
|
|
continue;
|
|
|
|
|
2020-12-23 22:06:25 -05:00
|
|
|
addReplyError(c,
|
Replication: disconnect blocked clients when switching to slave role.
Bug as old as Redis and blocking operations. It's hard to trigger since
only happens on instance role switch, but the results are quite bad
since an inconsistency between master and slave is created.
How to trigger the bug is a good description of the bug itself.
1. Client does "BLPOP mylist 0" in master.
2. Master is turned into slave, that replicates from New-Master.
3. Client does "LPUSH mylist foo" in New-Master.
4. New-Master propagates write to slave.
5. Slave receives the LPUSH, the blocked client get served.
Now Master "mylist" key has "foo", Slave "mylist" key is empty.
Highlights:
* At step "2" above, the client remains attached, basically escaping any
check performed during command dispatch: read only slave, in that case.
* At step "5" the slave (that was the master), serves the blocked client
consuming a list element, which is not consumed on the master side.
This scenario is technically likely to happen during failovers, however
since Redis Sentinel already disconnects clients using the CLIENT
command when changing the role of the instance, the bug is avoided in
Sentinel deployments.
Closes #2473.
2015-03-24 11:00:09 -04:00
|
|
|
"-UNBLOCKED force unblock from blocking operation, "
|
2020-12-23 22:06:25 -05:00
|
|
|
"instance state changed (master -> replica?)");
|
Replication: disconnect blocked clients when switching to slave role.
Bug as old as Redis and blocking operations. It's hard to trigger since
only happens on instance role switch, but the results are quite bad
since an inconsistency between master and slave is created.
How to trigger the bug is a good description of the bug itself.
1. Client does "BLPOP mylist 0" in master.
2. Master is turned into slave, that replicates from New-Master.
3. Client does "LPUSH mylist foo" in New-Master.
4. New-Master propagates write to slave.
5. Slave receives the LPUSH, the blocked client get served.
Now Master "mylist" key has "foo", Slave "mylist" key is empty.
Highlights:
* At step "2" above, the client remains attached, basically escaping any
check performed during command dispatch: read only slave, in that case.
* At step "5" the slave (that was the master), serves the blocked client
consuming a list element, which is not consumed on the master side.
This scenario is technically likely to happen during failovers, however
since Redis Sentinel already disconnects clients using the CLIENT
command when changing the role of the instance, the bug is avoided in
Sentinel deployments.
Closes #2473.
2015-03-24 11:00:09 -04:00
|
|
|
unblockClient(c);
|
2015-07-27 03:41:48 -04:00
|
|
|
c->flags |= CLIENT_CLOSE_AFTER_REPLY;
|
Replication: disconnect blocked clients when switching to slave role.
Bug as old as Redis and blocking operations. It's hard to trigger since
only happens on instance role switch, but the results are quite bad
since an inconsistency between master and slave is created.
How to trigger the bug is a good description of the bug itself.
1. Client does "BLPOP mylist 0" in master.
2. Master is turned into slave, that replicates from New-Master.
3. Client does "LPUSH mylist foo" in New-Master.
4. New-Master propagates write to slave.
5. Slave receives the LPUSH, the blocked client get served.
Now Master "mylist" key has "foo", Slave "mylist" key is empty.
Highlights:
* At step "2" above, the client remains attached, basically escaping any
check performed during command dispatch: read only slave, in that case.
* At step "5" the slave (that was the master), serves the blocked client
consuming a list element, which is not consumed on the master side.
This scenario is technically likely to happen during failovers, however
since Redis Sentinel already disconnects clients using the CLIENT
command when changing the role of the instance, the bug is avoided in
Sentinel deployments.
Closes #2473.
2015-03-24 11:00:09 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-09-06 09:43:28 -04:00
|
|
|
|
2019-09-06 06:24:26 -04:00
|
|
|
/* Helper function for handleClientsBlockedOnKeys(). This function is called
|
|
|
|
* when there may be clients blocked on a list key, and there may be new
|
|
|
|
* data to fetch (the key is ready). */
|
|
|
|
void serveClientsBlockedOnListKey(robj *o, readyList *rl) {
|
|
|
|
/* We serve clients in the same order they blocked for
|
|
|
|
* this key, from the first blocked to the last. */
|
|
|
|
dictEntry *de = dictFind(rl->db->blocking_keys,rl->key);
|
|
|
|
if (de) {
|
|
|
|
list *clients = dictGetVal(de);
|
|
|
|
int numclients = listLength(clients);
|
|
|
|
|
|
|
|
while(numclients--) {
|
|
|
|
listNode *clientnode = listFirst(clients);
|
|
|
|
client *receiver = clientnode->value;
|
|
|
|
|
|
|
|
if (receiver->btype != BLOCKED_LIST) {
|
|
|
|
/* Put at the tail, so that at the next call
|
|
|
|
* we'll not run into it again. */
|
2020-04-08 06:55:57 -04:00
|
|
|
listRotateHeadToTail(clients);
|
2019-09-06 06:24:26 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
robj *dstkey = receiver->bpop.target;
|
2020-10-08 01:33:17 -04:00
|
|
|
int wherefrom = receiver->bpop.listpos.wherefrom;
|
|
|
|
int whereto = receiver->bpop.listpos.whereto;
|
|
|
|
robj *value = listTypePop(o, wherefrom);
|
2019-09-06 06:24:26 -04:00
|
|
|
|
|
|
|
if (value) {
|
|
|
|
/* Protect receiver->bpop.target, that will be
|
|
|
|
* freed by the next unblockClient()
|
|
|
|
* call. */
|
|
|
|
if (dstkey) incrRefCount(dstkey);
|
|
|
|
unblockClient(receiver);
|
|
|
|
|
2021-01-29 08:38:30 -05:00
|
|
|
monotime replyTimer;
|
|
|
|
elapsedStart(&replyTimer);
|
2019-09-06 06:24:26 -04:00
|
|
|
if (serveClientBlockedOnList(receiver,
|
|
|
|
rl->key,dstkey,rl->db,value,
|
2020-10-08 01:33:17 -04:00
|
|
|
wherefrom, whereto) == C_ERR)
|
2019-09-06 06:24:26 -04:00
|
|
|
{
|
|
|
|
/* If we failed serving the client we need
|
|
|
|
* to also undo the POP operation. */
|
2020-10-08 01:33:17 -04:00
|
|
|
listTypePush(o,value,wherefrom);
|
2019-09-06 06:24:26 -04:00
|
|
|
}
|
2021-01-29 08:38:30 -05:00
|
|
|
updateStatsOnUnblock(receiver, 0, elapsedUs(replyTimer));
|
2019-09-06 06:24:26 -04:00
|
|
|
|
|
|
|
if (dstkey) decrRefCount(dstkey);
|
|
|
|
decrRefCount(value);
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (listTypeLength(o) == 0) {
|
|
|
|
dbDelete(rl->db,rl->key);
|
|
|
|
notifyKeyspaceEvent(NOTIFY_GENERIC,"del",rl->key,rl->db->id);
|
|
|
|
}
|
|
|
|
/* We don't call signalModifiedKey() as it was already called
|
|
|
|
* when an element was pushed on the list. */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper function for handleClientsBlockedOnKeys(). This function is called
|
|
|
|
* when there may be clients blocked on a sorted set key, and there may be new
|
|
|
|
* data to fetch (the key is ready). */
|
|
|
|
void serveClientsBlockedOnSortedSetKey(robj *o, readyList *rl) {
|
|
|
|
/* We serve clients in the same order they blocked for
|
|
|
|
* this key, from the first blocked to the last. */
|
|
|
|
dictEntry *de = dictFind(rl->db->blocking_keys,rl->key);
|
|
|
|
if (de) {
|
|
|
|
list *clients = dictGetVal(de);
|
|
|
|
int numclients = listLength(clients);
|
|
|
|
unsigned long zcard = zsetLength(o);
|
|
|
|
|
|
|
|
while(numclients-- && zcard) {
|
|
|
|
listNode *clientnode = listFirst(clients);
|
|
|
|
client *receiver = clientnode->value;
|
|
|
|
|
|
|
|
if (receiver->btype != BLOCKED_ZSET) {
|
|
|
|
/* Put at the tail, so that at the next call
|
|
|
|
* we'll not run into it again. */
|
2020-04-08 06:55:57 -04:00
|
|
|
listRotateHeadToTail(clients);
|
2019-09-06 06:24:26 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
int where = (receiver->lastcmd &&
|
|
|
|
receiver->lastcmd->proc == bzpopminCommand)
|
|
|
|
? ZSET_MIN : ZSET_MAX;
|
|
|
|
unblockClient(receiver);
|
2021-01-29 08:38:30 -05:00
|
|
|
monotime replyTimer;
|
|
|
|
elapsedStart(&replyTimer);
|
2019-09-06 06:24:26 -04:00
|
|
|
genericZpopCommand(receiver,&rl->key,1,where,1,NULL);
|
2021-01-29 08:38:30 -05:00
|
|
|
updateStatsOnUnblock(receiver, 0, elapsedUs(replyTimer));
|
2019-09-06 06:24:26 -04:00
|
|
|
zcard--;
|
|
|
|
|
|
|
|
/* Replicate the command. */
|
|
|
|
robj *argv[2];
|
|
|
|
struct redisCommand *cmd = where == ZSET_MIN ?
|
|
|
|
server.zpopminCommand :
|
|
|
|
server.zpopmaxCommand;
|
|
|
|
argv[0] = createStringObject(cmd->name,strlen(cmd->name));
|
|
|
|
argv[1] = rl->key;
|
|
|
|
incrRefCount(rl->key);
|
|
|
|
propagate(cmd,receiver->db->id,
|
|
|
|
argv,2,PROPAGATE_AOF|PROPAGATE_REPL);
|
|
|
|
decrRefCount(argv[0]);
|
|
|
|
decrRefCount(argv[1]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper function for handleClientsBlockedOnKeys(). This function is called
|
|
|
|
* when there may be clients blocked on a stream key, and there may be new
|
|
|
|
* data to fetch (the key is ready). */
|
|
|
|
void serveClientsBlockedOnStreamKey(robj *o, readyList *rl) {
|
|
|
|
dictEntry *de = dictFind(rl->db->blocking_keys,rl->key);
|
|
|
|
stream *s = o->ptr;
|
|
|
|
|
|
|
|
/* We need to provide the new data arrived on the stream
|
|
|
|
* to all the clients that are waiting for an offset smaller
|
|
|
|
* than the current top item. */
|
|
|
|
if (de) {
|
|
|
|
list *clients = dictGetVal(de);
|
|
|
|
listNode *ln;
|
|
|
|
listIter li;
|
|
|
|
listRewind(clients,&li);
|
|
|
|
|
|
|
|
while((ln = listNext(&li))) {
|
|
|
|
client *receiver = listNodeValue(ln);
|
|
|
|
if (receiver->btype != BLOCKED_STREAM) continue;
|
2020-04-08 06:55:57 -04:00
|
|
|
bkinfo *bki = dictFetchValue(receiver->bpop.keys,rl->key);
|
|
|
|
streamID *gt = &bki->stream_id;
|
2019-09-06 06:24:26 -04:00
|
|
|
|
|
|
|
/* If we blocked in the context of a consumer
|
|
|
|
* group, we need to resolve the group and update the
|
|
|
|
* last ID the client is blocked for: this is needed
|
|
|
|
* because serving other clients in the same consumer
|
|
|
|
* group will alter the "last ID" of the consumer
|
|
|
|
* group, and clients blocked in a consumer group are
|
|
|
|
* always blocked for the ">" ID: we need to deliver
|
|
|
|
* only new messages and avoid unblocking the client
|
|
|
|
* otherwise. */
|
|
|
|
streamCG *group = NULL;
|
|
|
|
if (receiver->bpop.xread_group) {
|
|
|
|
group = streamLookupCG(s,
|
|
|
|
receiver->bpop.xread_group->ptr);
|
|
|
|
/* If the group was not found, send an error
|
|
|
|
* to the consumer. */
|
|
|
|
if (!group) {
|
|
|
|
addReplyError(receiver,
|
|
|
|
"-NOGROUP the consumer group this client "
|
|
|
|
"was blocked on no longer exists");
|
|
|
|
unblockClient(receiver);
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
*gt = group->last_id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (streamCompareID(&s->last_id, gt) > 0) {
|
|
|
|
streamID start = *gt;
|
2019-12-26 05:01:37 -05:00
|
|
|
streamIncrID(&start);
|
2019-09-06 06:24:26 -04:00
|
|
|
|
|
|
|
/* Lookup the consumer for the group, if any. */
|
|
|
|
streamConsumer *consumer = NULL;
|
|
|
|
int noack = 0;
|
|
|
|
|
|
|
|
if (group) {
|
2020-09-24 05:02:40 -04:00
|
|
|
int created = 0;
|
2020-05-03 09:49:45 -04:00
|
|
|
consumer =
|
|
|
|
streamLookupConsumer(group,
|
|
|
|
receiver->bpop.xread_consumer->ptr,
|
2020-09-24 05:02:40 -04:00
|
|
|
SLC_NONE,
|
|
|
|
&created);
|
2019-09-06 06:24:26 -04:00
|
|
|
noack = receiver->bpop.xread_group_noack;
|
2020-09-24 05:02:40 -04:00
|
|
|
if (created && noack) {
|
|
|
|
streamPropagateConsumerCreation(receiver,rl->key,
|
|
|
|
receiver->bpop.xread_group,
|
|
|
|
consumer->name);
|
|
|
|
}
|
2019-09-06 06:24:26 -04:00
|
|
|
}
|
|
|
|
|
2021-01-29 08:38:30 -05:00
|
|
|
monotime replyTimer;
|
|
|
|
elapsedStart(&replyTimer);
|
2019-09-06 06:24:26 -04:00
|
|
|
/* Emit the two elements sub-array consisting of
|
|
|
|
* the name of the stream and the data we
|
|
|
|
* extracted from it. Wrapped in a single-item
|
|
|
|
* array, since we have just one key. */
|
|
|
|
if (receiver->resp == 2) {
|
|
|
|
addReplyArrayLen(receiver,1);
|
|
|
|
addReplyArrayLen(receiver,2);
|
|
|
|
} else {
|
|
|
|
addReplyMapLen(receiver,1);
|
|
|
|
}
|
|
|
|
addReplyBulk(receiver,rl->key);
|
|
|
|
|
|
|
|
streamPropInfo pi = {
|
|
|
|
rl->key,
|
|
|
|
receiver->bpop.xread_group
|
|
|
|
};
|
|
|
|
streamReplyWithRange(receiver,s,&start,NULL,
|
|
|
|
receiver->bpop.xread_count,
|
|
|
|
0, group, consumer, noack, &pi);
|
2021-01-29 08:38:30 -05:00
|
|
|
updateStatsOnUnblock(receiver, 0, elapsedUs(replyTimer));
|
2019-09-06 06:24:26 -04:00
|
|
|
|
|
|
|
/* Note that after we unblock the client, 'gt'
|
|
|
|
* and other receiver->bpop stuff are no longer
|
|
|
|
* valid, so we must do the setup above before
|
|
|
|
* this call. */
|
|
|
|
unblockClient(receiver);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-30 05:57:44 -04:00
|
|
|
/* Helper function for handleClientsBlockedOnKeys(). This function is called
|
|
|
|
* in order to check if we can serve clients blocked by modules using
|
|
|
|
* RM_BlockClientOnKeys(), when the corresponding key was signaled as ready:
|
2019-10-31 12:45:07 -04:00
|
|
|
* our goal here is to call the RedisModuleBlockedClient reply() callback to
|
|
|
|
* see if the key is really able to serve the client, and in that case,
|
|
|
|
* unblock it. */
|
2019-10-30 05:57:44 -04:00
|
|
|
void serveClientsBlockedOnKeyByModule(readyList *rl) {
|
|
|
|
dictEntry *de;
|
|
|
|
|
|
|
|
/* We serve clients in the same order they blocked for
|
|
|
|
* this key, from the first blocked to the last. */
|
|
|
|
de = dictFind(rl->db->blocking_keys,rl->key);
|
|
|
|
if (de) {
|
|
|
|
list *clients = dictGetVal(de);
|
|
|
|
int numclients = listLength(clients);
|
|
|
|
|
|
|
|
while(numclients--) {
|
|
|
|
listNode *clientnode = listFirst(clients);
|
|
|
|
client *receiver = clientnode->value;
|
|
|
|
|
2019-10-31 07:23:55 -04:00
|
|
|
/* Put at the tail, so that at the next call
|
|
|
|
* we'll not run into it again: clients here may not be
|
|
|
|
* ready to be served, so they'll remain in the list
|
|
|
|
* sometimes. We want also be able to skip clients that are
|
|
|
|
* not blocked for the MODULE type safely. */
|
2020-04-08 06:55:57 -04:00
|
|
|
listRotateHeadToTail(clients);
|
2019-10-31 07:23:55 -04:00
|
|
|
|
|
|
|
if (receiver->btype != BLOCKED_MODULE) continue;
|
|
|
|
|
|
|
|
/* Note that if *this* client cannot be served by this key,
|
|
|
|
* it does not mean that another client that is next into the
|
|
|
|
* list cannot be served as well: they may be blocked by
|
|
|
|
* different modules with different triggers to consider if a key
|
|
|
|
* is ready or not. This means we can't exit the loop but need
|
|
|
|
* to continue after the first failure. */
|
2021-01-29 08:38:30 -05:00
|
|
|
monotime replyTimer;
|
|
|
|
elapsedStart(&replyTimer);
|
2019-10-31 06:35:05 -04:00
|
|
|
if (!moduleTryServeClientBlockedOnKey(receiver, rl->key)) continue;
|
2021-01-29 08:38:30 -05:00
|
|
|
updateStatsOnUnblock(receiver, 0, elapsedUs(replyTimer));
|
2019-10-30 05:57:44 -04:00
|
|
|
|
|
|
|
moduleUnblockClient(receiver);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-06 09:43:28 -04:00
|
|
|
/* This function should be called by Redis every time a single command,
|
|
|
|
* a MULTI/EXEC block, or a Lua script, terminated its execution after
|
2018-05-11 11:31:46 -04:00
|
|
|
* being called by a client. It handles serving clients blocked in
|
|
|
|
* lists, streams, and sorted sets, via a blocking commands.
|
2017-09-06 09:43:28 -04:00
|
|
|
*
|
|
|
|
* All the keys with at least one client blocked that received at least
|
2018-05-11 11:31:46 -04:00
|
|
|
* one new element via some write operation are accumulated into
|
2017-09-06 09:43:28 -04:00
|
|
|
* the server.ready_keys list. This function will run the list and will
|
|
|
|
* serve clients accordingly. Note that the function will iterate again and
|
2020-10-08 01:33:17 -04:00
|
|
|
* again as a result of serving BLMOVE we can have new blocking clients
|
|
|
|
* to serve because of the PUSH side of BLMOVE.
|
2018-05-11 11:31:46 -04:00
|
|
|
*
|
|
|
|
* This function is normally "fair", that is, it will server clients
|
|
|
|
* using a FIFO behavior. However this fairness is violated in certain
|
|
|
|
* edge cases, that is, when we have clients blocked at the same time
|
|
|
|
* in a sorted set and in a list, for the same key (a very odd thing to
|
|
|
|
* do client side, indeed!). Because mismatching clients (blocking for
|
|
|
|
* a different type compared to the current key type) are moved in the
|
|
|
|
* other side of the linked list. However as long as the key starts to
|
|
|
|
* be used only for a single type, like virtually any Redis application will
|
|
|
|
* do, the function is already fair. */
|
2017-09-06 09:43:28 -04:00
|
|
|
void handleClientsBlockedOnKeys(void) {
|
|
|
|
while(listLength(server.ready_keys) != 0) {
|
|
|
|
list *l;
|
|
|
|
|
|
|
|
/* Point server.ready_keys to a fresh list and save the current one
|
|
|
|
* locally. This way as we run the old list we are free to call
|
|
|
|
* signalKeyAsReady() that may push new elements in server.ready_keys
|
2020-10-08 01:33:17 -04:00
|
|
|
* when handling clients blocked into BLMOVE. */
|
2017-09-06 09:43:28 -04:00
|
|
|
l = server.ready_keys;
|
|
|
|
server.ready_keys = listCreate();
|
|
|
|
|
|
|
|
while(listLength(l) != 0) {
|
|
|
|
listNode *ln = listFirst(l);
|
|
|
|
readyList *rl = ln->value;
|
|
|
|
|
|
|
|
/* First of all remove this key from db->ready_keys so that
|
|
|
|
* we can safely call signalKeyAsReady() against this key. */
|
|
|
|
dictDelete(rl->db->ready_keys,rl->key);
|
|
|
|
|
2019-11-19 05:23:43 -05:00
|
|
|
/* Even if we are not inside call(), increment the call depth
|
|
|
|
* in order to make sure that keys are expired against a fixed
|
|
|
|
* reference time, and not against the wallclock time. This
|
2020-10-08 01:33:17 -04:00
|
|
|
* way we can lookup an object multiple times (BLMOVE does
|
2019-11-19 05:23:43 -05:00
|
|
|
* that) without the risk of it being freed in the second
|
|
|
|
* lookup, invalidating the first one.
|
|
|
|
* See https://github.com/antirez/redis/pull/6554. */
|
2019-11-19 05:28:04 -05:00
|
|
|
server.fixed_time_expire++;
|
2019-11-08 06:06:51 -05:00
|
|
|
updateCachedTime(0);
|
|
|
|
|
2020-10-12 10:13:38 -04:00
|
|
|
/* Serve clients blocked on the key. */
|
2017-09-06 09:43:28 -04:00
|
|
|
robj *o = lookupKeyWrite(rl->db,rl->key);
|
|
|
|
|
2019-09-06 06:24:26 -04:00
|
|
|
if (o != NULL) {
|
|
|
|
if (o->type == OBJ_LIST)
|
|
|
|
serveClientsBlockedOnListKey(o,rl);
|
|
|
|
else if (o->type == OBJ_ZSET)
|
|
|
|
serveClientsBlockedOnSortedSetKey(o,rl);
|
|
|
|
else if (o->type == OBJ_STREAM)
|
|
|
|
serveClientsBlockedOnStreamKey(o,rl);
|
2019-10-30 05:57:44 -04:00
|
|
|
/* We want to serve clients blocked on module keys
|
|
|
|
* regardless of the object type: we don't know what the
|
|
|
|
* module is trying to accomplish right now. */
|
|
|
|
serveClientsBlockedOnKeyByModule(rl);
|
2017-09-08 10:57:32 -04:00
|
|
|
}
|
2019-11-19 05:28:04 -05:00
|
|
|
server.fixed_time_expire--;
|
2019-11-08 06:06:51 -05:00
|
|
|
|
2017-09-06 09:43:28 -04:00
|
|
|
/* Free this item. */
|
|
|
|
decrRefCount(rl->key);
|
|
|
|
zfree(rl);
|
|
|
|
listDelNode(l,ln);
|
|
|
|
}
|
|
|
|
listRelease(l); /* We have the new list on place at this point. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-29 19:10:42 -04:00
|
|
|
/* This is how the current blocking lists/sorted sets/streams work, we use
|
|
|
|
* BLPOP as example, but the concept is the same for other list ops, sorted
|
|
|
|
* sets and XREAD.
|
2017-09-06 09:43:28 -04:00
|
|
|
* - If the user calls BLPOP and the key exists and contains a non empty list
|
|
|
|
* then LPOP is called instead. So BLPOP is semantically the same as LPOP
|
|
|
|
* if blocking is not required.
|
|
|
|
* - If instead BLPOP is called and the key does not exists or the list is
|
|
|
|
* empty we need to block. In order to do so we remove the notification for
|
|
|
|
* new data to read in the client socket (so that we'll not serve new
|
|
|
|
* requests if the blocking request is not served). Also we put the client
|
|
|
|
* in a dictionary (db->blocking_keys) mapping keys to a list of clients
|
|
|
|
* blocking for this keys.
|
|
|
|
* - If a PUSH operation against a key with blocked clients waiting is
|
|
|
|
* performed, we mark this key as "ready", and after the current command,
|
|
|
|
* MULTI/EXEC block, or script, is executed, we serve all the clients waiting
|
|
|
|
* for this list, from the one that blocked first, to the last, accordingly
|
|
|
|
* to the number of elements we have in the ready list.
|
|
|
|
*/
|
|
|
|
|
2018-04-29 19:10:42 -04:00
|
|
|
/* Set a client in blocking mode for the specified key (list, zset or stream),
|
|
|
|
* with the specified timeout. The 'type' argument is BLOCKED_LIST,
|
|
|
|
* BLOCKED_ZSET or BLOCKED_STREAM depending on the kind of operation we are
|
|
|
|
* waiting for an empty key in order to awake the client. The client is blocked
|
|
|
|
* for all the 'numkeys' keys as in the 'keys' argument. When we block for
|
|
|
|
* stream keys, we also provide an array of streamID structures: clients will
|
|
|
|
* be unblocked only when items with an ID greater or equal to the specified
|
|
|
|
* one is appended to the stream. */
|
2020-10-08 01:33:17 -04:00
|
|
|
void blockForKeys(client *c, int btype, robj **keys, int numkeys, mstime_t timeout, robj *target, struct listPos *listpos, streamID *ids) {
|
2017-09-06 09:43:28 -04:00
|
|
|
dictEntry *de;
|
|
|
|
list *l;
|
|
|
|
int j;
|
|
|
|
|
|
|
|
c->bpop.timeout = timeout;
|
|
|
|
c->bpop.target = target;
|
|
|
|
|
2020-10-08 01:33:17 -04:00
|
|
|
if (listpos != NULL) c->bpop.listpos = *listpos;
|
|
|
|
|
2017-09-06 09:43:28 -04:00
|
|
|
if (target != NULL) incrRefCount(target);
|
|
|
|
|
|
|
|
for (j = 0; j < numkeys; j++) {
|
2020-04-08 06:55:57 -04:00
|
|
|
/* Allocate our bkinfo structure, associated to each key the client
|
|
|
|
* is blocked for. */
|
|
|
|
bkinfo *bki = zmalloc(sizeof(*bki));
|
|
|
|
if (btype == BLOCKED_STREAM)
|
|
|
|
bki->stream_id = ids[j];
|
2017-09-06 11:50:11 -04:00
|
|
|
|
|
|
|
/* If the key already exists in the dictionary ignore it. */
|
2020-04-08 06:55:57 -04:00
|
|
|
if (dictAdd(c->bpop.keys,keys[j],bki) != DICT_OK) {
|
|
|
|
zfree(bki);
|
2017-09-19 10:57:37 -04:00
|
|
|
continue;
|
|
|
|
}
|
2017-09-06 09:43:28 -04:00
|
|
|
incrRefCount(keys[j]);
|
|
|
|
|
|
|
|
/* And in the other "side", to map keys -> clients */
|
|
|
|
de = dictFind(c->db->blocking_keys,keys[j]);
|
|
|
|
if (de == NULL) {
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
/* For every key we take a list of clients blocked for it */
|
|
|
|
l = listCreate();
|
|
|
|
retval = dictAdd(c->db->blocking_keys,keys[j],l);
|
|
|
|
incrRefCount(keys[j]);
|
|
|
|
serverAssertWithInfo(c,keys[j],retval == DICT_OK);
|
|
|
|
} else {
|
|
|
|
l = dictGetVal(de);
|
|
|
|
}
|
|
|
|
listAddNodeTail(l,c);
|
2020-04-08 06:55:57 -04:00
|
|
|
bki->listnode = listLast(l);
|
2017-09-06 09:43:28 -04:00
|
|
|
}
|
2017-09-06 11:50:11 -04:00
|
|
|
blockClient(c,btype);
|
2017-09-06 09:43:28 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Unblock a client that's waiting in a blocking operation such as BLPOP.
|
|
|
|
* You should never call this function directly, but unblockClient() instead. */
|
|
|
|
void unblockClientWaitingData(client *c) {
|
|
|
|
dictEntry *de;
|
|
|
|
dictIterator *di;
|
|
|
|
list *l;
|
|
|
|
|
|
|
|
serverAssertWithInfo(c,NULL,dictSize(c->bpop.keys) != 0);
|
|
|
|
di = dictGetIterator(c->bpop.keys);
|
|
|
|
/* The client may wait for multiple keys, so unblock it for every key. */
|
|
|
|
while((de = dictNext(di)) != NULL) {
|
|
|
|
robj *key = dictGetKey(de);
|
2020-04-08 06:55:57 -04:00
|
|
|
bkinfo *bki = dictGetVal(de);
|
2017-09-06 09:43:28 -04:00
|
|
|
|
|
|
|
/* Remove this client from the list of clients waiting for this key. */
|
|
|
|
l = dictFetchValue(c->db->blocking_keys,key);
|
|
|
|
serverAssertWithInfo(c,key,l != NULL);
|
2020-04-08 06:55:57 -04:00
|
|
|
listDelNode(l,bki->listnode);
|
2017-09-06 09:43:28 -04:00
|
|
|
/* If the list is empty we need to remove it to avoid wasting memory */
|
|
|
|
if (listLength(l) == 0)
|
|
|
|
dictDelete(c->db->blocking_keys,key);
|
|
|
|
}
|
|
|
|
dictReleaseIterator(di);
|
|
|
|
|
|
|
|
/* Cleanup the client structure */
|
|
|
|
dictEmpty(c->bpop.keys,NULL);
|
|
|
|
if (c->bpop.target) {
|
|
|
|
decrRefCount(c->bpop.target);
|
|
|
|
c->bpop.target = NULL;
|
|
|
|
}
|
2017-09-07 03:30:50 -04:00
|
|
|
if (c->bpop.xread_group) {
|
|
|
|
decrRefCount(c->bpop.xread_group);
|
2018-01-19 10:39:09 -05:00
|
|
|
decrRefCount(c->bpop.xread_consumer);
|
2017-09-07 03:30:50 -04:00
|
|
|
c->bpop.xread_group = NULL;
|
2018-01-19 10:39:09 -05:00
|
|
|
c->bpop.xread_consumer = NULL;
|
2017-09-07 03:30:50 -04:00
|
|
|
}
|
2017-09-06 09:43:28 -04:00
|
|
|
}
|
|
|
|
|
2020-08-11 01:18:09 -04:00
|
|
|
static int getBlockedTypeByType(int type) {
|
|
|
|
switch (type) {
|
|
|
|
case OBJ_LIST: return BLOCKED_LIST;
|
|
|
|
case OBJ_ZSET: return BLOCKED_ZSET;
|
|
|
|
case OBJ_MODULE: return BLOCKED_MODULE;
|
|
|
|
case OBJ_STREAM: return BLOCKED_STREAM;
|
|
|
|
default: return BLOCKED_NONE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-06 09:43:28 -04:00
|
|
|
/* If the specified key has clients blocked waiting for list pushes, this
|
|
|
|
* function will put the key reference into the server.ready_keys list.
|
|
|
|
* Note that db->ready_keys is a hash table that allows us to avoid putting
|
|
|
|
* the same key again and again in the list in case of multiple pushes
|
|
|
|
* made by a script or in the context of MULTI/EXEC.
|
|
|
|
*
|
2019-09-05 07:05:57 -04:00
|
|
|
* The list will be finally processed by handleClientsBlockedOnKeys() */
|
2020-08-11 01:18:09 -04:00
|
|
|
void signalKeyAsReady(redisDb *db, robj *key, int type) {
|
2017-09-06 09:43:28 -04:00
|
|
|
readyList *rl;
|
|
|
|
|
2021-01-19 06:15:33 -05:00
|
|
|
/* Quick returns. */
|
2020-08-11 01:18:09 -04:00
|
|
|
int btype = getBlockedTypeByType(type);
|
2021-01-19 06:15:33 -05:00
|
|
|
if (btype == BLOCKED_NONE) {
|
|
|
|
/* The type can never block. */
|
2020-08-11 01:18:09 -04:00
|
|
|
return;
|
2021-01-19 06:15:33 -05:00
|
|
|
}
|
|
|
|
if (!server.blocked_clients_by_type[btype] &&
|
|
|
|
!server.blocked_clients_by_type[BLOCKED_MODULE]) {
|
|
|
|
/* No clients block on this type. Note: Blocked modules are represented
|
|
|
|
* by BLOCKED_MODULE, even if the intention is to wake up by normal
|
|
|
|
* types (list, zset, stream), so we need to check that there are no
|
|
|
|
* blocked modules before we do a quick return here. */
|
|
|
|
return;
|
|
|
|
}
|
2020-08-11 01:18:09 -04:00
|
|
|
|
2017-09-06 09:43:28 -04:00
|
|
|
/* No clients blocking for this key? No need to queue it. */
|
|
|
|
if (dictFind(db->blocking_keys,key) == NULL) return;
|
|
|
|
|
|
|
|
/* Key was already signaled? No need to queue it again. */
|
|
|
|
if (dictFind(db->ready_keys,key) != NULL) return;
|
|
|
|
|
|
|
|
/* Ok, we need to queue this key into server.ready_keys. */
|
|
|
|
rl = zmalloc(sizeof(*rl));
|
|
|
|
rl->key = key;
|
|
|
|
rl->db = db;
|
|
|
|
incrRefCount(key);
|
|
|
|
listAddNodeTail(server.ready_keys,rl);
|
|
|
|
|
|
|
|
/* We also add the key in the db->ready_keys dictionary in order
|
|
|
|
* to avoid adding it multiple times into a list with a simple O(1)
|
|
|
|
* check. */
|
|
|
|
incrRefCount(key);
|
|
|
|
serverAssert(dictAdd(db->ready_keys,key,NULL) == DICT_OK);
|
|
|
|
}
|
|
|
|
|