906 Commits

Author SHA1 Message Date
Dimitri John Ledkov
3e6ee55c23 Update netlink library.
Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
2015-10-19 14:52:23 +01:00
Madhu Venugopal
be8838d9ac Merge pull request #667 from LK4D4/improve_name_gen
Improve name gen
2015-10-16 12:49:47 -07:00
Alexander Morozov
a815036c2f Use netlink.LinkByName instead of net.InterfaceByName
It's x350 time faster.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-16 11:33:17 -07:00
Alexander Morozov
373c2459ff Fix build image name
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-16 11:33:08 -07:00
Jana Radhakrishnan
523014fb44 Merge pull request #661 from aboch/gr
Explicitly set namepsace for ipamutils.ElectInterface
2015-10-16 07:05:07 -07:00
Jana Radhakrishnan
19a81a18a2 Merge pull request #663 from mavenugo/dgw
Fixed Vagrantfile to use systemd script
2015-10-16 07:04:27 -07:00
Jana Radhakrishnan
7c3df71a9b Merge pull request #646 from coolljt0725/fix_cluster_store
Fix docker daemon failed to start with multiple cluster store address
2015-10-16 06:52:34 -07:00
Madhu Venugopal
33f9002c66 Fixed Vagrantfile to use systemd script
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-16 05:03:47 -07:00
Alessandro Boch
84049931c5 Explicitly set namepsace for ipamutils.ElectInterface
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-15 22:16:40 -07:00
Madhu Venugopal
13d7dee69a Merge pull request #660 from aboch/br
Fix ipam state cleanup logic
2015-10-15 18:03:47 -07:00
Alessandro Boch
4c9fc5a545 Fix ipam state cleanup logic
- Got accidentally broken by another commit

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-15 17:37:22 -07:00
Madhu Venugopal
cf06fd4401 Merge pull request #657 from mrjana/integ
Add etcd integrations tests
2015-10-15 11:37:52 -07:00
Jana Radhakrishnan
a30bf24c6b Add etcd integrations tests
- Added etcd integration test for overlay
    - Added etcd integration test for multinode
      with mock test driver suitable for circleci
    - Added multinode tests for zookeeper
    - Made the script smart enough to only start
      data stores necessary for the requested suites

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-14 23:07:30 -07:00
Jana Radhakrishnan
2934f6bf58 Merge pull request #656 from mavenugo/dgw
Changed Labels to DriverOpts
2015-10-14 16:58:56 -07:00
Madhu Venugopal
23fff3ec3b Changed Labels to DriverOpts
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-14 16:38:46 -07:00
Madhu Venugopal
baf0450a6c Merge pull request #645 from mrjana/integ
Add support for selectively running a suite
2015-10-14 10:41:10 -07:00
Lei Jitang
ba9a74681b Fix docker daemon failed to start with multiple cluster store address
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-14 02:46:42 -04:00
Jana Radhakrishnan
7deb838404 Add support for selectively running a suite
- With the selectively running a suite support
      one can do the following to select which suite
      of tests to run:
	 SUITES="simple multi" sudo -E make integration-tests
    - Refactored and cleaned up some ununsed code in helpers.bash
    - Added discover string parse function to parse discovery
      string into provide and address

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-13 22:42:06 -07:00
Jana Radhakrishnan
4f51d644a1 Merge branch 'zk_test' 2015-10-13 14:05:57 -07:00
Chun Chen
93467f9a7e Add overlay zookeeper test
Signed-off-by: Chun Chen <ramichen@tencent.com>
2015-10-13 14:05:09 -07:00
Madhu Venugopal
dd1c5f0ffe Merge pull request #641 from mrjana/bugs
Fix etcd as a backend store support
2015-10-13 11:12:46 -07:00
aboch
f65cfdcc22 Merge pull request #642 from mavenugo/dgw
Initializing generic to emtpy map
2015-10-13 11:04:29 -07:00
Jana Radhakrishnan
aa688f0c7d Ensure the parent directory for key prefix exists
Currently we are trying to ensure that the parent
directory exists as a key. But it is really a directory
and etcd expects it to be a directory. So made the
change to ensure that the parent key is created as
a directory and not as a simple key.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-13 10:46:37 -07:00
Jana Radhakrishnan
585bba5913 Update libkv godeps
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-13 10:46:24 -07:00
Madhu Venugopal
0521fe53fc Initializing generic to emtpy map
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-13 10:37:53 -07:00
Jana Radhakrishnan
3108c5c908 Merge pull request #640 from aboch/di
IPAM driver documentation
2015-10-12 16:55:53 -07:00
Alessandro Boch
d375197dd6 IPAM driver doc
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-12 16:39:24 -07:00
Jana Radhakrishnan
554f305dbc Merge pull request #639 from mavenugo/dgw
Made use of map[string]string for nw options in default-gateway impl
2015-10-12 15:42:24 -07:00
Madhu Venugopal
fe98b747f5 Made use of map[string]string for nw options in default-gateway impl
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-12 15:28:28 -07:00
Jana Radhakrishnan
8d810b1cc5 Merge pull request #637 from aboch/rm
Change in remote IPAM API payload
2015-10-12 14:21:57 -07:00
Jana Radhakrishnan
d6186c1e10 Merge pull request #638 from mavenugo/vin-fixes
Updated Vagrant with the latest UX
2015-10-12 14:18:02 -07:00
Madhu Venugopal
26468ebdf0 Updated Vagrant with the latest UX
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-12 13:54:58 -07:00
Alessandro Boch
a9386d0076 Change in remote IPAM API payload
- Avoid net.IP and net.IPNet types to ease marshalling/unmarshalling
  at client and server side

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-12 13:03:28 -07:00
aboch
0b5a1de470 Merge pull request #636 from mrjana/bugs
Check if address space valid in getStore
2015-10-12 11:48:37 -07:00
Jana Radhakrishnan
8c8bcffc56 Check if address space valid in getStore
Added a check to see if address space is valid in
addrSpaces map before accessing it. Also fixed some
error strings so that it provides better information
to the user.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-12 11:20:29 -07:00
Madhu Venugopal
1de5fc4b08 Merge pull request #633 from mrjana/bugs
Separate endpoint count into a different object
2015-10-11 23:41:58 -07:00
Jana Radhakrishnan
d7fec00821 Merge pull request #632 from mavenugo/vin-fixes
Moved the default local and global store to new root
2015-10-11 23:25:49 -07:00
Jana Radhakrishnan
cd49ffd80b Separate endpoint count data from network object
Currently endpoint count is maintained as part of
network object and the endpoint count gets updated
frequently while the rest of network is quite stable.
Because of the frequent updates to endpoint count the
network object is getting marshalled and unmarshalled
ferquently. This is causing a lot of churn and transient
memory usage. Fix this by creating a deparate object of
endpoint count so that only that gets updated.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-11 23:17:06 -07:00
Madhu Venugopal
a78deeff3c Moved the default local and global store to new root
This is required in order to provide a clean switchover.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-11 22:57:24 -07:00
Jana Radhakrishnan
c19a7795ff Synchronize datastore apis
Currently there are 3 distinct operations performed by
datastore
   - Pushing the data to the store
   - Updating the Index of the local object
   - Updating the cache (in case of localscope)

