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
1,742 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

16 Commits

Author SHA1 Message Date
Yicheng Qin
26c77fcf9e chore(config): reset retry interval 
Make retry interval random one to avoid join collision.
 2014-04-15 11:48:18 -07:00
Ben Johnson
62b89a128a Merge branch 'master' of https://github.com/coreos/etcd into proxy 
Conflicts:
	config/config.go
	server/peer_server.go
	server/transporter.go
	tests/server_utils.go
 2014-03-24 15:30:14 -07:00
Xiang Li
3ae792b159 refactor(listener) refactor listener related code 
Remove duplicate code around creating http listener.
Start to listen incoming http requests just before serving them.
 2014-03-13 15:47:27 -07:00
Ben Johnson
f5698d3566 Proxy promotion. 2014-02-24 17:01:04 -07:00
Yicheng Qin
46d817f91b Merge pull request #577 from unihorn/6 
chore: rename 'heartbeat timeout' to 'heartbeat interval'
 2014-02-18 17:11:31 -08:00
Yicheng Qin
f434177a9a chore: rename 'heartbeat timeout' to 'heartbeat interval' 
Heartbeat timeout means the period length that indicates heartbeat is
out of service, which is different from heartbeat interval.

So we should use '-peer-heartbeat-interval' instead of
'-peer-heartbeat-timeout' in etcd.

'-peer-heartbeat-timeout' is deprecated but still could be used.
 2014-02-18 16:37:20 -08:00
Yicheng Qin
3a4df1612c feat(discovery): adjust boot order to find peers 
The boot order for peers is -discovery, -peers, log data, forming
new cluster itself.

Special rules:
1. If discovery succeeds, it would find peers specified by discover URL
only.
2. Etcd would fail when meeting bad -discovery, no -peers and log data.

Add TestDiscoveryDownNoBackupPeersWithDataDir as the test.
 2014-02-17 12:53:39 -08:00
Brandon Philips
aa5c8b8ffd test(config): unexport ETCD_DISCOVERY 
if this is exported the next tests will try and use it and fail.
 2014-02-06 22:52:18 -08:00
Brandon Philips
468a68c96c feat(server): make the RetryInterval of PeerServer tunable 
For tests and other environments it would be nice to be able to tune how
long to sleep between retries.
 2014-02-06 22:10:09 -08:00
Brian Waldon
63fa35c99f refactor(tls): clarify & simplify tls configuration 2014-02-06 21:15:38 -08:00
Brandon Philips
1c91c167fc feat(config): remove the info file 
The info file was meant to help the user from accidently making a
mistake but often times it just confuses people:

https://github.com/coreos/etcd/issues/356
https://github.com/coreos/etcd/issues/531
https://github.com/coreos/etcd/issues/318

Lets remove the info file for this next release.
 2014-02-05 16:20:50 -08:00
Brandon Philips
a8b07b1b48 chore(config): go fmt 2014-02-05 09:27:39 -08:00
Brandon Philips
8687dd3802 feat(discovery): fully working discovery now 2014-02-05 09:27:39 -08:00
Brandon Philips
72514f8ab2 feat(bootstrap): initial working code 
This is an initial version of the bootstrap code that seems to work
under the normal circumstances. I need to mock out a server that will
test out all of the error cases now.
 2014-02-05 09:27:39 -08:00
Brandon Philips
40a8542c22 feat(bootstrap): wire up the flag 
This wires up `-bootstrap-url` to some code (which crashes) :)
 2014-02-05 09:27:39 -08:00
Brandon Philips
f56965b1c0 refactor(config): make config its own package 
Refactor config into its own package. Trying to tease the config from
the server so that all of the control surfaces are exposed in the Server
for easier testing.
 2014-02-05 09:27:39 -08:00