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

6632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Romano
187064187c tools/benchmark: report standard deviation 2016-01-07 15:30:23 -08:00
Xiang Li
6f39608624 Merge pull request #4160 from xiang90/fix_lease 
lease: unlock before another batch operation
 2016-01-07 11:20:31 -08:00
Anthony Romano
8774d53459 Merge pull request #4158 from heyitsanthony/nolease-to-leasepkg 
lease: move storage.NoLease to lease package
 2016-01-07 10:43:51 -08:00
Xiang Li
f22ea70c14 lease: unlock before another batch operation 2016-01-07 10:41:16 -08:00
Xiang Li
9e0378998b Merge pull request #4153 from xiang90/fix_listener 
etcdmain: tls listener MUST be at the outer layer of all listeners
 2016-01-07 10:36:24 -08:00
Anthony Romano
f9af744be3 lease: move storage.NoLease to lease package 2016-01-07 10:33:44 -08:00
Xiang Li
1f97f2dc36 etcdmain: tls listener MUST be at the outer layer of all listeners 
go HTTP library uses type assertion to determine if a connection
is a TLS connection. If we wrapper TLS Listener with any customized
Listener that can create customized Conn, HTTPs will be broken.

This commit fixes the issue.
 2016-01-07 10:26:49 -08:00
Xiang Li
db60cdc42c Merge pull request #4154 from xiang90/snapshot_from_backend 
*: get snapshot from backend
 2016-01-06 23:10:23 -08:00
Xiang Li
43a777b7a2 *: get snapshot from backend 
We should get snapshot from backend, not just KV.
We plan to store the lease data into backend too.
 2016-01-06 22:40:23 -08:00
Xiang Li
b42a0e4283 Merge pull request #4151 from xiang90/s 
storage: support recovering from backend
 2016-01-06 22:17:18 -08:00
Xiang Li
1714290f4e storage: support recovering from backend 
We want the KV to support recovering from backend to avoid
additional pointer swap. Or we have to do coordination between
etcdserver and API layer, since API layer might have access to
kv pointer and use a closed kv.
 2016-01-06 21:16:55 -08:00
Xiang Li
b546f4c2c2 Merge pull request #4152 from xiang90/fix_force 
backend: create bucket should increase pending
 2016-01-06 20:47:32 -08:00
Xiang Li
5dd8af444a backend: create bucket should increase pending 2016-01-06 20:25:50 -08:00
Gyu-Ho Lee
f91d96c9a4 Merge pull request #4150 from gyuho/fix_arg_update_dir 
etcdctl: get only the first argument for updatedir
 2016-01-06 16:44:05 -08:00
Gyu-Ho Lee
dd02ec6554 etcdctl: ignore value in updatedir command 
Fixes coreos#4145.
client.KeysAPI ignores value if SetOptions.Dir is true.
 2016-01-06 16:37:04 -08:00
Gyu-Ho Lee
c70d533771 Merge pull request #4138 from gyuho/watchresponse_header 
*: fill in WatchResponse.Header
 2016-01-06 15:19:36 -08:00
Gyu-Ho Lee
366e7a879f *: fill in WatchResponse.Header 
Related to coreos#3848.
 2016-01-06 15:12:53 -08:00
Xiang Li
ebbb91a713 Merge pull request #4147 from heyitsanthony/listener-unix-sockets 
pkg/transport: support listeners on unix sockets
 2016-01-06 12:41:38 -08:00
Anthony Romano
f2df87f3e4 pkg/transport: support listeners on unix sockets 
Given unix://<socketname>, NewListener will listen on unix socket <socketname>.
This is useful when binding to tcp ports is undesirable (e.g., testing).
 2016-01-06 12:09:05 -08:00
Xiang Li
eab052d5c4 Merge pull request #4141 from ngaut/ngaut/refactor 
raft: Rename q() to quorum() which is more readable
 2016-01-06 07:32:39 -08:00
Gyu-Ho Lee
027dd6169b Merge pull request #4143 from siddontang/master 
raft,rafthttp: fix typo
 2016-01-06 00:24:28 -08:00
siddontang
54a45ba2f5 *: fix typo 2016-01-06 16:17:02 +08:00
ngaut
8ee232d4ec raft: Rename q() to quorum() which is more readable 2016-01-06 15:23:35 +08:00
Gyu-Ho Lee
45b9cb170d Merge pull request #4142 from gyuho/delete_test_file 
storage: remove test file after test
 2016-01-05 22:15:40 -08:00
