Commit graph

1677 commits

Author SHA1 Message Date
Alessandro Boch
c0864059a7 Merge pull request #1329 from mavenugo/execroot
Make osl sandbox basepath configurable using --exec-root configuration
2016-07-20 18:28:21 -07:00
Madhu Venugopal
9b822c3fc6 Merge pull request #1327 from aboch/aead
Use Authenticated Encryption for dataplane encryption
2016-07-20 17:36:31 -07:00
Alessandro Boch
5a38961bc9 Merge pull request #1338 from vladqa/mutex-svc-records
added mutex on read from controller.svcRecords map
2016-07-20 13:02:12 -07:00
Alessandro Boch
ddff1b5a87 Use fnv1-a to construct the SPI
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-07-20 12:50:33 -07:00
Vladislav Kolesnikov
7301999c2a added locks for all other accesses to controller.svcRecords
Signed-off-by: Vladislav Kolesnikov <vkolesnikov@beget.ru>
2016-07-20 19:49:59 +03:00
Vladislav Kolesnikov
1e0c61c3a2 added mutex on read from controller.svcRecords map
Signed-off-by: Vladislav Kolesnikov <vkolesnikov@beget.ru>
2016-07-20 17:28:32 +03:00
Alessandro Boch
253c103b8c Use aead for dataplane encryption
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-07-19 11:48:28 -07:00
Alessandro Boch
d8ef832bc1 Merge pull request #1334 from polachok/retry
Actually retry LinkSetUp
2016-07-19 08:24:53 -07:00
Alexander Polakov
daf4c97f7a Actually retry LinkSetUp
Signed-off-by: Alexander Polakov <plhk@sdf.org>
2016-07-19 14:20:45 +03:00
Alessandro Boch
ae3f09faeb Merge pull request #1332 from coolljt0725/remove_ip_endpoint
ipvlan: remove endpoint from network on deleting endpoint
2016-07-18 22:02:24 -07:00
Lei Jitang
744d5332bd ipvlan: remove endpoint from network on deleting endpoint
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-07-19 00:06:46 -04:00
Madhu Venugopal
7b470ea14d Merge pull request #1326 from coolljt0725/fix_update_endpoint_cnt
Fix update endpoint count to store
2016-07-18 13:54:42 -07:00
Madhu Venugopal
25f0573785 Make osl sandbox basepath configurable via execroot.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-18 05:14:39 -07:00
Alessandro Boch
0b0678677f Update vishvananda/netlink to e73bad4
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-07-17 21:32:53 -07:00
Alessandro Boch
4f2efd3db3 Merge pull request #1328 from mavenugo/extkey
Moving the UDS file out of /var/lib/docker and into /run/
2016-07-15 14:04:56 -07:00
Madhu Venugopal
32e08e7700 Moving the UDS file out of /var/lib/docker and into /run/
the UDS sock is an unique file and the lifetime of it is until the
docker daemon dies (gracefully). Hence there is no need for it to be
under /var/lib and not mandatory to be configurable either.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-15 13:38:23 -07:00
Lei Jitang
4999c5707d Fix endpoint cnt decline overflow
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-07-14 22:52:44 -04:00
Lei Jitang
804f93bdff Fix update endpoint cnt to store
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-07-14 22:51:06 -04:00
Madhu Venugopal
cc69d2452c Merge pull request #1324 from aboch/ovcn
Overlay driver to cleanup stale endpoints
2016-07-14 13:23:55 -07:00
Alessandro Boch
46f525c7d6 Overlay driver to cleanup stale endpoints
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-07-13 10:56:57 -07:00
Madhu Venugopal
68e53443c9 Merge pull request #1323 from aboch/sbr
Return proper error types on sandbox creation
2016-07-12 21:33:30 -07:00
Alessandro Boch
2e88dfa406 Return proper error types on sandbox creation
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-07-12 21:02:10 -07:00
Alessandro Boch
8fbad4ba05 Merge pull request #1321 from mavenugo/secaddr
Add Virtual-IP of an endpoint as a secondary IP
2016-07-12 20:03:14 -07:00
Madhu Venugopal
5e5a1778d2 Merge pull request #1322 from aboch/bcastq
On agent init, re-join on existing cluster networks
2016-07-12 18:49:17 -07:00
Alessandro Boch
d0192db0cd On agent init, re-join on existing cluster networks
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-07-12 17:35:32 -07:00
Madhu Venugopal
f0292e04b8 Add Virtual-IP of an endpoint as a secondary IP
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-12 15:50:42 -07:00
Alessandro Boch
e4957174ee Merge pull request #1318 from mavenugo/nscope
manage network dynamic flag appropriately under various scenarios
2016-07-12 10:00:20 -07:00
Alessandro Boch
918c6052ae Merge pull request #1317 from LK4D4/no_debug_on_empty
networkdb: do nothing in bulkSync if nodes is empty
2016-07-12 09:38:04 -07:00
Madhu Venugopal
9d01c1fcd5 manage network dynamic flag appropriately under various scenarios
If a network is dynamic, make sure the scope of the object doesnt change
based on the cluster-mode

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-12 08:57:50 -07:00
Alexander Morozov
af3158ecdb networkdb: do nothing in bulkSync if nodes is empty
This patch allows getting rid of annoying debug message.

Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
2016-07-11 09:11:07 -07:00
Alessandro Boch
10aec4d8f0 Merge pull request #1314 from alindeman/bridge-conflict-panic
Avoids panic when checking for conflicts against an uninitalized network
2016-07-07 09:55:11 -07:00
Andy Lindeman
f2ae8467e3 Avoids panic when checking for conflicts against an uninitalized network
A network is added to the `d.networks` map before it's fully initialized. That
is, it's possible for a network in `d.networks` to exist without having
`bridgeIPv4` populated yet. If multiple networks are spun up close to the same
time, a panic can occur.

