mirror of
https://github.com/redis/redis.git
synced 2026-04-21 03:01:35 -04:00
List of squashed commits or PRs =============================== commit66801eaAuthor: hwware <wen.hui.ware@gmail.com> Date: Mon Jan 13 00:54:31 2020 -0500 typo fix in acl.c commit46f55dbAuthor: 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 commit61a2aa0Author: xindoo <xindoo@qq.com> Date: Tue Sep 1 19:24:59 2020 +0800 Correct errors in code comments commita5871d1Author: yz1509 <pro-756@qq.com> Date: Tue Sep 1 18:36:06 2020 +0800 fix typos in module.c commit41eede7Author: bookug <bookug@qq.com> Date: Sat Aug 15 01:11:33 2020 +0800 docs: fix typos in comments commitc303c84Author: lazy-snail <ws.niu@outlook.com> Date: Fri Aug 7 11:15:44 2020 +0800 fix spelling in redis.conf commit1eb76bfAuthor: zhujian <zhujianxyz@gmail.com> Date: Thu Aug 6 15:22:10 2020 +0800 add a missing 'n' in comment commit1530ec2Author: Daniel Dai <764122422@qq.com> Date: Mon Jul 27 00:46:35 2020 -0400 fix spelling in tracking.c commite517b31Author: 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> commitc300effAuthor: 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> commit4c058a8Author: 陈浩鹏 <chenhaopeng@heytea.com> Date: Thu Jun 25 19:00:56 2020 +0800 Grammar fix and clarification commit5fcaa81Author: bodong.ybd <bodong.ybd@alibaba-inc.com> Date: Fri Jun 19 10:09:00 2020 +0800 Fix typos commit4caca9aAuthor: Pruthvi P <pruthvi@ixigo.com> Date: Fri May 22 00:33:22 2020 +0530 Fix typo eviciton => eviction commitb2a25f6Author: Brad Dunbar <dunbarb2@gmail.com> Date: Sun May 17 12:39:59 2020 -0400 Fix a typo. commit12842aeAuthor: hwware <wen.hui.ware@gmail.com> Date: Sun May 3 17:16:59 2020 -0400 fix spelling in redis conf commitddba07cAuthor: Chris Lamb <chris@chris-lamb.co.uk> Date: Sat May 2 23:25:34 2020 +0100 Correct a "conflicts" spelling error. commit8fc7bf2Author: 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 commit9b2b67aAuthor: Brad Dunbar <dunbarb2@gmail.com> Date: Fri Apr 24 11:46:22 2020 -0400 Fix a typo. commit0746f10Author: devilinrust <63737265+devilinrust@users.noreply.github.com> Date: Thu Apr 16 00:17:53 2020 +0200 Fix typos in server.c commit92b588dAuthor: benjessop12 <56115861+benjessop12@users.noreply.github.com> Date: Mon Apr 13 13:43:55 2020 +0100 Fix spelling mistake in lazyfree.c commit1da37aaMerge:2d4ba28af347a8Author: hwware <wen.hui.ware@gmail.com> Date: Thu Mar 5 22:41:31 2020 -0500 Merge remote-tracking branch 'upstream/unstable' into expiretypofix commit2d4ba28Author: hwware <wen.hui.ware@gmail.com> Date: Mon Mar 2 00:09:40 2020 -0500 fix typo in expire.c commit1a746f7Author: SennoYuki <minakami1yuki@gmail.com> Date: Thu Feb 27 16:54:32 2020 +0800 fix typo commit8599b1aAuthor: dongheejeong <donghee950403@gmail.com> Date: Sun Feb 16 20:31:43 2020 +0000 Fix typo in server.c commitf38d4e8Author: hwware <wen.hui.ware@gmail.com> Date: Sun Feb 2 22:58:38 2020 -0500 fix typo in evict.c commitfe143fcAuthor: Leo Murillo <leonardo.murillo@gmail.com> Date: Sun Feb 2 01:57:22 2020 -0600 Fix a few typos in redis.conf commit1ab4d21Author: viraja1 <anchan.viraj@gmail.com> Date: Fri Dec 27 17:15:58 2019 +0530 Fix typo in Latency API docstring commitca1f70eAuthor: gosth <danxuedexing@qq.com> Date: Wed Dec 18 15:18:02 2019 +0800 fix typo in sort.c commita57c06bAuthor: ZYunH <zyunhjob@163.com> Date: Mon Dec 16 22:28:46 2019 +0800 fix-zset-typo commitb8c92b5Author: git-hulk <hulk.website@gmail.com> Date: Mon Dec 16 15:51:42 2019 +0800 FIX: typo in cluster.c, onformation->information commit9dd981cAuthor: wujm2007 <jim.wujm@gmail.com> Date: Mon Dec 16 09:37:52 2019 +0800 Fix typo commite132d7aAuthor: Sebastien Williams-Wynn <s.williamswynn.mail@gmail.com> Date: Fri Nov 15 00:14:07 2019 +0000 Minor typo change commit47f44d5Author: happynote3966 <01ssrmikururudevice01@gmail.com> Date: Mon Nov 11 22:08:48 2019 +0900 fix comment typo in redis-cli.c commitb8bdb0dAuthor: fulei <fulei@kuaishou.com> Date: Wed Oct 16 18:00:17 2019 +0800 Fix a spelling mistake of comments in defragDictBucketCallback commit0def46aAuthor: fulei <fulei@kuaishou.com> Date: Wed Oct 16 13:09:27 2019 +0800 fix some spelling mistakes of comments in defrag.c commitf3596fdAuthor: 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. commit2b928cdAuthor: KangZhiDong <worldkzd@gmail.com> Date: Sun Sep 1 07:03:11 2019 +0800 fix typos commit33aea14Author: Axlgrep <axlgrep@gmail.com> Date: Tue Aug 27 11:02:18 2019 +0800 Fixed eviction spelling issues commite282a80Author: 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. commit74d1f9aAuthor: Jim Green <jimgreen2013@qq.com> Date: Tue Aug 20 20:00:31 2019 +0800 fix comment error, the code is ok commiteea1407Author: Liao Tonglang <liaotonglang@gmail.com> Date: Fri May 31 10:16:18 2019 +0800 typo fix fix cna't to can't commit0da553cAuthor: KAWACHI Takashi <tkawachi@gmail.com> Date: Wed Jul 17 00:38:16 2019 +0900 Fix typo commit7fc8fb6Author: 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/ commit5f46c9dAuthor: zhumoing <34539422+zhumoing@users.noreply.github.com> Date: Tue May 21 21:16:50 2019 +0800 typo-fixes typo-fixes commit321dfe1Author: wxisme <850885154@qq.com> Date: Sat Mar 16 15:10:55 2019 +0800 typo fix commitb4fb131Merge:267e0e63df1eb8Author: Nikitas Bastas <nikitasbst@gmail.com> Date: Fri Feb 8 22:55:45 2019 +0200 Merge branch 'unstable' of antirez/redis into unstable commit267e0e6Author: Nikitas Bastas <nikitasbst@gmail.com> Date: Wed Jan 30 21:26:04 2019 +0200 Minor typo fix commit30544e7Author: inshal96 <39904558+inshal96@users.noreply.github.com> Date: Fri Jan 4 16:54:50 2019 +0500 remove an extra 'a' in the comments commit337969dAuthor: BrotherGao <yangdongheng11@gmail.com> Date: Sat Dec 29 12:37:29 2018 +0800 fix typo in redis.conf commit9f4b121Merge:423a030e504583Author: BrotherGao <yangdongheng@xiaomi.com> Date: Sat Dec 29 11:41:12 2018 +0800 Merge branch 'unstable' of antirez/redis into unstable commit423a030Merge:42b02b746a51cdAuthor: 杨东衡 <yangdongheng@xiaomi.com> Date: Tue Dec 4 23:56:11 2018 +0800 Merge branch 'unstable' of antirez/redis into unstable commit42b02b7Merge:68c0e6eb8febe6Author: Dongheng Yang <yangdongheng11@gmail.com> Date: Sun Oct 28 15:54:23 2018 +0800 Merge pull request #1 from antirez/unstable update local data commit714b589Author: Christian <crifei93@gmail.com> Date: Fri Dec 28 01:17:26 2018 +0100 fix typo "resulution" commite23259dAuthor: garenchan <1412950785@qq.com> Date: Wed Dec 26 09:58:35 2018 +0800 fix typo: segfauls -> segfault commita9359f8Author: xjp <jianping_xie@aliyun.com> Date: Tue Dec 18 17:31:44 2018 +0800 Fixed REDISMODULE_H spell bug commita12c3e4Author: jdiaz <jrd.palacios@gmail.com> Date: Sat Dec 15 23:39:52 2018 -0600 Fixes hyperloglog hash function comment block description commit770eb11Author: 林上耀 <1210tom@163.com> Date: Sun Nov 25 17:16:10 2018 +0800 fix typo commitfd97fbbAuthor: Chris Lamb <chris@chris-lamb.co.uk> Date: Fri Nov 23 17:14:01 2018 +0100 Correct "unsupported" typo. commita85522dAuthor: Jungnam Lee <jungnam.lee@oracle.com> Date: Thu Nov 8 23:01:29 2018 +0900 fix typo in test comments commitade8007Author: Arun Kumar <palerdot@users.noreply.github.com> Date: Tue Oct 23 16:56:35 2018 +0530 Fixed grammatical typo Fixed typo for word 'dictionary' commit869ee39Author: Hamid Alaei <hamid.a85@gmail.com> Date: Sun Aug 12 16:40:02 2018 +0430 fix documentations: (ThreadSafeContextStart/Stop -> ThreadSafeContextLock/Unlock), minor typo commitf89d158Author: 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. commit892198eAuthor: dsomeshwar <someshwar.dhayalan@gmail.com> Date: Sat Jul 21 23:23:04 2018 +0530 typo fix commit8a4d780Author: Itamar Haber <itamar@redislabs.com> Date: Mon Apr 30 02:06:52 2018 +0300 Fixes some typos commite3acef6Author: Noah Rosamilia <ivoahivoah@gmail.com> Date: Sat Mar 3 23:41:21 2018 -0500 Fix typo in /deps/README.md commit04442fbAuthor: WuYunlong <xzsyeb@126.com> Date: Sat Mar 3 10:32:42 2018 +0800 Fix typo in readSyncBulkPayload() comment. commit9f36880Author: WuYunlong <xzsyeb@126.com> Date: Sat Mar 3 10:20:37 2018 +0800 replication.c comment: run_id -> replid. commitf866b4aAuthor: Francesco 'makevoid' Canessa <makevoid@gmail.com> Date: Thu Feb 22 22:01:56 2018 +0000 fix comment typo in server.c commit0ebc69bAuthor: 줍 <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) commitb50a620Author: martinbroadhurst <martinbroadhurst@users.noreply.github.com> Date: Thu Dec 28 12:07:30 2017 +0000 Fix typo in valgrind.sup commit7d8f349Author: Peter Boughton <peter@sorcerersisle.com> Date: Mon Nov 27 19:52:19 2017 +0000 Update CONTRIBUTING; refer doc updates to redis-doc repo. commit02dec7eAuthor: Klauswk <klauswk1@hotmail.com> Date: Tue Oct 24 16:18:38 2017 -0200 Fix typo in comment commite1efbc8Author: chenshi <baiwfg2@gmail.com> Date: Tue Oct 3 18:26:30 2017 +0800 Correct two spelling errors of comments commit93327d8Author: 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. commit63d361fAuthor: 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. commitebe228dAuthor: hanael80 <hanael80@gmail.com> Date: Tue Aug 15 09:09:40 2017 +0900 Fix typo commit6b696e6Author: Matt Robenolt <matt@ydekproductions.com> Date: Mon Aug 14 14:50:47 2017 -0700 Fix typo in LATENCY DOCTOR output commita2ec6aeAuthor: caosiyang <caosiyang@qiyi.com> Date: Tue Aug 15 14:15:16 2017 +0800 Fix a typo: form => from commit3ab7699Author: caosiyang <caosiyang@qiyi.com> Date: Thu Aug 10 18:40:33 2017 +0800 Fix a typo: replicationFeedSlavesFromMaster() => replicationFeedSlavesFromMasterStream() commit72d43efAuthor: caosiyang <caosiyang@qiyi.com> Date: Tue Aug 8 15:57:25 2017 +0800 fix a typo: servewr => server commit707c958Author: 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> commitb9385b2Author: JackDrogon <jack.xsuperman@gmail.com> Date: Fri Jun 30 14:22:31 2017 +0800 Fix some spell problems commit20d9230Author: akosel <aaronjkosel@gmail.com> Date: Sun Jun 4 19:35:13 2017 -0500 Fix typo commitb167bfcAuthor: Krzysiek Witkowicz <krzysiekwitkowicz@gmail.com> Date: Mon May 22 21:32:27 2017 +0100 Fix #4008 small typo in comment commit2b78ac8Author: Jake Clarkson <jacobwclarkson@gmail.com> Date: Wed Apr 26 15:49:50 2017 +0100 Correct typo in tests/unit/hyperloglog.tcl commitb0f1cdbAuthor: Qi Luo <qiluo-msft@users.noreply.github.com> Date: Wed Apr 19 14:25:18 2017 -0700 Fix typo commita90b0f9Author: charsyam <charsyam@naver.com> Date: Thu Mar 16 18:19:53 2017 +0900 fix typos fix typos fix typos commit8430a79Author: Richard Hart <richardhart92@gmail.com> Date: Mon Mar 13 22:17:41 2017 -0400 Fixed log message typo in listenToPort. commit481a1c2Author: Vinod Kumar <kumar003vinod@gmail.com> Date: Sun Jan 15 23:04:51 2017 +0530 src/db.c: Correct "save" -> "safe" typo commit586b4d3Author: wangshaonan <wshn13@gmail.com> Date: Wed Dec 21 20:28:27 2016 +0800 Fix typo they->the in helloworld.c commitc1c4b5eAuthor: Jenner <hypxm@qq.com> Date: Mon Dec 19 16:39:46 2016 +0800 typo error commit1ee1a3fAuthor: tielei <43289893@qq.com> Date: Mon Jul 18 13:52:25 2016 +0800 fix some comments commit11a41fbAuthor: Otto Kekäläinen <otto@seravo.fi> Date: Sun Jul 3 10:23:55 2016 +0100 Fix spelling in documentation and comments commit5fb5d82Author: 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. commit6b254bcAuthor: 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 commitee9869fAuthor: clark.kang <charsyam@naver.com> Date: Tue Mar 22 11:09:51 2016 +0900 fix typos commitf7b3b11Author: Harisankar H <harisankarh@gmail.com> Date: Wed Mar 9 11:49:42 2016 +0530 Typo correction: "faield" --> "failed" Typo correction: "faield" --> "failed" commit3fd40fcAuthor: Itamar Haber <itamar@redislabs.com> Date: Thu Feb 25 10:31:51 2016 +0200 Fixes a typo in comments commit621c160Author: 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` commitd7d07d6Author: WonCheol Lee <toctoc21c@gmail.com> Date: Wed Dec 30 15:11:34 2015 +0900 Typo fixed commita4dade7Author: 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. commitd9caba9Author: daurnimator <quae@daurnimator.com> Date: Mon Dec 21 18:30:03 2015 +1100 README: Remove trailing whitespace commit72d42e5Author: daurnimator <quae@daurnimator.com> Date: Mon Dec 21 18:29:32 2015 +1100 README: Fix typo. th => the commitdd6e957Author: daurnimator <quae@daurnimator.com> Date: Mon Dec 21 18:29:20 2015 +1100 README: Fix typo. familar => familiar commit3a12b23Author: daurnimator <quae@daurnimator.com> Date: Mon Dec 21 18:28:54 2015 +1100 README: Fix typo. eviciton => eviction commit2d1d03bAuthor: daurnimator <quae@daurnimator.com> Date: Mon Dec 21 18:21:45 2015 +1100 README: Fix typo. sever => server commit3973b06Author: Itamar Haber <itamar@garantiadata.com> Date: Sat Dec 19 17:01:20 2015 +0200 Typo fix commit4f2e460Author: Steve Gao <fu@2token.com> Date: Fri Dec 4 10:22:05 2015 +0800 Update README - fix typos commitb21667cAuthor: binyan <binbin.yan@nokia.com> Date: Wed Dec 2 22:48:37 2015 +0800 delete redundancy color judge in sdscatcolor commit88894c7Author: binyan <binbin.yan@nokia.com> Date: Wed Dec 2 22:14:42 2015 +0800 the example output shoule be HelloWorld commit2763470Author: 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> commit0847b3dAuthor: Bruno Martins <bscmartins@gmail.com> Date: Wed Nov 4 11:37:01 2015 +0000 typo commitbbb9e9eAuthor: dawedawe <dawedawe@gmx.de> Date: Fri Mar 27 00:46:41 2015 +0100 typo: zimap -> zipmap commit5ed297eAuthor: Axel Advento <badwolf.bloodseeker.rev@gmail.com> Date: Tue Mar 3 15:58:29 2015 +0800 Fix 'salve' typos to 'slave' commitedec9d6Author: 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> commit692a7afAuthor: LudwikJaniuk <ludvig.janiuk@gmail.com> Date: Tue May 28 14:32:04 2019 +0200 grammar commitd962b0aAuthor: 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. Froma83af59Mon 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 Fromc961896Mon 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 Frome600ef2Mon 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 Fromc7d07faMon 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 Fromb25cb67Mon 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 Fromad28ca6Mon 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 commitfd2a1e7Author: 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: commit1d9aaf8Author: danmedani <danmedani@gmail.com> Date: Sun Aug 2 11:40:26 2015 -0700 README typo fix. Squashed commit of the following: commit32bfa7cAuthor: Erik Dubbelboer <erik@dubbelboer.com> Date: Mon Jul 6 21:15:08 2015 +0200 Fixed grammer Squashed commit of the following: commitb24f69cAuthor: 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: commit4e04082Author: Erik Dubbelboer <erik@dubbelboer.com> Date: Mon Mar 23 08:22:21 2015 +0000 Small config file documentation improvements Squashed commit of the following: commitacb8773Author: ctd1500 <ctd1500@gmail.com> Date: Fri May 8 01:52:48 2015 -0700 Typo and grammar fixes in readme commit2eb75b6Author: ctd1500 <ctd1500@gmail.com> Date: Fri May 8 01:36:18 2015 -0700 fixed redis.conf comment Squashed commit of the following: commita8249a2Author: Masahiko Sawada <sawada.mshk@gmail.com> Date: Fri Dec 11 11:39:52 2015 +0530 Revise correction of typos. Squashed commit of the following: commit3c02028Author: 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: commit9dba47cAuthor: 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 (cherry picked from commit1c71038540)
265 lines
10 KiB
Plaintext
265 lines
10 KiB
Plaintext
# Example sentinel.conf
|
|
|
|
# *** IMPORTANT ***
|
|
#
|
|
# By default Sentinel will not be reachable from interfaces different than
|
|
# localhost, either use the 'bind' directive to bind to a list of network
|
|
# interfaces, or disable protected mode with "protected-mode no" by
|
|
# adding it to this configuration file.
|
|
#
|
|
# Before doing that MAKE SURE the instance is protected from the outside
|
|
# world via firewalling or other means.
|
|
#
|
|
# For example you may use one of the following:
|
|
#
|
|
# bind 127.0.0.1 192.168.1.1
|
|
#
|
|
# protected-mode no
|
|
|
|
# port <sentinel-port>
|
|
# The port that this sentinel instance will run on
|
|
port 26379
|
|
|
|
# By default Redis Sentinel does not run as a daemon. Use 'yes' if you need it.
|
|
# Note that Redis will write a pid file in /var/run/redis-sentinel.pid when
|
|
# daemonized.
|
|
daemonize no
|
|
|
|
# When running daemonized, Redis Sentinel writes a pid file in
|
|
# /var/run/redis-sentinel.pid by default. You can specify a custom pid file
|
|
# location here.
|
|
pidfile /var/run/redis-sentinel.pid
|
|
|
|
# Specify the log file name. Also the empty string can be used to force
|
|
# Sentinel to log on the standard output. Note that if you use standard
|
|
# output for logging but daemonize, logs will be sent to /dev/null
|
|
logfile ""
|
|
|
|
# sentinel announce-ip <ip>
|
|
# sentinel announce-port <port>
|
|
#
|
|
# The above two configuration directives are useful in environments where,
|
|
# because of NAT, Sentinel is reachable from outside via a non-local address.
|
|
#
|
|
# When announce-ip is provided, the Sentinel will claim the specified IP address
|
|
# in HELLO messages used to gossip its presence, instead of auto-detecting the
|
|
# local address as it usually does.
|
|
#
|
|
# Similarly when announce-port is provided and is valid and non-zero, Sentinel
|
|
# will announce the specified TCP port.
|
|
#
|
|
# The two options don't need to be used together, if only announce-ip is
|
|
# provided, the Sentinel will announce the specified IP and the server port
|
|
# as specified by the "port" option. If only announce-port is provided, the
|
|
# Sentinel will announce the auto-detected local IP and the specified port.
|
|
#
|
|
# Example:
|
|
#
|
|
# sentinel announce-ip 1.2.3.4
|
|
|
|
# dir <working-directory>
|
|
# Every long running process should have a well-defined working directory.
|
|
# For Redis Sentinel to chdir to /tmp at startup is the simplest thing
|
|
# for the process to don't interfere with administrative tasks such as
|
|
# unmounting filesystems.
|
|
dir /tmp
|
|
|
|
# sentinel monitor <master-name> <ip> <redis-port> <quorum>
|
|
#
|
|
# Tells Sentinel to monitor this master, and to consider it in O_DOWN
|
|
# (Objectively Down) state only if at least <quorum> sentinels agree.
|
|
#
|
|
# Note that whatever is the ODOWN quorum, a Sentinel will require to
|
|
# be elected by the majority of the known Sentinels in order to
|
|
# start a failover, so no failover can be performed in minority.
|
|
#
|
|
# Replicas are auto-discovered, so you don't need to specify replicas in
|
|
# any way. Sentinel itself will rewrite this configuration file adding
|
|
# the replicas using additional configuration options.
|
|
# Also note that the configuration file is rewritten when a
|
|
# replica is promoted to master.
|
|
#
|
|
# Note: master name should not include special characters or spaces.
|
|
# The valid charset is A-z 0-9 and the three characters ".-_".
|
|
sentinel monitor mymaster 127.0.0.1 6379 2
|
|
|
|
# sentinel auth-pass <master-name> <password>
|
|
#
|
|
# Set the password to use to authenticate with the master and replicas.
|
|
# Useful if there is a password set in the Redis instances to monitor.
|
|
#
|
|
# Note that the master password is also used for replicas, so it is not
|
|
# possible to set a different password in masters and replicas instances
|
|
# if you want to be able to monitor these instances with Sentinel.
|
|
#
|
|
# However you can have Redis instances without the authentication enabled
|
|
# mixed with Redis instances requiring the authentication (as long as the
|
|
# password set is the same for all the instances requiring the password) as
|
|
# the AUTH command will have no effect in Redis instances with authentication
|
|
# switched off.
|
|
#
|
|
# Example:
|
|
#
|
|
# sentinel auth-pass mymaster MySUPER--secret-0123passw0rd
|
|
|
|
# sentinel auth-user <master-name> <username>
|
|
#
|
|
# This is useful in order to authenticate to instances having ACL capabilities,
|
|
# that is, running Redis 6.0 or greater. When just auth-pass is provided the
|
|
# Sentinel instance will authenticate to Redis using the old "AUTH <pass>"
|
|
# method. When also an username is provided, it will use "AUTH <user> <pass>".
|
|
# In the Redis servers side, the ACL to provide just minimal access to
|
|
# Sentinel instances, should be configured along the following lines:
|
|
#
|
|
# user sentinel-user >somepassword +client +subscribe +publish \
|
|
# +ping +info +multi +slaveof +config +client +exec on
|
|
|
|
# sentinel down-after-milliseconds <master-name> <milliseconds>
|
|
#
|
|
# Number of milliseconds the master (or any attached replica or sentinel) should
|
|
# be unreachable (as in, not acceptable reply to PING, continuously, for the
|
|
# specified period) in order to consider it in S_DOWN state (Subjectively
|
|
# Down).
|
|
#
|
|
# Default is 30 seconds.
|
|
sentinel down-after-milliseconds mymaster 30000
|
|
|
|
# requirepass <password>
|
|
#
|
|
# You can configure Sentinel itself to require a password, however when doing
|
|
# so Sentinel will try to authenticate with the same password to all the
|
|
# other Sentinels. So you need to configure all your Sentinels in a given
|
|
# group with the same "requirepass" password. Check the following documentation
|
|
# for more info: https://redis.io/topics/sentinel
|
|
|
|
# sentinel parallel-syncs <master-name> <numreplicas>
|
|
#
|
|
# How many replicas we can reconfigure to point to the new replica simultaneously
|
|
# during the failover. Use a low number if you use the replicas to serve query
|
|
# to avoid that all the replicas will be unreachable at about the same
|
|
# time while performing the synchronization with the master.
|
|
sentinel parallel-syncs mymaster 1
|
|
|
|
# sentinel failover-timeout <master-name> <milliseconds>
|
|
#
|
|
# Specifies the failover timeout in milliseconds. It is used in many ways:
|
|
#
|
|
# - The time needed to re-start a failover after a previous failover was
|
|
# already tried against the same master by a given Sentinel, is two
|
|
# times the failover timeout.
|
|
#
|
|
# - The time needed for a replica replicating to a wrong master according
|
|
# to a Sentinel current configuration, to be forced to replicate
|
|
# with the right master, is exactly the failover timeout (counting since
|
|
# the moment a Sentinel detected the misconfiguration).
|
|
#
|
|
# - The time needed to cancel a failover that is already in progress but
|
|
# did not produced any configuration change (SLAVEOF NO ONE yet not
|
|
# acknowledged by the promoted replica).
|
|
#
|
|
# - The maximum time a failover in progress waits for all the replicas to be
|
|
# reconfigured as replicas of the new master. However even after this time
|
|
# the replicas will be reconfigured by the Sentinels anyway, but not with
|
|
# the exact parallel-syncs progression as specified.
|
|
#
|
|
# Default is 3 minutes.
|
|
sentinel failover-timeout mymaster 180000
|
|
|
|
# SCRIPTS EXECUTION
|
|
#
|
|
# sentinel notification-script and sentinel reconfig-script are used in order
|
|
# to configure scripts that are called to notify the system administrator
|
|
# or to reconfigure clients after a failover. The scripts are executed
|
|
# with the following rules for error handling:
|
|
#
|
|
# If script exits with "1" the execution is retried later (up to a maximum
|
|
# number of times currently set to 10).
|
|
#
|
|
# If script exits with "2" (or an higher value) the script execution is
|
|
# not retried.
|
|
#
|
|
# If script terminates because it receives a signal the behavior is the same
|
|
# as exit code 1.
|
|
#
|
|
# A script has a maximum running time of 60 seconds. After this limit is
|
|
# reached the script is terminated with a SIGKILL and the execution retried.
|
|
|
|
# NOTIFICATION SCRIPT
|
|
#
|
|
# sentinel notification-script <master-name> <script-path>
|
|
#
|
|
# Call the specified notification script for any sentinel event that is
|
|
# generated in the WARNING level (for instance -sdown, -odown, and so forth).
|
|
# This script should notify the system administrator via email, SMS, or any
|
|
# other messaging system, that there is something wrong with the monitored
|
|
# Redis systems.
|
|
#
|
|
# The script is called with just two arguments: the first is the event type
|
|
# and the second the event description.
|
|
#
|
|
# The script must exist and be executable in order for sentinel to start if
|
|
# this option is provided.
|
|
#
|
|
# Example:
|
|
#
|
|
# sentinel notification-script mymaster /var/redis/notify.sh
|
|
|
|
# CLIENTS RECONFIGURATION SCRIPT
|
|
#
|
|
# sentinel client-reconfig-script <master-name> <script-path>
|
|
#
|
|
# When the master changed because of a failover a script can be called in
|
|
# order to perform application-specific tasks to notify the clients that the
|
|
# configuration has changed and the master is at a different address.
|
|
#
|
|
# The following arguments are passed to the script:
|
|
#
|
|
# <master-name> <role> <state> <from-ip> <from-port> <to-ip> <to-port>
|
|
#
|
|
# <state> is currently always "failover"
|
|
# <role> is either "leader" or "observer"
|
|
#
|
|
# The arguments from-ip, from-port, to-ip, to-port are used to communicate
|
|
# the old address of the master and the new address of the elected replica
|
|
# (now a master).
|
|
#
|
|
# This script should be resistant to multiple invocations.
|
|
#
|
|
# Example:
|
|
#
|
|
# sentinel client-reconfig-script mymaster /var/redis/reconfig.sh
|
|
|
|
# SECURITY
|
|
#
|
|
# By default SENTINEL SET will not be able to change the notification-script
|
|
# and client-reconfig-script at runtime. This avoids a trivial security issue
|
|
# where clients can set the script to anything and trigger a failover in order
|
|
# to get the program executed.
|
|
|
|
sentinel deny-scripts-reconfig yes
|
|
|
|
# REDIS COMMANDS RENAMING
|
|
#
|
|
# Sometimes the Redis server has certain commands, that are needed for Sentinel
|
|
# to work correctly, renamed to unguessable strings. This is often the case
|
|
# of CONFIG and SLAVEOF in the context of providers that provide Redis as
|
|
# a service, and don't want the customers to reconfigure the instances outside
|
|
# of the administration console.
|
|
#
|
|
# In such case it is possible to tell Sentinel to use different command names
|
|
# instead of the normal ones. For example if the master "mymaster", and the
|
|
# associated replicas, have "CONFIG" all renamed to "GUESSME", I could use:
|
|
#
|
|
# SENTINEL rename-command mymaster CONFIG GUESSME
|
|
#
|
|
# After such configuration is set, every time Sentinel would use CONFIG it will
|
|
# use GUESSME instead. Note that there is no actual need to respect the command
|
|
# case, so writing "config guessme" is the same in the example above.
|
|
#
|
|
# SENTINEL SET can also be used in order to perform this configuration at runtime.
|
|
#
|
|
# In order to set a command back to its original name (undo the renaming), it
|
|
# is possible to just rename a command to itself:
|
|
#
|
|
# SENTINEL rename-command mymaster CONFIG CONFIG
|