diff options
| author | Wen Hui <wen.hui.ware@gmail.com> | 2021-01-26 02:31:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 09:31:54 +0200 |
| commit | 1aad55b66fac0f8b7a855cafc1ee80ef37a80414 (patch) | |
| tree | 5addb589ad54c6661a2f143ce7a292bc87da05b2 /tests/sentinel/tests | |
| parent | 70789cf4bb15c7d1552c2eff32edfe7b608589ee (diff) | |
| download | redis-1aad55b66fac0f8b7a855cafc1ee80ef37a80414.tar.gz | |
Sentinel: Fix Config Dependency and Rewrite Sequence (#8271)
This commit fixes a well known and an annoying issue in Sentinel mode.
Cause of this issue:
Currently, Redis rewrite process works well in server mode, however in sentinel mode,
the sentinel config has variant semantics for different configurations, in example configuration
https://github.com/redis/redis/blob/unstable/sentinel.conf, we put comments on these.
However the rewrite process only treat the sentinel config as a single option. During rewrite
process, it will mess up with the lines and comments.
Approaches:
In order to solve this issue, we need to differentiate different subconfig options in sentinel separately,
for example, sentinel monitor <master-name> <ip> <redis-port> <quorum>
we can treat it as sentinel monitor option, instead of the sentinel option.
This commit also fixes the dependency issue when putting configurations in sentinel.conf.
For example before this commit,we must put
`sentinel monitor <master-name> <ip> <redis-port> <quorum>` before
`sentinel auth-pass <master-name> <password>` for a single master,
otherwise the server cannot start and will return error. This commit fixes this issue, as long as
the monitoring master was configured, no matter the sequence is, the sentinel can start and run properly.
Diffstat (limited to 'tests/sentinel/tests')
| -rw-r--r-- | tests/sentinel/tests/00-base.tcl | 2 | ||||
| -rw-r--r-- | tests/sentinel/tests/includes/sentinel.conf | 11 | ||||
| -rw-r--r-- | tests/sentinel/tests/includes/start-init-tests.tcl | 18 |
3 files changed, 30 insertions, 1 deletions
diff --git a/tests/sentinel/tests/00-base.tcl b/tests/sentinel/tests/00-base.tcl index 7fb1a8bef..75baf9817 100644 --- a/tests/sentinel/tests/00-base.tcl +++ b/tests/sentinel/tests/00-base.tcl @@ -1,5 +1,5 @@ # Check the basic monitoring and failover capabilities. - +source "../tests/includes/start-init-tests.tcl" source "../tests/includes/init-tests.tcl" if {$::simulate_error} { diff --git a/tests/sentinel/tests/includes/sentinel.conf b/tests/sentinel/tests/includes/sentinel.conf new file mode 100644 index 000000000..94f2804a4 --- /dev/null +++ b/tests/sentinel/tests/includes/sentinel.conf @@ -0,0 +1,11 @@ +# assume master is down after being unresponsive for 20s +sentinel down-after-milliseconds setmaster 20000 +# reconfigure one slave at a time +sentinel parallel-syncs setmaster 2 +# wait for 4m before assuming failover went wrong +sentinel failover-timeout setmaster 240000 +# monitoring set +sentinel monitor setmaster 10.0.0.1 30000 2 + + + diff --git a/tests/sentinel/tests/includes/start-init-tests.tcl b/tests/sentinel/tests/includes/start-init-tests.tcl new file mode 100644 index 000000000..b0523506a --- /dev/null +++ b/tests/sentinel/tests/includes/start-init-tests.tcl @@ -0,0 +1,18 @@ +test "(start-init) Flush config and compare rewrite config file lines" { + foreach_sentinel_id id { + assert_match "OK" [S $id SENTINEL FLUSHCONFIG] + set file1 ../tests/includes/sentinel.conf + set file2 [file join "sentinel_${id}" "sentinel.conf"] + set fh1 [open $file1 r] + set fh2 [open $file2 r] + while {[gets $fh1 line1]} { + if {[gets $fh2 line2]} { + assert [string equal $line1 $line2] + } else { + fail "sentinel config file rewrite sequence changed" + } + } + close $fh1 + close $fh2 + } +}
\ No newline at end of file |