Gyu-Ho Lee
ad29ba3073 storage: remove test file after test 2016-01-05 22:05:28 -08:00
Xiang Li
82f2cd6cef Merge pull request #4140 from xiang90/storage 
*: make backend outside kv
 2016-01-05 20:34:17 -08:00
Xiang Li
5dd3f91903 *: make backend outside kv 
KV and lease will share the same backend. Thus we need to make
backend outside KV.
 2016-01-05 19:55:29 -08:00
Xiang Li
70d120e08e Merge pull request #4137 from xiang90/lease 
lease: recovery leases from backend
 2016-01-05 11:32:03 -08:00
Xiang Li
9156e54f1f lease: recovery leases from backend 2016-01-05 11:21:11 -08:00
Xiang Li
1e61243fd7 Merge pull request #4134 from xiang90/lease 
lease: modify API and persist lease to disk
 2016-01-05 10:30:52 -08:00
Anthony Romano
23ddb9ff30 Merge pull request #4126 from heyitsanthony/testutil-recorder-stream 
remove WaitSchedule() from etcdserver tests
 2016-01-05 10:19:14 -08:00
Xiang Li
09b420f08c *: move leaseID typedef to lease pkg 2016-01-05 10:18:17 -08:00
Xiang Li
25f82b25f7 lease: modify API and persist lease to disk 2016-01-05 10:09:42 -08:00
Anthony Romano
838328b057 etcdserver: fix racey WaitSchedule() tests to wait for recorder actions 
Fixes #4119
 2016-01-05 09:39:18 -08:00
Anthony Romano
384cc76299 pkg/testutil: make Recorder an interface 
Provides two implementations of Recorder-- one that is non-blocking
like the original version and one that provides a blocking channel
to avoid busy waiting or racing in tests when no other synchronization
is available.
 2016-01-05 09:39:18 -08:00
Anthony Romano
e1bf726bc1 *: split out etcdserver's test mockup objects to live in interfaces' packages 2016-01-05 09:39:13 -08:00
Gyu-Ho Lee
be57b6b10e Merge pull request #4133 from gyuho/event_map_lookup 
storage: fix watchable_store notify to hash-lookup once
 2016-01-04 22:46:37 -08:00
Gyu-Ho Lee
7339abc79e storage: fix watchable_store notify to hash-lookup once 
We should just assign events and ok at first, and check the
boolean value, instead of looking up the map twice.
 2016-01-04 22:34:48 -08:00
Anthony Romano
d9d1342869 Merge pull request #4132 from heyitsanthony/watchid-typedef 
storage: change type of WatchIDs from int64 to WatchID
 2016-01-04 20:02:26 -08:00
Anthony Romano
21a6ade53d storage: change type of WatchIDs from int64 to WatchID 2016-01-04 19:52:22 -08:00
Gyu-Ho Lee
e5e355242d Merge pull request #4130 from gyuho/remove_cancelfunc 
*: remove CancelFunc return for Watch. Use Cancel for watch.
 2016-01-04 16:22:44 -08:00
Gyu-Ho Lee
556d4a6932 *: remove CancelFunc return for Watch. Use Cancel for watch. 2016-01-04 16:17:55 -08:00
Xiang Li
b3ad736d2a Merge pull request #4131 from xiang90/kv_lease 
*: support put with lease
 2016-01-04 16:05:35 -08:00
Xiang Li
4336278b44 *: support put with lease 2016-01-04 15:54:06 -08:00
Gyu-Ho Lee
2e2b0ea9a1 Merge pull request #4128 from akolb1/akolb1-4127 
storage/backend: disable MAP_POPULATE on Solaris
 2016-01-04 14:53:40 -08:00
Alexander Kolbasov
152dcdd04d storage/backend: disable MAP_POPULATE on Solaris 2016-01-04 14:42:57 -08:00
Gyu-Ho Lee
e2bd35ba1a Merge pull request #4129 from gyuho/licence_2016 
header: change date to 2016
 2016-01-04 14:13:46 -08:00
Gyu-Ho Lee
58112f3abe header: change date to 2016 
Update LICENCE header year to 2016.
 2016-01-04 14:05:22 -08:00
Xiang Li
cfe23b886d Merge pull request #4125 from ngaut/ngaut/refactor 
raft: Tiny refactor
 2016-01-04 11:49:08 -08:00
ngaut
b38dfda1c9 raft: Tiny refactor 
Rename i to id since i looks like index which is confusing.
 2016-01-04 21:20:54 +08:00