Commit graph

1601 commits

Author SHA1 Message Date
Santhosh Manohar
176088a742 Merge pull request #968 from aboch/ed6
Control IPv6 on container's interface
2016-12-22 18:15:15 -08:00
Alessandro Boch
8740d9e046 Merge pull request #1586 from sanimej/ptr
Defer PTR queries to external servers based on A/AAAA response
2016-12-21 11:40:08 -08:00
Santhosh Manohar
879d94edbd Defer PTR queries to external servers based on A/AAAA response
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-12-20 14:45:13 -08:00
Madhu Venugopal
92efad001c drvregistry to allow overriding plugin
drvRegistry isnt aware if a plugin is v1 or v2. Plugin-v2 provides a way
for user to disable and remove plugins. But unfortunately, there isnt
any api to advertise the removal to drvRegistry. Hence there is no way
to handle "docker plugin rm" of installed plugin. In order to support
the case of "docker plugin install x" followed by "docker plugin rm x"
followed by reinstalling of plugin x "docker plugin install x",
drvRegistry must allow overriding any existing plugin with the same
name. The protection in plugin infra will prevent willful override of
existing plugin.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-19 05:17:48 -08:00
Madhu Venugopal
1b28c5e01d Internal interface to differentiate built-in drivers from remote
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-19 05:17:42 -08:00
Madhu Venugopal
bc45d84e8d Handle the case of registering active plugins during remote init
With Plugin-V2, plugins can get activated before remote driver is
Initialized. Those plugins fails to get registered with drvRegistry.

This fix handles that scenario

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-16 08:38:55 -08:00
Madhu Venugopal
721518279a Handling the new experimental daemon flag
related to https://github.com/docker/docker/issues/29368

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-13 13:57:17 -08:00
Santhosh Manohar
3776604aab Correct regexp to match v6 addresses with zone ID
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-12-11 13:29:51 -08:00
Santhosh Manohar
0c2b4b267c Check for node's presence in networkDB's node map before accessing.
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-12-05 00:58:59 -08:00
Madhu Venugopal
48c4c81cb1 Merge pull request #1567 from daehyeok/logrus_formating
Refactoring logrus import and formatting
2016-12-02 16:02:57 -08:00
Madhu Venugopal
224a73d60b Merge pull request #1576 from daehyeok/misspell
Fixed misspelling
2016-12-02 16:02:23 -08:00
Aaron Lehmann
bb8b9a6040 networkdb: Properly format memberlist logs
Right now, items logged by memberlist end up as a complete log line
embedded inside another log line, like the following:

    Nov 22 16:34:16 hostname dockerd: time="2016-11-22T16:34:16.802103258-08:00" level=info msg="2016/11/22 16:34:16 [INFO] memberlist: Marking xyz-1d1ec2dfa053 as failed, suspect timeout reached\n"

This has two time and date stamps, and an escaped newline inside the
"msg" field of the outer log message.

To fix this, define a custom logger that only prints the message itself.
Capture this message in logWriter, strip off the log level (added
directly by memberlist), and route to the appropriate logrus method.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-01 19:08:07 -08:00
Madhu Venugopal
8a0563ec61 Merge pull request #1569 from aboch/ipm
Fix xtables_lock message probe
2016-11-30 09:25:55 -08:00
Alessandro Boch
054b2aac11 Merge pull request #1578 from sanimej/debug
Fix incorrect debug message
2016-11-29 16:21:18 -08:00
Madhu Venugopal
fefd9cd1e2 Merge pull request #1570 from aboch/lck
Add missing locks in agent and service code
2016-11-29 16:06:40 -08:00
Alessandro Boch
fac86cf69a Add missing locks in agent and service code
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-29 13:58:06 -08:00
Santhosh Manohar
46b59b7964 Fix incorrect debug message
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-11-29 10:59:29 -08:00
Madhu Venugopal
3d0ea58096 Merge pull request #1577 from aboch/idm
Fix a bug in idm.GetIDInRange()
2016-11-28 16:06:23 -08:00
Alessandro Boch
b495131861 Fix a bug in idm.GetIDInRange()
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-28 14:20:47 -08:00
Daehyeok Mun
f89d6b0073 Fixed misspelling
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2016-11-28 11:46:52 -07:00
Madhu Venugopal
5217602776 Create vxlan-id space from 0 instead of starting from 1
With the introduction of GetIDInRange function in IDM and using it in
ovmanager, the idm.New was modified to start from 1. But that causes
issues when the network is removed which results in releasing the
vxlan-id from IDM. With the offset of 1, the Release call incorrectly
releases a bit which could be in use by another network and this results
in the infamous "error creating vxlan interface: file exists" errors
when another network is created with this freed bit.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-11-25 13:02:03 -08:00
Alessandro Boch
f195563a4e Control IPv6 on container's interface
- Disable ipv6 on all interface by default at sandbox creation.
  Enable IPv6 per interface basis if the interface has an IPv6
  address. In case sandbox has an IPv6 interface, also enable
  IPv6 on loopback interface.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-22 15:38:24 -08:00
