]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoceph-volume/batch: return success when all devices are filtered 34472/head
Jan Fajerski [Wed, 8 Apr 2020 09:55:57 +0000 (11:55 +0200)]
ceph-volume/batch: return success when all devices are filtered

batch should only return an error if some (but not all) devices are
filtered. When only some devices are filtered the resulting osd layout
could look very different from what a user expects. If all devies are
filtered just return success.

Fixes: https://tracker.ceph.com/issues/44994
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #34412 from jan--f/c-v-fix-simple-scan-log-string
Jan Fajerski [Tue, 7 Apr 2020 13:37:09 +0000 (15:37 +0200)]
Merge pull request #34412 from jan--f/c-v-fix-simple-scan-log-string

devices/simple/scan: Fix string in log statement

5 years agoMerge pull request #34406 from liewegas/fix-cephadm-upgrade-start
Sebastian Wagner [Tue, 7 Apr 2020 09:59:00 +0000 (11:59 +0200)]
Merge pull request #34406 from liewegas/fix-cephadm-upgrade-start

qa/suites/rados/cephadm/upgrade: start from v15.2.0

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34310 from badone/wip-restful-api-dont-pass-empty-dict-to-get
Brad Hubbard [Mon, 6 Apr 2020 22:14:03 +0000 (08:14 +1000)]
Merge pull request #34310 from badone/wip-restful-api-dont-pass-empty-dict-to-get

qa/suites/rados/rest: don't pass empty dict as data arg

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #34302 from badone/wip-specify-rule-for-pool-creation
Brad Hubbard [Mon, 6 Apr 2020 21:44:30 +0000 (07:44 +1000)]
Merge pull request #34302 from badone/wip-specify-rule-for-pool-creation

Wip specify rule for pool creation

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #34239 from p-se/wip-pse-fix-false-root-vol-full-alert
Volker Theile [Mon, 6 Apr 2020 12:17:17 +0000 (14:17 +0200)]
Merge pull request #34239 from p-se/wip-pse-fix-false-root-vol-full-alert

monitoring: root volume full alert fires false positives

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #34240 from krig/grafana-dashboards-fixes
Lenz Grimmer [Mon, 6 Apr 2020 08:55:20 +0000 (10:55 +0200)]
Merge pull request #34240 from krig/grafana-dashboards-fixes

mgr/dashboard: Repair broken grafana panels

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agodevices/simple/scan: Fix string in log statement 34412/head
Jan Fajerski [Mon, 6 Apr 2020 08:51:27 +0000 (10:51 +0200)]
devices/simple/scan: Fix string in log statement

A multiline string enclosed by () gained a comma, making it into a
tuple, which has no format() method.

Fixes: https://tracker.ceph.com/issues/44949
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #34374 from sebastian-philipp/mgr-fix-tox-cephadm
Kefu Chai [Mon, 6 Apr 2020 07:34:38 +0000 (15:34 +0800)]
Merge pull request #34374 from sebastian-philipp/mgr-fix-tox-cephadm

pybind/mgr: Fix `run_tox.sh mgr -- cephadm`

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34269 from yuvalif/fix_cls_queue_logs
Yuval Lifshitz [Sun, 5 Apr 2020 10:50:41 +0000 (13:50 +0300)]
Merge pull request #34269 from yuvalif/fix_cls_queue_logs

cls/queue: remove error message when queue is not initialized

5 years agoMerge pull request #33985 from zhengchengyao/clone_metadata
Jason Dillaman [Sat, 4 Apr 2020 13:46:27 +0000 (09:46 -0400)]
Merge pull request #33985 from zhengchengyao/clone_metadata

librbd: children should inherit parent's stripe

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #34072 from shangdehao1/fix_nfs_bug
Jason Dillaman [Sat, 4 Apr 2020 13:45:49 +0000 (09:45 -0400)]
Merge pull request #34072 from shangdehao1/fix_nfs_bug

qa/tasks/qemu: fix nfs setup and teardown bug in qemu task

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #34371 from smithfarm/wip-43896
Josh Durgin [Fri, 3 Apr 2020 21:31:22 +0000 (14:31 -0700)]
Merge pull request #34371 from smithfarm/wip-43896

doc/releases/nautilus: restart OSDs to make them bind to v2 addr

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #31480 from ukernel/wip-20
Gregory Farnum [Fri, 3 Apr 2020 19:53:29 +0000 (12:53 -0700)]
Merge pull request #31480 from ukernel/wip-20

