Skip to content

Revert tasksmax workaround to avoid unsupported bins#24100

Merged
thaJeztah merged 1 commit intomoby:masterfrom
hypriot:revert-tasksmax-workaround-21628
Jun 30, 2016
Merged

Revert tasksmax workaround to avoid unsupported bins#24100
thaJeztah merged 1 commit intomoby:masterfrom
hypriot:revert-tasksmax-workaround-21628

Conversation

@StefanScherer
Copy link
Copy Markdown
Contributor

This PR reverts PR #21628 and does no longer modify the git source tree for any OS until we come up with a better solution setting tasksmax differently for specific OS.

The modification of 21628 while building the binaries for each DEB package result in binaries with the "unsupported" tag if checked with docker --version or docker version.

- What I did

I compiled all DEB packages with make deb for v1.12.0-rc2 and found out that some OS have unsupported binaries. So I reverted that commit that introduced the code change.

- How I did it

git clone https://github.com/docker/docker
cd docker
git checkout v1.12.0-rc2
make deb

- How to verify it

You can reproduce this problem by installing eg. the 1.12.0-rc2 DEB package on eg. ubuntu:xenial or debian:stretch with curl -fsSL https://test.docker.com/ | sh.

+ sh -c docker version
Client:
 Version:      1.12.0-rc2
 API version:  1.24
 Go version:   go1.6.2
 Git commit:   906eacd-unsupported
 Built:        Fri Jun 17 21:21:56 2016
 OS/Arch:      linux/amd64

Server:
 Version:      1.12.0-rc2
 API version:  1.24
 Go version:   go1.6.2
 Git commit:   906eacd-unsupported
 Built:        Fri Jun 17 21:21:56 2016
 OS/Arch:      linux/amd64

root@ubuntu-xenial:/home/ubuntu# 

The same steps with a debian/jessie64 Vagrant box shows clean binaries.

- Description for the changelog

Revert tasksmax hack to avoid unsupported binaries in DEB packages.

- A picture of a cute animal (not mandatory but encouraged)

flop

(mirrored image of 21628 :-) )

PS: You can't take a shortcut and remove some directories in the contrib/builder/deb/amd64 directory as this also leeds to a git code change and unsupported binaries.

@GordonTheTurtle GordonTheTurtle added status/0-triage dco/no Automatically set by a bot when one of the commits lacks proper signature labels Jun 29, 2016
@StefanScherer StefanScherer force-pushed the revert-tasksmax-workaround-21628 branch from 7bc10b1 to 6509cc4 Compare June 29, 2016 06:10
@GordonTheTurtle GordonTheTurtle removed the dco/no Automatically set by a bot when one of the commits lacks proper signature label Jun 29, 2016
@cpuguy83 cpuguy83 added this to the 1.12.0 milestone Jun 29, 2016
@cpuguy83 cpuguy83 added status/1-design-review priority/P1 Important: P1 issues are a top priority and a must-have for the next release. and removed status/0-triage labels Jun 29, 2016
@cpuguy83
Copy link
Copy Markdown
Member

Tagging this as P1 since it effects release.

I agree we should revert.
Ping @tiborvass

@thaJeztah
Copy link
Copy Markdown
Member

I still wonder if the reason we removed the option was needed; IIRC it was only a warning that the option was not supported, but I wonder if it really affected running docker if the systemd version didn't know about that option

@clnperez
Copy link
Copy Markdown
Contributor

@thaJeztah -- Systemd doesn't handle the situation where there's an option it doesn't recognize, so docker won't start. It's probably best to revert and figure out a better approach (like the one @tianon suggested).

@clnperez
Copy link
Copy Markdown
Contributor

clnperez commented Jun 30, 2016

@StefanScherer nice hedgehog 💜 and thanks for the deeper investigation. It's crazy that this doesn't affect all the deb builds.

Edit: I keep forgetting that it doesn't affect jessie b/c the sed doesn't apply there. But what I didn't try when I was testing this was installing the binary and checking the version output. I was purely looking at the package file name, so perhaps that is how I missed the problem.

@thaJeztah
Copy link
Copy Markdown
Member

Thanks @clnperez, that's very unfortunate indeed. So, yes, I agree we should revert, but we need a different solution, as a lot of people get hit by the limit otherwise.

@vdemeester
Copy link
Copy Markdown
Member

LGTM 🐸 then 😉

@StefanScherer
Copy link
Copy Markdown
Contributor Author

Yes, package names look good, but the binaries inside have problems.

BTW: What about adding some tests testing the DEB packages in a Docker container like this docker version serverspec test? 👼

And probably running such tests in CI if a PR affects the make-deb/make-rpm build steps would also help.

@thaJeztah
Copy link
Copy Markdown
Member

@mlaventure I know you worked on some things for testing debs ^^

@mlaventure
Copy link
Copy Markdown
Contributor

Uh, this shouldn't cause the build to be marked unsupported. The file being modified is generated by the `build-deb' script and as such shouldn't be part of the git repository.

LMTAL.

@thaJeztah
Copy link
Copy Markdown
Member

@StefanScherer can you open a separate issue for the CI suggestion? I like the idea, and think we can definitely improve in that area

@mlaventure
Copy link
Copy Markdown
Contributor

ok, my bad, I read it wrong, we change the docker.service file inline.

LGTM (IANAM).

Quick question though, aren't all the systemd distros concerned? In which case, why aren't we commiting this change to contrib/init/systemd/docker.service once and for all?

@clnperez
Copy link
Copy Markdown
Contributor

@mlaventure Only distros using systemd versions after (including) 228. You can read /pull/21297.

@StefanScherer
Copy link
Copy Markdown
Contributor Author

@thaJeztah Just recognized that there also is a make test-deb-install which is a good starting point for further tests. I'll open an issue with the suggestion.

@thaJeztah
Copy link
Copy Markdown
Member

LGTM

@thaJeztah
Copy link
Copy Markdown
Member

merging for now but lets find a better solution before GA (if possible)

@thaJeztah thaJeztah merged commit 295a6a3 into moby:master Jun 30, 2016
@StefanScherer StefanScherer deleted the revert-tasksmax-workaround-21628 branch June 30, 2016 20:22
@clnperez
Copy link
Copy Markdown
Contributor

@thaJeztah I'm looking into it since (although this area is not my expertise really, so it's been a lot of googling and manpage reading today!) Testing something out now...

@thaJeztah
Copy link
Copy Markdown
Member

Thanks so much @clnperez! I also asked @tianon to comment if he could come up with a solution.

Let me open a tracking issue for this, so that we don't forget

@thaJeztah
Copy link
Copy Markdown
Member

opened #24197

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

priority/P1 Important: P1 issues are a top priority and a must-have for the next release. process/cherry-picked status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants