Commit Graph

103464 Commits

Author SHA1 Message Date
Sage Weil
cfe1898b91 mgr/ssh: python, not python3
python 2.x is okay too.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-28 12:15:47 -05:00
Sage Weil
79a70558da ceph-daemon: python, not python3
python2 is okay too.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-28 12:15:47 -05:00
Sage Weil
4330502768 ceph-daemon: os.makedirs
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-28 12:15:47 -05:00
Sage Weil
97d9664927 ceph-daemon: configparser is ConfigParser on py2
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-28 12:15:47 -05:00
Sage Weil
beb09ff548 ceph-daemon: avoid py3-isms
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-28 12:15:47 -05:00
Sage Weil
0bc2ed6191 Merge PR #31141 into master
* refs/pull/31141/head:
	ceph-daemon: fix warning message
	ceph-daemon: fix enable with conflicting ceph.target files
	test_ceph_daemon.sh: use same fsid as qa/standalone/test_ceph_daemon.sh
	test_ceph_daemon.sh: use other latest-master image
	ceph-daemon: fix pathify (fix shell --config/--keyring)
	ceph-daemon: /var/run/ceph -> /var/run/ceph/$fsid

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-10-25 14:30:33 -05:00
Sage Weil
3ee7d4154b ceph-daemon: fix warning message
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 12:46:52 -05:00
Josh Durgin
8c7eeab703
Merge pull request #31164 from tchaikov/wip/doc/rados/fix-typo
doc/rados/deployment/ceph-deploy-mon: fix typo

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-10-25 10:41:42 -07:00
Sage Weil
efd3497d03 ceph-daemon: fix enable with conflicting ceph.target files
+ make description better

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 11:26:32 -05:00
Kefu Chai
659456d36a doc/rados/deployment/ceph-deploy-mon: fix typo
s/comingling/commingling/

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-25 22:38:44 +08:00
Kefu Chai
0f30a49953
Merge pull request #31113 from sungjunyoung/do_cmake-warning
do_cmake: Warn user about slow debug performance only for not set

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-25 22:24:42 +08:00
Sage Weil
b830870bbb Merge PR #31130 into master
* refs/pull/31130/head:
	ceph-daemon: only set up crash dir mount if it exists

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-10-25 09:18:20 -05:00
Sage Weil
23d22a2781 Merge PR #31138 into master
* refs/pull/31138/head:
	mon: fix tell to hybrid octopus/pre-octopus mons

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-10-25 09:11:36 -05:00
Jason Dillaman
190b0bf433
Merge pull request #31006 from zy751713126/fix_features
librbd: fix rbd_features_to_string output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-25 08:34:25 -04:00
Jason Dillaman
b0c876b48a
Merge pull request #30955 from runsisi/wip-fix-dup-lock
librbd: force reacquire lock if blacklist is disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-25 08:33:51 -04:00
Jason Dillaman
f80b7dd18f
Merge pull request #30954 from mxdInspur/thickimg_create_progress
rbd:  creating thick-provision image progress percent info exceeds 100%

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-25 08:33:12 -04:00
Kefu Chai
a90a52c428
Merge pull request #31143 from badone/wip-tracker-38466-enable-librabbitmq-devel
ceph.spec.in: enable amqp_endpoint on RHEL8 by default

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-25 19:15:43 +08:00
Kefu Chai
6046d4b4c0
Merge pull request #31110 from tchaikov/wip-cmake/enable-seastar-with-dpdk
cmake: support `Seastar_DPDK=ON` option

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-10-25 18:00:03 +08:00
Brad Hubbard
c44c140dfa ceph.spec.in: Enable amqp_endpoint on RHEL8 by default
RHEL/CentOS 8 now provide librabbitmq-devel so we can enable it as a
build requirement.