Without a lock racing datastore api calls can interleave
in various surprising ways. Best thing is to keep these
3 above operation inseparable. Use a datastore lock to
achieve this.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-11 18:51:10 -07:00
Madhu Venugopal
872cf3c5b1 Merge pull request #631 from mrjana/bugs
Update libkv godeps
2015-10-11 16:22:35 -07:00
Jana Radhakrishnan
3b24e85ce5 Update libkv godeps
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-11 16:02:16 -07:00
Madhu Venugopal
ecec37a3e0 Merge pull request #630 from mrjana/bugs
Make ipamutils compile for windows
2015-10-10 13:45:30 -07:00
Jana Radhakrishnan
e9f2439673 Make ipamutils compile for windows
currently ipamutils package uses apis which are linux
specific and makes windows compile error out. Separated
the OS specific apis into linux and windows files to
diverge the implementation.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-10 13:16:52 -07:00
Jana Radhakrishnan
9d82eec664 Merge pull request #629 from sanimej/slice
Fix the overlay cleanup in the multi-subnet case
2015-10-10 13:01:52 -07:00
Jana Radhakrishnan
a90468b00e Merge pull request #623 from aboch/ipc
Miscellaneous changes for ipam docker integration
2015-10-10 11:09:55 -07:00
Madhu Venugopal
bc2fb8a45b Merge pull request #628 from mavenugo/vin-fixes
Default bridge need not have persistence in bridge driver
2015-10-10 09:51:14 -07:00
Madhu Venugopal
c0b5b3df0b Default bridge need not have persistence in bridge driver
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-10 09:00:35 -07:00
Madhu Venugopal
180042feb4 Merge pull request #624 from aboch/bs6
Remove num bit limitation in bitsequence
2015-10-10 06:11:24 -07:00
Alessandro Boch
1cdfac15be Reduce logging verbosity in allocator
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-10 05:42:31 -07:00