Commit graph

567 commits

Author SHA1 Message Date
Jana Radhakrishnan
dc3bb60faa Merge pull request #288 from aboch/ag
Pass a canonical subnet to ipallocator
2015-07-24 10:45:20 -07:00
Jana Radhakrishnan
787190b773 Merge pull request #413 from pyakpyak/master
deadlock fix in RemoveStaticRoute
2015-07-24 08:11:15 -07:00
Andrei Ushakov
b62013c24c deadlock fix in RemoveStaticRoute 2015-07-24 01:32:35 -07:00
Jana Radhakrishnan
279bc5e134 Merge pull request #410 from kunalkushwaha/network-help-experimental
Reduced the two spaces for network help
2015-07-23 13:45:08 -07:00
Kunal Kushwaha
83b6a338a4 Reduced the two spaces for network help, required to pass tests at docker build
Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
2015-07-23 11:46:57 +09:00
Madhu Venugopal
413224ea84 Merge pull request #403 from mrjana/overlay
Sometimes fdb points to wrong vtep
2015-07-23 05:09:02 +05:30
Madhu Venugopal
e66b082070 Merge pull request #306 from kvasdopil/freebsd-work
make libnetwork compile on freebsd (again)
2015-07-23 02:55:53 +05:30
Alexey Guskov
94ca1f5bba make libnetwork compile on freebsd (again)
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-07-21 19:41:01 +03:00
Jana Radhakrishnan
524b3dca97 Sometimes fdb points to wrong vtep
When you start a container after some other container has already
been started in the same network, the current container will have
an fdb which points to a wrong vtep to reach the already started
container. This makes the network connectivity to not work. The root
cause of the issue is because of golang does variable capture by
reference in closures and so we cannot use the return values from
range iterators directly. It needs to be copied to a locally scoped
variable and then use that copy as a capture variable in the closure.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-20 18:01:40 -07:00
Jana Radhakrishnan
27385b21be Merge pull request #400 from QthCN/fix/readme_err
FIX incorrect usage about libnetwork.New() in README.md
2015-07-20 14:46:24 -07:00
TianHuan
951dcbe85e FIX incorrect usage about libnetwork.New() in README.md
libnetwork.New() should return a controller and an error. The
example in README.md ignore the error now, which will let the
codes can not be compiled by Go.
2015-07-20 21:59:05 +08:00
Jana Radhakrishnan
191d86c8dc Merge pull request #398 from LK4D4/remove_libcontainer_dep
Remove dependency on libcontainer
2015-07-16 13:53:04 -07:00
Alexander Morozov
55e7175f64 Remove dependency on libcontainer
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-16 13:26:26 -07:00
Jana Radhakrishnan
90de4b4f3f Merge pull request #396 from pyakpyak/master
fix for #14633, use original nexthop ip value instead of obtained via…
2015-07-15 09:08:11 -07:00
Andrei Ushakov
b4e87d5c98 fix for #14633, use original nexthop ip value instead of obtained via RouteGet 2015-07-14 20:16:01 -07:00
Jana Radhakrishnan
89ff6f6a38 Merge pull request #371 from mavenugo/v6
Fixed a bug in DeleteEndpoint to properly release v6 ip
2015-07-10 10:04:57 -06:00
Madhu Venugopal
981686787b Fixed a bug in DeleteEndpoint to properly release v6 ip
When fixed-cidrv6 is used, the allocation and release must happen from
the appropriate network. Allocation is done properly in createendpoint,
but the DeleteEndpoint wasnt taking care of this case.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-07-09 20:46:36 -07:00
Jana Radhakrishnan
83ca3ba01f Merge pull request #336 from alecbenson/check-kernel-params
Refactor of docker PR #11405
2015-07-09 12:25:59 -06:00
Jana Radhakrishnan
456b0d1463 Merge pull request #355 from chenchun/compile
Use github golang tools mirror
2015-07-09 12:25:00 -06:00
Madhu Venugopal
872792b2ec Merge pull request #367 from crquan/patch-1
fix file descriptor leak of ".../ip_local_port_range"
2015-07-09 12:14:24 +05:30
Alec Benson
90a410eb3d Refactor of docker PR #11405
Signed-off-by: Alec Benson <albenson@redhat.com>
2015-07-08 10:15:08 -04:00
Derek
f88ad7d340 fix file descriptor leak of ".../ip_local_port_range"
fix file descriptor leak of "/proc/sys/net/ipv4/ip_local_port_range"
2015-07-07 16:56:24 -07:00
Madhu Venugopal
4a8b4af8af Merge pull request #366 from mrjana/cnm
BitSequence should unmarshal data during get
2015-07-07 09:21:57 +08:00
Madhu Venugopal
8b6b55f188 Merge pull request #357 from runseb/vagrant-docs
Some users docs with a Vagrant setup
2015-07-07 09:19:15 +08:00
Jana Radhakrishnan
6692b6d072 BitSequence should unmarshal data during get
When bit sequence is trying to get key/value from the
data store it should always unmarshall the json data
before using it, as the data is JSON marshalled before
storing it in the data store.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-06 11:25:42 -07:00
Jana Radhakrishnan
0128339836 Merge pull request #363 from aboch/nf
Fix incorrect error handling in bitseq constructor
2015-07-05 22:16:54 -07:00
Alessandro Boch
8c3c747c62 Fix incorrect error handling in bitseq constructor
- We must ignore key not found error when querying
  datastore for initial state.
