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

20927 Commits

Author SHA1 Message Date
antirez
2321939218 Sentinel: small refactoring of sentinelCollectTerminatedScripts(). 
Related to #7113.
 2020-04-20 11:52:34 +02:00
Salvatore Sanfilippo
a69c1ac706 Merge pull request #7113 from OMG-By/unstable 
fix(sentinel): sentinel.running_scripts not reset
 2020-04-20 11:51:51 +02:00
Salvatore Sanfilippo
f9d624c504
Merge pull request #7113 from OMG-By/unstable 
fix(sentinel): sentinel.running_scripts not reset
 2020-04-20 11:51:51 +02:00
zhenwei pi
302db38055 Threaded IO: set thread name for redis-server 
Set thread name for each thread of redis-server, this helps us to
monitor the utilization and optimise the performance.

And suggested-by Salvatore, implement this feature for multi
platforms. Currently support linux and bsd, ignore other OS.

An exmaple on Linux:
 # top -d 5 -p `pidof redis-server ` -H

    PID USER      PR  NI    VIRT    RES    SHR S %CPU %MEM     TIME+ COMMAND
3682671 root      20   0  227744   8248   3836 R 99.2  0.0   0:19.53 redis-server
3682677 root      20   0  227744   8248   3836 S 26.4  0.0   0:04.15 io_thd_3
3682675 root      20   0  227744   8248   3836 S 23.6  0.0   0:03.98 io_thd_1
3682676 root      20   0  227744   8248   3836 S 23.6  0.0   0:03.97 io_thd_2
3682672 root      20   0  227744   8248   3836 S  0.2  0.0   0:00.02 bio_close_file
3682673 root      20   0  227744   8248   3836 S  0.2  0.0   0:00.02 bio_aof_fsync
3682674 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 bio_lazy_free
3682678 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682682 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682683 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682684 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682685 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682687 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd

Another exmaple on FreeBSD-12.1:
  PID USERNAME    PRI NICE   SIZE    RES STATE    C   TIME    WCPU COMMAND
 5212 root        100    0    48M  7280K CPU2     2   0:26  99.52% redis-server{redis-server}
 5212 root         38    0    48M  7280K umtxn    4   0:06  26.94% redis-server{io_thd_3}
 5212 root         36    0    48M  7280K umtxn    6   0:06  26.84% redis-server{io_thd_1}
 5212 root         39    0    48M  7280K umtxn    1   0:06  25.30% redis-server{io_thd_2}
 5212 root         20    0    48M  7280K uwait    3   0:00   0.00% redis-server{redis-server}
 5212 root         21    0    48M  7280K uwait    2   0:00   0.00% redis-server{bio_close_file}
 5212 root         21    0    48M  7280K uwait    3   0:00   0.00% redis-server{bio_aof_fsync}
 5212 root         21    0    48M  7280K uwait    0   0:00   0.00% redis-server{bio_lazy_free}

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
 2020-04-18 11:17:21 +08:00
zhenwei pi
5010da6ab0 Threaded IO: set thread name for redis-server 
Set thread name for each thread of redis-server, this helps us to
monitor the utilization and optimise the performance.

And suggested-by Salvatore, implement this feature for multi
platforms. Currently support linux and bsd, ignore other OS.

An exmaple on Linux:
 # top -d 5 -p `pidof redis-server ` -H

    PID USER      PR  NI    VIRT    RES    SHR S %CPU %MEM     TIME+ COMMAND
3682671 root      20   0  227744   8248   3836 R 99.2  0.0   0:19.53 redis-server
3682677 root      20   0  227744   8248   3836 S 26.4  0.0   0:04.15 io_thd_3
3682675 root      20   0  227744   8248   3836 S 23.6  0.0   0:03.98 io_thd_1
3682676 root      20   0  227744   8248   3836 S 23.6  0.0   0:03.97 io_thd_2
3682672 root      20   0  227744   8248   3836 S  0.2  0.0   0:00.02 bio_close_file
3682673 root      20   0  227744   8248   3836 S  0.2  0.0   0:00.02 bio_aof_fsync
3682674 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 bio_lazy_free
3682678 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682682 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682683 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682684 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682685 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd
3682687 root      20   0  227744   8248   3836 S  0.0  0.0   0:00.00 jemalloc_bg_thd