client: auto reconnect after blacklisted

Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge pull request #33915 from lxbsz/client_assert_failedddd
Gregory Farnum [Fri, 3 Apr 2020 19:49:59 +0000 (12:49 -0700)]
Merge pull request #33915 from lxbsz/client_assert_failedddd

Client: fix Finisher assert failure

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
5 years agoMerge pull request #34386 from gregsfortytwo/wip-33279-revert-sudo
Gregory Farnum [Fri, 3 Apr 2020 19:36:37 +0000 (12:36 -0700)]
Merge pull request #34386 from gregsfortytwo/wip-33279-revert-sudo

Wip 33279 revert sudo

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
5 years agoMerge pull request #34110 from ukernel/wip-44680
Gregory Farnum [Fri, 3 Apr 2020 19:33:51 +0000 (12:33 -0700)]
Merge pull request #34110 from ukernel/wip-44680

mds: don't assert empty io context list when shutting down

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agoMerge PR #34385 into master
Sage Weil [Fri, 3 Apr 2020 19:29:43 +0000 (14:29 -0500)]
Merge PR #34385 into master

* refs/pull/34385/head:
doc/dev/cephadm: a few notes on developing with cephadm

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #34281 from vshankar/wip-44677
Gregory Farnum [Fri, 3 Apr 2020 19:29:19 +0000 (12:29 -0700)]
Merge pull request #34281 from vshankar/wip-44677

mgr: force purge normal ceph entities from service map

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34306 from ukernel/wip-44771
Gregory Farnum [Fri, 3 Apr 2020 19:28:30 +0000 (12:28 -0700)]
Merge pull request #34306 from ukernel/wip-44771

ceph-fuse: don't get mount options from /etc/fstab when doing remount

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agoMerge PR #34296 into master
Sage Weil [Fri, 3 Apr 2020 19:16:21 +0000 (14:16 -0500)]
Merge PR #34296 into master

* refs/pull/34296/head:
qa/suites/rados/cephadm/smoke-roleless: add smoke test
qa/tasks/cephadm: add 'roleless' mode

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #34384 into master
Sage Weil [Fri, 3 Apr 2020 19:16:00 +0000 (14:16 -0500)]
Merge PR #34384 into master

* refs/pull/34384/head:
cephadm: create /var/run/ceph dir via unit.run, not unit file

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/suites/rados/cephadm/upgrade: start from v15.2.0 34406/head
Sage Weil [Fri, 3 Apr 2020 19:15:01 +0000 (14:15 -0500)]
qa/suites/rados/cephadm/upgrade: start from v15.2.0

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #34405 from ceph/wip-yuriw-cron-master2
Yuri Weinstein [Fri, 3 Apr 2020 17:19:17 +0000 (10:19 -0700)]
Merge pull request #34405 from ceph/wip-yuriw-cron-master2

qa/tests: fixed typo

5 years agoqa/tests: fixed typo 34405/head
yuriw [Fri, 3 Apr 2020 16:27:33 +0000 (09:27 -0700)]
qa/tests: fixed typo

Signed-off-by: yuriw <yuri.weinstein@gmail.com>
5 years agoMerge pull request #34404 from ceph/wip-yuriw-cron-master
Yuri Weinstein [Fri, 3 Apr 2020 16:21:14 +0000 (09:21 -0700)]
Merge pull request #34404 from ceph/wip-yuriw-cron-master

qa/tests: added client upgrades tests for octopus, removed mimic-x/ma…

5 years agoqa/tests: added client upgrades tests for octopus, removed mimic-x/masted as not... 34404/head
yuriw [Fri, 3 Apr 2020 15:57:28 +0000 (08:57 -0700)]
qa/tests: added client upgrades tests for octopus, removed mimic-x/masted as not needed

Signed-off-by: Yuri Weinstein <yweinstein@redhat.com>
5 years agodoc/dev/cephadm: a few notes on developing with cephadm 34385/head
Sage Weil [Fri, 3 Apr 2020 01:36:06 +0000 (20:36 -0500)]
doc/dev/cephadm: a few notes on developing with cephadm

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33502 from yison/rwl-image-writeback-cache-seq3
Jason Dillaman [Fri, 3 Apr 2020 14:39:28 +0000 (10:39 -0400)]
Merge pull request #33502 from yison/rwl-image-writeback-cache-seq3

