Commit graph

1915 commits

Author SHA1 Message Date
Santhosh Manohar
a7e1718800 Add sandbox API for task insertion to service LB and service discovery
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-10-25 05:41:44 -07:00
Jana Radhakrishnan
0b2dd7ce5a Merge pull request #1194 from aboch/ipd
Separate pool parsing from pool auto-allocation
2016-10-21 11:51:38 -07:00
Alessandro Boch
18c1727d1e Merge pull request #1486 from sanimej/reap
Reap failed nodes after 24 hours
2016-10-20 21:49:17 -07:00
Santhosh Manohar
e98b152bac Reap failed nodes after 24 hours
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-10-20 11:24:04 -07:00
Alessandro Boch
6b74a8d479 Merge pull request #1476 from sanimej/time
Use monotonic clock source to reap networkDB entries
2016-10-20 07:30:41 -07:00
Santhosh Manohar
0a2537eea3 Use monotonic clock for reaping networkDB entries
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-10-19 22:30:47 -07:00
Alessandro Boch
43582e8ef1 Merge pull request #1516 from tya/fix-vagrant-box
Updated vagrant box, ubuntu/vivid64 was remove from atlas.hashicorp.com
2016-10-19 14:49:39 -07:00
Jana Radhakrishnan
3f28b09ad4 Merge pull request #1513 from justincormack/no-logrus-proxy
Do not use logrus for proxy
2016-10-19 14:33:29 -07:00
Ty Alexander
6293a1b8ca Updated vagrant box, ubuntu/vivid64 was remove from atlas.hasicorp.com
Signed-off-by: Ty Alexander <ty.alexander@sendgrid.com>
2016-10-19 15:28:46 -06:00
Justin Cormack
65356ed861 Do not use logrus for proxy
This simplifies how we build it in docker/docker as no vendoring needed,
and this does program not use any logrus features.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-19 00:01:11 +01:00
Santhosh Manohar
ed88549edb Merge pull request #1512 from mrjana/bugs
Fix map access race in populatedEndpoints
2016-10-18 10:44:41 -07:00
Jana Radhakrishnan
eae800acf0 Fix map access race in populatedEndpoints
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-18 10:20:05 -07:00
Madhu Venugopal
9dce786794 Merge pull request #1225 from puneetpruthi/solaris_integ
libnetwork support for docker on Solaris
2016-10-14 17:46:23 -07:00
Puneet Pruthi
a48b541da3 libnetwork support for Solaris
Signed-off-by: Puneet Pruthi <puneetpruthi@gmail.com>
2016-10-14 16:38:23 -07:00
Madhu Venugopal
1c5e3c25d4 Merge pull request #1502 from aboch/mc
Run API check to assert xfrm modules
2016-10-14 16:33:47 -07:00
Madhu Venugopal
0e08803d36 Merge pull request #1507 from mrjana/lb
Avoid controller/service lock AB/BA situation
2016-10-14 10:42:27 -07:00
Jana Radhakrishnan
e18c1ffd0c Avoid controller/service lock AB/BA situation
Currently there is an instance of controller and service lock being
obtained in different order which causes the AB/BA deadlock. Do not ever
wrap controller lock around service lock.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-14 10:17:24 -07:00
Santhosh Manohar
ab217f0ea9 Merge pull request #1485 from aboch/ipe
Check for presence before installing forward rules
2016-10-14 09:55:17 -07:00
Madhu Venugopal
d7d72f8c4e Merge pull request #1455 from AkihiroSuda/support-create
add Created to NetworkInfo
2016-10-14 06:01:08 -07:00
Akihiro Suda
8e37c3160a add Created to NetworkInfo
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-10-14 05:27:44 +00:00
Alessandro Boch
795697d823 Check for presence before installing forward rules
- same for links rules

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-13 14:33:23 -07:00
Santhosh Manohar
3696adb39e Merge pull request #1495 from LK4D4/fix_sb_race
fix race in serializing sandbox to string
2016-10-13 13:16:59 -07:00
Santhosh Manohar
2be2c7786d Merge pull request #1503 from LK4D4/fix_race_delete_network
networkdb: fix race in deleteNetwork
2016-10-13 12:56:39 -07:00
Madhu Venugopal
3d08c3099a Merge pull request #1504 from aboch/ports
Reset endpoint port info on connectivity revoke in bridge driver
2016-10-13 11:33:41 -07:00
Alessandro Boch
2781cb0e1e Force go 1.7.1 in circle.yml to resolve failure to get golint
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-12 13:02:53 -07:00
Alessandro Boch
cff2573d1f Reset endpoint port info on connectivity revoke in bridge driver
- and update it to store. Otherwise after an ungraceful shutdown,
  at next boot there will be in store two bridge endpoints with
  same port-mapping data. When bridge driver will try to restore
  the endpoints, there will be conflicts and a container with
  restart policy could fail to start.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-12 13:02:47 -07:00
