]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agomgr/dashboard: unable to set bool values to false when default is true 31738/head
Ricardo Marques [Tue, 19 Nov 2019 13:20:01 +0000 (13:20 +0000)]
mgr/dashboard: unable to set bool values to false when default is true

Fixes: https://tracker.ceph.com/issues/41776
Signed-off-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge pull request #31637 from carletes/patch-1
Kefu Chai [Sun, 17 Nov 2019 17:53:40 +0000 (01:53 +0800)]
Merge pull request #31637 from carletes/patch-1

src/msg/async/net_handler.cc: Fix compilation

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31543 from tchaikov/wip/cmake/librt
Kefu Chai [Sun, 17 Nov 2019 17:51:28 +0000 (01:51 +0800)]
Merge pull request #31543 from tchaikov/wip/cmake/librt

cmake: detect librt for POSIX time functions

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agoMerge pull request #31532 from tchaikov/wip-42742
Kefu Chai [Sat, 16 Nov 2019 17:16:29 +0000 (01:16 +0800)]
Merge pull request #31532 from tchaikov/wip-42742

msg/async/rdma: do not init mutex before lockdeps is ready

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agoMerge pull request #31506 from Yan-waller/wip-walle-191109-fixomapentries
Kefu Chai [Sat, 16 Nov 2019 17:14:34 +0000 (01:14 +0800)]
Merge pull request #31506 from Yan-waller/wip-walle-191109-fixomapentries

common/options: decrease the default max_omap_entries_per_request

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #31310 from badone/wip-tracker-42477-reinstate-o-outfile
Kefu Chai [Sat, 16 Nov 2019 17:12:12 +0000 (01:12 +0800)]
Merge pull request #31310 from badone/wip-tracker-42477-reinstate-o-outfile

tools/rados: Unmask '-o' to restore original behaviour

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31469 from p-se/wip-pse-summary-reload-traceback
Kefu Chai [Sat, 16 Nov 2019 17:10:11 +0000 (01:10 +0800)]
Merge pull request #31469 from p-se/wip-pse-summary-reload-traceback

mgr/dashboard: KeyError on dashboard reload

Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31399 from zy751713126/osd_stat
Kefu Chai [Sat, 16 Nov 2019 17:07:37 +0000 (01:07 +0800)]
Merge pull request #31399 from zy751713126/osd_stat

mon/OSDMonitor: fix format error ceph osd stat --format json

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31427 from zy751713126/osd_status
Kefu Chai [Sat, 16 Nov 2019 17:03:47 +0000 (01:03 +0800)]
Merge pull request #31427 from zy751713126/osd_status

pybind/mgr: Cancel output color control

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #31560 from rosinL/wip-fix-incorrect-pg-pool-sum
Kefu Chai [Sat, 16 Nov 2019 16:54:25 +0000 (00:54 +0800)]
Merge pull request #31560 from rosinL/wip-fix-incorrect-pg-pool-sum

mon/PGMap: fix incorrect pg_pool_sum when delete pool

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31158 from zjcmszh/test_remove
Kefu Chai [Sat, 16 Nov 2019 16:53:30 +0000 (00:53 +0800)]
Merge pull request #31158 from zjcmszh/test_remove

test/pybind/test_rados.py: test test_operate_aio_write_op()

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30717 from rzarzynski/wip-bug-42026
Kefu Chai [Sat, 16 Nov 2019 16:51:15 +0000 (00:51 +0800)]
Merge pull request #30717 from rzarzynski/wip-bug-42026

msg/async: perform the v2 resets in proper EventCenter

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31517 from changchengx/rdma_gid
Kefu Chai [Sat, 16 Nov 2019 16:49:14 +0000 (00:49 +0800)]
Merge pull request #31517 from changchengx/rdma_gid

msg/async/rdma: add an option for choosing different RoCE protocol

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31620 into master
Sage Weil [Fri, 15 Nov 2019 23:14:22 +0000 (17:14 -0600)]
Merge PR #31620 into master

* refs/pull/31620/head:
mgr: handle race with finisher after shutdown

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31681 from ifed01/wio-ifed-fix-fio
Igor Fedotov [Fri, 15 Nov 2019 21:25:55 +0000 (00:25 +0300)]
Merge pull request #31681 from ifed01/wio-ifed-fix-fio