rbd/cache: Replicated Write Log core codes part 3

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #34362 from tchaikov/wip-rbd-with-pmem
Jason Dillaman [Fri, 3 Apr 2020 14:08:08 +0000 (10:08 -0400)]
Merge pull request #34362 from tchaikov/wip-rbd-with-pmem

cmake, librbd: fix build with pmem and cleanups

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #34332 from cyx1231st/wip-seastar-messenger-lossy-peer
Kefu Chai [Fri, 3 Apr 2020 13:26:04 +0000 (21:26 +0800)]
Merge pull request #34332 from cyx1231st/wip-seastar-messenger-lossy-peer

crimson/net: enable features for lossy peer connections of heartbeat

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34319 from clyso/patch-2
Sebastian Wagner [Fri, 3 Apr 2020 10:48:11 +0000 (12:48 +0200)]
Merge pull request #34319 from clyso/patch-2

doc/mgr/orchestrator: update cephadm shell proposed alias entry

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34318 from clyso/patch-1
Sebastian Wagner [Fri, 3 Apr 2020 10:44:55 +0000 (12:44 +0200)]
Merge pull request #34318 from clyso/patch-1

doc/mgr/orchestrator: add path to ssh-copy-id instructions

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34367 from sebastian-philipp/codeowners-cephadm-update
Sebastian Wagner [Fri, 3 Apr 2020 10:41:34 +0000 (12:41 +0200)]
Merge pull request #34367 from sebastian-philipp/codeowners-cephadm-update

CODEOWNERS: update cephadm paths

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34390 from tchaikov/wip-github-codeowners
Kefu Chai [Fri, 3 Apr 2020 09:41:02 +0000 (17:41 +0800)]
Merge pull request #34390 from tchaikov/wip-github-codeowners

.github/CODEOWNERS: add ceph/crimson

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #34325 from tspmelo/wip-npm-update-20-03
Lenz Grimmer [Fri, 3 Apr 2020 09:14:50 +0000 (11:14 +0200)]
Merge pull request #34325 from tspmelo/wip-npm-update-20-03

mgr/dashboard: Update all npm packages

Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #34377 from votdev/issue_44914_rgw_debug_info
Lenz Grimmer [Fri, 3 Apr 2020 08:45:50 +0000 (10:45 +0200)]
Merge pull request #34377 from votdev/issue_44914_rgw_debug_info

mgr/dashboard: Add more debug information to Dashboard RGW backend

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #34333 from changchengx/mail_org_update
Kefu Chai [Fri, 3 Apr 2020 08:08:55 +0000 (16:08 +0800)]
Merge pull request #34333 from changchengx/mail_org_update

mailmap: update mail org relationship

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agodoc/mgr/orchestrator: update cephadm shell proposed alias entry 34319/head
clyso [Tue, 31 Mar 2020 12:50:07 +0000 (14:50 +0200)]
doc/mgr/orchestrator: update cephadm shell proposed alias entry

prior change i get following error when using alias as "ceph -v":
INFO:cephadm:Inferring fsid ecfdb924-7341-11ea-943c-020100010027
INFO:cephadm:Using recent ceph image ceph/ceph:v15
/usr/bin/docker: Error response from daemon: OCI runtime create failed: container_linux.go:349: starting container process caused "exec: "/usr/bin/ceph -v": stat /usr/bin/ceph -v: no such file or directory": unknown.
after:
INFO:cephadm:Inferring fsid ecfdb924-7341-11ea-943c-020100010027
INFO:cephadm:Using recent ceph image ceph/ceph:v15
ceph version 15.2.0 (dc6a0b5) octopus (rc)

Signed-off-by: Tobias Fischer <tobias.fischer@clyso.com>
5 years agodoc/mgr/orchestrator: add path to ssh-copy-id instructions 34318/head
clyso [Tue, 31 Mar 2020 12:48:05 +0000 (14:48 +0200)]
doc/mgr/orchestrator: add path to ssh-copy-id instructions

by default ssh key will be placed under /etc/ceph - so it should be included in examples

Signed-off-by: Tobias Fischer <tobias.fischer@clyso.com>
5 years agoMerge pull request #34227 from p-se/wip-pse-fix-alert-space-prediction
Lenz Grimmer [Fri, 3 Apr 2020 07:48:33 +0000 (09:48 +0200)]
Merge pull request #34227 from p-se/wip-pse-fix-alert-space-prediction

monitoring: alert for prediction of disk and pool fill up broken

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years ago.github/CODEOWNERS: add ceph/crimson 34390/head
Kefu Chai [Fri, 3 Apr 2020 06:58:29 +0000 (14:58 +0800)]
.github/CODEOWNERS: add ceph/crimson