- Regression introduced by 04bd8f67ad

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-07-04 17:35:55 -07:00
Jana Radhakrishnan
61b35139b3 Merge pull request #361 from dave-tucker/bug/358
Use IANA assigned VXLAN port
2015-07-02 23:14:09 -07:00
Dave Tucker
6bba1cd7b1 Use IANA assigned VXLAN port
Fixes #358

Signed-off-by: Dave Tucker <dt@docker.com>
2015-07-03 03:43:02 +01:00
Jana Radhakrishnan
0dbbe8b696 Merge pull request #360 from mrjana/cnm
Cherry picks from docker1.7_integ branch
2015-07-02 10:51:23 -07:00
Jana Radhakrishnan
00456020f5 Adjust overlay driver for netlink api change
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 10:39:43 -07:00
Jana Radhakrishnan
70429527b0 Honor driver side resolv.conf file
For the moment in 1.7.1 since we provide a resolv.conf set api
to the driver honor that so that for host driver we can use the
the host's /etc/resolv.conf file as is rather than putting the
contents through a filtering logic.

It should be noted that the driver side capability to set the
resolv.conf file is most likely going to go away in the future
but this should be fine for 1.7.1

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 10:39:06 -07:00
Jana Radhakrishnan
a22d29b7cf Update vishvananda/netlink package
PR to update to vishvananda/netlink package

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:32:22 -07:00
Jana Radhakrishnan
10444cb448 Manually bring up the host side veth interface
In preparation for the new update of vishvananda/netlink package
we need to bringup the host veth interface manually.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:32:03 -07:00
Jana Radhakrishnan
15759edb38 Fix networking issues in RHEL/Centos 6.6
Some parts of the bridge driver code needs to use a different kernel
api or use the already existing apis in slightly different ways to
make the bridge driver work in RHEL/Centos 6.6. This PR provides
those fixes.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:31:13 -07:00
Jana Radhakrishnan
885056b243 Use ioctls to create bridge
The netlink way of creating bridge has problems in older
kernels like the one used on RHEL 6 (which is a supported
one). So trying to use ioctl method to create bridge
so that it works on any version.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:27:53 -07:00
Jana Radhakrishnan
a35025569e Updated Godeps
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:24:12 -07:00
Sebastien Goasguen
ca7aa81de8 Some users docs with a Vagrant setup 2015-07-01 23:04:46 +02:00
aboch
44b53e14a5 Merge pull request #356 from runseb/typo-overlay
small typo in the requirements
2015-07-01 10:06:28 -07:00
Sebastien Goasguen
e714096b54 small typo in the requirements 2015-07-01 15:35:52 +02:00
Chun Chen
1a52238be9 Use github golang tools mirror
Signed-off-by: Chun Chen <ramichen@tencent.com>
2015-07-01 12:57:39 +08:00
Madhu Venugopal
ee82cc7254 Merge pull request #270 from amylindburg/master
Update ROADMAP.md
2015-06-30 17:14:56 -07:00
Jana Radhakrishnan
e8e48b28cb Merge pull request #352 from mavenugo/master
Updating to latest netns to fix amd64 / RPI issues
2015-06-30 15:06:25 -07:00
Madhu Venugopal
1f1bb1700a Updating to latest netns to fix amd64 / RPI issues
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-30 14:46:49 -07:00
Madhu Venugopal
2ac749c006 Merge pull request #348 from aboch/is
Endpoint interface stats read fails when invoked from docker
2015-06-30 11:04:39 -07:00
Alessandro Boch
a3879fc169 Endpoint interface stats read fails when invoked from docker
- When invoked from docker, endpoint.Statistics() returns
  the statistics of the host's interfaces.

  Issue is tracked down to ioutil.ReadFile(). For some
  reason even if invoked from inside the sandbox netns,
  it ends up reading the stats file from the default netns,
  when invoked from docker.
  If same operation is run from inside a dedicated binary,
  it works as expected.

- Replacing it with exec.Command("cat", <file>) solves the issue

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-06-29 20:29:41 -07:00
Madhu Venugopal
667f714bc7 Merge pull request #342 from alexwlchan/master
Minor spelling fixes in documentation and code comments
2015-06-29 19:57:09 -07:00
Madhu Venugopal
26dc363928 Merge pull request #346 from aboch/is
Endpoint to expose interfaces' statistics
2015-06-29 16:45:04 -07:00
Alessandro Boch
5ac330aca2 Endpoint to expose interfaces' statistics
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-06-29 16:15:31 -07:00
Madhu Venugopal
88f16a11d2 Merge pull request #345 from mbentley/overlay-doc-fix
Fixed URL used by curl in overlay readme
2015-06-26 21:26:58 -07:00