Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,961 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

2961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon Philips
d98fe2ce1a Merge pull request #1247 from jonboulle/doc 
documentation: clustering guide fixes
 2014-10-06 15:16:25 -07:00
Jonathan Boulle
a10c62ae25 documentation: clustering guide fixes 2014-10-06 15:07:44 -07:00
Brandon Philips
3500b56e54 Merge pull request #1237 from philips/0.5-docs 
use initial-cluster and initial-cluster-state flags
 2014-10-06 15:04:04 -07:00
Brandon Philips
e2d8037ded main: use initial-cluster and initial-cluster-state flags 
In preperation for adding the ability to join a machine to an existing
cluster force the user to specify whether they expect this to me a new
cluster or an active one.

The error for not specifying the initial-cluster-state is:
```
etcd: initial cluster state unset and no wal found
```
 2014-10-06 14:59:25 -07:00
Jonathan Boulle
7081dabd12 Merge pull request #1244 from jonboulle/peers 
main: fail on peers/peers-file flags
 2014-10-06 14:25:39 -07:00
Jonathan Boulle
ec7bcbb50d main: fail on peers/peers-file flags 2014-10-06 14:25:11 -07:00
Brandon Philips
6bc160b4e3 Documentation: introduce the initial 0.5 clustering guide 
Introduce the concepts of static initial cluster configuration and
document the flag migrations.
 2014-10-06 12:25:12 -07:00
Xiang Li
9e3d045b2b *:discovery hook up 2014-10-06 10:12:42 -07:00
Xiang Li
824b7231b8 Merge pull request #1240 from coreos/fix_proposal 
raft: fix send
 2014-10-06 05:53:54 +08:00
Xiang Li
dc9cb4b4ba raft: fix send 
send should not attach current term to msgProp. Send should simply do proxy for msgProp without
changing its term. msgProp has a special term 0, which indicates that it is a local message.
 2014-10-06 04:48:35 +08:00
Jonathan Boulle
7ce3bb180c Merge pull request #1238 from jonboulle/etcdserver_cluster 
etcdserver: restore test coverage of cluster
 2014-10-03 17:06:36 -07:00
Jonathan Boulle
d2df23183d etcdserver: restore test coverage of cluster 2014-10-03 17:06:23 -07:00
Jonathan Boulle
2606508d1c Merge pull request #1215 from jonboulle/1215 
Flag `-timeout` not descriptive
 2014-10-03 14:06:18 -07:00
Jonathan Boulle
f432b9d29b etcdhttp: remove configurable timeout 
It's slightly unclear why we expose this timeout as being configurable,
and the `-timeout` flag does not exist in 0.4.x, so for now, remove the
flag until we have evidence that it is needed.
 2014-10-03 13:47:34 -07:00
Jonathan Boulle
1ca5991c8c Merge pull request #1096 from jonboulle/1096_embedded 
simplify initialization of EtcdServer to support embedded etcd
 2014-10-03 13:39:25 -07:00
Jonathan Boulle
1308c3e809 etcdserver: unexport EtcdServer fields where possible 2014-10-03 13:34:56 -07:00
Jonathan Boulle
e5f5fcff48 etcdserver: collapse dir configuration to DataDir 2014-10-03 13:34:49 -07:00
Jonathan Boulle
af6b29f291 main: move server configuration to etcdserver package 2014-10-03 13:34:49 -07:00
Jonathan Boulle
1c4163faf8 Merge pull request #1187 from jonboulle/1187_watches_header 
Watches do not return X-Etcd-Index header
 2014-10-03 10:13:25 -07:00
Xiang Li
01ecc60a88 Merge pull request #1203 from coreos/fix_raft 
raft: commitIndex=min(leaderCommit, index of last new entry)
 2014-10-03 22:24:07 +08:00
Xiang Li
172bd7d096 raft: add test for maybeappend change 2014-10-03 22:21:35 +08:00
Xiang Li
5b291b521b Merge pull request #1207 from coreos/check_stale_resp 
raft: do not decrease nextIndex and send entries for stale reply
 2014-10-03 13:45:58 +08:00
Xiang Li
70bf464cd6 raft: add comment to decrTo 2014-10-03 13:42:34 +08:00
Xiang Li
16ba77767e raft: do not decrease nextIndex and send entries for stale reply 2014-10-03 13:41:27 +08:00
Jonathan Boulle
1c11f6a144 *: expose etcd-index in watch requests 
This adds a StartIndex field to the Watcher interface, which represents
the Etcd-Index at which the Watcher is created.

