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

build/ops: rpm: move ceph-*-tool binaries out of ceph-test subpackage #18289

Merged
merged 2 commits into from Oct 18, 2017

Conversation

Projects
None yet
4 participants
@smithfarm
Copy link
Contributor

commented Oct 13, 2017

ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into ceph-base

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler ncutler@suse.com

Thanks to @vumrao for the proposal, to @ktdreyer for the suggestion to put ceph-kvstore-tool in ceph-base, and to @tchaikov for bringing the ceph-kvstore-tool manpage to my attention!

@smithfarm smithfarm requested review from tchaikov, jecluis, ktdreyer and dmick Oct 13, 2017

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

commented Oct 13, 2017

Since ceph-osd and ceph-mon are typically installed on all test nodes, I don't think this will break teuthology. . .

@smithfarm smithfarm force-pushed the smithfarm:wip-21762 branch from 74b2f24 to dc06fce Oct 13, 2017

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

commented Oct 13, 2017

Updated, and deb added.

@smithfarm smithfarm force-pushed the smithfarm:wip-21762 branch from dc06fce to 2080f18 Oct 13, 2017

@@ -5,6 +5,7 @@ usr/bin/ceph-run
usr/bin/crushtool
usr/bin/monmaptool
usr/bin/osdmaptool
usr/bin/ceph-kvstore-tool

This comment has been minimized.

Copy link
@tchaikov

tchaikov Oct 16, 2017

Contributor

@smithfarm could you please take this chance to add usr/share/man/man8/ceph-kvstore-tool.8 to this list?

@@ -1632,9 +1635,6 @@ fi
%{_bindir}/ceph_tpbench
%{_bindir}/ceph_xattr_bench
%{_bindir}/ceph-coverage
%{_bindir}/ceph-monstore-tool
%{_bindir}/ceph-osdomap-tool
%{_bindir}/ceph-kvstore-tool
%{_bindir}/ceph-debugpack
%{_mandir}/man8/ceph-debugpack.8*
%{_mandir}/man8/ceph-kvstore-tool.8*

This comment has been minimized.

Copy link
@tchaikov

tchaikov Oct 16, 2017

Contributor

move this line to the section of %files base.

build/ops: rpm: move ceph-*-tool binaries out of ceph-test subpackage
ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>

@smithfarm smithfarm force-pushed the smithfarm:wip-21762 branch from 2080f18 to a53a276 Oct 16, 2017

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

commented Oct 16, 2017

@tchaikov Updated and added you to credits in the PR description

@ktdreyer
Copy link
Member

left a comment

LGTM, thank you @smithfarm !

@@ -1,8 +1,5 @@
usr/bin/ceph-client-debug
usr/bin/ceph-coverage
usr/bin/ceph-kvstore-tool

This comment has been minimized.

Copy link
@tchaikov

tchaikov Oct 16, 2017

Contributor
2017-10-16T15:02:39.462 INFO:teuthology.orchestra.run.smithi112.stdout:dpkg: error processing archive /var/cache/apt/archives/ceph-test_13.0.0-2017-g207de03-1xenial_amd64.deb (--unpack):
2017-10-16T15:02:39.463 INFO:teuthology.orchestra.run.smithi112.stdout: trying to overwrite '/usr/share/man/man8/ceph-kvstore-tool.8.gz', which is also in package ceph-base 13.0.0-2017-g207de03-1xenial

see http://qa-proxy.ceph.com/teuthology/kchai-2017-10-16_14:55:45-rados-wip-kefu-testing-2017-10-16-1746-distro-basic-smithi/1739413/teuthology.log

weird ...

build/ops: deb: move ceph-*-tool binaries out of ceph-test subpackage
ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>

@smithfarm smithfarm force-pushed the smithfarm:wip-21762 branch from a53a276 to 40caf6a Oct 16, 2017

@@ -28,4 +25,3 @@ usr/bin/ceph_tpbench
usr/bin/ceph_xattr_bench
usr/lib/ceph/ceph-monstore-update-crush.sh
usr/share/java/libcephfs-test.jar
usr/share/man/man8/ceph-kvstore-tool.8

This comment has been minimized.

Copy link
@smithfarm

smithfarm Oct 16, 2017

Author Contributor

@tchaikov I forgot to drop this line - fixed

@tchaikov tchaikov added the needs-qa label Oct 16, 2017

@ceph-jenkins

This comment has been minimized.

Copy link
Collaborator

commented Oct 16, 2017

submodules for project are unmodified

@tchaikov tchaikov merged commit 62b70b3 into ceph:master Oct 18, 2017

5 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details

@smithfarm smithfarm deleted the smithfarm:wip-21762 branch Nov 14, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.