Fixes: https://tracker.ceph.com/issues/38466

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2019-10-25 18:18:23 +10:00
Sage Weil
12c08ec319 test_ceph_daemon.sh: use same fsid as qa/standalone/test_ceph_daemon.sh
That way these scripts both clean up for each other (and are obviously
bogus clusters).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-24 21:27:36 -05:00
Sage Weil
4005eddca0 test_ceph_daemon.sh: use other latest-master image
This one is newer?

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-24 21:26:21 -05:00
Sage Weil
75016caba5 ceph-daemon: fix pathify (fix shell --config/--keyring)
The relative path works on one of my machines but not my laptop; the
full CWD works everywhere.  This is presumably better anyway!

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-24 21:25:59 -05:00
Sage Weil
d23cf0113d ceph-daemon: /var/run/ceph -> /var/run/ceph/$fsid
This is better than having a single /var/run/ceph on the host with a
weird naming scheme.  Among other things, it means that we can access
the asok for any daemon for a given fsid from any container on the same
host with the same fsid (notably, a shell).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-24 21:25:17 -05:00
Sage Weil
7bbf9037ca mon: fix tell to hybrid octopus/pre-octopus mons
We can't decide whether to use the new tell command style based on the
monmap.min_mon_release alone because some mons may be octopus even though
that hasn't updated yet.  The same goes for if we look at the combined
features for the cluster--the underlying problem is the monmap doesn't
tell us which mons are octopus and which ones aren't, so we don't know
how to behave.

Instead, allow octopus+ mons to advertise the converted tell commands
going forward, for compatibility with pre-octopus clients (who do the old
style of tell) and for octopus+ clients talking to a min_mon_release <
octopus cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-24 20:09:05 -05:00
Sage Weil
f56a8db34d ceph-daemon: only set up crash dir mount if it exists
Sometimes we run containers on a host that doesn't have a crash dir set
up (becuase no daemon has been deployed).  Examples include shell and
ceph-volume.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-24 20:06:23 -05:00
David Zafman
4ea43f7342
Merge pull request #31133 from dzafman/wip-42476
ceph-objectstore-tool: call collection_bits() crashes on the meta col…

Reviewed-by: Sage Weil <sage@redhat.com>
2019-10-24 17:23:48 -07:00
Kefu Chai
cb43f9bf5e
Merge pull request #31135 from athanatos/sjust/wip-alien-echo-fix
test_alien_echo: update to use crimson:: namespace

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-25 07:50:32 +08:00
Sage Weil
458f369f46 Merge PR #31121 into master
* refs/pull/31121/head:
	mon/MonClient: fix mon tell to older mons

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-10-24 18:29:52 -05:00
Patrick Donnelly
e47d0e4cb3
Merge PR #31095 into master
* refs/pull/31095/head:
	qa: do not check pg count for new data_isolated volume

Reviewed-by: Sage Weil <sage@redhat.com>
2019-10-24 15:17:48 -07:00
Samuel Just
b2c34887a2 test/crimson/test_alien_echo: update to use crimson:: namespace
See: bd023211d9
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-10-24 13:41:59 -07:00
Mark Nelson
304c37f521
Merge pull request #30964 from markhpc/wip-bs-cache-trim-pinned
os/bluestore: Keep separate onode cache pinned list.
2019-10-24 14:50:11 -05:00
David Zafman
2d79e77b6a ceph-objectstore-tool: call collection_bits() crashes on the meta collection
Skip new check for meta collection
test:
    Turn off osd_pool_default_pg_autoscale_mode just like bash tests do
    Fix test by checking for new error message

Caused by: f88b353454

Fixes: https://tracker.ceph.com/issues/42476

Signed-off-by: David Zafman <dzafman@redhat.com>
2019-10-24 11:37:30 -07:00
Yuri Weinstein
7b4f9a083f
Merge pull request #31132 from smithfarm/wip-42474
build-integration-branch: take PRs in chronological order
2019-10-24 10:43:47 -07:00
Junyoung, Sung
678c14259f do_cmake: Disable shell command printing feature before cmake execution
Signed-off-by: Junyoung, Sung <junyoung.sung@navercorp.com>
2019-10-25 02:17:59 +09:00
Nathan Cutler
ceb3027930 build-integration-branch: change shebang to python3
The word "python" in the shebang means Python 2, but Python 2 is deprecated and
should no longer be used.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-10-24 18:54:55 +02:00
Nathan Cutler
bf564b5f1d build-integration-branch: take PRs in chronological order
Fixes: https://tracker.ceph.com/issues/42474
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-10-24 18:34:47 +02:00
Junyoung, Sung
87ada5fcc8 do_cmake: Warn user about slow debug performance only for not set
Signed-off-by: Junyoung, Sung <junyoung.sung@navercorp.com>
2019-10-25 00:48:59 +09:00
Sage Weil
bb84373070 mon/MonClient: fix mon tell to older mons
For older mons, we need to call into send_command so that we trigger the
compat code that futzes with our mon sessions.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-24 08:00:32 -05:00
Sage Weil
8b56c456b5 Merge PR #30848 into master
* refs/pull/30848/head:
	mon/PGMap: drop indentation on 'df' human output

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-24 06:20:29 -05:00
Kefu Chai
56070205e6 cmake: support Seastar_DPDK=ON option
seastar does not build any 3rd party libraries. but we do. currently, we
build DPDK/SPDK when they are enabled for the messenger backend and
bluestore backend.

