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.

Sign up for GitHub

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

fix(redis): 重试By Redis #8886 #8891

Open
wants to merge 1 commit into
base: v1.5.0
Choose a base branch
from
Open

fix(redis): 重试By Redis #8886 #8891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion dbm-services/common/dbha/ha-module/dbmodule/redis/redis_switch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,19 @@ func (ins *RedisSwitch) TwemproxySwitchM2S(masterIp string, masterPort int, slav
log.Logger.Infof("twemproxy switch: [%s:%d:%d] switch, from master[%s] -> slave[%s] begin .",
proxyInfo.Ip, proxyInfo.Port, proxyInfo.AdminPort, masterAddr, slaveAddr)

rsp, err := ins.DoSwitchTwemproxyBackends(proxyInfo.Ip, proxyInfo.AdminPort, masterAddr, slaveAddr)
var rsp string
var err error
for i := 0; i < 10; i++ { // read: connection reset by peer
if rsp, err = ins.DoSwitchTwemproxyBackends(proxyInfo.Ip, proxyInfo.AdminPort, masterAddr, slaveAddr); err != nil {
ins.ReportLogs(constvar.WarnResult,
fmt.Sprintf("twemproxy switch: [%s:%d] switch from %s to %s failed, retry:%d, err:%s",
proxyInfo.Ip, proxyInfo.Port, masterAddr, slaveAddr, i+1, err.Error()))
time.Sleep(time.Second)
} else {
break
}
}

if err != nil {
redisErr := fmt.Errorf("twemproxy switch: [%s:%d] switch from %s to %s failed, err:%s",
proxyInfo.Ip, proxyInfo.Port, masterAddr, slaveAddr, err.Error())
Expand Down
21 changes: 17 additions & 4 deletions dbm-services/redis/db-tools/dbmon/pkg/redismonitor/redis_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,29 @@ func (task *RedisMonitorTask) CheckRedisConn() {
var addr01 string
for _, port := range task.ServerConf.ServerPorts {
addr01 = task.getRedisAddr(task.ServerConf.ServerIP, port)
cli01, task.Err = myredis.NewRedisClientWithTimeout(addr01, task.Password, 0,
consts.TendisTypeRedisInstance, 5*time.Second)
retries := 1
if task.ServerConf.MetaRole == consts.MetaRoleRedisSlave {
retries = 10
}
for i := 0; i < retries; i++ {
cli01, task.Err = myredis.NewRedisClientWithTimeout(addr01, task.Password, 0,
consts.TendisTypeRedisInstance, 5*time.Second)
if task.Err != nil {
mylog.Logger.Error(fmt.Sprintf("create connection failed by(%s), retry:%d : %+v",
task.ServerConf.MetaRole, i+1, task.Err.Error()))
time.Sleep(time.Second)
continue
}
task.redisClis = append(task.redisClis, cli01)
break
}
if task.Err != nil {
task.eventSender.SetInstance(addr01)
task.eventSender.SendWarning(consts.EventRedisLogin, task.Err.Error(), consts.WarnLevelError,
task.ServerConf.ServerIP)
return
}
task.redisClis = append(task.redisClis, cli01)
}
} // end for ports.
}

// SetDbmonKeyOnMaster 如果'我'是master,则写入 dbmon:$master_ip:$master_port key
Expand Down