Yicheng Qin
6caae58814
docs/security: recommend cfssl instead of etcd-ca
...
This provides a more general and stable way for users to set TLS cluster.
2015-09-01 14:07:26 -07:00
Xiang Li
a94118893c
Merge pull request #3413 from xiang90/snapshot_dir
...
*: support wal dir
2015-09-01 10:03:50 -07:00
Xiang Li
d94e712d91
*: support wal dir
2015-09-01 09:54:27 -07:00
Xiang Li
406bb6749e
doc: add 0.4.9 to 2.2 migration guide
2015-08-31 09:55:12 -07:00
Yicheng Qin
b40e077047
Merge pull request #3388 from sckott/docfix-tuning
...
fix docs, change tuning link in api.md from section to file
2015-08-28 09:23:58 -07:00
Yicheng Qin
753a079700
docs/benchmark: add benchmark result links in README
2015-08-27 17:08:49 -07:00
Yicheng Qin
425afa66ea
docs/benchmarks: update bench version for more accuracy
2015-08-27 17:08:30 -07:00
Yicheng Qin
605f0ce730
docs/benchmark: update etcd 2.2 bench
...
This benchmark is for etcd 2.2 rc after fixing several performance
downgrade bugs.
2015-08-27 16:52:55 -07:00
Scott Chamberlain
b0192118dd
doc: change tuning link in api.md from section to file
2015-08-27 15:04:07 -07:00
Raoof Mohammed
bc2b8856d7
doc: correct calculation of fault tolerance of an etcd cluster in admin_guide.md
...
doc: correct calculation of fault tolerance of an etcd cluster in admin_guide.md
2015-08-27 14:30:12 -07:00
Xiang Li
25c87f13fd
Merge pull request #3354 from mx2323/faq
...
add faq documentation
2015-08-26 16:36:04 -07:00
Michael Xu
8f3ea5ebed
doc: add faq documentation
2015-08-26 16:34:52 -07:00
Xiang Li
35a0459cc8
doc: add evn variable name to configuration.md
2015-08-25 14:35:15 -07:00
Xiang Li
c30c85898e
doc: add explanation for client urls
2015-08-25 13:46:27 -07:00
Xiang Li
f56c5455f3
doc: mention reconfiguration design in clustering.md
2015-08-25 11:22:08 -07:00
Yicheng Qin
0132b091d2
Merge pull request #3360 from yichengq/bench-3
...
*: add initial read benchmark for etcd v3
2015-08-25 07:58:30 -07:00
Yicheng Qin
3632a1b9b1
*: add initial read benchmark for etcd v3
...
It includes the initial read benchmark for etcd v3.
This is the first step to give some rough thoughts. I haven't digged
deeper to answer some questions, including why its performance is not
better than HTTP + json, why one put will cause performance downgrade.
2015-08-25 07:50:18 -07:00
Xiang Li
0cb45aee64
rfc: update v3 proto
2015-08-24 11:00:51 -07:00
Yicheng Qin
e1dfcec0ab
Merge pull request #3327 from yichengq/bench-2.2
...
docs/benchmarks: add benchmark result for 2.2
2015-08-20 00:18:32 -07:00
Yicheng Qin
807de81172
docs/benchmarks: add benchmark result for 2.2
...
And it analyzes the reason for performance changes.
2015-08-19 23:59:33 -07:00
Xiang Li
60387dc408
Merge pull request #3320 from yichengq/doc-rtt
...
docs: document how to set heartbeat interval and election timeout
2015-08-19 11:08:05 -07:00
Yicheng Qin
7082d3a765
docs: document how to set heartbeat interval and election timeout
...
It gives more details about how to set heartbeat interval and election
timeout correctly based on RTT.
2015-08-18 13:54:44 -07:00
Yicheng Qin
927d5f3d26
Merge pull request #3301 from yichengq/ca-file
...
etcdmain: update -ca-file description
2015-08-17 23:36:33 -07:00
Yicheng Qin
c0747a7b8b
etcdmain: update -ca-file description
...
so people could deprecate old flags and use new flags much easier.
2015-08-17 22:36:04 -07:00
Sebastian Schrader
f70950ff93
docs: warn about proxy loops with incorrect advertise-client-urls
2015-08-18 00:42:48 +02:00
Ian Kelling
8dd44465c3
documentation: fix misspelled word
2015-08-15 17:56:17 -07:00
Xiang Li
959feb70d1
Merge pull request #3275 from xiang90/sort
...
improve in order key generation
2015-08-13 13:51:19 -07:00
Xiang Li
a7b9bff939
store: add 0 as padding for better lexicographic sorting.
2015-08-13 13:42:37 -07:00
Yicheng Qin
a45f0ede56
docs: add discovery protocol doc
...
This document talks about the technical details of discovery service
protocol. It helps users to learn about how discovery service works and
what behavior to expect.
2015-08-12 13:15:21 -07:00
Xiang Li
a718329ad3
Merge pull request #3248 from xiang90/v3
...
initial v3 demo
2015-08-10 13:59:03 -07:00
Xiang Li
b0ea4ab3b1
doc: link to v3 api doc
2015-08-10 11:22:55 -07:00
Xiang Li
c1e0b19f9f
*: better flag
2015-08-10 09:53:17 -07:00
Xiang Li
601801ced5
doc: add runtime reconfiguration design doc
2015-08-09 10:55:34 -07:00
Xiang Li
845c51fedd
*: fix typos vaild->valid
2015-08-07 10:57:11 -07:00
Yicheng Qin
b965c4b415
Merge pull request #3217 from yichengq/update-migrate-example
...
update commands used in admin_guide.md
2015-08-06 15:00:04 -07:00
Xiang Li
e9f05e8959
doc: explain srv error
2015-08-06 14:24:58 -07:00
Yicheng Qin
807a6f209e
docs/admin_guide: decouple example from CoreOS specific details
...
This makes the example commands general, while keeping it easy to
understand. It also fixes some name mismatch.
2015-08-05 11:33:46 -07:00
Yicheng Qin
0650170a1b
Merge pull request #3196 from eyakubovich/fix-watch-timeout
...
client: handle watch timing out elegantly
2015-08-04 13:52:42 -07:00
Eugene Yakubovich
6312e22b1d
client: handle empty watch responses elegantly
...
Even though current etcd does not time out
watches, the client could be running against
an old etcd version or the server may close
polling connection for other reasons.
This patch ignores successful (as in 200)
responses with emtpy bodies instead
of producing JSON errors.
2015-08-03 11:47:21 -07:00
Xiang Li
2b8abeb093
*: remove migration related stuff from 2.2
2015-08-01 19:37:20 +08:00
Xiang Li
beeecc32b0
doc: unique names must be specified when using public discovery service
2015-07-31 09:12:44 +08:00
Yicheng Qin
6b8b507312
Merge pull request #3176 from yichengq/reject-high-election
...
etcdmain: reject unreasonably high values of -election-timeout
2015-07-28 10:33:58 -07:00
Yicheng Qin
ec214030d0
etcdmain: reject unreasonably high values of -election-timeout
...
This helps users to detect setting problem early.
2015-07-28 10:07:57 -07:00
Yicheng Qin
7831a30e46
Merge pull request #3180 from shafreeck/master
...
Update libraries-and-tools.md
2015-07-27 14:45:31 -07:00
Xiang Li
53a77fa519
*: tnx -> txn
2015-07-24 23:21:09 +08:00
Shafreeck Sea
e75446ca27
docs: add cetcd into libraries-and-tools.md
2015-07-24 12:08:39 +00:00
Xiang Li
1b5e41e3f4
doc: add reporting bug doc
2015-07-23 12:55:38 +08:00
Yicheng Qin
ca540b23dc
Merge pull request #3158 from yichengq/exp-auth
...
docs: add experimental notice on auth doc
2015-07-21 10:24:11 -07:00
Yicheng Qin
097ec0f25b
docs: add experimental notice on auth doc
...
Reasons for the notice:
1. No users have reported about their feedback about auth feature so
far.
2. We haven't used it internally.
3. This is the first release that includes auth feature, so it is good
to be more cautious.
2015-07-21 10:23:23 -07:00
Ryan Doyle
d373645b8c
docs: glibc NSS module for resolving names in etcd
2015-07-21 10:33:23 +10:00
Yicheng Qin
d86e94b824
Merge pull request #3128 from yichengq/doc-watch-api
...
docs: update watch API doc for clarity
2015-07-20 14:54:26 -07:00
Yicheng Qin
d52cb2e5d9
docs: add watch command and correct the example
2015-07-20 14:49:01 -07:00
Barak Michener
f8baa4ebe0
Merge pull request #3138 from barakmich/auth_doc
...
documentation: Add authentication walkthrough with etcdctl. Fixes #2949
2015-07-16 16:41:15 -04:00
Barak Michener
452a327334
documentation: Add authentication walkthrough with etcdctl. Fixes #2949
2015-07-15 15:54:26 -04:00
Yicheng Qin
d0e976ad4b
docs: fix wrong proxy command
2015-07-15 08:37:10 -07:00
Michael Schurter
f52db1c08e
docs: add back original example w/index=prevIndex
2015-07-13 23:04:39 -07:00
Michael Schurter
b94f6595e6
docs: rewrite existing docs instead of adding a new section
...
@xiang90 pointed out my earlier commit duplicated a lot of things that
were mentioned earlier in the doc.
This time around I tried just making some gotchas more explicit in the
existing docs instead of just tacking new stuff onto the end.
2015-07-13 23:03:59 -07:00
Yicheng Qin
8b7c600009
docs: update tuning.md to match today's situation
...
1. etcd requires that election-timeout >= 5 * heartbeat-interval
2. etcd doesn't have flag -snapshot
2015-07-13 16:35:30 -07:00
Xiang Li
11452585bb
doc: add rolling upgrade doc for 2.1
2015-07-07 13:20:41 -07:00
Michal Witkowski
7bca757d09
*: add metrics to `store` and `proxy`.
2015-07-07 16:01:51 +01:00
Brandon Philips
83fe8187f4
Documentation/security: add FAQ about peer TLS and etcd 2.0.x
...
etcd 2.0.x TLS can appear not to work on smaller machines with less
horse-power or lots of other work going on. Document the timeout
workaround.
2015-07-04 15:28:47 -07:00
Xiang Li
cbe00e4415
Merge pull request #2967 from webner/feature/proxy-config
...
proxy: added endpoint refresh and timeout configuration values
2015-07-03 11:51:15 -07:00
Yicheng Qin
606876154d
rafthttp: message_sent_latency metrics: channel -> sendingType
...
Better naming.
2015-06-29 10:44:40 -07:00
Yicheng Qin
bb287fa22e
Merge pull request #3051 from yichengq/doc-rafthttp-metrics
...
docs: doc metrics used in rafthttp package
2015-06-29 10:22:50 -07:00
Yicheng Qin
fcdd9779e9
docs: explain label in rafthttp metrics
2015-06-26 15:51:39 -07:00
Yicheng Qin
9c695dce25
docs: fix typos in auth_api.md
2015-06-25 17:37:16 -07:00
Yicheng Qin
4c8408f92f
docs: doc metrics used in rafthttp package
2015-06-25 10:38:36 -07:00
Xiang Li
2ace10626d
Merge pull request #3050 from yichengq/doc-bench-tool
...
docs/benchmarks: doc benchmark tool
2015-06-25 08:15:02 -07:00
Chance Zibolski
ca2ea1bc7d
Merge pull request #3048 from ecnahc515/documentation_improvements
...
Documentation: Refer back between name and initial-cluster options
2015-06-24 15:22:46 -07:00
Yicheng Qin
0949cc06e6
docs/benchmarks: doc benchmark tool
2015-06-24 15:11:08 -07:00
Chance Zibolski
ea2c203aee
Documentation: Refer back between name and initial-cluster options
2015-06-24 14:10:42 -07:00
Xiang Li
403fad14ae
auth: update the auth doc
2015-06-23 20:02:48 -07:00
Xiang Li
aaf802f321
doc: update auth_api.md
2015-06-23 11:08:04 -07:00
Brandon Philips
740187f199
*: docs and code %s%maximal%maximum%g
...
maximum is a more common word, use it instead
2015-06-22 16:06:57 -07:00
Xiang Li
b1dbab2b6b
auth: minor fix for user section
2015-06-19 14:30:04 -07:00
Xiang Li
4f0f57b322
doc: move enable section to the top in auth_api.md
2015-06-19 14:08:29 -07:00
Xiang Li
2efbc76689
Merge pull request #2993 from xiang90/md
...
doc: add doc for metrics feature
2015-06-16 14:22:16 -07:00
Xiang Li
c599e81d46
doc: add proposal into glossary.md
2015-06-16 14:19:18 -07:00
Xiang Li
5c1d4544fc
doc: add doc for metrics feature
2015-06-16 14:18:22 -07:00
Wolfgang Ebner
aeeae25d87
proxy: documentation for disabling the proxy timeout
2015-06-16 12:18:16 +02:00
Barak Michener
64ec8af91b
*: Rename `security` to `auth`
2015-06-15 18:18:50 -04:00
nikfoundas
dadbc03171
docs: add etcd-viewer into libraries-and-tools.md
...
I've been working on this project for a few weeks and I believe it has some features that could assist maintaining etcd registries. Please check it out and I hope you would like to include it in your list of etcd tools.
Kind regards,
Nikos
2015-06-14 02:25:42 +03:00
Wolfgang Ebner
1264dbe24d
proxy: added endpoint refresh and timeout configuration values
...
the default dial timeout was set to 30 seconds this made the proxy a pain to use
in failure scenarios.
fixes 2862
2015-06-13 09:42:18 +02:00
Xiang Li
3390f38bba
Merge pull request #2925 from yichengq/doc-gomaxprocs
...
docs: document cpu cores deployment
2015-06-08 13:49:28 -07:00
Yicheng Qin
471cf82905
docs: document maximal OS threads
2015-06-08 12:00:33 -07:00
Jonathan Boulle
048a948eca
docs: readme/branch-management cleanup
2015-06-04 16:41:32 -07:00
Xiang Li
de1c9c08e1
Merge pull request #2842 from SpencerBrown/SpencerBrown-patch-2
...
docs: add client flags to examples in clustering.md
2015-05-27 14:28:38 -07:00
Xiang Li
1be69b1391
Merge pull request #2864 from schmichael/mention-metafora
...
docs: mention metafora distributed task library
2015-05-22 13:24:20 -07:00
Michael Schurter
e93242967c
docs: mention metafora distributed task library
...
Metafora uses etcd as a task broker, command channel, and state store.
2015-05-22 13:17:05 -07:00
Spencer Brown
0e49a0a3ef
docs: add client flags to examples in clustering.md
...
to make it a complete functional example
2015-05-22 14:18:14 -05:00
Barak Michener
a88a53274f
security: Lazily create the security directories. Fixes #2755 , may find new instances for #2741
...
revert the kv integration test
fix nits
amend security mention of GUEST
2015-05-18 17:28:04 -04:00
Xiang Li
6ee5cd9105
Merge pull request #2675 from xiang90/v3rfc
...
doc: v3api rfc
2015-05-18 13:52:54 -07:00
Xiang Li
7c879ee576
doc: v3api rfc
2015-05-18 13:48:16 -07:00
Marcus Stong
b3e6ad136a
docs: add node-etcd-config to libs and tools doc
2015-05-16 02:02:44 -07:00
Alex Chan
0c63e16ae0
docs: small fixes to spelling and similar
...
This commit is a collection of fixes to spelling, capitalisation
and spacing. No substantial changes.
2015-05-13 11:45:00 +01:00
Scott Chamberlain
5203de5566
Documentation: add the R client etseed to libraries-and-tools.md
...
etseed is an R client for etcd.
2015-05-11 15:43:31 -07:00
Yicheng Qin
1abf2636b5
docs: proxy needs accessible advertise client urls
...
Users cannot use proxy if -advertise-client-urls is set correctly.
Especially mention this in the doc to help them bypass the wrong
settings.
2015-05-07 22:53:42 -07:00
Yicheng Qin
6c77e7a737
Merge pull request #2768 from coreos/docs-formatting
...
docs: fix code block formatting
2015-04-28 14:02:30 -07:00
Barak Michener
ad8e3ea5dc
etcdmain: fix logging flag documentation
2015-04-28 16:31:19 -04:00
Rob Szumski
bfd4a29f67
docs: fix code block formatting
2015-04-28 11:17:13 -07:00
Giuseppe Lavagetto
968f3d9711
docs: clarify the disaster recovery guide
...
A bit was missing from the documentation on disaster recovery, the reset
of the advertised peer urls for the node recovered from backup. Without
that, any subsequent server joining the cluster would not be able to
speak to the first node.
2015-04-25 18:54:29 +02:00
Barak Michener
fa74e702d8
security: Improve the security api as per the suggestions list in #2384
...
Subcommits:
decouple root and security enable/disable
create root role
prefix matching
godep: bump go-etcd to include credentials
add godep for speakeasy and auth entry parsing
appropriate errors for security enable/disable
WIP adding to etcd/client all the security client methods
add guest access
minor ui return tweaks
revert client changes
respond to comments, log more security operations
fix major ensure() bug, add better UX
block recursive access
fix some boneheaded mistakes
fix integration test
last comments
fix up security_api.md
philips nits
fix docs
2015-04-23 16:11:38 -04:00
Rob Szumski
c9878f4765
docs: add absolute link to readme
2015-04-22 13:59:08 -07:00
Rob Szumski
bd54f46d1b
docs: remove absolute links to other docs
2015-04-22 11:47:52 -07:00
Rob Szumski
df32fe63c8
docs: size up all headers by 2
2015-04-16 09:55:46 -07:00
Brandon Philips
a223fd532b
Documentation: add migration notes to backward compatibility
...
Add thorough notes on both the data directory migration and the snapshot
migration options.
2015-04-15 20:42:12 -07:00
Yicheng Qin
852213879b
Merge pull request #2633 from yichengq/deprecate
...
etcdmain: deprecate --ca-file and --peer-ca-file
2015-04-09 10:22:30 -07:00
Yicheng Qin
2f7b9a2232
etcdmain: deprecate --ca-file and --peer-ca-file
...
1. Print out DEPRECATE warning when running and configuration doc.
2. Use new flags for security example.
2015-04-09 10:14:32 -07:00
Xiang Li
1b4bcedf99
Merge pull request #2637 from bakins/proxy-randomize-endpoints
...
proxy: shuffle endpoints
2015-04-07 14:12:50 -07:00
Brian Akins
1fa511b995
Clarify that it is the proxy doing the shuffle.
2015-04-07 17:05:17 -04:00
Brian Akins
e1622cd22c
proxy: shuffle endpoints
...
Shuffle endpoitns to avoid being "stuck" to a single cluster member.
2015-04-07 15:40:29 -04:00
Yicheng Qin
552acd8c37
docs: fix broken link for migration tool
2015-04-06 22:55:37 -07:00
Kelsey Hightower
3db33d19e9
Documentation: update docker docs to use new image and mount certs
2015-04-02 13:22:27 -07:00
Xiang Li
a9157ce6d3
build: do not build internal debugging tool
...
We are still playing around with the dump-log tool.
Stop building it publicly until we are happy with its
ux and functionality.
2015-03-31 11:45:12 -07:00
Xiang Li
80d08ca280
Merge pull request #2521 from xiang90/sec_remove_lastmodified
...
doc/rfc: remove unimplemented stuff
2015-03-30 13:42:31 -07:00
Xiang Li
45032480f1
*: remove upgrading related stuff
2015-03-27 15:28:00 -07:00
Mateus Braga
7f833ced2b
docs: add clarity about the 1000 events history
...
When talking about missing events on a particular key, the 1000 event history
limit can be understood as being per key, instead of etcd-wide events. Make it
clear that it is across all etcd keys.
2015-03-27 13:02:48 -04:00
Kelsey Hightower
2a980ee336
Merge pull request #2503 from yichengq/339
...
docs/security: fix peer TLS communication example
2015-03-19 17:16:09 -07:00
Brandon Philips
408cfc4f28
Documentation: fixup grammar around the unsafe flags
2015-03-18 16:39:45 -07:00
Xiang Li
263e55e2ff
doc/rfc: remove unimplemented stuff
2015-03-16 22:22:34 -07:00
Barak Michener
001efa0639
security: Implement RBAC security for etcd
...
stub out security
further wip
Last stub before CRUD for roles
Complete role merging
start tests
add Godep for golang.org/x/crypto/bcrypt
first round of comments
add tests, remove root addition (will be added back as part of creation)
Add security checks for /v2/machines and /v2/keys
Allow non-root to determine if security is enabled, get machine list.
Responding to comments, remove multiple verbs (like /v2/security/user/foo/password)
add some prefixes to the logging
2015-03-16 16:23:11 -04:00
Yicheng Qin
45d790c345
docs: add branch management
2015-03-13 15:33:59 -07:00
Yicheng Qin
b53bfd2b40
docs/security: fix peer TLS communication example
2015-03-12 22:40:39 -07:00
Kelsey Hightower
4a38788b2f
Documentation: add initial benchmarks
2015-03-06 09:32:24 -08:00
Brandon Philips
dcd125e7a6
Merge pull request #2382 from philips/add-faq
...
Documentation: add implementation faq
2015-03-01 20:24:50 -08:00
Mikael Kjaer
22c8d781ef
Documentation: fix "Missing infra1="
...
Documentation: fix "Missing infra1="
2015-03-01 09:44:25 +04:00
ravigadde
8fb6eb6c70
Update libraries-and-tools.md
...
Added a distributed r/w lock in addition to the master election implementation.
2015-02-28 10:09:07 -08:00
Brandon Philips
53fda9d558
Documentation: add implementation faq
...
Add some notes on the design discussion around the `--initial` flags. If
anything is wrong let me know.
2015-02-26 09:52:45 -08:00
Jonathan Yu
31bfffaa48
Documentation: standardize on url over URL
...
url and URL both appear in this doc. Choose url due to higher frequency
2015-02-24 16:26:27 -05:00
Jonathan Yu
1fbaf9dbb7
Documentation: fix discovery flag for proxy docs
...
It seems that the -discovery flag used to be -discovery-url. Updated this to use
the currently documented and supported -discovery flag.
2015-02-24 16:25:18 -05:00
Jonathan Yu
28e150e50e
Documentation: fix sample command flags for proxy
...
The docs mention the listen-client-urls flag, but the examples use
client-listen-urls, which is an invalid flag.
2015-02-23 11:15:42 -05:00
Barak Michener
40365c4f8d
docs: add Security RFC
...
docs: Add v2 ACL RFC
Add workflow, fix terminology, make the API JSON, and general cleanup
fixes from xiang90s comments
add permissions struct
update regarding glob matches
rename file
2015-02-18 14:34:00 -05:00
Kelsey Hightower
217a1f0730
doc: add etcd docker guide
...
Fixes #2253
2015-02-16 11:44:41 -08:00
zhangbaitong
518eb9fa2f
docs:small fix
...
Signed-off-by: zhangbaitong <zhangbaitong@163.com>
2015-02-16 17:54:24 +08:00
Matis Hsiao
fd90ec6c26
add etcd-console tool to tools list
...
i add etcd-console tool to tools list for reference
2015-02-11 10:43:21 +08:00
Rob Szumski
24b953a55d
docs: add diagram and restructure for clarity
2015-02-10 17:34:23 -08:00
Yicheng Qin
54bef0d2cd
Merge pull request #2233 from yichengq/315
...
docs: add allow_legacy_mode.md
2015-02-10 15:46:52 -08:00
Yicheng Qin
d0677a24dd
docs: add allow_legacy_mode.md
2015-02-10 15:46:26 -08:00
gabesullice
df2a689d1c
documentation: fix typo in Documentation/clustering.md
...
just an extra space needed to be removed.
Fixes #2279
2015-02-10 16:18:51 -07:00
Xiang Li
8d663078bf
Documentation: document kv api change
2015-02-09 15:35:15 -08:00
Yicheng Qin
c990099008
docs: fix stats response in api.md
2015-02-09 11:48:54 -08:00
Peter Rosell
c8b5d47f24
Documentation: Correct defaults for heartbeat and election
...
Defaults for hearbeat-interval and election-timeout is updated according to configuration documentation.
2015-02-06 10:13:57 +01:00
Brandon Philips
860a8c8717
Documentation: grammar fixup in admin guide
...
Rephrase to avoid "becomes".
2015-02-04 21:28:43 -08:00
Rob Szumski
b6936a0079
docs: fix broken link
2015-01-30 15:37:26 -08:00
Rob Szumski
87a8ebd222
docs: expand description of -initial-cluster-state
2015-01-30 14:14:51 -08:00
Rob Szumski
27e5b9a394
docs: clarify reconfig options
2015-01-30 14:14:28 -08:00
Omer Katz
f5afe3cc34
Fixed typo in API documentation.
2015-01-30 14:14:18 -08:00
Rob Szumski
0945e487e7
docs: fix static clustering example
...
When using very similar flags to our examples, the cluster doesn't bootstrap due to mismatched protocols (`http` vs `https`) in the `-initial-advertise-peer-urls` and `initial-cluster` list:
```
./etcd -name infra0 -initial-advertise-peer-urls https://127.0.0.1:2380 \
> -listen-peer-urls https://127.0.0.1:2380 \
> -initial-cluster-token etcd-cluster-1 \
> -initial-cluster infra0=http://127.0.0.1:2380,infra1=http://127.0.0.1:2381,infra2=http://127.0.0.1:2382 \
> -initial-cluster-state new
2015/01/29 10:32:16 no data-dir provided, using default data-dir ./infra0.etcd
2015/01/29 10:32:16 etcd: listening for peers on https://127.0.0.1:2380
2015/01/29 10:32:16 etcd: listening for client requests on http://localhost:2379
2015/01/29 10:32:16 etcd: listening for client requests on http://localhost:4001
2015/01/29 10:32:16 etcd: stopping listening for client requests on http://localhost:4001
2015/01/29 10:32:16 etcd: stopping listening for client requests on http://localhost:2379
2015/01/29 10:32:16 etcd: stopping listening for peers on https://127.0.0.1:2380
2015/01/29 10:32:16 etcd: infra0 has different advertised URLs in the cluster and advertised peer URLs list
```
2015-01-29 13:44:13 -08:00
Yicheng Qin
0f2582e0be
Merge pull request #2042 from yichengq/279
...
docs: improve doc for server timeout
2015-01-27 14:12:42 -08:00
Yicheng Qin
a03c906e9d
docs: improve doc for server timeout
2015-01-27 14:12:27 -08:00