Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version #11417

rhatdan · 2015-03-16T18:55:46Z

They say we should only use the BTRFS_LIB_VERSION

They will no longer support this since it had to be managed manually

Docker-DCO-1.1-Signed-off-by: Dan Walsh dwalsh@redhat.com (github: rhatdan)

tianon · 2015-03-16T18:59:16Z

Does that mean http://repo.or.cz/w/btrfs-progs-unstable/devel.git/commit/514c5689bd672b21fa8033a7a48eae56a6e36b7f was reverted?

cc @lsm5 @vbatts

rhatdan · 2015-03-16T19:06:43Z

The comments in the bugzilla seemed to indicate that upstream would not take a patch to put the BTRFS_BUILD_VERSION back since it was being manually created while BTRFS_LIB_VERSION can be automatically created.

jessfraz · 2015-03-16T19:56:14Z

# github.com/docker/docker/daemon/graphdriver/btrfs
./version_test.go:10: invalid argument BtrfsLibVersion() (type int) for len
Precompiled: github.com/docker/docker/daemon/graphdriver/overlay
Precompiled: github.com/docker/docker/daemon
Precompiled: github.com/docker/docker/daemon/networkdriver
Precompiled: github.com/docker/docker/daemon/graphdriver/devmapper
Precompiled: github.com/docker/docker/daemon/graphdriver/vfs
Precompiled: github.com/docker/docker/daemon/networkdriver/ipallocator
Precompiled: github.com/docker/docker/daemon/networkdriver/portallocator
Precompiled: github.com/docker/docker/daemon/networkdriver/portmapper
Precompiled: github.com/docker/docker/daemon/networkdriver/bridge

lsm5 · 2015-03-16T20:07:11Z

@tianon @rhatdan for now, sandeen and kdave sound ok with it: https://bugzilla.redhat.com/show_bug.cgi?id=1202373#c4 and given that the patch grabs whatever value exists for PACKAGE_VERSION from its config.h, it shouldn't be a hassle I think. correct me if i'm wrong.

jessfraz · 2015-03-16T22:16:58Z

can you fix the unit test @rhatdan, otherwise this seems like a sane fix to me :)

rhatdan · 2015-03-17T12:10:21Z

Fixed.

prologic · 2015-03-19T01:48:29Z

/cc @prologic

They say we should only use the BTRFS_LIB_VERSION They will no longer support this since it had to be managed manually Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

jessfraz · 2015-03-24T17:19:19Z

still failing the unit tests, would be nice to get this into 1.6.0-rc2, do you want us to carry

vbatts · 2015-03-24T17:24:37Z

@jfrazelle strange. and the build box has the have /usr/include/btrfs/version.h?

+ go test -test.timeout=45m github.com/docker/docker/daemon/graphdriver/btrfs
--- FAIL: TestLibVersion (0.00s)
    version_test.go:11: expected output from btrfs lib version > 0
FAIL

would only happen if docker was built with btrfs_noversion

vbatts · 2015-03-24T17:25:01Z

