Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rpm: fix shared library devel package names and dependencies #9744

Merged
merged 4 commits into from Aug 9, 2016

Conversation

smithfarm
Copy link
Contributor

@@ -410,14 +413,15 @@ Striping interface built on top of the rados library, allowing
to stripe bigger objects onto several standard rados objects using
an interface very similar to the rados one.

%package -n libradosstriper1-devel
%package -n libradosstriper-devel
Summary: RADOS striping interface headers
Group: Development/Libraries
License: LGPL-2.0
Requires: libradosstriper1 = %{epoch}:%{version}-%{release}
Requires: librados2-devel = %{epoch}:%{version}-%{release}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be Requires: librados-devel

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@tserong
Copy link
Contributor

tserong commented Jun 16, 2016

In addition to those two line notes, I did a quick search through the spec file, and I think the librbd-devel and devel-compat packages still also have Requires: lib$FOO$VERSION-devel lines, which should become Requires: lib$FOO-devel to match the renamed devel packages.

@smithfarm
Copy link
Contributor Author

Thanks, @tserong, for the review. I have made the necessary corrections.

@ktdreyer @b-ranto Your thoughts on this PR?

@smithfarm
Copy link
Contributor Author

I'm trying to get the latest jewel into openSUSE "Tumbleweed". This appears to be the last obstacle...

@ktdreyer
Copy link
Member

I'm ok with this. We could drop the devel-compat package altogether at this point. It's quite old and everyone should upgrade through Firefly -> Hammer -> etc to pick up the newer names.

@smithfarm
Copy link
Contributor Author

@ktdreyer Done. Just devel-compat? Not any of the other "compats"?

@ktdreyer
Copy link
Member

I think the other -compats could go as well, but that could be a separate PR :)

@ktdreyer
Copy link
Member

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

@smithfarm
Copy link
Contributor Author

pushed wip-16345 to gitbuilders

@smithfarm
Copy link
Contributor Author

gitbuilder likes it

@smithfarm
Copy link
Contributor Author

smithfarm commented Jun 17, 2016

Changelog:

@b-ranto
Copy link
Contributor

b-ranto commented Jun 21, 2016

This lgtm, I'd like to see this go through some upgrade path tests though.

@b-ranto
Copy link
Contributor

b-ranto commented Jun 21, 2016

Also, when I think about it, this could probably break a lot of (qa) tooling. How would ceph-deploy/ansible handle this (especially things like purge/uninstall)?

@ktdreyer
Copy link
Member

I checked ceph-deploy and ceph-ansible, and they don't bother installing any -devel RPMs.

@smithfarm
Copy link
Contributor Author

smithfarm commented Jun 23, 2016

Well, I've tried but these cleanups do not pass upgrade/hammer-x because it does

sudo yum -y install libcephfs_jni1 rbd-fuse ceph-radosgw librbd1 ceph-fuse python-ceph ceph ceph-devel ceph-test librados2 cephfs-java libcephfs1

(notice the presence of ceph-devel) and it fails due to a bunch of unsatisfied dependencies like this (I show only the first two here - there are many more):

Error: Package: 1:ceph-devel-compat-0.80.7-0.8.el7.x86_64 (epel)
           Requires: libcephfs_jni1-devel = 1:0.80.7
           Installing: 1:libcephfs_jni-devel-10.2.0-2477.gea64db4.el7.x86_64 (Ceph)
               libcephfs_jni1-devel = 1:10.2.0-2477.gea64db4.el7
           Available: 1:libcephfs_jni1-devel-0.80.7-0.8.el7.x86_64 (epel)
               libcephfs_jni1-devel = 1:0.80.7-0.8.el7
Error: Package: 1:python-ceph-compat-0.80.7-0.8.el7.x86_64 (epel)
           Requires: python-cephfs = 1:0.80.7
           Installing: 1:python-cephfs-10.2.0-2477.gea64db4.el7.x86_64 (Ceph)
               python-cephfs = 1:10.2.0-2477.gea64db4.el7

Next I will try upgrade/infernalis-x and upgrade/jewel-x.

@ktdreyer
Copy link
Member

