Code

twemproxy work with redis-sentinel#324

Code

Open

andyqzb wants to merge 36 commits intotwitter:mastertwitter/twemproxy:masterfrom andyqzb:ha_with_sentinel_rebaseandyqzb/twemproxy:ha_with_sentinel_rebaseCopy head branch name to clipboard

+1,387-31

Commits

Commits on Jan 7, 2014

• Merge pull request #1 from twitter/master

  Show description for a63cd7a
  andyqzb

  committed
  a63cd7a

  Copy full SHA for a63cd7a

Commits on Aug 22, 2014

• Merge pull request #2 from twitter/master

  Show description for 47afc28
  andyqzb

  committed
  47afc28

  Copy full SHA for 47afc28

Commits on Oct 29, 2014

• Merge pull request #3 from twitter/master

  Show description for 49d62f7
  andyqzb

  committed
  49d62f7

  Copy full SHA for 49d62f7

Commits on Dec 2, 2014

• Merge pull request #4 from twitter/master

  Show description for dcc2613
  andyqzb

  committed
  dcc2613

  Copy full SHA for dcc2613

Commits on Mar 2, 2015

• add sentinels config to nc_conf

  andyqzb

  committed
  1914e4a

  Copy full SHA for 1914e4a

• add nc_sentinel.c which works with sentinel

  andyqzb

  committed
  a0ba197

  Copy full SHA for a0ba197

• add mbuf_read_string and server_switch function

  andyqzb

  committed
  334b7e5

  Copy full SHA for 334b7e5

• add conf_server member to struct server

  andyqzb

  committed
  9fde4c5

  Copy full SHA for 9fde4c5

• modify sentinel_status to member of struct conn and fix some warning

  andyqzb

  committed
  a6abc7e

  Copy full SHA for a6abc7e

• modify sentinel connect always no matter what preconnect is

  andyqzb

  committed
  e0d8cf2

  Copy full SHA for e0d8cf2

• don't log fake request in req_log

  andyqzb

  committed
  431889d

  Copy full SHA for 431889d

• add sentinel tag to struct server, add sentinel disconnect and deinit when proxy deinits, simplify the process steps of sentinel messages

  andyqzb

  committed
  49c2d7b

  Copy full SHA for 49c2d7b

• fix sentinel sentinel disconnect bug, and add sentinel deinit check

  andyqzb

  committed
  b935675

  Copy full SHA for b935675

• skip sentinel server's stats

  andyqzb

  committed
  e27b51c

  Copy full SHA for e27b51c

• add sentinel reconnect after conn is closed

  andyqzb

  committed
  ca5311b

  Copy full SHA for ca5311b

• add sentinel conf, merge conn_get_sentinel to conn_get

  andyqzb

  committed
  36c5c2f

  Copy full SHA for 36c5c2f

• delete conn_get_sentinel prototype

  andyqzb

  committed
  70cb70a

  Copy full SHA for 70cb70a

• modify aligning of struct server

  andyqzb

  committed
  948ffb2

  Copy full SHA for 948ffb2

• add assert in server_init

  andyqzb

  committed
  2612dcf

  Copy full SHA for 2612dcf

Commits on Mar 4, 2015

• add a sentinel address to pool sigma in example configure

  andyqzb

  committed
  06303aa

  Copy full SHA for 06303aa

Commits on Mar 31, 2015

• add sentinels description to README.md and redis.md

  andyqzb

  committed
  4faefb0

  Copy full SHA for 4faefb0

Commits on Jul 12, 2015

• merge twitter/master and resolve conflict

  andyqzb

  committed
  95c87eb

  Copy full SHA for 95c87eb

• update README.md

  andyqzb

  committed
  b954260

  Copy full SHA for b954260

Commits on Jul 18, 2015

• log error msg when open temp conf failed

  andyqzb

  committed
  b6b2c5d

  Copy full SHA for b6b2c5d

Commits on Jul 20, 2015

• add sentinel test cases

  andyqzb

  committed
  be5c36d

  Copy full SHA for be5c36d

• copy sentinel binary in travis.sh

  andyqzb

  committed
  9e77b58

  Copy full SHA for 9e77b58

Commits on Jul 21, 2015

• update travis.sh to support sentinel

  andyqzb

  committed
  a910ca2

  Copy full SHA for a910ca2

Commits on Jul 25, 2015

• support set keepalive interval parameter

  andyqzb

  committed
  131712c

  Copy full SHA for 131712c

Commits on Sep 16, 2016

• Merge pull request #5 from twitter/master

  andyqzb

  authored
  ea45e69

  Copy full SHA for ea45e69

Commits on Sep 17, 2016

• modify sentinel req to RESP prototol

  andyqzb

  committed
  fcc80f7

  Copy full SHA for fcc80f7

Commits on Jul 2, 2021

• Merge branch 'twitter:master' into master

  andyqzb

  authored
  89ddda9

  Copy full SHA for 89ddda9

Commits on May 3, 2022

• Merge branch 'twitter:master' into master

  andyqzb

  authored
  081b327

  Copy full SHA for 081b327

Commits on May 4, 2022

• modify sentinel tests to support python3 and fix merge conflict

  andyqzb

  committed
  a62fa1d

  Copy full SHA for a62fa1d

• modify nc_sentinel.c to support multi version redis-sentinel

  andyqzb

  committed
  a7dc446

  Copy full SHA for a7dc446

• check the error code of conf_write

  andyqzb

  committed
  c48722f

  Copy full SHA for c48722f

Commits on Oct 9, 2022

• continue to process left master info when proxy met a unknown server name

  

  andyqzb

  authored and

  Andy

  committed
  ef3d8d0

  Copy full SHA for ef3d8d0