so we can add reviewers in a more efficient way for crimson related
changes

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: specify CC when compiling pmem 34362/head
Kefu Chai [Thu, 2 Apr 2020 04:36:34 +0000 (12:36 +0800)]
cmake: specify CC when compiling pmem

make always assume that `cc` is available. but we cannot ensure this,
and furthermore, we need to use the compiler specified by user. so
specify `CC` variable when compiling pmem. and reindent the code to fix
the formatting.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrbd/cache: undefine dout_subsys before defining it
Kefu Chai [Thu, 2 Apr 2020 04:22:54 +0000 (12:22 +0800)]
librbd/cache: undefine dout_subsys before defining it

otherwise we could have following warning from compiler
```
In file included from ../src/test/librbd/cache/test_mock_ReplicatedWriteLog.cc:42:
../src/librbd/cache/ImageWriteback.cc:13: warning: "dout_subsys" redefined
   13 | #define dout_subsys ceph_subsys_rbd
      |
In file included from ../src/test/librbd/cache/test_mock_ReplicatedWriteLog.cc:39:
../src/librbd/cache/ReplicatedWriteLog.cc:23: note: this is the location of the previous definition
   23 | #define dout_subsys ceph_subsys_rbd_rwl
      |
In file included from ../src/test/librbd/cache/test_mock_ReplicatedWriteLog.cc:43:
../src/librbd/cache/rwl/ImageCacheState.cc:12: warning: "dout_subsys" redefined
   12 | #define dout_subsys ceph_subsys_rbd_rwl
      |
In file included from ../src/test/librbd/cache/test_mock_ReplicatedWriteLog.cc:42:
../src/librbd/cache/ImageWriteback.cc:13: note: this is the location of the previous definition
   13 | #define dout_subsys ceph_subsys_rbd
      |
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: expose pmem::pmemobj from rbd_internal
Kefu Chai [Thu, 2 Apr 2020 04:19:50 +0000 (12:19 +0800)]
cmake: expose pmem::pmemobj from rbd_internal

because `librbd/cache/rwl/Types.h` includes `libpmemobj.h`, without this
change, `cache/test_mock_ReplicatedWriteLog.cc` will fail to compile as
`libpmemobj.h` might not exist in the default directories compile search
for header files. and hence we could have following failure
```
ceph/src/test/librbd/cache/test_mock_ReplicatedWriteLog.cc:11:
86 /root/luyuan/community/github/ceph/src/librbd/cache/rwl/Types.h:8:10: fatal error: libpmemobj.h: No such file or directory
87 8 | #include <libpmemobj.h>
88 | ^~~~~~~~~~~~~~
89 compilation terminated.
90 src/test/librbd/CMakeFiles/unittest_librbd.dir/build.make:1814: recipe for target 'src/test/librbd/CMakeFiles/unittest_librbd.dir/cache/test_mock_ReplicatedWriteLog.cc.o' failed
91 make[3]: *** [src/test/librbd/CMakeFiles/unittest_librbd.dir/cache/test_mock_ReplicatedWriteLog.cc.o] Error 1
92 make[3]: *** Waiting for unfinished jobs....
93 CMakeFiles/Makefile2:20379: recipe for target 'src/test/librbd/CMakeFiles/unittest_librbd.dir/all' failed
94 make[2]: *** [src/test/librbd/CMakeFiles/unittest_librbd.dir/all] Error 2
95 CMakeFiles/Makefile2:20391: recipe for target 'src/test/librbd/CMakeFiles/unittest_librbd.dir/rule' failed
96 make[1]: *** [src/test/librbd/CMakeFiles/unittest_librbd.dir/rule] Error 2
97 Makefile:5375: recipe for target 'unittest_librbd' failed
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: do not use $(MAKE) in Buildpmem.cmake
Kefu Chai [Thu, 2 Apr 2020 04:15:21 +0000 (12:15 +0800)]
cmake: do not use $(MAKE) in Buildpmem.cmake

we cannot assume that we are using `make` as the cmake generatator,
for instance, if ninja is used, `$(MAKE)` won't be substituted by ninja.
so we need to check if Make is used as generator, if that's the case, we
can just use `$(MAKE)` so we can benefit from the job control of `make`,
otherwise, `make` is used, because currently, PMDK uses Makefile to
build.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: add find_make() function
Kefu Chai [Fri, 3 Apr 2020 04:39:16 +0000 (12:39 +0800)]
cmake: add find_make() function

