gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some more failing tests

Browse Source 
Former-commit-id: cd836a37e74e4fdf3bbe49f1697c68e6db4eb20a
This commit is contained in:
John Sully 2019-04-04 00:25:30 -04:00
parent a7ed7e06a8
commit 2fef83aa60
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core.REMOVED.git-id
View File

@ -1 +0,0 @@
f6027990a0231d80395d15f8f867d3a31eea285d

18
src/server.cpp
View File

@ -4313,12 +4313,12 @@ extern "C" sds genRedisInfoString(const char *section) {
slave_repl_offset = mi->cached_master->reploff; slave_repl_offset = mi->cached_master->reploff;
info = sdscatprintf(info, info = sdscatprintf(info,
"\tmaster_host:%s\r\n" "master_host:%s\r\n"
"\tmaster_port:%d\r\n" "master_port:%d\r\n"
"\tmaster_link_status:%s\r\n" "master_link_status:%s\r\n"
"\tmaster_last_io_seconds_ago:%d\r\n" "master_last_io_seconds_ago:%d\r\n"
"\tmaster_sync_in_progress:%d\r\n" "master_sync_in_progress:%d\r\n"
"\tslave_repl_offset:%lld\r\n" "slave_repl_offset:%lld\r\n"
,mi->masterhost, ,mi->masterhost,
mi->masterport, mi->masterport,
(mi->repl_state == REPL_STATE_CONNECTED) ? (mi->repl_state == REPL_STATE_CONNECTED) ?
@ -4331,8 +4331,8 @@ extern "C" sds genRedisInfoString(const char *section) {
if (mi->repl_state == REPL_STATE_TRANSFER) { if (mi->repl_state == REPL_STATE_TRANSFER) {
info = sdscatprintf(info, info = sdscatprintf(info,
"\tmaster_sync_left_bytes:%lld\r\n" "master_sync_left_bytes:%lld\r\n"
"\tmaster_sync_last_io_seconds_ago:%d\r\n" "master_sync_last_io_seconds_ago:%d\r\n"
, (long long) , (long long)
(mi->repl_transfer_size - mi->repl_transfer_read), (mi->repl_transfer_size - mi->repl_transfer_read),
(int)(server.unixtime-mi->repl_transfer_lastio) (int)(server.unixtime-mi->repl_transfer_lastio)
@ -4341,7 +4341,7 @@ extern "C" sds genRedisInfoString(const char *section) {
if (mi->repl_state != REPL_STATE_CONNECTED) { if (mi->repl_state != REPL_STATE_CONNECTED) {
info = sdscatprintf(info, info = sdscatprintf(info,
"\tmaster_link_down_since_seconds:%jd\r\n", "master_link_down_since_seconds:%jd\r\n",
(intmax_t)server.unixtime-mi->repl_down_since); (intmax_t)server.unixtime-mi->repl_down_since);
} }
} }

2
tests/cluster/tests/05-slave-selection.tcl
View File

@ -163,7 +163,7 @@ test "New Master down consecutively" {
wait_for_condition 1000 50 { wait_for_condition 1000 50 {
[master_detected $instances] [master_detected $instances]
} else { } else {
failover "No failover detected when master $master_id fails" fail "No failover detected when master $master_id fails"
} }
assert_cluster_state ok assert_cluster_state ok