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

Jump to bottom

twemproxy work with redis-sentinel #324

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

twemproxy work with redis-sentinel #324

wants to merge 36 commits into from
+1,387 −31

Commits on Jan 7, 2014

  1. Merge pull request #1 from twitter/master 

    merge author‘s change
    @andyqzb
    andyqzb committed Jan 7, 2014
    Configuration menu
    Copy the full SHA
    a63cd7a View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2014

  1. Merge pull request #2 from twitter/master 

    merge author's code
    @andyqzb
    andyqzb committed Aug 22, 2014
    Configuration menu
    Copy the full SHA
    47afc28 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2014

  1. Merge pull request #3 from twitter/master 

    merge twitter twemproxy master changes
    @andyqzb
    andyqzb committed Oct 29, 2014
    Configuration menu
    Copy the full SHA
    49d62f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2014

  1. Merge pull request #4 from twitter/master 

    merge twitter twemproxy master changes
    @andyqzb
    andyqzb committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    dcc2613 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2015

  1. add sentinels config to nc_conf

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    1914e4a View commit details
    Browse the repository at this point in the history

  2. add nc_sentinel.c which works with sentinel

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    a0ba197 View commit details
    Browse the repository at this point in the history

  3. add mbuf_read_string and server_switch function

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    334b7e5 View commit details
    Browse the repository at this point in the history

  4. add conf_server member to struct server

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    9fde4c5 View commit details
    Browse the repository at this point in the history

  5. modify sentinel_status to member of struct conn and fix some warning

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    a6abc7e View commit details
    Browse the repository at this point in the history

  6. modify sentinel connect always no matter what preconnect is

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    e0d8cf2 View commit details
    Browse the repository at this point in the history

  7. don't log fake request in req_log

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    431889d View commit details
    Browse the repository at this point in the history

  8. add sentinel tag to struct server, add sentinel disconnect and deinit… 

    … when proxy deinits, simplify the process steps of sentinel messages
    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    49c2d7b View commit details
    Browse the repository at this point in the history

  9. fix sentinel sentinel disconnect bug, and add sentinel deinit check

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    b935675 View commit details
    Browse the repository at this point in the history

  10. skip sentinel server's stats

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    e27b51c View commit details
    Browse the repository at this point in the history

  11. add sentinel reconnect after conn is closed

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    ca5311b View commit details
    Browse the repository at this point in the history

  12. add sentinel conf, merge conn_get_sentinel to conn_get

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    36c5c2f View commit details
    Browse the repository at this point in the history

  13. delete conn_get_sentinel prototype

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    70cb70a View commit details
    Browse the repository at this point in the history

  14. modify aligning of struct server

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    948ffb2 View commit details
    Browse the repository at this point in the history

  15. add assert in server_init

    @andyqzb
    andyqzb committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    2612dcf View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2015

  1. add a sentinel address to pool sigma in example configure

    @andyqzb
    andyqzb committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    06303aa View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2015

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

    @andyqzb
    andyqzb committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    4faefb0 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2015

  1. merge twitter/master and resolve conflict

    @andyqzb
    andyqzb committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    95c87eb View commit details
    Browse the repository at this point in the history

  2. update README.md

    @andyqzb
    andyqzb committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    b954260 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2015

  1. log error msg when open temp conf failed

    @andyqzb
    andyqzb committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    b6b2c5d View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2015

  1. add sentinel test cases

    @andyqzb
    andyqzb committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    be5c36d View commit details
    Browse the repository at this point in the history

  2. copy sentinel binary in travis.sh

    @andyqzb
    andyqzb committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    9e77b58 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2015

  1. update travis.sh to support sentinel

    @andyqzb
    andyqzb committed Jul 21, 2015
    Configuration menu
    Copy the full SHA
    a910ca2 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2015

  1. support set keepalive interval parameter

    @andyqzb
    andyqzb committed Jul 25, 2015
    Configuration menu
    Copy the full SHA
    131712c View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2016

  1. Merge pull request #5 from twitter/master

    @andyqzb
    andyqzb committed Sep 16, 2016
    Configuration menu
    Copy the full SHA
    ea45e69 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2016

  1. modify sentinel req to RESP prototol

    @andyqzb
    andyqzb committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    fcc80f7 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. Merge branch 'twitter:master' into master

    @andyqzb
    andyqzb committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    89ddda9 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2022

  1. Merge branch 'twitter:master' into master

    @andyqzb
    andyqzb committed May 3, 2022
    Configuration menu
    Copy the full SHA
    081b327 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2022

  1. modify sentinel tests to support python3 and fix merge conflict

    @andyqzb
    andyqzb committed May 4, 2022
    Configuration menu
    Copy the full SHA
    a62fa1d View commit details
    Browse the repository at this point in the history

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

    @andyqzb
    andyqzb committed May 4, 2022
    Configuration menu
    Copy the full SHA
    a7dc446 View commit details
    Browse the repository at this point in the history

  3. check the error code of conf_write

    @andyqzb
    andyqzb committed May 4, 2022
    Configuration menu
    Copy the full SHA
    c48722f View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2022

  1. continue to process left master info when proxy met a unknown server … 

    …name
    @andyqzb
    andyqzb authored and Andy committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    ef3d8d0 View commit details
    Browse the repository at this point in the history