Skip to content

Commit a295f54

Browse files
committed
compatible some usage
1 parent 60a58fa commit a295f54

3 files changed

Lines changed: 23 additions & 13 deletions

File tree

cmd/ha/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ Options:
7575

7676
t, err := client.Model()
7777
if err != nil {
78-
log.PanicErrorf(err, "rpc fetch model failed")
78+
log.ErrorErrorf(err, "rpc fetch model failed")
7979
}
8080
log.Warnf("topom =\n%s", t.Encode())
8181

8282
client.SetXAuth(t.ProductName)
8383

8484
overview, err := client.Overview()
8585
if err != nil {
86-
log.PanicErrorf(err, "rpc fetch overview failed")
86+
log.ErrorErrorf(err, "rpc fetch overview failed")
8787
}
8888
prodcutAuth := overview.Config.ProductAuth
8989

@@ -329,6 +329,8 @@ Groups:
329329
n, err := strconv.Atoi(stats.Stats["master_link_down_since_seconds"])
330330
if err != nil {
331331
log.WarnErrorf(err, "try to get %s master_link_down_since_seconds failed", addr)
332+
// some backend server like pika doen't support master_link_down_since_seconds, temp resolution
333+
picked = i
332334
continue
333335
}
334336
if n >= 0 && n < mindown {

config/proxy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jodis_compatible = false
4242
proxy_datacenter = ""
4343

4444
# Set max number of alive sessions.
45-
proxy_max_clients = 1000
45+
proxy_max_clients = 20000
4646

4747
# Set max offheap memory size. (0 to disable)
4848
proxy_max_offheap_size = "1024mb"

pkg/utils/redis/client.go

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,28 @@ func (c *Client) SetMaster(master string) error {
170170
if err != nil {
171171
return errors.Trace(err)
172172
}
173-
c.conn.Send("MULTI")
174-
c.conn.Send("CONFIG", "SET", "masterauth", c.Auth)
175-
c.conn.Send("SLAVEOF", host, port)
176-
c.conn.Send("CONFIG", "REWRITE")
177-
c.conn.Send("CLIENT", "KILL", "TYPE", "normal")
178-
values, err := redigo.Values(c.Do("EXEC"))
179-
if err != nil {
173+
if _, err := c.Do("CONFIG", "SET", "masterauth", c.Auth); err != nil {
174+
return errors.Trace(err)
175+
}
176+
if _, err := c.Do("SLAVEOF", host, port); err != nil {
180177
return errors.Trace(err)
181178
}
182-
for _, r := range values {
183-
if err, ok := r.(redigo.Error); ok {
179+
/*
180+
c.conn.Send("MULTI")
181+
c.conn.Send("CONFIG", "SET", "masterauth", c.Auth)
182+
c.conn.Send("SLAVEOF", host, port)
183+
c.conn.Send("CONFIG", "REWRITE")
184+
c.conn.Send("CLIENT", "KILL", "TYPE", "normal")
185+
values, err := redigo.Values(c.Do("EXEC"))
186+
if err != nil {
184187
return errors.Trace(err)
185188
}
186-
}
189+
for _, r := range values {
190+
if err, ok := r.(redigo.Error); ok {
191+
return errors.Trace(err)
192+
}
193+
}
194+
*/
187195
return nil
188196
}
189197

0 commit comments

Comments
 (0)