OH! ubuntu ... :-(
it is built with btrfs_noversion

jessfraz · 2015-03-24T17:27:11Z

oh so wait should i just upgrade btrfs-tools is that the problem

On Tue, Mar 24, 2015 at 10:25 AM, Vincent Batts notifications@github.com
wrote:

OH! ubuntu ... :-(
it is built with btrfs_noversion

—
Reply to this email directly or view it on GitHub
#11417 (comment).

vbatts · 2015-03-24T17:29:03Z

well, ideally the test would be on a newer btrfs... but would mean the test will fail when there is no version.h.

@rhatdan perhaps move you Lib Version test to a _test.go file that has the build tags of // +build linux,btrfs_noversion

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

rhatdan · 2015-03-24T18:15:23Z

Sadly I did that locally but never pushed.

vbatts · 2015-03-24T18:16:13Z

https://www.youtube.com/watch?v=vCadcBR95oU

On Tue, Mar 24, 2015 at 2:15 PM, Daniel J Walsh notifications@github.com
wrote:

Sadly I did that locally but never pushed.

—
Reply to this email directly or view it on GitHub
#11417 (comment).

vbatts · 2015-03-24T19:53:54Z

\o/

vbatts · 2015-03-24T19:54:06Z

LGTM

tianon · 2015-03-24T19:58:54Z

Aw, that's a shame. The library version is completely 1000% meaningless to me (where the "build version" actually matches the version number of the package I've got installed), but OK.

LGTM

Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version

tianon · 2015-03-24T20:00:22Z

Couldn't we instead find a way to conditionally include this based on that one release of btrfs-progs that doesn't have the build version info (since they added it back thanks to @lsm5)?

tianon · 2015-03-24T20:01:02Z

It's especially worrying since they never responded to https://bugzilla.redhat.com/show_bug.cgi?id=1202373#c5 to tell us whether they approve of our use of this header bit or not. 😢

vbatts · 2015-03-24T20:03:52Z

@tianon an #ifdef check would be easy enough, and the stubbing out that info in the Status(). That's what I'd started. Perhaps by that time, we can have a better position from upstream.

jessfraz · 2015-03-24T20:07:12Z

/me is not pleased there is a merge commit tsk tsk

tianon · 2015-03-24T20:12:11Z

@vbatts 👍 😍

vbatts · 2015-03-24T20:15:16Z

Meaningless, but more than nothing. I also understand the difficulty in
maintaining a string like that, when it is not automatically produced. When
/if they add a better version string, we'll consume it.
On Mar 24, 2015 4:12 PM, "Tianon Gravi" notifications@github.com wrote:

@vbatts 👍 😍

—
Reply to this email directly or view it on GitHub
#11417 (comment).

tianon · 2015-03-24T20:22:21Z

They did, though! @lsm5 sent the patch and they applied it, and it shouldn't be a problem going forward because it's autogenerated now instead of manually curated.

…diff-479b910834cf0e4daea2e02767fd5dc9R1 pr moby#11417 Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

vbatts · 2015-03-25T14:06:32Z

Ah yeah. I had to dig for that commit. it's not in their master
http://git.kernel.org/cgit/linux/kernel/git/kdave/btrfs-progs.git/commit/?h=v3.19.x&id=514c5689bd672b21fa8033a7a48eae56a6e36b7f

lsm5 · 2015-03-26T00:00:22Z

/me is late to the party... the BUILD_VERSION patch has now landed in btrfs-progs master branch

jessfraz · 2015-03-26T00:01:41Z

yayyyyy!

On Wed, Mar 25, 2015 at 5:00 PM, Lokesh Mandvekar notifications@github.com
wrote:

/me is late to the party... the BUILD_VERSION patch has now landed in
btrfs-progs master branch

—
Reply to this email directly or view it on GitHub
#11417 (comment).

GordonTheTurtle added status/0-triage dco/yes labels Mar 16, 2015

jessfraz added status/2-code-review and removed status/0-triage labels Mar 16, 2015

rhatdan force-pushed the btrfs branch from 2b2a33c to 3f7ce4d Compare March 17, 2015 12:10

tianon mentioned this pull request Mar 19, 2015

'BTRFS_BUILD_VERSION' undeclared (first use in this function) -- btrfs-progs 3.19 #11487

Closed

Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version

3c13633

They say we should only use the BTRFS_LIB_VERSION They will no longer support this since it had to be managed manually Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

rhatdan force-pushed the btrfs branch from 3f7ce4d to 3c13633 Compare March 20, 2015 15:44

jessfraz modified the milestone: 1.7.0 Mar 20, 2015

jessfraz added this to the 1.6.0 milestone Mar 24, 2015

Merge branch 'master' of github.com:docker/docker into btrfs

25c4a92

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

vbatts added a commit that referenced this pull request Mar 24, 2015

Merge pull request #11417 from rhatdan/btrfs

8fc9e40

Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version

vbatts merged commit 8fc9e40 into moby:master Mar 24, 2015

tianon mentioned this pull request Mar 25, 2015

=app-emulation/docker-1.6.0_rc1: could not determine kind of name for C.BTRFS_BUILD_VERSION tianon/docker-overlay#38

Closed

vbatts mentioned this pull request Mar 25, 2015

btrfs: #ifdef for build version #11753

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version #11417

Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version #11417

rhatdan commented Mar 16, 2015

tianon commented Mar 16, 2015

rhatdan commented Mar 16, 2015

jessfraz commented Mar 16, 2015

lsm5 commented Mar 16, 2015

jessfraz commented Mar 16, 2015

rhatdan commented Mar 17, 2015

prologic commented Mar 19, 2015

jessfraz commented Mar 24, 2015

vbatts commented Mar 24, 2015

vbatts commented Mar 24, 2015

jessfraz commented Mar 24, 2015

vbatts commented Mar 24, 2015

rhatdan commented Mar 24, 2015

vbatts commented Mar 24, 2015

vbatts commented Mar 24, 2015

vbatts commented Mar 24, 2015

tianon commented Mar 24, 2015

tianon commented Mar 24, 2015

tianon commented Mar 24, 2015

vbatts commented Mar 24, 2015

jessfraz commented Mar 24, 2015

tianon commented Mar 24, 2015 via email

vbatts commented Mar 24, 2015

tianon commented Mar 24, 2015 via email

vbatts commented Mar 25, 2015

lsm5 commented Mar 26, 2015

jessfraz commented Mar 26, 2015

Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version #11417

Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version #11417

Conversation

rhatdan commented Mar 16, 2015

tianon commented Mar 16, 2015

rhatdan commented Mar 16, 2015

jessfraz commented Mar 16, 2015

lsm5 commented Mar 16, 2015

jessfraz commented Mar 16, 2015

rhatdan commented Mar 17, 2015

prologic commented Mar 19, 2015

jessfraz commented Mar 24, 2015

vbatts commented Mar 24, 2015

vbatts commented Mar 24, 2015

jessfraz commented Mar 24, 2015

vbatts commented Mar 24, 2015

rhatdan commented Mar 24, 2015

vbatts commented Mar 24, 2015

vbatts commented Mar 24, 2015

vbatts commented Mar 24, 2015

tianon commented Mar 24, 2015

tianon commented Mar 24, 2015

tianon commented Mar 24, 2015

vbatts commented Mar 24, 2015

jessfraz commented Mar 24, 2015

tianon commented Mar 24, 2015 via email

vbatts commented Mar 24, 2015

tianon commented Mar 24, 2015 via email

vbatts commented Mar 25, 2015

lsm5 commented Mar 26, 2015

jessfraz commented Mar 26, 2015