Alexandre Beslic
77884de123
Merge pull request #793 from aluzzardi/lock-channel
...
store: Lock returns a channel that is closed if the lock is lost
2015-05-14 17:55:09 -07:00
Andrea Luzzardi
23481131c4
store: Add a channel to lock that is closed if our lock is lost or an error.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-14 17:35:57 -07:00
Andrea Luzzardi
250a17e954
Merge pull request #780 from abronan/improve_helpers
...
Refactor helpers for storage key formatting
2015-05-14 17:02:58 -07:00
Alexandre Beslic
b95e826b08
Merge pull request #789 from kelseyhightower/master
...
discovery: improve code comments.
2015-05-14 10:34:40 -07:00
Kelsey Hightower
0d87489773
discovery: improve code comments.
...
Signed-off-by: Kelsey Hightower <kelsey.hightower@gmail.com>
2015-05-14 08:49:40 -07:00
Alexandre Beslic
9d68cc0506
Merge pull request #787 from aluzzardi/store-options-as-ptr
...
pkg/store: Pass Options as pointer, not value.
2015-05-13 23:09:37 -07:00
Andrea Luzzardi
ece52698d6
Merge pull request #783 from vieux/fix_image_match
...
fix image.Match to take only repo or repo:tag
2015-05-13 19:05:30 -07:00
Andrea Luzzardi
04f7d2ac10
pkg/store: Remove unsused ErrSessionUndefined from consul.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-13 19:01:01 -07:00
Andrea Luzzardi
9d055d6bf8
pkg/store: Pass Options as pointer, not value.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-13 19:00:39 -07:00
Alexandre Beslic
a73c89d42b
remove bool argument from getDirectory
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-13 18:05:47 -07:00
Alexandre Beslic
ccf6e37c16
Refactor helpers to be more meaningful and flexible for future store usage
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-13 18:02:48 -07:00
Victor Vieux
4da6b2b093
Merge pull request #551 from noxiouz/fix_eventsHandler
...
[eventsHandler] Use Lock/Unlock to sync a write access
2015-05-13 17:58:52 -07:00
Victor Vieux
f9b457f152
fix image.Match
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 17:36:08 -07:00
Victor Vieux
ac8c210384
Merge pull request #785 from vieux/fix_apiversion_case
...
APIVersion -> ApiVersion to match docker API
2015-05-13 17:27:19 -07:00
Andrea Luzzardi
e6d4a5733c
Merge pull request #782 from abronan/fix_init_etcd
...
Call SyncCluster at etcd client initialization
2015-05-13 17:17:41 -07:00
Victor Vieux
b73f54def4
APIVersion -> ApiVersion to match docker API
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 17:12:16 -07:00
Alexandre Beslic
959bd0adbb
Add call to SyncCluster at etcd client initialization
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-13 17:10:52 -07:00
Victor Vieux
0cf32ec0a5
Merge pull request #784 from vieux/fix_heartbeat
...
fix heartbeat default value
2015-05-13 16:50:15 -07:00
Victor Vieux
69bdf1a87b
fix heartbeat default value
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 16:50:01 -07:00
Alexandre Beslic
2180a703cb
Merge pull request #777 from aluzzardi/store-locks
...
store: Improved Lock support.
2015-05-13 16:45:29 -07:00
Andrea Luzzardi
cde1550a13
Merge pull request #774 from vieux/cluster_opt
...
add --cluster-driver and --cluster-opt
2015-05-13 16:31:54 -07:00
Andrea Luzzardi
f4bd5834fa
store: Improved Lock support.
...
- New interface: `store.CreateLock` returns a `Locker` interface with
`Lock` and `Unlock` functions.
- Consul: New locking implementation leveraging helper lock
implementation that comes with the go library.
- ZK: Lock support using the library helpers.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-13 16:15:19 -07:00
Alexandre Beslic
8e7447c040
Merge pull request #779 from vieux/watch_varargs
...
user varargs in store the watch callback
2015-05-13 15:49:55 -07:00
Victor Vieux
59cd11b946
change swarm.heartbeat to swarm.discovery.heartbeat
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:48:07 -07:00
Victor Vieux
0b45fa5154
user varargs in store the watch callback
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:42:44 -07:00
Victor Vieux
5db3a9cd0e
remove options struct, yay!
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:36:30 -07:00
Victor Vieux
54dfabd252
Merge pull request #778 from mavenugo/store
...
GetRange and WatchRange to return {key,value,index} tuple
2015-05-13 15:14:28 -07:00
Madhu Venugopal
0130c2262d
GetRange and WatchRange to return {key,value,index} tuple
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-13 11:24:03 -07:00
Victor Vieux
c29404e272
add --cluster-driver and --cluster-opt
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-12 17:49:00 -07:00
Victor Vieux
7dd0cde819
Merge pull request #766 from jimmyxian/update-readme
...
update api README.md
2015-05-12 15:46:08 -07:00
Victor Vieux
4bc58b1150
Merge pull request #756 from abronan/store_integration
...
Change existing discovery backends to 'kv' using metatada storage backends in a new 'store' package
2015-05-12 15:15:38 -07:00
Victor Vieux
a9eb48dcf2
Merge pull request #745 from aluzzardi/swarm-id
...
Support for Swarm IDs
2015-05-12 15:12:19 -07:00
Victor Vieux
d741a24887
Merge pull request #770 from aluzzardi/integration-constraints-debug
...
integration: add debug to constraint
2015-05-12 15:08:26 -07:00
Alexandre Beslic
2fc3f8e663
update README
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-12 15:06:57 -07:00
Andrea Luzzardi
f5ad970c87
integration: more debug into affinity
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-12 14:54:36 -07:00
Alexandre Beslic
06f51e09b0
revert variable names
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-12 14:47:48 -07:00
Alexandre Beslic
6b0b82cddc
Add fixme related to timeout/heartbeat issue
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-12 14:41:09 -07:00
Andrea Luzzardi
bdd97c1d72
swarm id: Fix proxy for execs.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-12 14:21:09 -07:00
Alexandre Beslic
403f95f86c
Remove placeholder TLS parameter in discovery interface and New method
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-12 14:19:30 -07:00
Andrea Luzzardi
b9cb4f4f35
integration: add debug to constraint
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-12 14:03:45 -07:00
Alexandre Beslic
6f67ca3a58
replace variadic method options for simple Config struct, correct Consul Watch method
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-12 14:00:55 -07:00
Alexandre Beslic
8909dfda63
Fix zookeeper watch methods with key being formatted twice before given to GetRange
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-11 19:07:21 -07:00
Xian Chaobo
a72d37be2d
update api README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-11 21:37:45 -04:00
Alexandre Beslic
e039563c78
Fix zookeeper timeout value
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-11 18:23:40 -07:00
Alexandre Beslic
d333da5284
remove log info for default case in SetOptions
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-11 17:49:40 -07:00
Alexandre Beslic
59e1e9b942
Change existing discovery backends to 'kv' using metatada storage backends in the store package
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-11 17:23:55 -07:00
Victor Vieux
38a1708e81
Merge pull request #754 from aluzzardi/jimmyxian-add-support-images-save
...
Add support images save
2015-05-11 17:16:36 -07:00
Andrea Luzzardi
dde47ee650
swarm IDs: Convert Swarm ID to Container ID in API Proxy.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
b6a7c3d7f5
swarm ID: Remove backward compatibility.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
Andrea Luzzardi
5c801d2c6a
swarm id: Handle compatibility.
...
Containers created with Swarm<0.3.0 or directly on the host without
going through Swarm don't have a Swarm ID. We are going to fake it by
using the Container ID.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00