test/fio: handle nullptr when parsing throttle params

Reviewed-by: Samuel Just <sjust@redhat.com>
5 years agoMerge pull request #31025 from scarvalhojr/ssevault2
Casey Bodley [Fri, 15 Nov 2019 18:53:32 +0000 (13:53 -0500)]
Merge pull request #31025 from scarvalhojr/ssevault2

rgw: improvements to SSE-KMS with Vault

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agotest/fio: handle nullptr when throttle params parsing 31681/head
Igor Fedotov [Fri, 15 Nov 2019 17:37:07 +0000 (20:37 +0300)]
test/fio: handle nullptr when throttle params parsing

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge pull request #31671 from sebastian-philipp/pybind-mgr-exclude-tests
Nathan Cutler [Fri, 15 Nov 2019 16:04:41 +0000 (17:04 +0100)]
Merge pull request #31671 from sebastian-philipp/pybind-mgr-exclude-tests

pybind/mgr: Exclude tests/

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge PR #31486 into master
Sage Weil [Fri, 15 Nov 2019 15:48:28 +0000 (09:48 -0600)]
Merge PR #31486 into master

* refs/pull/31486/head:
ceph-daemon: add standalone `adopt` tests

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31618 from dsavineau/ceph_daemon_rename_podman_vars
Sebastian Wagner [Fri, 15 Nov 2019 15:26:30 +0000 (16:26 +0100)]
Merge pull request #31618 from dsavineau/ceph_daemon_rename_podman_vars

ceph-daemon: replace podman variables by container

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agopybind/mgr: Exclude tests/ 31671/head
Sebastian Wagner [Fri, 15 Nov 2019 13:29:42 +0000 (14:29 +0100)]
pybind/mgr: Exclude tests/

Fixes: d6c10192c61a59f6a77d04a9d601c9df2f72d07f
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #31666 from hrchu/origin/patch-2
Kefu Chai [Fri, 15 Nov 2019 12:13:41 +0000 (20:13 +0800)]
Merge pull request #31666 from hrchu/origin/patch-2

doc: Update mailing lists

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31667 from tchaikov/wip/run-cbt-sh/fs.aio-max-nr
Kefu Chai [Fri, 15 Nov 2019 11:37:29 +0000 (19:37 +0800)]
Merge pull request #31667 from tchaikov/wip/run-cbt-sh/fs.aio-max-nr

script/run-cbt.sh: set fs.aio-max-nr for seastar

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoscript/run-cbt.sh: set fs.aio-max-nr for seastar 31667/head
Kefu Chai [Fri, 15 Nov 2019 09:55:53 +0000 (17:55 +0800)]
script/run-cbt.sh: set fs.aio-max-nr for seastar

seastar requires 11027 for each reactor, so we need at least

fs.aio-max-nr = 11027 * n_osd

but to make it simple and to take the needs of other applications using
aio on the machine, we increase the number of io context to 32768,
and always set this setting no matter if we are starting a vstart
cluster with classic osd or crimson osd

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31523 from sebastian-philipp/ssh-make-check
Sebastian Wagner [Fri, 15 Nov 2019 08:43:21 +0000 (09:43 +0100)]
Merge pull request #31523 from sebastian-philipp/ssh-make-check

mgr/ssh: add make check integration

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
5 years agodoc: Update mailing lists 31666/head
hrchu [Fri, 15 Nov 2019 07:13:09 +0000 (15:13 +0800)]
doc: Update mailing lists

Signed-off-by: hrchu <petertc.chu@gmail.com>
5 years agoMerge PR #31509 into master
Patrick Donnelly [Fri, 15 Nov 2019 05:51:46 +0000 (21:51 -0800)]
Merge PR #31509 into master

* refs/pull/31509/head:
client: remove unused variable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoclient: remove unused variable 31509/head
su_nan@inspur.com [Thu, 14 Nov 2019 01:49:30 +0000 (09:49 +0800)]
client: remove unused variable

the flock and cond are useless variables in Client::_read_sync,remove useless variables

