1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

1652 commits

Author SHA1 Message Date
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
Alessandro Boch
e4957174ee Merge pull request 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 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 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 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 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 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 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 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 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 from mrjana/lb
Index service on both id and portconfigs
2016-06-28 16:52:17 -07:00
Alessandro Boch
3f6e3727e3 Merge pull request 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 from aboch/loc
Remove locator check on endpoint force removal
2016-06-27 14:46:21 -07:00
Alessandro Boch
37d8df2b0b Merge pull request 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 from clinta/1288
Make sure route selected is direct
2016-06-27 10:43:35 -07:00
Brian Goff
3925ea0a2d Fix panic calling ep instead of endpoint
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-27 13:25:20 -04:00
Santhosh Manohar
3bcffc0c02 Merge pull request from aboch/sec
Do not error on non NodeDiscovery type messages in remote driver
2016-06-25 19:15:54 -07:00
Alessandro Boch
5146f05b33 Do not error on non discovery type messages in remote driver
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-25 16:23:11 -07:00
Alessandro Boch
b766159f38 Merge pull request from mrjana/overlay
Update ovmanager to support maximum vni
2016-06-24 18:50:28 -07:00
Jana Radhakrishnan
d3b8412ac6 Update ovmanager to support maximum vni
To support maximum possible overlay networks in swarm mode.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-24 16:41:53 -07:00
Madhu Venugopal
a4f03577b5 Merge pull request from aaronlehmann/sanbox
Fix sanbox typo
2016-06-24 15:33:20 -07:00
Aaron Lehmann
91e8d5bfb9 Fix sanbox typo
Change "sanbox" to "sandbox".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-06-24 15:14:01 -07:00
Jana Radhakrishnan
d82e80e221 Merge pull request from jimmycmh/master
Remove Lock in datastore for global scope
2016-06-24 06:38:05 -07:00
Clint Armstrong
fa68f9d017 Make sure route selected is direct
Signed-off-by: Clint Armstrong <clint@clintarmstrong.net>
2016-06-23 16:23:47 -04:00
menghui.chen
115cdb52b3 Remove Lock in datastore for global scope
Signed-off-by: menghui.chen <menghui.chen@alibaba-inc.com>
2016-06-23 14:22:58 +08:00
Alessandro Boch
64673bce0a Remove locator check on endpoint force removal
- If an endpoint is forcibly removed, it should not
  matter whether the locator info is present. If
  the daemon was started w/o the --cluster-advertise
  option (the option is not mandatory), then the
  locator would be empty for any endpoint.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 18:34:30 -07:00
Alessandro Boch
ba36e2b75e Merge pull request from nerdalert/vlan_doc
Fixed missing v6 enable flag in macvlan doc
2016-06-22 17:05:44 -07:00
Brent Salisbury
500a255181 Fixed missing v6 enable flag in macvlan doc
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-06-22 19:59:55 -04:00
Alessandro Boch
23830083ea Merge pull request from sanimej/lateread
For cached connections ignore late replies after read timeout
2016-06-22 08:17:42 -07:00
Alessandro Boch
382aefbeb5 Merge pull request from BSWANG/master
make sure interface up successful
2016-06-22 08:17:28 -07:00
Alessandro Boch
0c9b6e44dd Merge pull request from sanimej/keys
Add debugs for key change events in networkdb
2016-06-21 18:27:03 -07:00
Santhosh Manohar
dd19ad27d8 Merge pull request from aboch/vnd
Gracefully handle missing xfmr modules and netlink vendor
2016-06-21 13:49:28 -07:00
Alessandro Boch
0122e632e3 Merge pull request from nerdalert/macvlan_docs
Added docs for macvlan driver
2016-06-21 09:45:29 -07:00
bingshen.wbs
93cada0d94 make sure interface up successful
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
2016-06-21 14:28:13 +08:00
Alessandro Boch
117131c41b Gracefully handle missing xfrm modules
If xfrm modules cannot be loaded:
- Create netlink.Handle only for ROUTE socket
- Reject local join on overlay secure network

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-20 17:25:32 -07:00
Alessandro Boch
b39f13f80e Update vishvananda/netlink 734d02c
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-20 12:54:58 -07:00
Brent Salisbury
165a1f6021 Added docs for macvlan driver
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-06-20 05:55:45 -04:00
Alessandro Boch
090a12035f Merge pull request from sanimej/3keys
Update key handling logic to process keyring with 3 keys
2016-06-19 11:03:20 -07:00
Madhu Venugopal
7541e6b6c7 Merge pull request from mrjana/lb
Do not bulk sync state which is getting deleted
2016-06-18 19:05:21 -07:00
Jana Radhakrishnan
6538faa880 Do not bulk sync state which is getting deleted
Bulk sync should not sync state which is getting deleted

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-18 17:58:51 -07:00