Example:
```
panic(0x1a75d20, 0xc82000e090)
        /usr/local/go/src/runtime/panic.go:443 +0x4e9
net.networkNumberAndMask(0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0)
        /usr/local/go/src/net/ip.go:433 +0x42
net.(*IPNet).Contains(0x0, 0xc82084dbd0, 0x4, 0x4, 0xc820010200)
        /usr/local/go/src/net/ip.go:457 +0x25
github.com/docker/libnetwork/drivers/bridge.(*networkConfiguration).conflictsWithNetworks(0xc822249360, 0xc822761380, 0x40, 0xc820866a60, 0x4, 0x4, 0x0, 0x0)
        /root/rpmbuild/BUILD/docker-engine/vendor/src/github.com/docker/libnetwork/drivers/bridge/bridge.go:334 +0x40b
```

Signed-off-by: Andy Lindeman <alindeman@salesforce.com>
2016-07-07 11:27:12 -04:00
Madhu Venugopal
630e106529 Merge pull request #1230 from justincormack/proxy
Make the docker proxy a standalone binary not a re-exec
2016-07-06 11:38:06 -07:00
Alessandro Boch
83be979887 Merge pull request #1310 from mavenugo/drvRegIpam
Moving IPAM initalization out of drvRegistry into libnetwork core
2016-07-05 17:56:47 -07:00
Madhu Venugopal
576267bfb9 Moving IPAM initalization out of drvRegistry into libnetwork core
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-05 16:42:34 -07:00
Madhu Venugopal
68be2ca7e4 Merge pull request #1304 from dmcgowan/fix-fd-leaks
Fix file descriptor leaks
2016-07-05 14:07:04 -07:00
Justin Cormack
5202f95604 Make the docker proxy a standalone binary not a re-exec
Rather than re-execing docker as the proxy, create a new command docker-proxy
that is much smaller to save memory in the case where there are a lot of
procies being created. Also allows the proxy to be replaced, for example
in Docker for Mac we have a proxy that proxies to osx instead of locally.

This is the vendoring pull for https://github.com/docker/docker/pull/23312

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-04 13:17:16 +01:00
Derek McGowan
ccabedfbe3 Fix file descriptor leaks
Ensures network connections and file are closed when done writing.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-07-01 16:29:51 -07:00
Alessandro Boch
5da0b08e40 Merge pull request #1307 from mrjana/networkdb
Retain deleted entries for longer time
2016-06-30 22:58:58 -07:00
Jana Radhakrishnan
8936daab5e Retain deleted entries for longer time
When deleting entries or when learning about deleted entries remember
then for a longer time to avoid excessive delete duplicates in the
gossip cluster. Also added code changes to ignore event messages
originated from the source node so that it doesn't get added into the
rebroadcast queue.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-30 18:24:13 -07:00
Alessandro Boch
e942cb3dd6 Merge pull request #1294 from sanimej/ipseckeys
Switch overlay encryption to use IPSec subsystem keys
2016-06-29 17:23:34 -07:00
Alessandro Boch
c92c6aa795 Merge pull request #1305 from mrjana/lb
Do not remove service record while scaling down
2016-06-29 13:58:18 -07:00
Jana Radhakrishnan
2988086ab1 Do not remove service record while scaling down
While scaling down, currently we are removing the service record even if
the LB entry for the vip is not fully removed. This causes resolution
issues when scaling down. Fixed it by removing the service record only
if the LB for the vip is going away.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-29 11:51:32 -07:00
Madhu Venugopal
29f758f532 Merge pull request #1292 from mrjana/lb
Index service on both id and portconfigs
2016-06-28 16:52:17 -07:00
Alessandro Boch
3f6e3727e3 Merge pull request #1303 from mrjana/overlay
ovmanager: Error out on vxlan id alloc failure
2016-06-28 14:12:53 -07:00
Jana Radhakrishnan
de766cc7e6 ovmanager: Error out on vxlan id alloc failure
Currently ovmanager simply logs an error when there is a vni allocation
failure. Instead it should error out and free all the previously
allocated vnis

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-28 13:46:22 -07:00
Jana Radhakrishnan
bc89397105 Index service on both id and portconfigs
While trying to update loadbalancer state index the service both on id
and portconfig. From libnetwork point of view a service is not just
defined by its id but also the ports it exposes. When a service updates
its port its id remains the same but its portconfigs change which should
be treated as a new service in libnetwork in order to ensure proper
cleanup of old LB state and creation of new LB state.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-27 15:37:22 -07:00
Madhu Venugopal
b3fc24768b Merge pull request #1285 from aboch/loc
Remove locator check on endpoint force removal
2016-06-27 14:46:21 -07:00
Alessandro Boch
37d8df2b0b Merge pull request #1300 from cpuguy83/fix_bridge_ep_panic
Fix panic calling `ep` instead of `endpoint`
2016-06-27 11:08:14 -07:00
Jana Radhakrishnan
3c8ea96159 Merge pull request #1289 from clinta/1288
Make sure route selected is direct
2016-06-27 10:43:35 -07:00