Fixes: https://tracker.ceph.com/issues/42720
Signed-off-by: su_nan@inspur.com <su_nan@inspur.com>
5 years agoMerge pull request #31643 from liewegas/fix-empty-crash
Dan Mick [Thu, 14 Nov 2019 22:21:57 +0000 (14:21 -0800)]
Merge pull request #31643 from liewegas/fix-empty-crash

mgr/crash: behave when posted crash has no backtrace

5 years agosrc/msg/async/net_handler.cc: Fix compilation 31637/head
Carlos Valiente [Thu, 14 Nov 2019 18:27:50 +0000 (18:27 +0000)]
src/msg/async/net_handler.cc: Fix compilation

On a Cray system I'm working on, it seems that `SO_PRIORITY` is defined,
but `IPTOS_CLASS_CS6` is not. Without this patch, compilation fails at
line 150:

```
r = ::setsockopt(sd, SOL_SOCKET, SO_PRIORITY, &prio, sizeof(prio));
```

because the variable `r` is not defined (originally it is defined inside
the `#ifdef IPTOS_CLASS_CS6` block).

Fixes: https://tracker.ceph.com/issues/42821
Signed-off-by: Carlos Valiente <carlos.valiente@ecmwf.int>
5 years agoMerge PR #31626 into master
Patrick Donnelly [Thu, 14 Nov 2019 19:13:09 +0000 (11:13 -0800)]
Merge PR #31626 into master

* refs/pull/31626/head:
test_cephfs_shell: initialize stderr for run_cephfs_shell_cmd()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31460 into master
Patrick Donnelly [Thu, 14 Nov 2019 19:06:10 +0000 (11:06 -0800)]
Merge PR #31460 into master

* refs/pull/31460/head:
cephfs-shell: print helpful message when conf file is not found

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #30385 from ZVampirEM77/acl-detailed-err-msg
Casey Bodley [Thu, 14 Nov 2019 18:22:44 +0000 (13:22 -0500)]
Merge pull request #30385 from ZVampirEM77/acl-detailed-err-msg

rgw: add detailed error message for PutACLs

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30470 from dongbula/bf-fix-usage-keyiter-update
Casey Bodley [Thu, 14 Nov 2019 18:21:22 +0000 (13:21 -0500)]
Merge pull request #30470 from dongbula/bf-fix-usage-keyiter-update

RGW: fix an endless loop error when to show usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30574 from zhangsw/rgw-fix-compress
Casey Bodley [Thu, 14 Nov 2019 18:21:02 +0000 (13:21 -0500)]
Merge pull request #30574 from zhangsw/rgw-fix-compress

rgw: compression info should be same during multipart uploading

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30575 from mkogan1/wip-rgw-resharding-mem
Casey Bodley [Thu, 14 Nov 2019 18:13:00 +0000 (13:13 -0500)]
Merge pull request #30575 from mkogan1/wip-rgw-resharding-mem

rgw: when resharding store progress json

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agoMerge pull request #31632 from tspmelo/wip-rbd-timezone
Lenz Grimmer [Thu, 14 Nov 2019 17:33:36 +0000 (17:33 +0000)]
Merge pull request #31632 from tspmelo/wip-rbd-timezone

mgr/dashboard: Fix error in unit test caused by timezone

Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #29004 from zhangsw/rgw-cleanup-taggingop
Casey Bodley [Thu, 14 Nov 2019 16:45:27 +0000 (11:45 -0500)]
Merge pull request #29004 from zhangsw/rgw-cleanup-taggingop

rgw: remove re-defined is_tagging_op in RGWHandler_REST_Bucket_S3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge PR #31582 into master
Sage Weil [Thu, 14 Nov 2019 16:35:31 +0000 (10:35 -0600)]
Merge PR #31582 into master

* refs/pull/31582/head:
global: disable THP for Ceph daemons

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
5 years agoMerge PR #31584 into master
Sage Weil [Thu, 14 Nov 2019 16:33:24 +0000 (10:33 -0600)]
Merge PR #31584 into master

* refs/pull/31584/head:
common/options: osd_crush_chooseleaf_type is CLUSTER_CREATE
mon/ConfigMonitor: do not assimilate CLUSTER_CREATE options
common/ceph_context: observe container_image so we don't get warnings

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #31621 into master
Sage Weil [Thu, 14 Nov 2019 16:30:53 +0000 (10:30 -0600)]
Merge PR #31621 into master

* refs/pull/31621/head:
os/bluestore: consolidate extents from the same device only

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomgr/crash: behave when posted crash has no backtrace 31643/head
Sage Weil [Thu, 14 Nov 2019 16:28:47 +0000 (10:28 -0600)]
mgr/crash: behave when posted crash has no backtrace

This is the case when the qa/tasks/mgr/test_crash.py test runs, and could
happen in the real world too, perhaps, if someone fed us wonky input.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: replace podman variables by container 31618/head
Dimitri Savineau [Wed, 13 Nov 2019 16:47:59 +0000 (11:47 -0500)]
ceph-daemon: replace podman variables by container

There's no logic to use variables with podman prefix when we can use both
docker and podman.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
5 years agomgr/ssh: add make check integration 31523/head
Sebastian Wagner [Mon, 11 Nov 2019 10:51:14 +0000 (11:51 +0100)]
mgr/ssh: add make check integration

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #31436 from dang/wip-dang-zipper-3
Casey Bodley [Thu, 14 Nov 2019 15:18:08 +0000 (10:18 -0500)]
Merge pull request #31436 from dang/wip-dang-zipper-3

rgw: Project Zipper - Bucket

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge PR #30754 into master
Patrick Donnelly [Thu, 14 Nov 2019 14:14:11 +0000 (06:14 -0800)]
Merge PR #30754 into master

* refs/pull/30754/head:
doc/cephfs: merge fstab doc with respective mount docs
doc: add systemd unit part for FUSE mounts in fstab doc
doc: update and improve "mount using kernel driver" doc
doc: update and improve "mount using FUSE" doc

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31631 into master
Sage Weil [Thu, 14 Nov 2019 14:08:19 +0000 (08:08 -0600)]
Merge PR #31631 into master

* refs/pull/31631/head:
ceph-daemon: Add more type hints

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31561 from sebastian-philipp/orchestrator-remove-cli-tox
Sebastian Wagner [Thu, 14 Nov 2019 13:44:01 +0000 (14:44 +0100)]
Merge pull request #31561 from sebastian-philipp/orchestrator-remove-cli-tox

mgr/orchestrator_cli: remove tox and move test to parent dir

Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agocmake: detect librt for POSIX time functions 31543/head
Kefu Chai [Mon, 11 Nov 2019 22:55:40 +0000 (06:55 +0800)]
cmake: detect librt for POSIX time functions

per clock_gettime(3),

> On POSIX systems on which these functions are available, the symbol
> _POSIX_TIMERS is defined in <unistd.h> to a value greater than 0.

and

> Most systems require the program be linked with the librt library to
> use these functions.

so, we should detect this symbol and link against librt for using these
functions.

in this change, librt is linked for checking the existence of
clock_gettime(), if it exists. RT_LIBRARY is defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/orchestrator: remove tox and move test to parent dir 31561/head
Sebastian Wagner [Tue, 12 Nov 2019 10:48:54 +0000 (11:48 +0100)]
mgr/orchestrator: remove tox and move test to parent dir

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/dashboard: Fix error in unit test caused by timezone 31632/head
Tiago Melo [Thu, 14 Nov 2019 10:48:23 +0000 (09:48 -0100)]
mgr/dashboard: Fix error in unit test caused by timezone

Unit test was only accepting positive timezones

Fixes: https://tracker.ceph.com/issues/42812
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoceph-daemon: Add more type hints 31631/head
Thomas Bechtold [Thu, 14 Nov 2019 09:55:15 +0000 (10:55 +0100)]
ceph-daemon: Add more type hints

Commit 7ce26be7a3448 started to add type hints. This commit continues
that and adds the missing type hints.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agotest_cephfs_shell: initialize stderr for run_cephfs_shell_cmd() 31626/head
Rishabh Dave [Wed, 13 Nov 2019 13:22:18 +0000 (18:52 +0530)]
test_cephfs_shell: initialize stderr for run_cephfs_shell_cmd()

Since teuthology initializes stderr to None by default, absence of this
breaks the tests accessing stderr of commands executed within the test
when the execution is using teuthology.

Fixes: https://tracker.ceph.com/issues/42806
Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agodoc/cephfs: merge fstab doc with respective mount docs 30754/head
Rishabh Dave [Mon, 4 Nov 2019 13:44:07 +0000 (19:14 +0530)]
doc/cephfs: merge fstab doc with respective mount docs

Fixes: https://tracker.ceph.com/issues/42601
Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoceph-daemon: add standalone `adopt` tests 31486/head
Michael Fritch [Wed, 13 Nov 2019 23:28:21 +0000 (16:28 -0700)]
ceph-daemon: add standalone `adopt` tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoglobal: disable THP for Ceph daemons 31582/head
Patrick Donnelly [Tue, 12 Nov 2019 22:50:52 +0000 (14:50 -0800)]
global: disable THP for Ceph daemons

Ceph is known to suffer from memory fragmentation due to transparent
huge pages (THP). This is indicated by RSS usage above configured memory
targets and is only observable when the distribution default for THP is
"always", which is the default in the upstream kernel if
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is unset.

For now, enabling THP is currently discouraged until selective use of
THP by Ceph is implemented via madvise. We will need to consider both
defaults for THP so madvise calls to both enable and disable THP will
need implemented.

All credit to Mark Nelson for doing the legwork identifying this issue
and potential solutions.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Signed-off-by: Mark Nelson <mnelson@redhat.com>
5 years agomgr: handle race with finisher after shutdown 31620/head
Patrick Donnelly [Wed, 13 Nov 2019 19:00:44 +0000 (11:00 -0800)]
mgr: handle race with finisher after shutdown

The module is deleted when modules is cleared. The notify method is
called on a destructed class.

Fixes: https://tracker.ceph.com/issues/42744
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31614 into master
Sage Weil [Wed, 13 Nov 2019 19:14:12 +0000 (13:14 -0600)]
Merge PR #31614 into master

* refs/pull/31614/head:
ceph-daemon: use `-e` instead of `--env`

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoos/bluestore: consolidate extents from the same device only 31621/head
Igor Fedotov [Wed, 13 Nov 2019 19:09:53 +0000 (22:09 +0300)]
os/bluestore: consolidate extents from the same device only

Presumably Fixes: https://tracker.ceph.com/issues/42223

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge PR #31613 into master
Sage Weil [Wed, 13 Nov 2019 18:59:57 +0000 (12:59 -0600)]
Merge PR #31613 into master

* refs/pull/31613/head:
mgr/ssh: fix redeploy

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31609 into master
Sage Weil [Wed, 13 Nov 2019 18:35:03 +0000 (12:35 -0600)]
Merge PR #31609 into master

* refs/pull/31609/head:
ceph-daemon: Add basic mypy support

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31601 from tchaikov/wip/install-newer-binutils-on-xenial
Kefu Chai [Wed, 13 Nov 2019 17:03:47 +0000 (01:03 +0800)]
Merge pull request #31601 from tchaikov/wip/install-newer-binutils-on-xenial

install-deps.sh: install binutils 2.28 for xenial

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
5 years agoMerge PR #31602 into master
Sage Weil [Wed, 13 Nov 2019 16:18:58 +0000 (10:18 -0600)]
Merge PR #31602 into master

* refs/pull/31602/head:
mgr/ssh: annotate object representation

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoceph-daemon: use `-e` instead of `--env` 31614/head
Michael Fritch [Wed, 13 Nov 2019 16:10:10 +0000 (09:10 -0700)]
ceph-daemon: use `-e` instead of `--env`

Older versions of podman don't allow intermixing `-e` and `--env`

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoinstall-deps.sh: remove the cleanup for kitware repo 31601/head
Kefu Chai [Wed, 13 Nov 2019 12:41:05 +0000 (20:41 +0800)]
install-deps.sh: remove the cleanup for kitware repo

it was used for removing the kitware repo, and in
7265b55d094a639be50a567d3be92fba94c04786, we switched to a rebuilt
version hosted in chacra, and it was more than two months ago,
presumably, none builder has kitware repo anymore. so, let's remove
the cleanup code.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoinstall-deps.sh: install binutils 2.28 for xenial
Kefu Chai [Wed, 13 Nov 2019 12:11:53 +0000 (20:11 +0800)]
install-deps.sh: install binutils 2.28 for xenial

ld 2.26 segment faults when linking librados.so in
https://github.com/ceph/ceph/pull/16715 .

while ld 2.28 always survives.
binutils 2.28 is rebuilt and uploaded to chacra
binutils/master/7fa393306ed8b93019d225548474c0540b8928f7/ubuntu/xenial,

so let's use it instead.

the source deb package comes from
http://ppa.launchpad.net/jonathonf/binutils/ubuntu

i tried to use the binutils 2.30 source package from bionic,
but it has build dependency of dpkg-dev (>= 1.19.0.5) which cannot be
fulfilled on xenial. so without more changes, we cannot get
binutils 2.30 built on xenial using this source package.

Fixes: https://tracker.ceph.com/issues/42596
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31592 from jan--f/c-v-fix-mimic-functional-tests
Alfredo Deza [Wed, 13 Nov 2019 16:10:58 +0000 (11:10 -0500)]
Merge pull request #31592 from jan--f/c-v-fix-mimic-functional-tests

ceph-volume: assume msgrV1 for all branches containing mimic

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge PR #31603 into master
Sage Weil [Wed, 13 Nov 2019 16:10:20 +0000 (10:10 -0600)]
Merge PR #31603 into master

* refs/pull/31603/head:
ceph-daemon: fix prompt

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoceph-daemon: Add basic mypy support 31609/head
Thomas Bechtold [Wed, 13 Nov 2019 15:13:20 +0000 (16:13 +0100)]
ceph-daemon: Add basic mypy support

Add mypy support and some type hints to be able to do static code
analysis.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agomgr/ssh: fix redeploy 31613/head
Sage Weil [Wed, 13 Nov 2019 14:53:37 +0000 (08:53 -0600)]
mgr/ssh: fix redeploy

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/dashboard: Add E2E tests for tasks and notifications sideb… (#31128)
Lenz Grimmer [Wed, 13 Nov 2019 14:26:19 +0000 (14:26 +0000)]
mgr/dashboard: Add E2E tests for tasks and notifications sideb… (#31128)

mgr/dashboard: Add E2E tests for tasks and notifications sidebar

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoceph-daemon: fix prompt 31603/head
Sage Weil [Wed, 13 Nov 2019 13:18:11 +0000 (07:18 -0600)]
ceph-daemon: fix prompt

[ceph: root@gnit /]#
not
[ceph: root@gnit /]$

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: annotate object representation 31602/head
Joshua Schmid [Wed, 13 Nov 2019 13:07:24 +0000 (14:07 +0100)]
mgr/ssh: annotate object representation

* InventoryNode
* ServiceDescription

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge PR #31583 into master
Sage Weil [Wed, 13 Nov 2019 13:04:04 +0000 (07:04 -0600)]
Merge PR #31583 into master

* refs/pull/31583/head:
ceph-daemon: -v|--verbose, not -d|--debug

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31585 into master
Sage Weil [Wed, 13 Nov 2019 13:03:46 +0000 (07:03 -0600)]
Merge PR #31585 into master

* refs/pull/31585/head:
ceph-daemon: add `--legacy-dir` arg to `ls` command

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31533 from tspmelo/wip-bc-redmine-key
Nathan Cutler [Wed, 13 Nov 2019 12:27:26 +0000 (13:27 +0100)]
Merge pull request #31533 from tspmelo/wip-bc-redmine-key

backport-create-issue: read redmine key from file

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #31544 from ifed01/wip-ifed-gettid2
Kefu Chai [Wed, 13 Nov 2019 10:58:36 +0000 (18:58 +0800)]
Merge pull request #31544 from ifed01/wip-ifed-gettid2

test/fio: bump to fio-3.15

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoceph-volume: assume msgrV1 for all branches containing mimic 31592/head
Jan Fajerski [Wed, 13 Nov 2019 09:13:01 +0000 (10:13 +0100)]
ceph-volume: assume msgrV1 for all branches containing mimic

With nautilus and newer OSDs listen on v1 ports and v2 ports. Assume
that if mimic (or luminous) occur in the branch name, the OSDs are
running msgrv1 only.

Fixes: https://tracker.ceph.com/issues/42791
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31426 from cyx1231st/rfc-seastar-fix-build-dpdk
Kefu Chai [Wed, 13 Nov 2019 09:05:04 +0000 (17:05 +0800)]
Merge pull request #31426 from cyx1231st/rfc-seastar-fix-build-dpdk

crimson: fix build seastar with dpdk

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30662 from sebastian-philipp/orchestrator-c-v-inventory
Sebastian Wagner [Wed, 13 Nov 2019 09:03:57 +0000 (10:03 +0100)]
Merge pull request #30662 from sebastian-philipp/orchestrator-c-v-inventory

python-common, mgr/orchestrator, mgr/dashboard: Use common "Devices"

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
5 years agocrimson: build seastar dpdk from src/seastar/dpdk 31426/head
Yingxin Cheng [Wed, 6 Nov 2019 09:34:32 +0000 (17:34 +0800)]
crimson: build seastar dpdk from src/seastar/dpdk

src/spdk/dpdk and src/seastar/dpdk are both at their private branches
with project-specific modifications, so select proper dpdk source
directory according to flags WITH_SPDK and Seastar_DPDK.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agocrimson: link required dpdk components for seastar
Yingxin Cheng [Wed, 6 Nov 2019 09:27:39 +0000 (17:27 +0800)]
crimson: link required dpdk components for seastar

see https://github.com/scylladb/seastar/blob/
809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agodoc: add systemd unit part for FUSE mounts in fstab doc
Rishabh Dave [Mon, 4 Nov 2019 14:05:29 +0000 (19:35 +0530)]
doc: add systemd unit part for FUSE mounts in fstab doc

To make FUSE-mounted CephFS persist across reboots, user also needs to
start and enable the systemd units. Add that part to the document for
fstab, instead of mentioning it in "Mount CephFS using FUSE" doc. Also,
wrap few lines and rename mountpoint to /mnt/mycephfs in examples to
keep them same across docs.

Fixes: https://tracker.ceph.com/issues/42298
Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agodoc: update and improve "mount using kernel driver" doc
Rishabh Dave [Tue, 8 Oct 2019 06:59:56 +0000 (12:29 +0530)]
doc: update and improve "mount using kernel driver" doc

Move the examples of mount command for Ceph cluster with CephX enabled
to the top of page, since it is enabled by default, improve explanation
around Ceph with multiple FSs, get rid of hash symbols before every
command (without them it's clear that the text is command and with them
the reader cannot use the commands directly), link fstab page, add how
mount in general looks, add prerequisites required for kernel mounts and
expand explanation wherever possible.

Fixes: https://tracker.ceph.com/issues/42220
Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agodoc: update and improve "mount using FUSE" doc
Rishabh Dave [Mon, 7 Oct 2019 07:27:29 +0000 (12:57 +0530)]
doc: update and improve "mount using FUSE" doc

Recommend keyring permission to be 600 instead of 644, show examples
for `-k`, `-r`, `-m` and `--client_mds_namespace` options, move
references to the bottom of the page,  show how to unmount FUSE-mounted
CephFS, copy the tip about unmounting from "mount using kernel" page to
"mount using FUSE" page, correct commands for automating FUSE mounts,
add sub-headings to the document and add how ceph-fuse command looks in
general.

Fixes: https://tracker.ceph.com/issues/42205
Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge pull request #31571 from rhcs-dashboard/42775-fix-typo
Kefu Chai [Wed, 13 Nov 2019 03:49:05 +0000 (11:49 +0800)]
Merge pull request #31571 from rhcs-dashboard/42775-fix-typo

common: fix typo in rgw_user_max_buckets option long description.

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31510 from yuvalif/wip-yuval-remove-flaky-amqp-test
Kefu Chai [Wed, 13 Nov 2019 03:44:21 +0000 (11:44 +0800)]
Merge pull request #31510 from yuvalif/wip-yuval-remove-flaky-amqp-test

rgw/amqp: remove flaky amqp test

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomon/PGMap: fix incorrect pg_pool_sum when delete pool 31560/head
luo rixin [Tue, 12 Nov 2019 08:36:53 +0000 (16:36 +0800)]
mon/PGMap: fix incorrect pg_pool_sum when delete pool

We found the pools num diplayed by "ceph -s" is not the same with
"ceph osd lspools" after deleting a pool sometime. The result is
Mgr ClusterState::ingest_pgstats get the old pg_stat which pg is
not deleted in some osd before the pool deleted and add to
pending_inc.pool_statfs_updates. The deleted pool will be added to
pg_pool_sum unconsciously by PGMap::apply_incremental and which has
been deleted in OSDMap. This will also casue MON's Segmentation
fault.

Fixes: https://tracker.ceph.com/issues/42689
Fixes: https://tracker.ceph.com/issues/42592
Fixes: https://tracker.ceph.com/issues/41228
Fixes: https://tracker.ceph.com/issues/40011
Signed-off-by: luo rixin <luorixin@huawei.com>
5 years agocommon/options: osd_crush_chooseleaf_type is CLUSTER_CREATE 31584/head
Sage Weil [Tue, 12 Nov 2019 23:50:14 +0000 (17:50 -0600)]
common/options: osd_crush_chooseleaf_type is CLUSTER_CREATE

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/ConfigMonitor: do not assimilate CLUSTER_CREATE options
Sage Weil [Tue, 12 Nov 2019 23:50:02 +0000 (17:50 -0600)]
mon/ConfigMonitor: do not assimilate CLUSTER_CREATE options

These are only useful when the mon first bootstrapped--no reason to pull
them into the cluster config.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocommon/ceph_context: observe container_image so we don't get warnings
Sage Weil [Tue, 12 Nov 2019 23:47:51 +0000 (17:47 -0600)]
common/ceph_context: observe container_image so we don't get warnings

This gets rid of messages like

2019-11-12T23:46:28.578+0000 7f9ab2b70700 -1 set_mon_vals failed to set container_image = cephci/daemon-base:wip-sage2-testing-2019-11-11-1737-4ea2bc7-centos-7-x86_64-devel: Configuration option 'container_image' may not be modified at runtime

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: add `--legacy-dir` arg to `ls` command 31585/head
Michael Fritch [Tue, 12 Nov 2019 23:46:09 +0000 (16:46 -0700)]
ceph-daemon: add `--legacy-dir` arg to `ls` command

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-daemon: -v|--verbose, not -d|--debug 31583/head
Sage Weil [Tue, 12 Nov 2019 23:20:06 +0000 (17:20 -0600)]
ceph-daemon: -v|--verbose, not -d|--debug

-v is more natural IMO

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31575 into master
Sage Weil [Tue, 12 Nov 2019 23:16:22 +0000 (17:16 -0600)]
Merge PR #31575 into master

* refs/pull/31575/head:
ceph-daemon: 'logs' command

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-daemon: 'logs' command 31575/head
Sage Weil [Tue, 12 Nov 2019 16:42:00 +0000 (10:42 -0600)]
ceph-daemon: 'logs' command

This just invokes podman logs with the appropriate argument(s).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31577 into master
Sage Weil [Tue, 12 Nov 2019 20:16:06 +0000 (14:16 -0600)]
Merge PR #31577 into master

* refs/pull/31577/head:
pybind/mgr/CMakeLists: exclude tox.ini, requirements.txt from install

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31542 from neha-ojha/wip-42756
Neha Ojha [Tue, 12 Nov 2019 18:24:29 +0000 (10:24 -0800)]
Merge pull request #31542 from neha-ojha/wip-42756

osd/OSDMap.cc: don't output over/underfull messages to lderr

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
5 years agopybind/mgr/CMakeLists: exclude tox.ini, requirements.txt from install 31577/head
Sage Weil [Tue, 12 Nov 2019 18:06:04 +0000 (12:06 -0600)]
pybind/mgr/CMakeLists: exclude tox.ini, requirements.txt from install

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agobackport-create-issue: read redmine key from file 31533/head
Tiago Melo [Mon, 11 Nov 2019 14:34:44 +0000 (13:34 -0100)]
backport-create-issue: read redmine key from file

Now you don't need to provide redmine key or user/password as a flag, as the
script will read it from "~/.redmine_key".

This makes it more consistent with other scripts.

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge PR #31157 into master
Patrick Donnelly [Tue, 12 Nov 2019 17:25:26 +0000 (09:25 -0800)]
Merge PR #31157 into master

* refs/pull/31157/head:
doc: update inf/infinite option for subvolume resize
qa/tasks: fs subvolume resize inf command
mgr/volumes: fs subvolume resize inf/infinite command

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>