Alexander Morozov
c772d14e58 networkdb: fix race in deleteNetwork
There are multiple places which reads from that slice(i.e. bulkSync).

Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
2016-10-12 08:42:05 -07:00
Alessandro Boch
a4f56880b2 Run API check to assert xfrm modules
- When docker is run inside a container, the infrastructure
  needed by modprobe is not always available, causing the
  xfrm module load to fail even when these modules are already
  loaded or builtin in the kernel.
- In case of probe failure, before declaring the failure,
  run an API check by attempting the creation of
  a NETLINK_XFRM socket.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-10 16:28:07 -07:00
Alexander Morozov
7a51c79979 fix race in serializing sandbox to string
Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
2016-10-10 09:41:43 -07:00
Alessandro Boch
eb02cb999b Merge pull request #1500 from anusha-ragunathan/update_path
Update plugingetter import path.
2016-10-07 13:25:42 -07:00
Anusha Ragunathan
5c77ba43e2 Update plugingetter import path.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-07 12:00:57 -07:00
Jana Radhakrishnan
23d7708bd5 Merge pull request #1497 from mavenugo/pluginv2-sk2
Add support for NetworkAllocate and NetworkFree in remote driver
2016-10-07 20:49:45 +02:00
Madhu Venugopal
b48e25b44f Add support for NetworkAllocate and NetworkFree in remote driver
Also added an API to return list of builtin network drivers

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-10-05 18:20:02 -07:00
Alessandro Boch
11b0e69fcd Merge pull request #1489 from mrjana/lb
Do not add names to ingress network
2016-10-05 10:50:24 -07:00
Jana Radhakrishnan
ffd13e32a8 Merge pull request #1492 from LK4D4/fix_nodes_race
networkdb: fix race in access to nodes len
2016-10-04 12:52:52 -07:00
Alexander Morozov
03088ace1b networkdb: fix race in access to nodes len
Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
2016-10-04 12:19:25 -07:00
Jana Radhakrishnan
c7b9435004 Do not add names to ingress network
Do not add service discovery names to ingress network as this is a
routing only network and no intra-cluster discovery should happen in
that network. This fixes the ambiguity and resolving names between
services which are both publishing ports and also attached to same
another network.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-04 10:41:11 -07:00
Alessandro Boch
ef5f9395a6 Merge pull request #1491 from mrjana/bugs
Update golang version to 1.7.1
2016-10-04 10:38:14 -07:00
Jana Radhakrishnan
47759a5d4b WIP: Update golang version to 1.7.1
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-04 10:12:34 -07:00
Alessandro Boch
421f6e0bf6 Merge pull request #1487 from mrjana/networkdb
Do not hold ack channel in ack table after closing
2016-10-03 11:44:42 -07:00
Alessandro Boch
c609dfcfe7 Merge pull request #1466 from rony36/master
Fix macvlan private mode argument vaildation
2016-10-03 10:54:43 -07:00
Jana Radhakrishnan
cf2049e470 Merge pull request #1482 from aboch/ingr
Clear ingress resources on graceful shutdown
2016-10-03 10:44:12 -07:00
Jana Radhakrishnan
f649d5ae61 Do not hold ack channel in ack table after closing
Once the bulksync ack channel is closed remove it from the ack table
right away. There is no reason to keep it in the ack table and later
delete it in the ack waiter. Ack waiter anyways has reference to the
channel on which it is waiting.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-03 09:50:02 -07:00
Alessandro Boch
ded6e1934a Clear ingress resources on graceful shutdown
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-29 15:01:44 -07:00
Madhu Venugopal
59832beb31 Merge pull request #1470 from runcom/proxy-path
bridge,portmapper: custom docker-proxy path
2016-09-29 14:43:40 -07:00
Madhu Venugopal
4396a733bc Merge pull request #1472 from anusha-ragunathan/plugins
Make libnetwork understand pluginv2.
2016-09-27 19:11:55 -07:00
Anusha Ragunathan
003e04775b Make libnetwork understand pluginv2.
As part of daemon init, network and ipam drivers are passed a
pluginstore object that implements the plugin/getter interface. Use this
interface methods in libnetwork to interact with network plugins. This
interface provides the new and improved pluginv2 functionality and falls
back to pluginv1 (legacy) if necessary.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-09-27 15:29:10 -07:00
Anusha Ragunathan
952520472f Godep changes.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-09-27 13:53:58 -07:00
Madhu Venugopal
6d06782301 Merge pull request #1473 from mrjana/agent
Avoid returning early on agent join failures
2016-09-27 09:04:08 -07:00
Jana Radhakrishnan
22c322dded Avoid returning early on agent join failures
When a gossip join failure happens do not return early in the call chain
because a join failure is most likely transient and the retry logic
built in the networkdb is going to retry and succeed. Returning early
makes the initialization of ingress network/sandbox to not happen which
causes a problem even after the gossip join on retry is successful.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-27 08:36:10 -07:00