it's a shorthand for finding "make" or "gmake" (for FreeBSD), and set
the path to the executable and the command to use in the generated
"Makefile" or whatever build script generated by cmake.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoRevert "qa/cephfs: move run_shell and related methods to mount.py" 34386/head
Greg Farnum [Fri, 3 Apr 2020 01:09:21 +0000 (01:09 +0000)]
Revert "qa/cephfs: move run_shell and related methods to mount.py"

This reverts commit 751d432a8696c7fdceb9d9707c2b3331878342ea.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
5 years agoRevert "vstart_runner.py: add methods for negative testing a cmd"
Greg Farnum [Fri, 3 Apr 2020 01:09:15 +0000 (01:09 +0000)]
Revert "vstart_runner.py: add methods for negative testing a cmd"

This reverts commit 48e0e1d7030bc4167bd3151696106a51f143bdba.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
5 years agocephadm: create /var/run/ceph dir via unit.run, not unit file 34384/head
Sage Weil [Thu, 2 Apr 2020 23:36:39 +0000 (18:36 -0500)]
cephadm: create /var/run/ceph dir via unit.run, not unit file

The systemd unit file is shared with non-ceph daemons, which (1) don't
need the /var/run directory, and (2) are based on a uid/gid from a
different container image, which means we can't figure out the right
ceph uid/gid from them to set the ownership properly.

Instead, put it in the unit.run file... and only for ceph daemons when
we have the uid/gid we need.

Fixes: https://tracker.ceph.com/issues/44894
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/cephadm/smoke-roleless: add smoke test 34296/head
Sage Weil [Mon, 30 Mar 2020 18:21:12 +0000 (18:21 +0000)]
qa/suites/rados/cephadm/smoke-roleless: add smoke test

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/tasks/cephadm: add 'roleless' mode
Sage Weil [Mon, 30 Mar 2020 17:57:09 +0000 (17:57 +0000)]
qa/tasks/cephadm: add 'roleless' mode

Allow cephadm to start up with roles like:

roles:
- - host.a
  - client.0
  - osd.0
  - osd.1
- - host.b
  - osd.2
  - osd.3

Cephadm will pick the mon names (based on host) and provision all
services by default.

The cephadm task can still provision other daemons, but it may
fight with mgr/cephadm.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #34330 from mgfritch/cephadm-nfs-extra-args
Sebastian Wagner [Thu, 2 Apr 2020 18:02:46 +0000 (20:02 +0200)]
Merge pull request #34330 from mgfritch/cephadm-nfs-extra-args

cephadm: add `extra_args` to nfs daemon

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agoMerge pull request #34361 from mgfritch/cephadm-revert-nfs-trivial
Sebastian Wagner [Thu, 2 Apr 2020 16:05:19 +0000 (18:05 +0200)]
Merge pull request #34361 from mgfritch/cephadm-revert-nfs-trivial

mgr/cephadm: revert trivial_completion for nfs_add

Reviewed-by: Matthew Oliver <moliver@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34329 from liewegas/cephadm-bootstrap-typo
Sebastian Wagner [Thu, 2 Apr 2020 16:02:51 +0000 (18:02 +0200)]
Merge pull request #34329 from liewegas/cephadm-bootstrap-typo

cephadm: fix typo

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34283 from tspmelo/wip-reduce-scss
Laura Paduano [Thu, 2 Apr 2020 14:51:57 +0000 (16:51 +0200)]
Merge pull request #34283 from tspmelo/wip-reduce-scss

mgr/dashboard: Reduce size of component styles

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #33807 from ofriedma/wip-disable-range-prefetch
Casey Bodley [Thu, 2 Apr 2020 14:46:27 +0000 (10:46 -0400)]
Merge pull request #33807 from ofriedma/wip-disable-range-prefetch

rgw: Disable prefetch of entire head object when GET request with ran…

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Mark Kogan <mkogan@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agomgr/dashboard: Add more debug information to Dashboard RGW backend 34377/head
Volker Theile [Thu, 2 Apr 2020 14:01:53 +0000 (16:01 +0200)]
mgr/dashboard: Add more debug information to Dashboard RGW backend

Fixes: https://tracker.ceph.com/issues/44914
Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Update npm dependencies 34325/head
Tiago Melo [Tue, 31 Mar 2020 14:43:17 +0000 (14:43 +0000)]
mgr/dashboard: Update npm dependencies

ngx-bootstrap now requires BrowserAnimationsModule, so it has to be imported
in each unit test that imports ngx-bootstrap modules.

Fixes: https://tracker.ceph.com/issues/44854
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Update npm devDependencies
Tiago Melo [Tue, 31 Mar 2020 13:55:38 +0000 (13:55 +0000)]
mgr/dashboard: Update npm devDependencies

The following updates required code style changes:
- TSLint updated the logic of ordering imports.
- Prettier improved when to break a command chain into multiple lines.

Fixes: https://tracker.ceph.com/issues/44854
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #34312 from tspmelo/wip-improve-unit-test
Lenz Grimmer [Thu, 2 Apr 2020 13:02:50 +0000 (15:02 +0200)]
Merge pull request #34312 from tspmelo/wip-improve-unit-test

mgr/dashboard: Fix ServiceDetails and PoolDetails unit tests

Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agopybind/mgr: Fix `run_tox.sh mgr -- cephadm` 34374/head
Sebastian Wagner [Thu, 2 Apr 2020 12:52:33 +0000 (14:52 +0200)]
pybind/mgr: Fix `run_tox.sh mgr -- cephadm`

Failed with a cryptic error.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34206 from sebastian-philipp/cephadm-hostname-check-lowercase
Sebastian Wagner [Thu, 2 Apr 2020 12:27:30 +0000 (14:27 +0200)]
Merge pull request #34206 from sebastian-philipp/cephadm-hostname-check-lowercase

cephadm: check hostnames case insensitive

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #34250 from Daniel-Pivonka/cephadm_python3
Sebastian Wagner [Thu, 2 Apr 2020 12:26:43 +0000 (14:26 +0200)]
Merge pull request #34250 from Daniel-Pivonka/cephadm_python3

mgr/cephadm: add useful error if python3 is not on remote host

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #33954 from jschmid1/parse_hostsspecs
Sebastian Wagner [Thu, 2 Apr 2020 12:25:54 +0000 (14:25 +0200)]
Merge pull request #33954 from jschmid1/parse_hostsspecs

python-common: fix /hosts/ parsing in servicespecs

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34033 from rhcs-dashboard/44666-fix-sso-certificate-file
Lenz Grimmer [Thu, 2 Apr 2020 11:38:21 +0000 (13:38 +0200)]
Merge pull request #34033 from rhcs-dashboard/44666-fix-sso-certificate-file

mgr/dashboard: fix error when enabling SSO with cert. file

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agodoc/releases/nautilus: restart OSDs to make them bind to v2 addr 34371/head
Nathan Cutler [Thu, 2 Apr 2020 11:03:31 +0000 (13:03 +0200)]
doc/releases/nautilus: restart OSDs to make them bind to v2 addr

Fixes: https://tracker.ceph.com/issues/43896
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoCODEOWNERS: update cephadm paths 34367/head
Sebastian Wagner [Thu, 2 Apr 2020 09:00:48 +0000 (11:00 +0200)]
CODEOWNERS: update cephadm paths

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: revert trivial_completion for nfs_add 34361/head
Michael Fritch [Thu, 2 Apr 2020 03:10:40 +0000 (21:10 -0600)]
mgr/cephadm: revert trivial_completion for nfs_add

revert change that was missed in af8fa11

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #34324 from rzarzynski/wip-crimson-returnvec
Kefu Chai [Thu, 2 Apr 2020 00:29:35 +0000 (08:29 +0800)]
Merge pull request #34324 from rzarzynski/wip-crimson-returnvec

crimson/osd: OP_CALL does support RETURNVEC now.

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34290 from sebastian-philipp/doc-cephadm-service-spec
Sebastian Wagner [Wed, 1 Apr 2020 22:31:14 +0000 (00:31 +0200)]
Merge pull request #34290 from sebastian-philipp/doc-cephadm-service-spec

doc/mgr/orchestrator: Add "Service Specification"

Reviewed-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge pull request #34322 from cbodley/wip-44857
Casey Bodley [Wed, 1 Apr 2020 18:25:00 +0000 (14:25 -0400)]
Merge pull request #34322 from cbodley/wip-44857

rgw: pubsub sync module ignores ERR_USER_EXIST

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agoMerge pull request #34134 from zhangdaolong/fix_incorrect_log_info
Mykola Golub [Wed, 1 Apr 2020 18:01:23 +0000 (21:01 +0300)]
Merge pull request #34134 from zhangdaolong/fix_incorrect_log_info