At this point, since Firefly is EOL, that test should probably be changed to use the -devel names from Hammer

smithfarm added a commit to smithfarm/ceph-qa-suite that referenced this pull request Jun 29, 2016
There are no "-dev" packages listed in the deb section of this file, so it
serves no purpose to have ceph-devel here.

Also, once ceph/ceph#9744 is merged the presence of
"ceph-devel" in this file will break teuthology for rpm targets.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
smithfarm added a commit to smithfarm/ceph-qa-suite that referenced this pull request Jun 29, 2016
There are no "-dev" packages listed in the deb section of this file, so it
serves no purpose to have ceph-devel here.

Also, once ceph/ceph#9744 is merged the presence of
"ceph-devel" in this file will break teuthology for rpm targets.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit af9e057)
@smithfarm
Copy link
Contributor Author

JFYI ceph-devel has been dropped from the list of packages that get installed by teuthology - see ceph/ceph-qa-suite#1068

@smithfarm
Copy link
Contributor Author

Rebased again.

@smithfarm
Copy link
Contributor Author

Repushed wip-16345 to gitbuilders.

@smithfarm
Copy link
Contributor Author

This passed gitbuilder but there's no point in running any more tests until ceph/teuthology#912 is merged.

@smithfarm
Copy link
Contributor Author

Hey Jenkins, test this please (logs are gone)

Everyone should upgrade through Firefly -> Hammer -> etc to pick up the newer
package names.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
This patch ensures that packages with the new name properly
replace old-named packages on upgrades.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm
Copy link
Contributor Author

rebased, pushed to gitbuilder

@smithfarm
Copy link
Contributor Author

smithfarm commented Aug 8, 2016

fail http://pulpito.ceph.com/smithfarm-2016-08-08_02:50:55-upgrade:jewel-x-wip-16345---basic-smithi/

"RuntimeError: Fuse mount failed to populate /sys/ after 31 seconds"

@smithfarm
Copy link
Contributor Author

smithfarm commented Aug 8, 2016

fail http://pulpito.ceph.com/smithfarm-2016-08-08_05:24:13-upgrade:jewel-x:point-to-point-x-wip-16345---basic-smithi/

Unrelated failure due to bug http://tracker.ceph.com/issues/16529 present in the jewel branch. The actual upgrade goes fine. Sorry, the test (1) installs 10.2.0, (2) upgrades to latest jewel, and (3) upgrades to "x". But the test failed before it got to (3).

2016-08-08T07:20:06.916 INFO:tasks.workunit.client.1.smithi015.stdout:test/cls_rbd/test_cls_rbd.cc:1384: Failure
2016-08-08T07:20:06.916 INFO:tasks.workunit.client.1.smithi015.stdout:Value of: mirror_image_set(&ioctx, "image_id2", image2)
2016-08-08T07:20:06.916 INFO:tasks.workunit.client.1.smithi015.stdout:  Actual: -2
2016-08-08T07:20:06.917 INFO:tasks.workunit.client.1.smithi015.stdout:Expected: 0
2016-08-08T07:20:06.998 INFO:tasks.workunit.client.1.smithi015.stdout:[  FAILED  ] TestClsRbd.mirror_image (5 ms)

@smithfarm
Copy link
Contributor Author

The jewel-x upgrade suite is in sorry shape.

@smithfarm
Copy link
Contributor Author

smithfarm commented Aug 8, 2016

pass http://pulpito.ceph.com/smithfarm-2016-08-08_07:44:47-upgrade:jewel-x-wip-16345---basic-smithi/

Chose one that currently succeeds in the nightlies.

@smithfarm
Copy link
Contributor Author

@ktdreyer @b-ranto The upgrade/jewel-x job passed. OK to merge?

@ktdreyer
Copy link
Member

ktdreyer commented Aug 8, 2016

👍 thanks

@b-ranto
Copy link
Contributor

b-ranto commented Aug 9, 2016

👍

@smithfarm smithfarm merged commit 1ab7792 into ceph:master Aug 9, 2016
@smithfarm smithfarm deleted the wip-16345 branch August 9, 2016 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants