Added support for Swarm Service Driller (ssd) #2077
Conversation
|
Please sign your commits following these rules: $ git clone -b "master" [email protected]:quadespresso/libnetwork.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -fAmending updates the existing PR. You DO NOT need to open a new one. |
Codecov Report
@@ Coverage Diff @@
## master #2077 +/- ##
=========================================
Coverage ? 36.31%
=========================================
Files ? 99
Lines ? 15810
Branches ? 0
=========================================
Hits ? 5742
Misses ? 9204
Partials ? 864Continue to review full report at Codecov.
|
|
Ping @fcrisciani @ctelfer @ddebroy PTAL |
|
@adamancini yes: https://github.com/docker/orca/blob/master/images/dsinfo/Dockerfile#L36 Also: still waiting on this to be merged, which will address where |
|
Am focusing on other work activities through at least next Tuesday March 27. Please nominate another reviewer if this needs attention before then. |
support.sh
Outdated
| IPTABLES="${IPTABLES:-iptables}" | ||
| IPVSADM="${IPVSADM:-ipvsadm}" | ||
| IP="${IP:-ip}" | ||
| SSDBIN="${SSDBIN:-/ssd}" |
There was a problem hiding this comment.
@quadespresso if I drop a ssd binary (or shell script calling 'docker run ... ssd') in my $PATH to test, the leading / breaks the lookup for the command - I think we can we depend on $PATH inside the container, can we change this to SSDBIN="${SSDBIN:-ssd}"
There was a problem hiding this comment.
https://gist.github.com/adamancini/116ae89b260dc64b67ee46e86ef3a9b1 are my results from support.sh when I call it with ssd support
There was a problem hiding this comment.
As discussed on Slack with @adamancini, I'll make the change as discussed above to remove the leading /.
Likewise, I'll update Dockerfile in dsinfo to /bin in order to leverage $PATH correctly (and to be consistent with a couple other items we're copying to that directory).
| echo -e "\t IP overlap found: $ip_overlap" | ||
| echo -e "\t Processed $containers containers" | ||
|
|
||
| if [ "true" == ${SSD} ] ; then |
There was a problem hiding this comment.
not sure if the SSD has some output, but I would like the SUMMARY to be the last thing to be printed at the end
There was a problem hiding this comment.
${SSD} is just something getting passed from another script to enable the ssd code. If I've understood your question correctly?
There was a problem hiding this comment.
I put the comment on the top of the block but was referring to the underlying code. I would like to keep the summary as the last output produced from the script, so you need to move your change on top
support.sh
Outdated
| for netName in $(docker network ls -f driver=overlay --format "{{.Name}}") ; do | ||
| echo "## $netName ##" | ||
| ${SSDBIN} $netName gossip-consistency | ||
| done |
There was a problem hiding this comment.
The concern with running gossip-consistency is that this command eventually forks another container, so doing this on x networks will result of x containers. Would this be taxing?
support/support.sh
Outdated
| ${SSDBIN} $netName | ||
| echo "" | ||
| done | ||
| echo "" ; echo "#### SSD control-plane consistency check across nodes in a cluster ####" |
There was a problem hiding this comment.
@quadespresso let's take gossip-consistency out for now, we'll add it back once we address the caller
Signed-off-by: Jim Carroll <[email protected]>
|
Looks like all comments were addressed. The unit tests that failed clearly had nothing to do with this change as it touches none of the go code, but the tests that were failing were go tests. |
No description provided.