Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use 'primary' instead of 'master' in Sentinel tcl testing. #724

Merged
merged 3 commits into from
Jul 3, 2024

Conversation

AlanZhang1204
Copy link
Contributor

@AlanZhang1204 AlanZhang1204 commented Jul 1, 2024

Use 'primary' instead of 'master' in Sentinel tcl testing.

Copy link

codecov bot commented Jul 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.26%. Comparing base (1269532) to head (f1e0e16).
Report is 16 commits behind head on unstable.

Additional details and impacted files
@@             Coverage Diff              @@
##           unstable     #724      +/-   ##
============================================
+ Coverage     70.23%   70.26%   +0.02%     
============================================
  Files           111      111              
  Lines         60203    60305     +102     
============================================
+ Hits          42286    42371      +85     
- Misses        17917    17934      +17     

see 29 files with indirect coverage changes

@@ -64,7 +64,7 @@ test "SDOWN is triggered by crashed instance" {
ensure_master_up
}

test "SDOWN is triggered by masters advertising as slaves" {
test "SDOWN is triggered by primarys advertising as slaves" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
test "SDOWN is triggered by primarys advertising as slaves" {
test "SDOWN is triggered by primaries advertising as slaves" {

@@ -56,7 +56,7 @@ test "SENTINEL PENDING-SCRIPTS returns the information about pending scripts" {
assert_morethan_equal [llength [S 0 SENTINEL PENDING-SCRIPTS]] 0
}

test "SENTINEL MASTERS returns a list of monitored masters" {
test "SENTINEL PRIMARYS returns a list of monitored primarys" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
test "SENTINEL PRIMARYS returns a list of monitored primarys" {
test "SENTINEL PRIMARIES returns a list of monitored primaries" {

assert {[RI $master_id role] eq {master}}
}

test "SENTINEL RESET can resets the master" {
test "SENTINEL RESET can resets the primary" {
# After SENTINEL RESET, sometimes the sentinel can sense the master again,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# After SENTINEL RESET, sometimes the sentinel can sense the master again,
# After SENTINEL RESET, sometimes the sentinel can sense the primary again,

@@ -63,7 +63,7 @@ proc wait_for_sentinels_connect_servers { {is_connect 1} } {
}
}

test "Sentinels (re)connection following SENTINEL SET mymaster auth-pass" {
test "Sentinels (re)connection following SENTINEL SET myprimary auth-pass" {
# 3 types of sentinels to test:
# (re)started while master changed pwd. Manage to connect only after setting pwd
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# (re)started while master changed pwd. Manage to connect only after setting pwd
# (re)started while primary changed pwd. Manage to connect only after setting pwd

@hwware hwware merged commit b298dfd into valkey-io:unstable Jul 3, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants