]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agocephfs-journal-tool: fix wrong read_offset when get missing objects 35096/head
jhonxue [Thu, 30 Jul 2020 06:40:16 +0000 (14:40 +0800)]
cephfs-journal-tool: fix wrong read_offset when get missing objects

Fixes: https://tracker.ceph.com/issues/45575
Signed-off-by: Xue Yantao <jhonxue@tencent.com>
5 years agoMerge pull request #31133 from dzafman/wip-42476
David Zafman [Fri, 25 Oct 2019 00:23:48 +0000 (17:23 -0700)]
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>
5 years agoMerge pull request #31135 from athanatos/sjust/wip-alien-echo-fix
Kefu Chai [Thu, 24 Oct 2019 23:50:32 +0000 (07:50 +0800)]
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>
5 years agoMerge PR #31121 into master
Sage Weil [Thu, 24 Oct 2019 23:29:52 +0000 (18:29 -0500)]
Merge PR #31121 into master

* refs/pull/31121/head:
mon/MonClient: fix mon tell to older mons

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #31095 into master
Patrick Donnelly [Thu, 24 Oct 2019 22:17:48 +0000 (15:17 -0700)]
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>
5 years agotest/crimson/test_alien_echo: update to use crimson:: namespace 31135/head
Samuel Just [Thu, 24 Oct 2019 20:18:29 +0000 (13:18 -0700)]
test/crimson/test_alien_echo: update to use crimson:: namespace

See: bd023211d999f1e2b70f48254507524d0763bd33
Signed-off-by: Samuel Just <sjust@redhat.com>
5 years agoMerge pull request #30964 from markhpc/wip-bs-cache-trim-pinned
Mark Nelson [Thu, 24 Oct 2019 19:50:11 +0000 (14:50 -0500)]
Merge pull request #30964 from markhpc/wip-bs-cache-trim-pinned

os/bluestore: Keep separate onode cache pinned list.

5 years agoceph-objectstore-tool: call collection_bits() crashes on the meta collection 31133/head
David Zafman [Thu, 24 Oct 2019 18:31:52 +0000 (11:31 -0700)]
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: f88b3534549bb2ede76e9f3e8b6b641b5886a9f4

Fixes: https://tracker.ceph.com/issues/42476
Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #31132 from smithfarm/wip-42474
Yuri Weinstein [Thu, 24 Oct 2019 17:43:47 +0000 (10:43 -0700)]
Merge pull request #31132 from smithfarm/wip-42474

build-integration-branch: take PRs in chronological order

5 years agobuild-integration-branch: change shebang to python3 31132/head
Nathan Cutler [Thu, 24 Oct 2019 16:54:55 +0000 (18:54 +0200)]
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>
5 years agobuild-integration-branch: take PRs in chronological order
Nathan Cutler [Thu, 24 Oct 2019 16:29:02 +0000 (18:29 +0200)]
build-integration-branch: take PRs in chronological order

Fixes: https://tracker.ceph.com/issues/42474
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agomon/MonClient: fix mon tell to older mons 31121/head
Sage Weil [Thu, 24 Oct 2019 13:00:32 +0000 (08:00 -0500)]
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>
5 years agoMerge PR #30848 into master
Sage Weil [Thu, 24 Oct 2019 11:20:29 +0000 (06:20 -0500)]
Merge PR #30848 into master

* refs/pull/30848/head:
mon/PGMap: drop indentation on 'df' human output

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31112 from smithfarm/wip-distros-sle
Nathan Cutler [Thu, 24 Oct 2019 09:28:41 +0000 (11:28 +0200)]
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>
5 years agoqa/distros: add SLE-12-SP3 and SLE-15-SP1 31112/head
Nathan Cutler [Thu, 24 Oct 2019 07:47:22 +0000 (09:47 +0200)]
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>
5 years agoMerge pull request #31069 from tchaikov/wip/crimson/replace-ceph-with-crimson
Kefu Chai [Thu, 24 Oct 2019 05:57:11 +0000 (13:57 +0800)]
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>
5 years agotest/crimson: silence deprecated warnings 31069/head
Kefu Chai [Wed, 23 Oct 2019 08:27:08 +0000 (16:27 +0800)]
test/crimson: silence deprecated warnings

* do not discard returned future<>
* do not use variadic future<>

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson: s/ceph/crimson/ in namespace names
Kefu Chai [Wed, 23 Oct 2019 08:08:38 +0000 (16:08 +0800)]
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>
5 years agocrimson/osd/osd_operation.h: s/ceph_assert/assert/
Kefu Chai [Thu, 24 Oct 2019 03:57:09 +0000 (11:57 +0800)]
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>
5 years agoMerge pull request #31066 from ideepika/wip-doc-adds-cmake-options
Neha Ojha [Thu, 24 Oct 2019 03:59:36 +0000 (09:29 +0530)]
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>
5 years agoMerge PR #30859 into master
Sage Weil [Thu, 24 Oct 2019 02:05:42 +0000 (21:05 -0500)]
Merge PR #30859 into master

* refs/pull/30859/head:
auth: EACCES, not EPERM
mon: shunt old tell commands from cli interface to asok
mon: allow mgr to tell mon.foo smart
mon: include quorum features in quorum_status
qa/workunits/mon/caps.sh: fix test
ceph_test_rados_api_cmd: fix MonDescribe test
Merge branch 'vstart-fs-auth' of git://github.com/batrick/ceph into wip-cleanup-mon-asok
test/pybind/test_ceph_argparse: fix tests
vstart: add volume client keys to keyring
vstart: use fs authorize to create master client key
vstart: redirect some output to stderr
vstart: output command strings to stderr
qa/workunits/cephtool/test.sh: fix 'quorum enter' caller
qa: change mon_status calls to quorum_status or tell commands
mon: fix 'heap ...' command
mon: consolidate 'sync force' commands
mon: allow asok commands to return an error code
mon: move 'quorum enter|exit' and 'mon_status' to asok
mon: fix 'smart' asok command
mon: remove old 'config set' and 'injectargs'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge PR #31094 into master
Sage Weil [Thu, 24 Oct 2019 00:46:06 +0000 (19:46 -0500)]
Merge PR #31094 into master

* refs/pull/31094/head:
ceph-daemon: remove redundant --privileged
test_ceph_daemon: test unit, enter, shell
ceph-daemon: drop exec
ceph-daemon: fix exit code for run, shell, enter, exec
ceph-daemon: allow optional command for 'enter'
ceph-daemon: fix LANG for 'enter' command
ceph-daemon: allow shell to take optional command
qa/suites/rados/singleton-nomsgr/ceph-daemon: run test_ceph_daemon.sh
qa/standalone/test_ceph_daemon.sh: add new functional tests
test_ceph_daemon.sh: use newer image
ceph-daemon: unconditionally enable and start crash unit
ceph-daemon: fix crash unit cleanup
ceph-daemon: include 'crash' unit/item in 'ls' output
ceph-daemon: fix 'ls'
mgr/orchestrator: s/sdd/ssd/
mgr/ssh: remove stdout/stderr kludges
ceph-daemon: fix ceph-volume command to write stdout to stdout

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #30650 from athanatos/sjust/wip-dmclock-server-only
Gregory Farnum [Wed, 23 Oct 2019 20:35:13 +0000 (13:35 -0700)]
Merge pull request #30650 from athanatos/sjust/wip-dmclock-server-only

dmclock server side refactor

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoPendingReleaseNotes: note mClockScheduler config changes 30650/head
Samuel Just [Tue, 22 Oct 2019 21:07:53 +0000 (14:07 -0700)]
PendingReleaseNotes: note mClockScheduler config changes

Signed-off-by: Samuel Just <sjust@redhat.com>
5 years agoosd/: remove legacy schedulers
Samuel Just [Thu, 26 Sep 2019 22:04:09 +0000 (15:04 -0700)]
osd/: remove legacy schedulers

The consensus seems to be that PrioritizedQueue is strictly worse than
WeightedPriorityQueue.

mClockClientQueue and mClockClassQueue are superceded by
mClockScheduler.