Another exmaple on FreeBSD-12.1:
  PID USERNAME    PRI NICE   SIZE    RES STATE    C   TIME    WCPU COMMAND
 5212 root        100    0    48M  7280K CPU2     2   0:26  99.52% redis-server{redis-server}
 5212 root         38    0    48M  7280K umtxn    4   0:06  26.94% redis-server{io_thd_3}
 5212 root         36    0    48M  7280K umtxn    6   0:06  26.84% redis-server{io_thd_1}
 5212 root         39    0    48M  7280K umtxn    1   0:06  25.30% redis-server{io_thd_2}
 5212 root         20    0    48M  7280K uwait    3   0:00   0.00% redis-server{redis-server}
 5212 root         21    0    48M  7280K uwait    2   0:00   0.00% redis-server{bio_close_file}
 5212 root         21    0    48M  7280K uwait    3   0:00   0.00% redis-server{bio_aof_fsync}
 5212 root         21    0    48M  7280K uwait    0   0:00   0.00% redis-server{bio_lazy_free}

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
 2020-04-18 11:17:21 +08:00
omg-by
189ff29490 fix(sentinel): sentinel.running_scripts will always increase more times and not reset 
when trigger a always fail scripts, sentinel.running_scripts will increase ten times, however it
only decrease one times onretry the maximum. and it will't reset, when it become
SENTINEL_SCRIPT_MAX_RUNNING, sentinel don't trigger scripts.
 2020-04-18 00:49:16 +08:00
omg-by
9d27e00ddb fix(sentinel): sentinel.running_scripts will always increase more times and not reset 
when trigger a always fail scripts, sentinel.running_scripts will increase ten times, however it
only decrease one times onretry the maximum. and it will't reset, when it become
SENTINEL_SCRIPT_MAX_RUNNING, sentinel don't trigger scripts.
 2020-04-18 00:49:16 +08:00
antirez
0b1b56b6fc Fix XCLAIM propagation in AOF/replicas for blocking XREADGROUP. 
See issue #7105.
 2020-04-17 12:40:54 +02:00
antirez
c39f16c422 Fix XCLAIM propagation in AOF/replicas for blocking XREADGROUP. 
See issue #7105.
 2020-04-17 12:40:54 +02:00
antirez
901e70ca72 Fix XCLAIM propagation in AOF/replicas for blocking XREADGROUP. 
See issue #7105.
 2020-04-17 12:38:15 +02:00
antirez
c479eace45 Fix XCLAIM propagation in AOF/replicas for blocking XREADGROUP. 
See issue #7105.
 2020-04-17 12:38:15 +02:00
John Sully
9bc3029a02 Fix some clang warnings 
Former-commit-id: 3785b1efd49002e629c1d821c57e971f8f09a2d2
 2020-04-16 20:12:05 -04:00
John Sully
0b9779c33f Fix some clang warnings 
Former-commit-id: 3785b1efd49002e629c1d821c57e971f8f09a2d2
 2020-04-16 20:12:05 -04:00
John Sully
68c455a6d6 Always link libatomic 
Former-commit-id: 7aeae62f84fe958bcda9925f76180a7e149a337e
 2020-04-16 20:01:24 -04:00
John Sully
3ecb621ccf Always link libatomic 
Former-commit-id: 7aeae62f84fe958bcda9925f76180a7e149a337e
 2020-04-16 20:01:24 -04:00
John Sully
fbecb9d5c9 Fix warning in cluster.cpp 
Former-commit-id: e5e33f8cb7b4c928884a934184cbf81b916b3c03
 2020-04-16 20:01:13 -04:00
John Sully
e5a1f84582 Fix warning in cluster.cpp 
Former-commit-id: e5e33f8cb7b4c928884a934184cbf81b916b3c03
 2020-04-16 20:01:13 -04:00
John Sully
5a23a6da76 Merge branch 'unstable' into keydbpro 
Former-commit-id: 642719cef20a88d23af84a16d3f6757088c23b1a
 2020-04-16 17:06:33 -04:00
John Sully
0962c5f366 Merge branch 'unstable' into keydbpro 
Former-commit-id: 642719cef20a88d23af84a16d3f6757088c23b1a
 2020-04-16 17:06:33 -04:00
John Sully
fe307bb1b1 quiet TSAN in serverLog 
Former-commit-id: a836d5947d5a024d855bf5d0d6269e014e47b868
 2020-04-16 17:06:25 -04:00
John Sully
158868ed92 quiet TSAN in serverLog 
Former-commit-id: a836d5947d5a024d855bf5d0d6269e014e47b868
 2020-04-16 17:06:25 -04:00
John Sully
f627dd8cbe Initial merge of unstable 6 
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
 2020-04-16 16:36:16 -04:00
John Sully
05cc1fd3de Initial merge of unstable 6 
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
 2020-04-16 16:36:16 -04:00