Also refactors the HTTP tests to use a table for most handleWatch tests
 2014-10-02 18:10:11 -07:00
Yicheng Qin
8490904f20 Merge pull request #1224 from unihorn/149 
raft: msg.Denied -> msg.Reject
 2014-10-02 12:24:09 -07:00
Yicheng Qin
fff918c672 raft: msg.Denied -> msg.Reject 
Change the field name because it has msgDenied already.
 2014-10-02 12:22:12 -07:00
Yicheng Qin
4a5bf2e1b7 Merge pull request #1151 from unihorn/138 
raft: add removed
 2014-10-01 15:01:30 -07:00
Yicheng Qin
b64246720b etcdserver: fix test due to rebase 2014-10-01 14:57:39 -07:00
Yicheng Qin
182c8316e1 raft: refine comment for doc and removed list tests 2014-10-01 14:57:39 -07:00
Yicheng Qin
e4a6c9651a raft: add removed 
The usage of removed:
1. tell removed node about its removal explicitly using msgDenied
2. prevent removed node disrupt cluster progress by launching leader election

It is set when apply node removal, or receive msgDenied.
 2014-10-01 14:57:38 -07:00
Brandon Philips
b1fc0feb72 Merge pull request #1221 from philips/fixing-stuff 
pkg/types: introduce a URLs type
 2014-10-01 14:55:41 -07:00
Brandon Philips
83137f9eba pkg/types: introduce a URLs type 
Cleanup the usage of URLs into its own type so we don't have to use a
FlagValue everywhere we have a list of URLs.
 2014-10-01 14:41:01 -07:00
Brandon Philips
619c7f9fdb Merge pull request #1220 from bcwaldon/bkcompat 
Backwards-compatibility with v0.4.6 addr-related flags
 2014-10-01 12:53:50 -07:00
Yicheng Qin
f84b5b1071 Merge pull request #1201 from unihorn/143 
etcdserver: publish self info when start
 2014-10-01 11:56:20 -07:00
Yicheng Qin
b3c7711da8 Merge pull request #1219 from unihorn/148 
flags/urls: reject url without port
 2014-10-01 11:51:32 -07:00
Yicheng Qin
073eb7677d etcdserver: move grep member logic into publish func 2014-10-01 11:50:47 -07:00
Brian Waldon
dd88a08f8e etcd: support v0.4.6 addr flags 
The -addr, -bind-addr, -peer-addr, and peer-bind-addr flags are
superseded by -advertise-client-urls, -listen-client-urls,
-advertise-peer-urls, and -listen-peer-urls, respectively.
If any of the former flags are provided, however, they will still
work. If the new counterparts to the old flags are provided, etcd
will log an error and fail.
 2014-10-01 11:49:01 -07:00
Brian Waldon
11582b0f5f pkg: add URLsFromFlags 2014-10-01 11:49:01 -07:00
Brian Waldon
add3906f6c pkg/flags: add NewURLs helper 2014-10-01 11:49:01 -07:00
Brian Waldon
c9cac5fee5 flags: replace Addrs with IPAddressPort 2014-10-01 11:49:00 -07:00
Yicheng Qin
cbc84bc70e etcdserver: minimize input info 2014-10-01 11:47:17 -07:00
Yicheng Qin
a40a270e19 etcdserver: publish self info when start 2014-10-01 11:47:17 -07:00
Yicheng Qin
1356037fc6 flags/urls: reject url without port 
For now, if etcd receives a url without port, it will listen on a random
port, which is useless.
 2014-10-01 11:44:17 -07:00
Yicheng Qin
c0c0b08ff2 Merge pull request #1218 from unihorn/147 
flags/urls: assign urls instead of append
 2014-10-01 11:34:24 -07:00
Yicheng Qin
fd758c71b8 Merge pull request #1217 from unihorn/146 
main: not use loop variable in goroutine in loop body
 2014-10-01 11:25:53 -07:00
Yicheng Qin
8944364884 flags/urls: assign urls instead of append 2014-10-01 11:23:20 -07:00
Yicheng Qin
7a698be6a3 main: not use loop variable in goroutine in loop body 
Because loop variable are reused in following loops.
 2014-10-01 11:07:32 -07:00
Brandon Philips
6760345453 Merge pull request #1216 from philips/improve-cluster-procfile 
etcdserver: stop worrying about scheme
 2014-09-30 17:13:41 -07:00
Brandon Philips
04bd48fef3 etcdserver: stop worrying about scheme 
Stop worrying about the scheme. This puts a TODO on adding validation to
the schemes if TLS is specified. But we can worry about that later.
 2014-09-30 17:05:20 -07:00