Alessandro Boch
e2f0070492 Fix xtables_lock message probe
- iptables pkg functions are coded to discard
  the xtables_lock error message about acquiring
  the lock, because all the calls are done with
  the wait logic. But the error message has
  slightly changed between iptables 1.4.x and 1.6.
  This lead to false positives causing docker
  network create to fil in presence of concurrent calls.
- Fixed message mark to be common among the two main versions.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-21 22:02:07 -08:00
Madhu Venugopal
afcec80137 Merge pull request #1564 from aboch/ll
Fix bug in link-local unmarshalling
2016-11-21 11:29:06 -08:00
Santhosh Manohar
94845a80f7 Serialize embedded resolver Start and Stop
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-11-21 11:08:41 -08:00
Daehyeok Mun
0f745fbb23 Refactoring logrus import and formatting
Fix import name to use original project name 'logrus' instead of 'log'
Removing `f` from `logrus.Debugf` when formatting string is not present.

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2016-11-21 11:53:07 -07:00
Alessandro Boch
69c2f8d6db Fix bug in link-local unmarshalling
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-21 10:17:38 -08:00
Madhu Venugopal
684ea92515 Add a ICMP reply rule for service VIP
Ping on VIP has been behaving inconsistently depending on if a task
for a service is local or remote.

With this fix, the ICMP echo-request packets to service VIP are replied
to by the NAT rule to self

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-11-21 08:57:40 -08:00
Madhu Venugopal
b6540296b0 Revert "Enable ping for service vip address"
This reverts commit ddc74ffced.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-11-21 03:30:27 -08:00
Alessandro Boch
1770ced6c0 Fix bug in needDefaultGW()
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-19 19:23:37 -08:00
Madhu Venugopal
a57efbd6c2 Merge pull request #1550 from sanimej/plumb
Separate service LB & SD from network plumbing
2016-11-17 17:17:33 -08:00
Madhu Venugopal
950f2e07ff Merge pull request #1557 from aboch/to
Set a timeout to the netlink handle sockets
2016-11-17 16:39:29 -08:00
Santhosh Manohar
27500b1e35 Separate service LB & SD from network plumbing
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-11-17 13:09:14 -08:00
Alessandro Boch
85b22fabbe Allow spaces in network names
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-17 10:02:16 -08:00
Santhosh Manohar
7040bb9159 Merge pull request #1538 from aboch/06
Respect auto allocation for --ipv6
2016-11-16 14:57:21 -08:00
Santhosh Manohar
8a2bdec6f5 Merge pull request #1545 from dongluochen/attachable_network
Add attachable to network structure
2016-11-16 10:57:47 -08:00
Jana Radhakrishnan
c4b8671e48 Merge pull request #1555 from aboch/nd
Fix bug in DeleteNeighbor
2016-11-16 09:39:47 -08:00
Alessandro Boch
763f0fa1da Set a timeout on the netlink handle sockets
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-15 12:08:36 -08:00
Alessandro Boch
c3e00a2611 Update netlink @17ea11b
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-15 12:08:36 -08:00
Santhosh Manohar
d07d6814f3 Add a nil check for sandbox.osSbox
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-11-15 10:09:19 -08:00
Alessandro Boch
6afe20096d Fix bug in DeleteNeighbor
- stop iterating after changing the list reference

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-14 21:53:03 -08:00
Alessandro Boch
5b4059e087 Fix new golint reported errors
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-14 16:41:54 -08:00
Victor Vieux
236dc57a9e fix unsafe acces on arm
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 23:05:11 -08:00
Madhu Venugopal
5040d8ccd7 Merge pull request #1526 from sanimej/policy
when enabling ip forwarding set the default forward policy to drop
2016-11-10 10:12:26 -08:00
Alessandro Boch
96f001e6ed Merge pull request #1547 from mavenugo/vxidm
IDM need not be bound by default vxlan-id start index
2016-11-09 15:22:06 -08:00
Madhu Venugopal
1066f9ed5c IDM need not be bound by default vxlan-id start index
This will allow users to use the full spectrum of vxlan-ids

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-11-09 14:42:54 -08:00
Madhu Venugopal
cbe520b62c Add GetIDInRange API in idm package
Thanks @aboch

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-11-09 14:42:48 -08:00
Alessandro Boch
1685e48b03 Increase timeout for local store client
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-09 08:44:50 -08:00
Alessandro Boch
83dd2c193a Respect auto allocation for --ipv6
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-08 19:05:51 -08:00
Alessandro Boch
e755b439fa Update libkv @1d84310
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-08 18:37:29 -08:00