antirez
b3ff2337b9 Redis 6.0-RC4. 2020-04-16 16:18:02 +02:00
antirez
7cf0a77d59 Redis 6.0-RC4. 2020-04-16 16:18:02 +02:00
antirez
151fae1f23 Update SDS to latest version. 2020-04-16 16:09:06 +02:00
antirez
9f594e2432 Update SDS to latest version. 2020-04-16 16:09:06 +02:00
antirez
7d289b1771 Update SDS to latest version. 2020-04-16 16:08:37 +02:00
antirez
37b135a400 Update SDS to latest version. 2020-04-16 16:08:37 +02:00
antirez
2dac74ffb4 RESP3: fix HELLO map len in Sentinel mode. 
See #6160.
 2020-04-16 11:22:18 +02:00
antirez
48781dd95c RESP3: fix HELLO map len in Sentinel mode. 
See #6160.
 2020-04-16 11:22:18 +02:00
antirez
f475453b11 RESP3: fix HELLO map len in Sentinel mode. 
See #6160.
 2020-04-16 11:21:52 +02:00
antirez
c9388ecc73 RESP3: fix HELLO map len in Sentinel mode. 
See #6160.
 2020-04-16 11:21:52 +02:00
John Sully
34d768f5ad Deprecate travis and finish setting up github CI 
Former-commit-id: 90094a2dcaa004437c43818b411d44e722da420a
 2020-04-15 23:04:04 -04:00
John Sully
cf9efc8e9f Deprecate travis and finish setting up github CI 
Former-commit-id: 90094a2dcaa004437c43818b411d44e722da420a
 2020-04-15 23:04:04 -04:00
John Sully
c001ea5b41 Merge branch 'unstable' into redis_6_merge 
Former-commit-id: cc9924ffa606200f331b3bf5e1e1a4aa3f2702fa
 2020-04-15 23:00:13 -04:00
John Sully
c498381b1a Merge branch 'unstable' into redis_6_merge 
Former-commit-id: cc9924ffa606200f331b3bf5e1e1a4aa3f2702fa
 2020-04-15 23:00:13 -04:00
Ubuntu
412e3a059f updating version 
Former-commit-id: f994436486b2e8b4eb63f8ce29ab9c8595e1a694
 2020-04-16 02:56:49 +00:00
Ubuntu
47575ae364 updating version 
Former-commit-id: f994436486b2e8b4eb63f8ce29ab9c8595e1a694
 2020-04-16 02:56:49 +00:00
John Sully
fe06034b33 OS X build break 
Former-commit-id: 5e6b4ab99e6f2ad29577c8d4cc151284f0c652b4
 2020-04-15 22:43:40 -04:00
John Sully
e09a2ac94a OS X build break 
Former-commit-id: 5e6b4ab99e6f2ad29577c8d4cc151284f0c652b4
 2020-04-15 22:43:40 -04:00
John Sully
822f64ed2f During AOF reload we can erroneously read incorrect aof_state values, so this variable must be read with the global lock acquired 
Former-commit-id: 6ff9d23fd4541a011d754209d9fda3ef3af4a7f9
 2020-04-15 22:30:19 -04:00
John Sully
34131bf287 During AOF reload we can erroneously read incorrect aof_state values, so this variable must be read with the global lock acquired 
Former-commit-id: 6ff9d23fd4541a011d754209d9fda3ef3af4a7f9
 2020-04-15 22:30:19 -04:00
John Sully
32b028b9cb Quiet test only ASAN fd race 
Former-commit-id: d4939c838b58eab2fb3b631267045cff9d3caff1
 2020-04-15 22:27:45 -04:00
John Sully
470a895585 Quiet test only ASAN fd race 
Former-commit-id: d4939c838b58eab2fb3b631267045cff9d3caff1
 2020-04-15 22:27:45 -04:00
John Sully
c177e6e34d Fix race in sendBulk 
Former-commit-id: 5fd07e08894482e1a55f18ece9c52ff5379b82ec
 2020-04-15 22:26:00 -04:00
John Sully
19550c4819 Fix race in sendBulk 
Former-commit-id: 5fd07e08894482e1a55f18ece9c52ff5379b82ec
 2020-04-15 22:26:00 -04:00
John Sully
e8270a2f0b Convert variables accessed outside lock to atomics 
Former-commit-id: b0796ff5fd7e069a2fadbfd968f7bbb2020edd2d
 2020-04-15 22:25:17 -04:00
John Sully
bbb08af294 Convert variables accessed outside lock to atomics 
Former-commit-id: b0796ff5fd7e069a2fadbfd968f7bbb2020edd2d
 2020-04-15 22:25:17 -04:00
John Sully
c64f9d5d30 ASAN races in leak checker 
Former-commit-id: 9dfa074cd6d5ed9a87036e582861dfc386b56d5e
 2020-04-15 22:24:12 -04:00