topom: option sentinel_client_timeout

Author: spinlock

config/dashboard.toml

@@ -28,6 +28,7 @@ migration_async_numkeys = 500
 migration_timeout = "30s"
 
 # Set configs for redis sentinel.
+sentinel_client_timeout = "10s"
 sentinel_quorum = 2
 sentinel_parallel_syncs = 1
 sentinel_down_after = "30s"

pkg/topom/config.go

@@ -45,6 +45,7 @@ migration_async_numkeys = 500
 migration_timeout = "30s"
 
 # Set configs for redis sentinel.
+sentinel_client_timeout = "10s"
 sentinel_quorum = 2
 sentinel_parallel_syncs = 1
 sentinel_down_after = "30s"
@@ -71,6 +72,7 @@ type Config struct {
 	MigrationAsyncNumKeys  int               `toml:"migration_async_numkeys" json:"migration_async_numkeys"`
 	MigrationTimeout       timesize.Duration `toml:"migration_timeout" json:"migration_timeout"`
 
+	SentinelClientTimeout        timesize.Duration `toml:"sentinel_client_timeout" json:"sentinel_client_timeout"`
 	SentinelQuorum               int               `toml:"sentinel_quorum" json:"sentinel_quorum"`
 	SentinelParallelSyncs        int               `toml:"sentinel_parallel_syncs" json:"sentinel_parallel_syncs"`
 	SentinelDownAfter            timesize.Duration `toml:"sentinel_down_after" json:"sentinel_down_after"`
@@ -137,6 +139,9 @@ func (c *Config) Validate() error {
 	if c.MigrationTimeout <= 0 {
 		return errors.New("invalid migration_timeout")
 	}
+	if c.SentinelClientTimeout <= 0 {
+		return errors.New("invalid sentinel_client_timeout")
+	}
 	if c.SentinelQuorum <= 0 {
 		return errors.New("invalid sentinel_quorum")
 	}

pkg/topom/topom_api.go

@@ -546,7 +546,7 @@ func (s *apiServer) InfoSentinelMonitored(params martini.Params) (int, string) {
 		return rpc.ApiResponseError(err)
 	}
 	sentinel := redis.NewSentinel(s.topom.Config().ProductName, s.topom.Config().ProductAuth)
-	if info, err := sentinel.MastersAndSlaves(addr, time.Second); err != nil {
+	if info, err := sentinel.MastersAndSlaves(addr, s.topom.Config().SentinelClientTimeout.Duration()); err != nil {
 		return rpc.ApiResponseError(err)
 	} else {
 		return rpc.ApiResponseJson(info)

pkg/topom/topom_group.go

@@ -275,7 +275,7 @@ func (s *Topom) GroupPromoteServer(gid int, addr string) error {
 			}
 			groupIds := map[int]bool{g.Id: true}
 			sentinel := redis.NewSentinel(s.config.ProductName, s.config.ProductAuth)
-			if err := sentinel.RemoveGroups(p.Servers, time.Second*5, groupIds); err != nil {
+			if err := sentinel.RemoveGroups(p.Servers, s.config.SentinelClientTimeout.Duration(), groupIds); err != nil {
 				log.WarnErrorf(err, "group-[%d] remove sentinels failed", g.Id)
 			}
 			if s.ha.masters != nil {

pkg/topom/topom_sentinel.go

@@ -34,7 +34,7 @@ func (s *Topom) AddSentinel(addr string) error {
 	}
 
 	sentinel := redis.NewSentinel(s.config.ProductName, s.config.ProductAuth)
-	if err := sentinel.FlushConfig(addr, time.Second*5); err != nil {
+	if err := sentinel.FlushConfig(addr, s.config.SentinelClientTimeout.Duration()); err != nil {
 		return err
 	}
 	defer s.dirtySentinelCache()
@@ -74,7 +74,7 @@ func (s *Topom) DelSentinel(addr string, force bool) error {
 	}
 
 	sentinel := redis.NewSentinel(s.config.ProductName, s.config.ProductAuth)
-	if err := sentinel.RemoveGroupsAll([]string{addr}, time.Second*5); err != nil {
+	if err := sentinel.RemoveGroupsAll([]string{addr}, s.config.SentinelClientTimeout.Duration()); err != nil {
 		log.WarnErrorf(err, "remove sentinel %s failed", addr)
 		if !force {
 			return errors.Errorf("remove sentinel %s failed", addr)
@@ -194,10 +194,10 @@ func (s *Topom) ResyncSentinels() error {
 	}
 
 	sentinel := redis.NewSentinel(s.config.ProductName, s.config.ProductAuth)
-	if err := sentinel.RemoveGroupsAll(p.Servers, time.Second*5); err != nil {
+	if err := sentinel.RemoveGroupsAll(p.Servers, s.config.SentinelClientTimeout.Duration()); err != nil {
 		log.WarnErrorf(err, "remove sentinels failed")
 	}
-	if err := sentinel.MonitorGroups(p.Servers, time.Second*5, config, ctx.getGroupMasters()); err != nil {
+	if err := sentinel.MonitorGroups(p.Servers, s.config.SentinelClientTimeout.Duration(), config, ctx.getGroupMasters()); err != nil {
 		log.WarnErrorf(err, "resync sentinels failed")
 		return err
 	}