Signed-off-by: Samuel Just <sjust@redhat.com>
5 years agoosd/scheduler: introduce mClockScheduler
Samuel Just [Tue, 17 Sep 2019 19:10:52 +0000 (12:10 -0700)]
osd/scheduler: introduce mClockScheduler

mClockScheduler schedules items based on op_scheduler_class
with configured mclock parameters.  Items which should be
scheduled immediately (op_scheduler_class::immediate) are placed
into a single queue as it's not clear that there's a reason to
differentiate among them.

A subsequent patch will add support for client provided mclock
params and dmclock request state.

Signed-off-by: Samuel Just <sjust@redhat.com>
5 years agoMerge PR #31057 into master
Sage Weil [Wed, 23 Oct 2019 20:20:56 +0000 (15:20 -0500)]
Merge PR #31057 into master

* refs/pull/31057/head:
common/thread: Fix race condition in make_named_thread

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
5 years agoMerge PR #31054 into master
Sage Weil [Wed, 23 Oct 2019 20:20:43 +0000 (15:20 -0500)]
Merge PR #31054 into master

* refs/pull/31054/head:
qa/suites/upgrade/*-x-singleton: suppress TOO_FEW_PGS warning

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge PR #30882 into master
Sage Weil [Wed, 23 Oct 2019 20:18:26 +0000 (15:18 -0500)]
Merge PR #30882 into master

* refs/pull/30882/head:
ceph-daemon: deploy a logrotate.d config file for each cluster

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoceph-daemon: remove redundant --privileged 31094/head
Sage Weil [Wed, 23 Oct 2019 20:08:26 +0000 (15:08 -0500)]
ceph-daemon: remove redundant --privileged

The only caller, command_shell, passes this.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agotest_ceph_daemon: test unit, enter, shell
Sage Weil [Wed, 23 Oct 2019 16:34:46 +0000 (11:34 -0500)]
test_ceph_daemon: test unit, enter, shell

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: drop exec
Sage Weil [Wed, 23 Oct 2019 16:25:12 +0000 (11:25 -0500)]
ceph-daemon: drop exec

It's not identical to enter.  enter seems more intuitive to me, but that
may be because I'm not a longtime docker user.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: fix exit code for run, shell, enter, exec
Sage Weil [Wed, 23 Oct 2019 16:23:32 +0000 (11:23 -0500)]
ceph-daemon: fix exit code for run, shell, enter, exec

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: allow optional command for 'enter'
Sage Weil [Wed, 23 Oct 2019 16:14:49 +0000 (11:14 -0500)]
ceph-daemon: allow optional command for 'enter'

Default to interactive shell; otherwise run a specific command, just like
the 'shell' command.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: fix LANG for 'enter' command
Sage Weil [Wed, 23 Oct 2019 16:07:59 +0000 (11:07 -0500)]
ceph-daemon: fix LANG for 'enter' command

We did the same thing for 'shell' in 02d4f8c0970489c7184bbbe6b239af4a0067e38e

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: allow shell to take optional command
Sage Weil [Wed, 23 Oct 2019 16:05:00 +0000 (11:05 -0500)]
ceph-daemon: allow shell to take optional command

This is different from 'exec' in that it creates a new container instead
of entering an existing one.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/singleton-nomsgr/ceph-daemon: run test_ceph_daemon.sh
Sage Weil [Wed, 23 Oct 2019 15:57:55 +0000 (10:57 -0500)]
qa/suites/rados/singleton-nomsgr/ceph-daemon: run test_ceph_daemon.sh

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/standalone/test_ceph_daemon.sh: add new functional tests
Sage Weil [Wed, 23 Oct 2019 15:54:33 +0000 (10:54 -0500)]
qa/standalone/test_ceph_daemon.sh: add new functional tests

- sudo as needed
- clean up afterward

There is still a bit of missing coverage, but this captures most of it.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agotest_ceph_daemon.sh: use newer image
Sage Weil [Wed, 23 Oct 2019 15:49:55 +0000 (10:49 -0500)]
test_ceph_daemon.sh: use newer image

Not sure what the difference between latest-master and latest-master-devel
is, but the -devel image is way out of date.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: unconditionally enable and start crash unit
Sage Weil [Wed, 23 Oct 2019 15:49:20 +0000 (10:49 -0500)]
ceph-daemon: unconditionally enable and start crash unit

Even if it exists, (re)try to enable and start it.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: fix crash unit cleanup
Sage Weil [Wed, 23 Oct 2019 15:47:58 +0000 (10:47 -0500)]
ceph-daemon: fix crash unit cleanup

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: include 'crash' unit/item in 'ls' output
Sage Weil [Wed, 23 Oct 2019 16:45:03 +0000 (11:45 -0500)]
ceph-daemon: include 'crash' unit/item in 'ls' output

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: fix 'ls'
Sage Weil [Wed, 23 Oct 2019 15:30:40 +0000 (10:30 -0500)]
ceph-daemon: fix 'ls'

This broke when we added the crash service.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: s/sdd/ssd/
Sage Weil [Wed, 23 Oct 2019 19:06:56 +0000 (14:06 -0500)]
mgr/orchestrator: s/sdd/ssd/

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: remove stdout/stderr kludges
Sage Weil [Wed, 23 Oct 2019 19:04:56 +0000 (14:04 -0500)]
mgr/ssh: remove stdout/stderr kludges

ceph-daemon is now well-behaved with respect to stdout vs stderr.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: fix ceph-volume command to write stdout to stdout
Sage Weil [Wed, 23 Oct 2019 19:04:30 +0000 (14:04 -0500)]
ceph-daemon: fix ceph-volume command to write stdout to stdout

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoauth: EACCES, not EPERM 30859/head
Sage Weil [Wed, 23 Oct 2019 18:36:48 +0000 (13:36 -0500)]
auth: EACCES, not EPERM

EPERM means an operation requires superuser; EACCES more generally means
permission denied.  We use EACCES elsewhere for ceph auth denials; use it
here too for consistency.  This fixes qa/workunits/mon/caps.sh.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa: do not check pg count for new data_isolated volume 31095/head
Patrick Donnelly [Wed, 23 Oct 2019 18:11:49 +0000 (11:11 -0700)]
qa: do not check pg count for new data_isolated volume

We don't need to specify the number of PGs for a new data pool anymore
since b1b821f60812dd36e61be115c5ad8223ab51befe and other related
changes. The related health warnings are also deprecated/gone. So this
no longer needs to be done.

Fixes: b1b821f60812dd36e61be115c5ad8223ab51befe
Fixes: https://tracker.ceph.com/issues/42436
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #30997 from cbodley/wip-qa-rgw-objectstores
Casey Bodley [Wed, 23 Oct 2019 15:37:32 +0000 (11:37 -0400)]
Merge pull request #30997 from cbodley/wip-qa-rgw-objectstores

qa/rgw: drop some objectstore types

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #28421 from pritha-srivastava/wip-rgw-omap-offload
Casey Bodley [Wed, 23 Oct 2019 13:59:28 +0000 (09:59 -0400)]
Merge pull request #28421 from pritha-srivastava/wip-rgw-omap-offload

rgw: add cls_queue and cls_rgw_gc for omap offload

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #31068 from bk201/wip-lint-python-common
Sebastian Wagner [Wed, 23 Oct 2019 12:39:20 +0000 (14:39 +0200)]
Merge pull request #31068 from bk201/wip-lint-python-common

python-common: enable lint in tox tests

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/dashboard: Extend documentation about differences between… (#30963)
Lenz Grimmer [Wed, 23 Oct 2019 11:13:23 +0000 (11:13 +0000)]
mgr/dashboard: Extend documentation about differences between… (#30963)

mgr/dashboard: Extend documentation about differences between E2E and Unit Tests

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Document valid frontend tests 30963/head
Laura Paduano [Wed, 16 Oct 2019 11:01:59 +0000 (13:01 +0200)]
mgr/dashboard: Document valid frontend tests

This documentation is supposed to help clarify
when and where different type of tests should
be used by explaining the types and what
they are designed for.

Fixes: https://tracker.ceph.com/issues/42253
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
Signed-off-by: Laura Paduano <lpaduano@suse.com>
5 years agopython-common: fix lint errors 31068/head
Kiefer Chang [Wed, 23 Oct 2019 07:45:39 +0000 (15:45 +0800)]
python-common: fix lint errors

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agopython-common: enable lint in tox tests
Kiefer Chang [Wed, 23 Oct 2019 07:41:53 +0000 (15:41 +0800)]
python-common: enable lint in tox tests

* Change tox env py35 and py36 to just py3.
* Use flake8 to lint code.
* Use rstcheck to lint rst files.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoMerge pull request #30974 from tchaikov/wip/do_cmake/enable-amqp
Kefu Chai [Wed, 23 Oct 2019 06:46:12 +0000 (14:46 +0800)]
Merge pull request #30974 from tchaikov/wip/do_cmake/enable-amqp

do_cmake.sh: enable amqp and rdma for EL8

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agodoc: Adds cmake build options for optionally skipping few components 31066/head
Deepika Upadhyay [Tue, 22 Oct 2019 23:27:20 +0000 (04:57 +0530)]
doc: Adds cmake build options for optionally skipping few components

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #31044 from tchaikov/wip/pybind/rados-py3
Kefu Chai [Wed, 23 Oct 2019 06:08:58 +0000 (14:08 +0800)]
Merge pull request #31044 from tchaikov/wip/pybind/rados-py3

pybind/rados: do not slice zip()

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #30710 into master
Patrick Donnelly [Wed, 23 Oct 2019 03:55:19 +0000 (20:55 -0700)]
Merge PR #30710 into master

* refs/pull/30710/head:
mds: add configurable snapshot limit

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #31065 from changchengx/mon_doc
Kefu Chai [Wed, 23 Oct 2019 03:34:20 +0000 (11:34 +0800)]
Merge pull request #31065 from changchengx/mon_doc

doc: fix typo to auto scale pg number

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #30887 into master
Patrick Donnelly [Wed, 23 Oct 2019 03:30:27 +0000 (20:30 -0700)]
Merge PR #30887 into master

* refs/pull/30887/head:
mgr/volumes: refactor dir handle cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agodoc: fix typo to auto scale pg number 31065/head
Changcheng Liu [Wed, 23 Oct 2019 02:53:14 +0000 (10:53 +0800)]
doc: fix typo to auto scale pg number

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agocommon/thread: Fix race condition in make_named_thread 31057/head
Adam C. Emerson [Tue, 22 Oct 2019 15:39:20 +0000 (11:39 -0400)]
common/thread: Fix race condition in make_named_thread

The thread may well no longer exist by the time we try to set the
name, so have the thread set its own name first thing.

Thanks to Ilya Dryomov <idryomov@gmail.com> for pointing it out.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
5 years agomon: shunt old tell commands from cli interface to asok
Sage Weil [Tue, 22 Oct 2019 16:36:06 +0000 (11:36 -0500)]
mon: shunt old tell commands from cli interface to asok

Pre-octopus clients will send tell commands as CLI commands.  Explicitly
identify those and send them to the asok infrastructure.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agosrc/osd: replace OpQueue abstraction in osd with Scheduler
Samuel Just [Wed, 11 Sep 2019 20:42:44 +0000 (13:42 -0700)]
src/osd: replace OpQueue abstraction in osd with Scheduler

OpQueue is overkill for mclock based schedulers.  The interface doesn't
need to externalize the _strict modifiers, the scheduler can figure that
out from the item itself.  Introduce simpler Scheduler interface and add
an adapter for the existing OpQueue based implementations.

Signed-off-by: Samuel Just <sjust@redhat.com>
5 years agoMerge PR #30772 into master
Sage Weil [Tue, 22 Oct 2019 20:57:02 +0000 (15:57 -0500)]
Merge PR #30772 into master

* refs/pull/30772/head:
cmake/modules/GetGitRevisionDescription: update to work with git-worktree

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agoqa/suites/upgrade/*-x-singleton: suppress TOO_FEW_PGS warning 31054/head
Sage Weil [Tue, 22 Oct 2019 14:18:08 +0000 (09:18 -0500)]
qa/suites/upgrade/*-x-singleton: suppress TOO_FEW_PGS warning

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31003 into master
Sage Weil [Tue, 22 Oct 2019 20:52:58 +0000 (15:52 -0500)]
Merge PR #31003 into master

* refs/pull/31003/head:
 test/pybind/test_rados.py: test test_aio_remove

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31052 into master
Sage Weil [Tue, 22 Oct 2019 20:51:31 +0000 (15:51 -0500)]
Merge PR #31052 into master

* refs/pull/31052/head:
auth/cephx/CephxClientHandler: handle decode errors
auth/cephx/CephxProtocol: handle decode errors in CephXTicketHandler::verify_service_ticket_reply
auth/cephx/CephxServiceHandler: handle decode errors

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #30837 from Amrita42/patch-2
Gregory Farnum [Tue, 22 Oct 2019 20:28:07 +0000 (13:28 -0700)]
Merge pull request #30837 from Amrita42/patch-2

doc/start/hardware-recommendations.rst: minor tweaks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31060 into master
Sage Weil [Tue, 22 Oct 2019 20:27:14 +0000 (15:27 -0500)]
Merge PR #31060 into master

* refs/pull/31060/head:
ceph-daemon: make rm-cluster clear out previously failed units
ceph-daemon: fix get_config_and_both_keyrings() return value

5 years agoMerge PR #31007 into master
Sage Weil [Tue, 22 Oct 2019 20:15:18 +0000 (15:15 -0500)]
Merge PR #31007 into master

* refs/pull/31007/head:
mgr/progress: remove "since" from duration string

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
5 years agoMerge PR #30975 into master
Sage Weil [Tue, 22 Oct 2019 20:14:18 +0000 (15:14 -0500)]
Merge PR #30975 into master

* refs/pull/30975/head:
rpm: make librados2, libcephfs2 own (create) /etc/ceph

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoosd/OSD: Set the number of cache shards independently. Default to 32 30964/head
Mark Nelson [Thu, 17 Oct 2019 13:50:37 +0000 (09:50 -0400)]
osd/OSD: Set the number of cache shards independently.  Default to 32

Signed-off-by: Mark Nelson <mnelson@redhat.com>
5 years agoos/bluestore: Keep separate onode cache pinned list.
Mark Nelson [Wed, 16 Oct 2019 14:34:59 +0000 (10:34 -0400)]
os/bluestore: Keep separate onode cache pinned list.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
5 years agoceph-daemon: make rm-cluster clear out previously failed units 31060/head
Sage Weil [Tue, 22 Oct 2019 18:41:28 +0000 (13:41 -0500)]
ceph-daemon: make rm-cluster clear out previously failed units

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: fix get_config_and_both_keyrings() return value
Sage Weil [Tue, 22 Oct 2019 18:31:16 +0000 (13:31 -0500)]
ceph-daemon: fix get_config_and_both_keyrings() return value

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31022 from drunkard/master
Jason Dillaman [Tue, 22 Oct 2019 15:37:19 +0000 (11:37 -0400)]
Merge pull request #31022 from drunkard/master

doc: add missed word 'than' in doc/man/8/rbd.rst

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #30826 into master
Sage Weil [Tue, 22 Oct 2019 15:13:51 +0000 (10:13 -0500)]
Merge PR #30826 into master

* refs/pull/30826/head:
ceph-daemon: deploy: behave when crash keyring isn't provided
ceph-daemon: simplify calls from rm_cluster
ceph-daemon: explicitly wait for mon to start
ceph-daemon: bootstrap finish message
ceph-daemon: shell: LANG=C
ceph-daemon: verify mon IP is valid before continuing
ceph-daemon: cleanly capture stdout, err; log
ceph-daemon: --debug for more log detail
test_ceph_daemon: default to test on 127.0.0.1; accept ip as arg
ceph-daemon: bootstrap: assimilate and minimize input config file

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agomon: allow mgr to tell mon.foo smart
Sage Weil [Tue, 22 Oct 2019 15:10:14 +0000 (10:10 -0500)]
mon: allow mgr to tell mon.foo smart

The mgr profile needs to do a tell command to the mon, which was restricted
to *only* allow_all (*) caps.  Additionally allow whitelisted commands,
and whitelist 'smart'.  This is somewhat imprecise since it conflates
tell vs cli commands in the MonCap, but since those don't overlap it should
be fine.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon: include quorum features in quorum_status
Sage Weil [Tue, 22 Oct 2019 14:42:26 +0000 (09:42 -0500)]
mon: include quorum features in quorum_status

This is part of mon_status, and qa/standalone/mon/misc.sh mon_features test
uses it.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoauth/cephx/CephxClientHandler: handle decode errors 31052/head
Sage Weil [Tue, 22 Oct 2019 12:43:14 +0000 (07:43 -0500)]
auth/cephx/CephxClientHandler: handle decode errors

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoauth/cephx/CephxProtocol: handle decode errors in CephXTicketHandler::verify_service_...
Sage Weil [Tue, 22 Oct 2019 12:41:26 +0000 (07:41 -0500)]
auth/cephx/CephxProtocol: handle decode errors in CephXTicketHandler::verify_service_ticket_reply

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoauth/cephx/CephxServiceHandler: handle decode errors
Sage Weil [Tue, 22 Oct 2019 12:37:32 +0000 (07:37 -0500)]
auth/cephx/CephxServiceHandler: handle decode errors

Decode errors should trigger EPERM, not throw exceptions that trigger
timeouts/retries in the messenger.

Fixes: https://tracker.ceph.com/issues/42369
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #30867 from rishabh-d-dave/cv-api-lvm
Jan Fajerski [Tue, 22 Oct 2019 12:17:31 +0000 (14:17 +0200)]
Merge pull request #30867 from rishabh-d-dave/cv-api-lvm

ceph-volume: rearrange api/lvm.py

5 years ago test/pybind/test_rados.py: test test_aio_remove 31003/head
zhangjiao [Sun, 20 Oct 2019 15:01:32 +0000 (23:01 +0800)]
 test/pybind/test_rados.py: test test_aio_remove

Signed-off-by: Zhang Jiao <zhangjiao@cmss.chinamobile.com>
5 years agodoc/start/hardware-recommendations.rst: minor tweaks 30837/head
Amrita42 [Thu, 10 Oct 2019 09:50:53 +0000 (05:50 -0400)]
doc/start/hardware-recommendations.rst: minor tweaks

* Hard Disk Drive: Replaced word 'accelerate' with 'optimize'
* Networks: Replaced word 'have' with 'has'

Fixes: https://tracker.ceph.com/issues/42379
Signed-off-by: Amrita Sakthivel <asakthiv@redhat.com>
5 years agorpm: make librados2, libcephfs2 own (create) /etc/ceph 30975/head
Nathan Cutler [Tue, 22 Oct 2019 08:52:45 +0000 (10:52 +0200)]
rpm: make librados2, libcephfs2 own (create) /etc/ceph

Fixes: https://tracker.ceph.com/issues/42352
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agotest/pybind/test_rados: always pass bytes to rados.Object.set_xattr() 31044/head
Kefu Chai [Tue, 22 Oct 2019 04:44:35 +0000 (12:44 +0800)]
test/pybind/test_rados: always pass bytes to rados.Object.set_xattr()

> an empty '' is of type str, not bytes.

python3 says. so let's be more explicit.

this change address failures like:
```
======================================================================
ERROR: test_rados.TestIoctx.test_obj_xattrs
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/nose/case.py", line 197, in
runTest
    self.test(*self.arg)
  File "/var/ssd/ceph/src/test/pybind/test_rados.py", line 380, in
test_obj_xattrs
    obj.set_xattr(key, value)
  File "rados.pyx", line 4119, in rados.set_object_locator.retfunc
  File "rados.pyx", line 4129, in rados.set_object_namespace.retfunc
  File "rados.pyx", line 4204, in rados.Object.set_xattr
  File "rados.pyx", line 572, in rados.requires.wrapper.validate_func
  File "rados.pyx", line 560, in rados.requires.check_type
TypeError: xattr_value must be bytes
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind/rados: do not slice zip()
Kefu Chai [Tue, 22 Oct 2019 04:42:06 +0000 (12:42 +0800)]
pybind/rados: do not slice zip()

in python2, zip() returns a list. while in python3, zip() returns an
iterator. so we cannot slice the return value of zip(...) anymore. let's
just materialized the iterator before slicing it.

this change address the failure of
```
ERROR: test_rados.TestIoctx.test_applications
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/nose/case.py", line 197, in
runTest
    self.test(*self.arg)
  File "/var/ssd/ceph/src/test/pybind/test_rados.py", line 879, in
test_applications
    eq([], self.ioctx.application_metadata_list("app1"))
  File "rados.pyx", line 4074, in rados.Ioctx.application_metadata_list
TypeError: 'zip' object is unsliceable
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/volumes: refactor dir handle cleanup 30887/head
Jos Collin [Mon, 14 Oct 2019 04:51:35 +0000 (10:21 +0530)]
mgr/volumes: refactor dir handle cleanup

introduce with statement in rmtree. This change
simplifies the code's handling of directory cleanup.

Signed-off-by: Jos Collin <jcollin@redhat.com>
5 years agoMerge PR #30505 into master
Patrick Donnelly [Tue, 22 Oct 2019 04:23:41 +0000 (21:23 -0700)]
Merge PR #30505 into master

* refs/pull/30505/head:
test/libcephfs: introduce (uint64_t)ceph_pthread_self()
test/libcephfs: Only use sys/xattr.h on Linux
cephfs: Create a separate dirent{} for FreeBSD
test/fs: Only use features.h on Linux

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #30813 into master
Patrick Donnelly [Tue, 22 Oct 2019 04:22:00 +0000 (21:22 -0700)]
Merge PR #30813 into master

* refs/pull/30813/head:
qa: get rid of iteritems for python3 compatibility

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #30886 into master
Patrick Donnelly [Tue, 22 Oct 2019 04:21:15 +0000 (21:21 -0700)]
Merge PR #30886 into master

* refs/pull/30886/head:
mgr/volumes: cleanup leftovers from earlier purge job implementation

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #30971 into master
Patrick Donnelly [Tue, 22 Oct 2019 04:18:36 +0000 (21:18 -0700)]
Merge PR #30971 into master

* refs/pull/30971/head:
qa: whitelist "Error recovering journal" for cephfs-data-scan

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #30986 into master
Patrick Donnelly [Tue, 22 Oct 2019 04:14:07 +0000 (21:14 -0700)]
Merge PR #30986 into master

* refs/pull/30986/head:
qa: allow client mount to reset fully

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoqa/workunits/mon/caps.sh: fix test
Sage Weil [Tue, 22 Oct 2019 02:34:12 +0000 (21:34 -0500)]
qa/workunits/mon/caps.sh: fix test

I'm not really sure why this test expected EPERM before when it expects 0
a bit earlier, but it should certainly expect EPERM after the user is
deleted.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph_test_rados_api_cmd: fix MonDescribe test
Sage Weil [Tue, 22 Oct 2019 02:30:03 +0000 (21:30 -0500)]
ceph_test_rados_api_cmd: fix MonDescribe test

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #30897 from tchaikov/wip-bluestore/avl-allocator
Xie Xingguo [Tue, 22 Oct 2019 00:33:54 +0000 (08:33 +0800)]
Merge pull request #30897 from tchaikov/wip-bluestore/avl-allocator

os/bluestore: AVL-tree & extent - based space allocator

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agoMerge branch 'vstart-fs-auth' of git://github.com/batrick/ceph into wip-cleanup-mon...
Sage Weil [Mon, 21 Oct 2019 16:43:01 +0000 (11:43 -0500)]
Merge branch 'vstart-fs-auth' of git://github.com/batrick/ceph into wip-cleanup-mon-asok