pybind/rbd: fix no lockers are obtained, ImageNotFound exception will be output

5 years agoMerge PR #34320 into master
Sage Weil [Wed, 1 Apr 2020 15:58:57 +0000 (10:58 -0500)]
Merge PR #34320 into master

* refs/pull/34320/head:
cephadm: ceph-volume: disallow concurrent execution

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #34096 from smanjara/wip-dynamic-resharding
Casey Bodley [Wed, 1 Apr 2020 15:55:06 +0000 (11:55 -0400)]
Merge pull request #34096 from smanjara/wip-dynamic-resharding

rgw: groundwork for supporting dynamic resharding in multisite environment

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agocrimson/osd: OP_CALL does support RETURNVEC now. 34324/head
Radoslaw Zarzynski [Tue, 31 Mar 2020 15:45:51 +0000 (17:45 +0200)]
crimson/osd: OP_CALL does support RETURNVEC now.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #34345 from tchaikov/wip-crimson-less-chatty
Kefu Chai [Wed, 1 Apr 2020 12:31:52 +0000 (20:31 +0800)]
Merge pull request #34345 from tchaikov/wip-crimson-less-chatty

crimson: do not warn() under expected circumstances

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson/osd: do not use "warn()" when handling non-error 34345/head
Kefu Chai [Wed, 1 Apr 2020 11:59:16 +0000 (19:59 +0800)]
crimson/osd: do not use "warn()" when handling non-error

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/mon: do not print error log at seeing unknown connection
Kefu Chai [Tue, 31 Mar 2020 07:32:58 +0000 (15:32 +0800)]
crimson/mon: do not print error log at seeing unknown connection

it happens if a client or an peer osd drops the connection, so it's not
an error and hence we should not print this error message using
"error()".

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34341 from guits/update_cv_deploy
Jan Fajerski [Wed, 1 Apr 2020 11:26:59 +0000 (13:26 +0200)]
Merge pull request #34341 from guits/update_cv_deploy

ceph-volume: update functional testing deploy.yml playbook

5 years agoMerge pull request #34331 from zealoussnow/wip-fix-clone-error
Kefu Chai [Wed, 1 Apr 2020 11:23:54 +0000 (19:23 +0800)]
Merge pull request #34331 from zealoussnow/wip-fix-clone-error

test/common/unittest_blkdev: delete unused test file

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agounittest_blkdev: delete unused test file 34331/head
Leo Zhang [Wed, 1 Apr 2020 02:55:12 +0000 (10:55 +0800)]
unittest_blkdev: delete unused test file

Signed-off-by: Leo Zhang <nguzcf@gmail.com>
5 years agodoc/mgr/orchestrator: Update `Placement by pattern matching` 34290/head
Sebastian Wagner [Wed, 1 Apr 2020 09:33:51 +0000 (11:33 +0200)]
doc/mgr/orchestrator: Update `Placement by pattern matching`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agodoc/cephadm/drivegroup: Don't introduce DriveGroups
Sebastian Wagner [Mon, 30 Mar 2020 14:48:16 +0000 (16:48 +0200)]
doc/cephadm/drivegroup: Don't introduce DriveGroups

We already have a name for it: a Service Specification of
type `osd`. We don't need to introduce a new name for it.

Well, they are "DriveGroups", but users don't need to know it.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agodoc/cephadm/drivegroups: Update to new yaml
Sebastian Wagner [Mon, 30 Mar 2020 14:43:44 +0000 (16:43 +0200)]
doc/cephadm/drivegroups: Update to new yaml

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agodoc/mgr/orchestrator: use yaml syntax highlighting
Sebastian Wagner [Tue, 31 Mar 2020 13:21:45 +0000 (15:21 +0200)]
doc/mgr/orchestrator: use yaml syntax highlighting

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agodoc/mgr/orchestrator: Add "Service Specification"
Sebastian Wagner [Mon, 30 Mar 2020 14:36:46 +0000 (16:36 +0200)]
doc/mgr/orchestrator: Add "Service Specification"

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoceph-volume: update functional testing deploy.yml playbook 34341/head
Guillaume Abrioux [Wed, 1 Apr 2020 09:32:40 +0000 (11:32 +0200)]
ceph-volume: update functional testing deploy.yml playbook

This commit adds a call to `ceph-facts` role in the first play of this
playbook. This is needed so `ceph-validate` won't fail because of
following error:

