Jana Radhakrishnan
585bba5913
Update libkv godeps
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-13 10:46:24 -07:00
Jana Radhakrishnan
3108c5c908
Merge pull request #640 from aboch/di
...
IPAM driver documentation
2015-10-12 16:55:53 -07:00
Alessandro Boch
d375197dd6
IPAM driver doc
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-12 16:39:24 -07:00
Jana Radhakrishnan
554f305dbc
Merge pull request #639 from mavenugo/dgw
...
Made use of map[string]string for nw options in default-gateway impl
2015-10-12 15:42:24 -07:00
Madhu Venugopal
fe98b747f5
Made use of map[string]string for nw options in default-gateway impl
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-12 15:28:28 -07:00
Jana Radhakrishnan
8d810b1cc5
Merge pull request #637 from aboch/rm
...
Change in remote IPAM API payload
2015-10-12 14:21:57 -07:00
Jana Radhakrishnan
d6186c1e10
Merge pull request #638 from mavenugo/vin-fixes
...
Updated Vagrant with the latest UX
2015-10-12 14:18:02 -07:00
Madhu Venugopal
26468ebdf0
Updated Vagrant with the latest UX
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-12 13:54:58 -07:00
Alessandro Boch
a9386d0076
Change in remote IPAM API payload
...
- Avoid net.IP and net.IPNet types to ease marshalling/unmarshalling
at client and server side
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-12 13:03:28 -07:00
aboch
0b5a1de470
Merge pull request #636 from mrjana/bugs
...
Check if address space valid in getStore
2015-10-12 11:48:37 -07:00
Jana Radhakrishnan
8c8bcffc56
Check if address space valid in getStore
...
Added a check to see if address space is valid in
addrSpaces map before accessing it. Also fixed some
error strings so that it provides better information
to the user.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-12 11:20:29 -07:00
Madhu Venugopal
1de5fc4b08
Merge pull request #633 from mrjana/bugs
...
Separate endpoint count into a different object
2015-10-11 23:41:58 -07:00
Jana Radhakrishnan
d7fec00821
Merge pull request #632 from mavenugo/vin-fixes
...
Moved the default local and global store to new root
2015-10-11 23:25:49 -07:00
Jana Radhakrishnan
cd49ffd80b
Separate endpoint count data from network object
...
Currently endpoint count is maintained as part of
network object and the endpoint count gets updated
frequently while the rest of network is quite stable.
Because of the frequent updates to endpoint count the
network object is getting marshalled and unmarshalled
ferquently. This is causing a lot of churn and transient
memory usage. Fix this by creating a deparate object of
endpoint count so that only that gets updated.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-11 23:17:06 -07:00
Madhu Venugopal
a78deeff3c
Moved the default local and global store to new root
...
This is required in order to provide a clean switchover.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-11 22:57:24 -07:00
Jana Radhakrishnan
c19a7795ff
Synchronize datastore apis
...
Currently there are 3 distinct operations performed by
datastore
- Pushing the data to the store
- Updating the Index of the local object
- Updating the cache (in case of localscope)
Without a lock racing datastore api calls can interleave
in various surprising ways. Best thing is to keep these
3 above operation inseparable. Use a datastore lock to
achieve this.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-11 18:51:10 -07:00
Madhu Venugopal
872cf3c5b1
Merge pull request #631 from mrjana/bugs
...
Update libkv godeps
2015-10-11 16:22:35 -07:00
Jana Radhakrishnan
3b24e85ce5
Update libkv godeps
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-11 16:02:16 -07:00
Madhu Venugopal
ecec37a3e0
Merge pull request #630 from mrjana/bugs
...
Make ipamutils compile for windows
2015-10-10 13:45:30 -07:00
Jana Radhakrishnan
e9f2439673
Make ipamutils compile for windows
...
currently ipamutils package uses apis which are linux
specific and makes windows compile error out. Separated
the OS specific apis into linux and windows files to
diverge the implementation.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-10 13:16:52 -07:00
Jana Radhakrishnan
9d82eec664
Merge pull request #629 from sanimej/slice
...
Fix the overlay cleanup in the multi-subnet case
2015-10-10 13:01:52 -07:00
Jana Radhakrishnan
a90468b00e
Merge pull request #623 from aboch/ipc
...
Miscellaneous changes for ipam docker integration
2015-10-10 11:09:55 -07:00
Madhu Venugopal
bc2fb8a45b
Merge pull request #628 from mavenugo/vin-fixes
...
Default bridge need not have persistence in bridge driver
2015-10-10 09:51:14 -07:00
Madhu Venugopal
c0b5b3df0b
Default bridge need not have persistence in bridge driver
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-10 09:00:35 -07:00
Madhu Venugopal
180042feb4
Merge pull request #624 from aboch/bs6
...
Remove num bit limitation in bitsequence
2015-10-10 06:11:24 -07:00
Alessandro Boch
1cdfac15be
Reduce logging verbosity in allocator
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-10 05:42:31 -07:00
Alessandro Boch
094b657ff9
Remove 2^32 bits restriction on bitsequence
...
- Allow bitsequence of length 2^64-1
- Updated ID Manager and IPAM
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-10 05:42:26 -07:00
aboch
b5e66b502d
Merge pull request #627 from mavenugo/vin-fixes
...
Few more fixes identified during integration
2015-10-10 04:09:25 -07:00
Madhu Venugopal
16e1647872
Few more fixes identified during integration
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-10 03:49:39 -07:00
Jana Radhakrishnan
15be04dbde
Merge pull request #611 from sanimej/slice
...
marshal/unmarshal for overlay multiple subnets
2015-10-09 20:17:20 -07:00
Madhu Venugopal
ab2a9e6cba
Merge pull request #625 from aboch/acf
...
Relax restriction on IpamConfig
2015-10-09 20:04:15 -07:00
Madhu Venugopal
fbc701d8d7
Merge pull request #626 from mrjana/bugs
...
Network ep count increment/decrement needs retry
2015-10-09 20:03:29 -07:00
Jana Radhakrishnan
73935333f6
Network ep count increment/decrement needs retry
...
Today we try to increment/decrement endpoint count
only once even if it is a key modified error. In case
of key modified error we should retry it to allow it to
succeed.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-09 19:37:25 -07:00
Alessandro Boch
eda95b48f4
Relax restriction on IpamConfig
...
- Both an empty and nil list of IpamConf object
will trigger auto-allocation for ipv4.
Auto-allocation for ipv6 will still be excluded
in the two cases above.
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 17:54:28 -07:00
Alessandro Boch
e2620d6b3e
Preserve default ipam driver setting
...
- If IPAMConf does not contain an ipam driver setting
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 14:24:49 -07:00
Alessandro Boch
49cbd88831
Network to expose ipam config
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 14:24:38 -07:00
Madhu Venugopal
dda36227d3
Merge pull request #622 from mrjana/bugs
...
Move sandbox resources when container restarts
2015-10-09 13:56:59 -07:00
Jana Radhakrishnan
a559c45f0a
Move sandbox resources when container restarts
...
Currently when container has a restart policy and gets
restarted, docker does not release networking and allocate
it back. But it presents libnetwork with a new sandbox while
all the network resources are locked in the old sandbox. This
commit attempts to move all the network resources from the old
sandbox to the new sandbox when libnetwork is presented with the
new sandbox.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-09 13:43:25 -07:00
Jana Radhakrishnan
cc8a9df7f4
Merge pull request #621 from mavenugo/vin-fixes
...
move Labels from array to map to be consistent with docker
2015-10-09 11:25:31 -07:00
Madhu Venugopal
998617236b
move Labels from array to map to be consistent with cotnainers
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-09 11:08:13 -07:00
Jana Radhakrishnan
5347a05701
Merge pull request #618 from mavenugo/vin-fixes
...
Fixed a bridge driver bug in unmarshalling DefaultBridge
2015-10-09 08:40:25 -07:00
Madhu Venugopal
29f9670d0b
Fixed a bridge driver bug in unmarshalling DefaultBridge
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-09 03:53:22 -07:00
Jana Radhakrishnan
59ae76f6c0
Merge pull request #616 from mavenugo/vin-fixes
...
Fixed a couple of error messages to address UX related comments
2015-10-09 02:12:50 -07:00
Madhu Venugopal
fd583747c8
Fixed a couple of error messages to address UX related comments
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-09 01:45:24 -07:00
Jana Radhakrishnan
0cfe3bafc2
Merge pull request #222 from aboch/nlb
...
Labels support for Network Create
2015-10-09 01:16:48 -07:00
Alessandro Boch
d53a6f9815
Enable network labels in Rest API
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 01:06:20 -07:00
Alessandro Boch
fbe33267f0
Enable Network labels in backend
...
- Allow labels to be passed to network driver during network create
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 01:06:15 -07:00
Alessandro Boch
9df6bb2778
Add netlable. KeyValue() and ToMap()
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-10-09 00:21:09 -07:00
Madhu Venugopal
a08562d89e
Merge pull request #615 from mrjana/bridge
...
Make the integration tests robust
2015-10-09 00:17:37 -07:00
Jana Radhakrishnan
a92fadbe59
Make the integration tests robust
...
Currently integration test is a bit flaky because of
variability in the dnet bootup time. Fixed it to wait for
dnet to come up before performing any tests.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-10-09 00:06:51 -07:00