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

Upstream merge #3

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

Upstream merge #3

wants to merge 21 commits into from

Commits on Oct 27, 2014

  1. Shuffle server list to avoid hotspots

    @samuel
    samuel committed Oct 27, 2014
    Configuration menu
    Copy the full SHA
    e59e565 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2014

  1. Fixes samuel#40 Don't Fatal on failure to reset watches. 

    - Add a test for slow servers
    @samuel
    samuel committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    8499ec2 View commit details
    Browse the repository at this point in the history

  2. Fix race conditions in tests

    @samuel
    samuel committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    ad552be View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2014

  1. Change Connect to take session timeout rather than read

    @samuel
    samuel committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    4a222ca View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2014

  1. Add docs for Connect and ConnectWithDialer

    @samuel
    samuel committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    7a44a0a View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2014

  1. Very minor cleanup

    @samuel
    samuel committed Dec 10, 2014
    Configuration menu
    Copy the full SHA
    1fff4bb View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2014

  1. Return results Multi and allow ordering of ops

    @samuel
    samuel committed Dec 19, 2014
    Configuration menu
    Copy the full SHA
    6b99eab View commit details
    Browse the repository at this point in the history

  2. Switch to Go 1.4 for travis-ci

    @samuel
    samuel committed Dec 19, 2014
    Configuration menu
    Copy the full SHA
    6387533 View commit details
    Browse the repository at this point in the history

  3. travis-ci: disable sudo to use new containers

    @samuel
    samuel committed Dec 19, 2014
    Configuration menu
    Copy the full SHA
    bb79e7c View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2015

  1. Add timeouts around IO calls during authenticate

    Mac Browning committed Jan 15, 2015
    Configuration menu
    Copy the full SHA
    4f64bfc View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2015

  1. Merge pull request samuel#48 from macb/add_authenticate_timeouts 

    Add timeouts around IO calls during authenticate
    @samuel
    samuel committed Jan 19, 2015
    Configuration menu
    Copy the full SHA
    fa6674a View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2015

  1. Return error on empty server list

    @samuel
    samuel committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    1bc9c36 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2015

  1. add support for some of the FourLetter words 

    I have a need for polling the Zookeeper instance with some of the four-letter words. In this PR te following words are implemneted with tests:

* srvr
* cons
* ruok

`srvr` get some stats about the server (connections, latencies, leader/follower mode, etc.)
`cons` gets detailed information about the individual connections and their sessions
`ruok` is actually mostly useless, but specifies whether the server has returned `imok` when prompted with `ruok`

I'm not sold on the name of the public API functions, `FLWCons()`, and would happily change them to something better.
    @theckman
    theckman committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    c5438a7 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2015

  1. [Fix] Conn.Close stops all goroutines if we haven't conencted yet. 

    Without that patch Conn.Close cannot interrupt Conn.connect.
So it's impossible to dispose two goroutines related to a connection,
if the connection hasn't been established yet.

Signed-off-by: Anton Tiurin <[email protected]>
    @noxiouz
    noxiouz committed Mar 28, 2015
    Configuration menu
    Copy the full SHA
    c760c43 View commit details
    Browse the repository at this point in the history

  2. Merge pull request samuel#55 from noxiouz/fix_proper_conn_close 

    [Fix] Conn.Close stops all goroutines if we haven't connencted yet
    @samuel
    samuel committed Mar 28, 2015
    Configuration menu
    Copy the full SHA
    f7d698c View commit details
    Browse the repository at this point in the history

  3. Fix flakey test

    @samuel
    samuel committed Mar 28, 2015
    Configuration menu
    Copy the full SHA
    ee0ba8d View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2015

  1. Copy the server list instead of mutating in-place

    @samuel
    samuel committed Apr 4, 2015
    Configuration menu
    Copy the full SHA
    a7d37a3 View commit details
    Browse the repository at this point in the history

  2. remove embarrassing typos in comments

    @theckman
    theckman committed Apr 4, 2015
    Configuration menu
    Copy the full SHA
    87dc101 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2015

  1. Merge pull request samuel#54 from theckman/server_stats 

    add support for some of the FourLetter words
    @samuel
    samuel committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    20c8c1d View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2015

  1. Merge remote-tracking branch 'upstream/master' into upstream-merge

    Dominic Wong committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    e439022 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2015

  1. Clean up session/recv/ping timeout

    Dominic Wong committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    abad148 View commit details
    Browse the repository at this point in the history