```
fatal: [osd0]: FAILED! => {}

MSG:

'osd_pool_default_size' is undefined
```

`osd_pool_default_size` is set in ceph-facts.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
5 years agopybind/rbd: fix no lockers are obtained, ImageNotFound exception will be output 34134/head
zhangdaolong [Tue, 24 Mar 2020 00:51:44 +0000 (08:51 +0800)]
pybind/rbd: fix no lockers are obtained, ImageNotFound exception will be output

No lockers are obtained, ImageNotFound exception will be output,
but tht image is always exist.when lockers number is zero,
Should not output any exceptions。

Fixes: https://tracker.ceph.com/issues/44613
Signed-off-by: zhangdaolong <zhangdaolong@fiberhome.com>
5 years agoMerge pull request #34232 from bk201/wip-44743
Laura Paduano [Wed, 1 Apr 2020 08:15:41 +0000 (10:15 +0200)]
Merge pull request #34232 from bk201/wip-44743

qa/tasks/mgr/dashboard/test_rbd: wait longer when purging

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agomailmap: update mail org relationship 34333/head
Changcheng Liu [Wed, 1 Apr 2020 06:02:39 +0000 (14:02 +0800)]
mailmap: update mail org relationship

The owner of "changcheng.liu@aliyun.com" is an employee of Intel.
Update info for comming statistic.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agomodified get_target_shard_id() to take bucket_index_normal_layout directly 34096/head
Shilpa Jagannath [Tue, 31 Mar 2020 11:20:58 +0000 (16:50 +0530)]
modified get_target_shard_id() to take bucket_index_normal_layout directly

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
5 years agocrimson/net: fix is_connected() to identify if handshake has completed 34332/head
Yingxin Cheng [Tue, 31 Mar 2020 08:07:13 +0000 (16:07 +0800)]
crimson/net: fix is_connected() to identify if handshake has completed

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agocrimson/net: notify if the connection is to be replaced during reset
Yingxin Cheng [Sun, 29 Mar 2020 11:17:52 +0000 (19:17 +0800)]
crimson/net: notify if the connection is to be replaced during reset

is_replace=true means the reset connection is going to be replaced by
another accepting connection with the same peer_addr, which currently
only happens under lossy policy when both sides wish to connect to each
other.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agocrimson/net: remove too-verbose info logs in connect()
Yingxin Cheng [Fri, 27 Mar 2020 07:38:15 +0000 (15:38 +0800)]
crimson/net: remove too-verbose info logs in connect()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agocrimson/net: audit peer_name(type, id) during handshake
Yingxin Cheng [Fri, 27 Mar 2020 07:12:13 +0000 (15:12 +0800)]
crimson/net: audit peer_name(type, id) during handshake

Allow connect to specific peer with entity_name_t, with required
internal validation during handshake in v2.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agoClient: make sure the Finisher's mutex lock not held during it being distructed 33915/head
Xiubo Li [Tue, 31 Mar 2020 09:09:45 +0000 (05:09 -0400)]
Client: make sure the Finisher's mutex lock not held during it being distructed

The objecter_finisher is already started in Client::Client(), but
in the failure path when initializing and starting the Client object,
we may not get a chance to call the Client::shutdown() to stop the
Finisher thread, which maybe still holding the mutex lock in it. Then
when destrucing the Finisher object the pthread_mutex_destroy() will
fail.

This fix will delay the objecter_finisher thread to start in ::init()
until we're ready to call Client::shutdown on any errors instead.

Fixes: https://tracker.ceph.com/issues/44389
Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agocephadm: add `extra_args` to nfs daemon 34330/head
Michael Fritch [Tue, 31 Mar 2020 23:39:03 +0000 (17:39 -0600)]
cephadm: add `extra_args` to nfs daemon

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agocephadm: fix typo 34329/head
Sage Weil [Tue, 31 Mar 2020 23:06:46 +0000 (18:06 -0500)]
cephadm: fix typo

This has been bugging me

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agorgw: pubsub sync module ignores ERR_USER_EXIST 34322/head
Casey Bodley [Tue, 31 Mar 2020 14:46:33 +0000 (10:46 -0400)]
rgw: pubsub sync module ignores ERR_USER_EXIST

otherwise, this error gets returned by RGWPSDataSyncModule::start_sync()
and data sync fails to start

Fixes: https://tracker.ceph.com/issues/44857
Signed-off-by: Casey Bodley <cbodley@redhat.com>