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

Proxies & Config API #582

Merged
merged 18 commits into from
Mar 24, 2014
Merged

Proxies & Config API #582

Changes from 3 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1d961b8
Add proxy mode.
benbjohnson Feb 18, 2014
f5698d3
Proxy promotion.
benbjohnson Feb 25, 2014
fddbf35
Add automatic node promotion / demotion.
benbjohnson Feb 25, 2014
c8d6b26
Add auto-demotion after peer inactivity.
benbjohnson Feb 28, 2014
063f3b5
Check for peer before demotion.
benbjohnson Mar 4, 2014
c3b4afc
Fix JoinCommand comment.
benbjohnson Mar 4, 2014
fe4dee0
Minor fixes.
benbjohnson Mar 4, 2014
ddce52c
feat(scripts/test-cluster): create three proxy nodes
Mar 5, 2014
2a7fdfe
Merge pull request #4 from philips/benbjohnson-proxy
benbjohnson Mar 6, 2014
3cd83c6
Fix PUT /config response and log errors.
benbjohnson Mar 6, 2014
c324775
Merge branch 'proxy' of https://github.com/benbjohnson/etcd into proxy
benbjohnson Mar 6, 2014
3fff1a8
Add /machines and /machines/:name endpoints.
benbjohnson Mar 6, 2014
c916883
Minor fixes to proxies.
benbjohnson Mar 7, 2014
c0a59b3
Add minimum active size and promote delay.
benbjohnson Mar 10, 2014
e9a1ac1
Allow partial cluster config updates.
benbjohnson Mar 10, 2014
7d4fda5
Machine join/remove v2 API.
benbjohnson Mar 18, 2014
174b9ff
bump(github.com/goraft/raft): 6bf34b9
benbjohnson Mar 24, 2014
62b89a1
Merge branch 'master' of https://github.com/coreos/etcd into proxy
benbjohnson Mar 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions scripts/test-cluster
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/bin/bash
#!/bin/bash -x
SESSION=etcd-cluster
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

ulimit -n unlimited

tmux new-session -d -s $SESSION
mkdir test-cluster

peer_args=
if [ -n "${DISCOVERY_URL}" ]; then
Expand All @@ -15,7 +16,7 @@ fi
tmux new-window -t $SESSION:1 -n 'peers'
tmux split-window -h
tmux select-pane -t 0
tmux send-keys "${DIR}/../bin/etcd -peer-addr 127.0.0.1:7001 -addr 127.0.0.1:4001 -data-dir peer1 -name peer1 ${peer_args}" C-m
tmux send-keys "${DIR}/../bin/etcd -peer-addr 127.0.0.1:7001 -addr 127.0.0.1:4001 -data-dir test-cluster/peer1 -name peer1 ${peer_args}" C-m

if [ -z "${peer_args}" ]; then
peer_args="-peers 127.0.0.1:7001"
Expand All @@ -24,7 +25,18 @@ fi
for i in 2 3; do
tmux select-pane -t 0
tmux split-window -v
tmux send-keys "${DIR}/../bin/etcd -cors='*' -peer-addr 127.0.0.1:700${i} -addr 127.0.0.1:400${i} -data-dir peer${i} -name peer${i} ${peer_args}" C-m
tmux send-keys "sleep 2; ${DIR}/../bin/etcd -cors='*' -peer-addr 127.0.0.1:700${i} -addr 127.0.0.1:400${i} -data-dir test-cluster/peer${i} -name peer${i} ${peer_args}" C-m
done

tmux new-window -t $SESSION:2 -n 'proxy'
tmux split-window -h
tmux select-pane -t 0
tmux send-keys "curl -XPUT -H \"Content-Type: application/json\" -d '{\"activeSize\":3, \"promoteDelay\":30}' http://127.0.0.1:7001/config" C-m

for i in 4 5 6; do
tmux select-pane -t 0
tmux split-window -v
tmux send-keys "sleep 5; ${DIR}/../bin/etcd -cors='*' -peer-addr 127.0.0.1:700${i} -addr 127.0.0.1:400${i} -data-dir test-cluster/peer${i} -name peer${i} ${peer_args}" C-m
done

# Attach to session
Expand Down