Commit Graph

1613 Commits (022908f1fa955f3c4eb6ab36edcc4dbff5248c7d)

Author SHA1 Message Date
Xiang Li 12c334a141 Merge pull request #613 from unihorn/29
docs(CONTRIBUTING): add code style section
2014-03-06 16:53:55 -05:00
Yicheng Qin e80a35edbe docs(CONTRIBUTING): add code style section 2014-03-06 13:38:20 -08:00
Ben Johnson c3247755ea Merge branch 'proxy' of https://github.com/benbjohnson/etcd into proxy 2014-03-06 13:39:05 -07:00
Ben Johnson 3cd83c61c4 Fix PUT /config response and log errors. 2014-03-06 13:35:46 -07:00
Ben Johnson 2a7fdfe189 Merge pull request #4 from philips/benbjohnson-proxy
feat(scripts/test-cluster): create three proxy nodes
2014-03-06 10:13:13 -08:00
Brandon Philips ac872b3855 Merge pull request #607 from Asmod4n/patch-1
Added Error 107 to Documentation
2014-03-05 09:18:44 -08:00
Brandon Philips b1916b30fb Merge pull request #612 from congpeijun/master
Add PHP library.
2014-03-05 09:17:23 -08:00
Cong Peijun 3a1d9e683b Add PHP library.
We implement the api client useing php.
2014-03-05 20:01:42 +08:00
Asmod4n 148ac97742 docs(errorcode.md): add the EcodeRootROnly error 2014-03-05 09:18:10 +01:00
Brandon Philips ddce52c44e feat(scripts/test-cluster): create three proxy nodes
This uses some sleep hackery to make sure that window 1 has followers
and window 2 has proxy machines. Seems to work!
2014-03-04 18:58:39 -08:00
Ben Johnson fe4dee03ab Minor fixes. 2014-03-04 09:29:44 -07:00
Ben Johnson c3b4afc139 Fix JoinCommand comment. 2014-03-04 08:56:10 -07:00
Ben Johnson 063f3b574c Check for peer before demotion. 2014-03-04 08:53:13 -07:00
Brandon Philips 49253d8fdf Merge pull request #604 from ccding/master
fix trivial issues as I see them
2014-03-03 16:21:04 -08:00
Cong Ding dbed0f7d6a fix(Documentation/*): fix various typos 2014-03-03 16:12:15 -08:00
Ben Johnson c8d6b26dfd Add auto-demotion after peer inactivity. 2014-03-03 11:15:05 -07:00
Yicheng Qin f3cc456385 Merge pull request #598 from unihorn/19
fix bugs that are found in issue #579
2014-03-01 00:30:58 -08:00
Yicheng Qin 349a802a82 chore(server): remove useless CancelWhenTimeout
Setting request timeout is covered by go-httpclient now.
2014-02-28 21:52:56 -08:00
Yicheng Qin 69adb78433 fix(transporter): CancelRequest doesn't work on HTTPS connections blocked
Currently this is a workaround. And it should be fixed in Go1.3.
2014-02-27 14:31:46 -08:00
Yicheng Qin e99bc99dcc fix(tests/multi_node_kill_all_and_recovery): wait for cluter to build over 2014-02-27 14:31:46 -08:00
Yicheng Qin df49265674 fix(discovery): remove its own address from peer list to join 2014-02-27 14:31:28 -08:00
Brandon Philips e5797a54a1 fix(README): remove the drone.io badge
the drone.io badge is either cached wrong by github or links to a wrong version when we build a branch, just remove it.
2014-02-27 12:48:07 -08:00
Ben Johnson a60481c6b1 Merge pull request #593 from benbjohnson/lock-fix
fix(mod/lock): correct watch index to remove cpu load
2014-02-26 17:34:22 -07:00
Ben Johnson dde2b71850 fix(mod/lock): correct watch index to remove cpu load
The waitIndex was being pulled from the wrong node in the lock parent which caused the watch to be returned immediately. This caused a continuous set of calls while a client was waiting for a lock.
2014-02-26 17:26:25 -07:00
Ben Johnson fddbf35df2 Add automatic node promotion / demotion. 2014-02-25 10:02:01 -07:00
Brandon Philips 23ffafefc0 Merge pull request #596 from philips/add-file-upload-docs
feat(Documentation/api): document file upload
2014-02-24 18:49:11 -08:00
Ben Johnson f5698d3566 Proxy promotion. 2014-02-24 17:01:04 -07:00
Brandon Philips 02a053a4b8 feat(Documentation/api): document file upload
This gets asked about a lot int IRC/mailinglist/etc. Fixes this issue:
https://github.com/coreos/etcd/issues/383#issuecomment-31183603
2014-02-23 10:17:05 -08:00
Brandon Philips 4c17dc3431 Merge pull request #592 from Plasma/patch-1
Trivial formatting correction
2014-02-22 18:49:57 -08:00
Andrew Armstrong e6e6f7d8d0 Trivial formatting correction 2014-02-23 12:48:35 +11:00
Ben Johnson 1d961b8e56 Add proxy mode. 2014-02-22 15:02:20 -07:00
Brandon Philips f922a08a27 Merge pull request #586 from wereHamster/patch-1
docs: Add links to haskell bindings and scrz project
2014-02-21 10:03:35 -08:00
Brandon Philips 7289224af9 Merge pull request #585 from philips/document-consistent
feat(Documentation): add a section on consistent reads
2014-02-21 09:40:47 -08:00
Brandon Philips 035bbc6913 feat(Documentation): add a section on consistent reads
We have waited too long to document `consistent=true`. Document it!
2014-02-21 09:39:54 -08:00
Tomas Carnecky ae8d416c57 Add links to haskell bindings and scrz project 2014-02-21 02:59:38 +00: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
Brandon Philips 8485987b74 Merge pull request #524 from yifan-gu/remove_omitempty_on_value
remove omitempty on value
2014-02-18 07:08:00 -08:00
evan-gu 9cfd8c5f0b fix(store): make NodeExtern.Value a *string
Before this change if the value of a Node was "" it would get dropped from the json
encoding and the Node.Value field would be missing. Fix this problem by making
NodeExtern.Value a *string so that an empty string will be encoded but a nil value
will drop the field.
2014-02-18 00:50:44 -05:00
Yicheng Qin 04f21b5976 Merge pull request #569 from unihorn/5
Ordering and functionality of `-discovery` `-peers` and data dir to find peers
2014-02-17 14:34:53 -08:00
Yicheng Qin cf38910601 docs: boot order to find peers 2014-02-17 14:17:14 -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
Yicheng Qin bd56b15b6e fix(tests/discovery): use host as -peers parameter instead of url
Or it cannot test the functionality correctly.
Moreover, add TestDiscoveryNoWithBackupPeers as the test for it.
2014-02-14 18:23:41 -08:00
Brandon Philips a72f913a60 fix(tests/functional): some squashing mistakes in PR merge
accidental squash mistake in the last PR that was merged caused a
function to be renamed but not it's caller.
2014-02-14 18:17:30 -08:00
Brandon Philips 7599a285c3 Merge pull request #574 from unihorn/6
Fix the bug that TestSimpleMultiNodeTls may error sometimes
2014-02-14 18:08:01 -08:00
Yicheng Qin efdc741e5c feat(tests/util): wait until server is up when creating cluster
Wait until server is up instead of for some time
2014-02-14 18:06:43 -08:00
Xiang Li 93a02b619e Merge pull request #573 from cenkalti/stream-bug
Store: Fix slow consumer bug
2014-02-14 20:46:37 -05:00
Yicheng Qin e69118ade7 chore(tests/multi_node_kill_one): check function-call result
To stop test in time if error occurs
2014-02-14 17:36:11 -08:00
Cenk Alti 8bed1e1f15 fix(store/watch): fix the slow consumer bug 2014-02-14 16:52:40 -08:00
Cenk Alti e73e61f238 test(store/watch): add test case for slow event consumers 2014-02-14 16:12:53 -08:00