in this change, the same function is reused for preparing the DPDK
libraries if `Seastar_DPDK` is enabled. probably we should outsource
this work to install-deps.sh in future, but before that, let's keep
this as a builtin "feature".

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 17:54:05 +08:00
Kefu Chai
a123c85256 cmake: enable Finddpdk to find DPDK to be built
find_package(dpdk...) is used by seastar to find DPDK if Seastar_DPDK is
enabled. but `build_dpdk()` only exposes `dpdk::dpdk`, and it does not
set the variables like `dpdk_INCLUDE_DIRS` and `dpdk_LIBRARIES` when it
gets called. so we need to adapt Finddpdk to query them from `dpdk::dpdk`
target.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 17:54:05 +08:00
Nathan Cutler
54020b75bc
Merge pull request #31112 from smithfarm/wip-distros-sle
qa/distros: add SLE-12-SP3 and SLE-15-SP1

Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.de>
2019-10-24 11:28:41 +02:00
Nathan Cutler
33a9e4a671 qa/distros: add SLE-12-SP3 and SLE-15-SP1
Ceph luminous is known to run on SLE-12-SP3 and nautilus on SLE-15-SP1, so add
these two to qa/distros/all.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-10-24 09:47:22 +02:00
Kefu Chai
aa25f6202f cmake: define dpdk_LIBRARIES properly
dpdk_LIBRARIES should not be a list of dpdk library target, it should be
a list of paths to them. this also align with the definition of
`Finddpdk.cmake` in seastar project. so, if `Seastar_DPDK` is defined,
we should be able to offer the expected `dpdk_LIBRARIES` for seastar, as
our `Finddpdk.cmake` has higher priority than the one in seastar, and is
used when `find_package(dpdk...)` is called.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 15:15:51 +08:00
Kefu Chai
d82ea5d738 cmake: refactor BuildDPDK
* extract `do_export_dpdk()` into a separated function
* no need to check for `dpdk-ext` target before calling `build_dpdk()`,
  as the name of this target should be hidden from the caller of this
  function.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 15:15:51 +08:00
Kefu Chai
097de62bf9
Merge pull request #31069 from tchaikov/wip/crimson/replace-ceph-with-crimson
crimson: s/ceph/crimson/ in namespace names

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-10-24 13:57:11 +08:00
Kefu Chai
bd023211d9 test/crimson: silence deprecated warnings
* do not discard returned future<>
* do not use variadic future<>

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 12:37:30 +08:00
Kefu Chai
4589fff6bf crimson: s/ceph/crimson/ in namespace names
to help differentiate the symbols shared by classic and crimson osd,
after this change, all crimson code will live in "crimson::" namespaces.
and in a follow-up change, all classic code used by crimson will live in
"ceph::" namespaces.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 12:37:30 +08:00
Kefu Chai
acff723c32 crimson/osd/osd_operation.h: s/ceph_assert/assert/
so we don't need to include `include/ceph_assert.h` for it. and
presumably, `ceph_assert()` is for fail the application early when it is
not able to recover from a failure, while `assert()` is for debugging.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 12:23:17 +08:00
Neha Ojha
d79325b07f
Merge pull request #31066 from ideepika/wip-doc-adds-cmake-options
doc: Adds cmake build options for optionally skipping few components

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-10-24 09:29:36 +05:30