]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agomgr/dashboard: fix failing user tests 32461/head
Tatjana Dehler [Thu, 2 Jan 2020 12:22:48 +0000 (13:22 +0100)]
mgr/dashboard: fix failing user tests

Choose another future_date_1 date (9 days instead of 10) to
make sure the expiration date will be between future_date_1
and future_date_2. Otherwise the expiration date might be
equal to future_date_1.
Also wait for 10 seconds before the password refresh in
test_pwd_expiration_date_update to prevent date equality.

Fixes: https://tracker.ceph.com/issues/43431
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #32499 from sebastian-philipp/orchestrator-cli-mon-update-count...
Kefu Chai [Tue, 7 Jan 2020 10:52:26 +0000 (18:52 +0800)]
Merge pull request #32499 from sebastian-philipp/orchestrator-cli-mon-update-count-only

mgr/orchestrator_cli: _update_mons require host spec only

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32376 from idryomov/wip-krbd-fsx-object-map
Ilya Dryomov [Tue, 7 Jan 2020 10:32:26 +0000 (11:32 +0100)]
Merge pull request #32376 from idryomov/wip-krbd-fsx-object-map

qa/suites/krbd: fsx with object-map and fast-diff

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32518 from tchaikov/wip-orchestrator-service-action-tests
Kefu Chai [Tue, 7 Jan 2020 09:44:10 +0000 (17:44 +0800)]
Merge pull request #32518 from tchaikov/wip-orchestrator-service-action-tests

qa/tasks/mgr/test_orchestrator_cli: fix service action tests

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/rook: Add some more type annotations 32499/head
Sebastian Wagner [Mon, 6 Jan 2020 13:08:42 +0000 (14:08 +0100)]
mgr/rook: Add some more type annotations

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/orchestrator_cli: _update_mons require host spec only
Sebastian Wagner [Mon, 6 Jan 2020 13:07:55 +0000 (14:07 +0100)]
mgr/orchestrator_cli: _update_mons require host spec only

* `mgr/cephadm` requres a host spec right now
* `mgr/rook` only supports `spec.count` right now

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #32496 from majianpeng/osd-remove-unused-func2
Kefu Chai [Tue, 7 Jan 2020 08:40:16 +0000 (16:40 +0800)]
Merge pull request #32496 from majianpeng/osd-remove-unused-func2

osd/OSD: remove unused func enqueue_peering_evt_front

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32484 from bzed/bluefs-use-uint64_t-for-len
Kefu Chai [Tue, 7 Jan 2020 08:38:04 +0000 (16:38 +0800)]
Merge pull request #32484 from bzed/bluefs-use-uint64_t-for-len

os/bluestore/Blue(FS|Store): uint64_t alloc_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32473 from sseshasa/fix-mon-autotune-update
Kefu Chai [Tue, 7 Jan 2020 08:32:41 +0000 (16:32 +0800)]
Merge pull request #32473 from sseshasa/fix-mon-autotune-update

mon/OSDMonitor: Don't update mon cache settings if rocksdb is not used

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #28921 from rzarzynski/wip-msgr-drop-0c
Kefu Chai [Tue, 7 Jan 2020 08:31:49 +0000 (16:31 +0800)]
Merge pull request #28921 from rzarzynski/wip-msgr-drop-0c

msg/async: drop zero_copy_read() & co from ConnectedSocket.

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32112 from hjwsm1989/wip-42706
Kefu Chai [Tue, 7 Jan 2020 08:30:37 +0000 (16:30 +0800)]
Merge pull request #32112 from hjwsm1989/wip-42706

test/librados: don't release handler if set_pg_num failed

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32428 from tchaikov/wip-qa-mgr-mon-update
Kefu Chai [Tue, 7 Jan 2020 08:29:34 +0000 (16:29 +0800)]
Merge pull request #32428 from tchaikov/wip-qa-mgr-mon-update

qa/tasks/mgr/test_orchestrator_cli: fix "mon update" test

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31929 from majianpeng/msg-async-bugfix
Kefu Chai [Tue, 7 Jan 2020 08:28:30 +0000 (16:28 +0800)]
Merge pull request #31929 from majianpeng/msg-async-bugfix

msg/async: update refcount and perf counter properly

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks/mgr/test_orchestrator_cli: fix service action tests 32518/head
Kefu Chai [Tue, 7 Jan 2020 07:58:56 +0000 (15:58 +0800)]
qa/tasks/mgr/test_orchestrator_cli: fix service action tests

in b77f0c74a5213ee57de19d21c930b2f3c872a1c4, "reload"
service[-instance] action was dropped. so replace "reload" with
"restart" in the related tests.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32358 from idryomov/wip-krbd-py3-fixup
Ilya Dryomov [Mon, 6 Jan 2020 20:54:43 +0000 (21:54 +0100)]
Merge pull request #32358 from idryomov/wip-krbd-py3-fixup

qa: krbd_exclusive_option.sh: fixup for json.tool ordering change

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #32498 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:42:05 +0000 (12:42 -0800)]
Merge PR #32498 into master

* refs/pull/32498/head:
doc: mounting CephFS subdirectory and Persistent Mounts cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32480 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:34:37 +0000 (12:34 -0800)]
Merge PR #32480 into master

* refs/pull/32480/head:
qa: use -D_GNU_SOURCE when compiling fsync-tester.c
qa: add comment about fsync-tester distribution

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #29995 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:31:57 +0000 (12:31 -0800)]
Merge PR #29995 into master

* refs/pull/29995/head:
mds: add config to require forward to auth MDS

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31494 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:30:59 +0000 (12:30 -0800)]
Merge PR #31494 into master

* refs/pull/31494/head:
qa: force creation of fs with EC default data pool
qa: add tests for adding EC data pools
mon/MDSMonitor: warn when creating fs with default EC data pool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32015 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:29:39 +0000 (12:29 -0800)]
Merge PR #32015 into master

* refs/pull/32015/head:
doc/cephfs/standby: document mds_join_fs
mgr/cephadm: map mds daemons to a particular fs
mon/MDSMonitor: respect mfs fscid preference
mon/MDSMonitor: assign standbys to their preferred fscid
mds/FSMap: track preferred fscid for standby daemons
mds: add mds_join_fs option; pass via MMDSBeacon

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32268 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:28:20 +0000 (12:28 -0800)]
Merge PR #32268 into master

* refs/pull/32268/head:
mds: only enable batch getattr/lookup for non-snap request.
mds: pin dentry when attaching batch lookup to it

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32307 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:27:31 +0000 (12:27 -0800)]
Merge PR #32307 into master

* refs/pull/32307/head:
mon: print FSMap if standbys exist

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32308 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:26:58 +0000 (12:26 -0800)]
Merge PR #32308 into master

* refs/pull/32308/head:
mon/MDSMonitor: cleanup check_subs

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #32467 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:25:34 +0000 (12:25 -0800)]
Merge PR #32467 into master

* refs/pull/32467/head:
qa: fix various py3 cephfs qa bugs

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #32164 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:19:01 +0000 (12:19 -0800)]
Merge PR #32164 into master

* refs/pull/32164/head:
mount.ceph: give a hint message when no mds is up or cluster is laggy

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge PR #32363 into master
Patrick Donnelly [Mon, 6 Jan 2020 20:18:12 +0000 (12:18 -0800)]
Merge PR #32363 into master

* refs/pull/32363/head:
qa: add .qa link

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32426 from tchaikov/wip-qa-test_envlibrados_for_rocksdb.sh
Kefu Chai [Mon, 6 Jan 2020 17:46:14 +0000 (01:46 +0800)]
Merge pull request #32426 from tchaikov/wip-qa-test_envlibrados_for_rocksdb.sh

qa: enable CRB repo for RHEL8

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoqa: enable CRB repo for RHEL8 32426/head
Kefu Chai [Thu, 26 Dec 2019 07:48:28 +0000 (15:48 +0800)]
qa: enable CRB repo for RHEL8

instead of enabling PowerTools repo, we need to enable CodeReady Builder
repo for RHEL8

also, since we are moving to RHEL8, there is no need to install cmake3
specifically for CentOS. CentOS 8 comes with cmake3.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32242 from rishabh-d-dave/cv-methods-for-lvm-opt-S
Jan Fajerski [Mon, 6 Jan 2020 14:53:52 +0000 (15:53 +0100)]
Merge pull request #32242 from rishabh-d-dave/cv-methods-for-lvm-opt-S

ceph-volume: add methods to pass filters to pvs, vgs and lvs commands

5 years agoqa: krbd_exclusive_option.sh: fixup for json.tool ordering change 32358/head
Ilya Dryomov [Thu, 19 Dec 2019 18:02:18 +0000 (19:02 +0100)]
qa: krbd_exclusive_option.sh: fixup for json.tool ordering change

In Python 3.5 json.tool was changed to produce unsorted output and
--sort-keys option was added to compensate.  This wasn't caught by
4fe245cc2f2d ("qa: update krbd tests for python3") because it raced
with 50933b863a1d ("qa: krbd_exclusive_option.sh: update for recent
kernel changes").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
5 years agoceph-volume: add methods to pass filters to pvs, vgs and lvs commands 32242/head
Rishabh Dave [Thu, 21 Nov 2019 14:33:32 +0000 (20:03 +0530)]
ceph-volume: add methods to pass filters to pvs, vgs and lvs commands

Filters can be passed to these commands by using option '-S'.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoqa/suites/krbd: fsx with object-map and fast-diff 32376/head
Ilya Dryomov [Thu, 19 Dec 2019 19:22:06 +0000 (20:22 +0100)]
qa/suites/krbd: fsx with object-map and fast-diff

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
5 years agotest/librbd/fsx: don't disable features for krbd
Ilya Dryomov [Wed, 18 Dec 2019 13:32:11 +0000 (14:32 +0100)]
test/librbd/fsx: don't disable features for krbd

rbd_default_features is set in krbd suite, no need to hard-code this in
fsx (especially now when object-map, fast-diff and deep-flatten are all
supported).

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
5 years agodoc: mounting CephFS subdirectory and Persistent Mounts cleanup 32498/head
Jos Collin [Thu, 5 Dec 2019 06:26:54 +0000 (11:56 +0530)]
doc: mounting CephFS subdirectory and Persistent Mounts cleanup

Fixes: https://tracker.ceph.com/issues/37746
Signed-off-by: Jos Collin <jcollin@redhat.com>
5 years agoosd/OSD: remove unused func enqueue_peering_evt_front 32496/head
Jianpeng Ma [Mon, 6 Jan 2020 08:42:19 +0000 (16:42 +0800)]
osd/OSD: remove unused func enqueue_peering_evt_front

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
5 years agoMerge pull request #32485 from tchaikov/wip-clang
Kefu Chai [Mon, 6 Jan 2020 06:43:13 +0000 (14:43 +0800)]
Merge pull request #32485 from tchaikov/wip-clang

common,crimson: fixes to compile with clang and libc++

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #31728 from luis-henrix/copy-from-notrunc
Kefu Chai [Mon, 6 Jan 2020 02:07:45 +0000 (10:07 +0800)]
Merge pull request #31728 from luis-henrix/copy-from-notrunc

osd: add a 'copy-from2' operation that includes truncate_{seq,size} parameters

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agoMerge pull request #32488 from ronen-fr/clang_3
Kefu Chai [Mon, 6 Jan 2020 02:00:14 +0000 (10:00 +0800)]
Merge pull request #32488 from ronen-fr/clang_3

crimson: CLANG-related fixes to errorator.h

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32490 from rzarzynski/wip-crimson-missing_err_include
Kefu Chai [Mon, 6 Jan 2020 01:57:46 +0000 (09:57 +0800)]
Merge pull request #32490 from rzarzynski/wip-crimson-missing_err_include

crimson: add missing include in common/errorator.h

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson: add missing include in common/errorator.h 32490/head
Radoslaw Zarzynski [Thu, 2 Jan 2020 12:30:40 +0000 (13:30 +0100)]
crimson: add missing include in common/errorator.h

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocrimson: fix non-standard C++ constructs in errorator.h 32488/head
Ronen Friedman [Sun, 5 Jan 2020 06:23:58 +0000 (08:23 +0200)]
crimson: fix non-standard C++ constructs in errorator.h

Fixing use patterns accepted by gcc, but frowned upon by Clang:

Put noexcept specifier after attributes specifiers (as
per the C++ standard $11.3.5)

Limit the use of a not-completely-defined class names to
within function bodies, per the standard ("A class is considered
a completely-defined object type (or complete type) at the
closing } of the class-specifier.
Within the class member-specification, the class is regarded as
complete within function bodies, default arguments, noexcept-specifiers,
and default member initializers (including such things in nested classes).
Otherwise it is regarded as incomplete within its own class member-specification.")

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
5 years agocrimson: fix FTBFS on Clang induced by errorator.
Radoslaw Zarzynski [Wed, 1 Jan 2020 21:18:47 +0000 (22:18 +0100)]
crimson: fix FTBFS on Clang induced by errorator.

Reported-by Ronen Friedman <rfriedma@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocommon: add missing #include 32485/head
Kefu Chai [Sun, 5 Jan 2020 14:25:40 +0000 (22:25 +0800)]
common: add missing #include

clang++-9.0.1 and libc++ require them to build

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson: do not use auto in param list of function prototype
Kefu Chai [Sun, 5 Jan 2020 14:17:42 +0000 (22:17 +0800)]
crimson: do not use auto in param list of function prototype

src/crimson/net/Socket.cc:114:57: error: 'auto' not allowed in function
prototype
static inline seastar::future<> close_and_handle_errors(auto& out) {
                                                        ^~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson: do not capture unused variables
Kefu Chai [Sun, 5 Jan 2020 14:15:24 +0000 (22:15 +0800)]
crimson: do not capture unused variables

to silence warnings like

src/crimson/net/Socket.cc:93:41: warning: lambda capture 'this' is not
used [-Wunused-lambda-capture]
    return in.read_exactly(bytes).then([this](auto buf) {
                                        ^~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoos/bluestore/Blue(FS|Store): uint64_t alloc_size 32484/head
Bernd Zeimetz [Sun, 5 Jan 2020 13:30:54 +0000 (14:30 +0100)]
os/bluestore/Blue(FS|Store): uint64_t alloc_size

Compiling on Debian's 32bit architectures failed with

<<PKGBUILDDIR>>/src/os/bluestore/BlueStore.cc:5539:37: error: no matching function for call to ‘p2align(size_t&, uint64_t&)’
 5539 |     total += p2align(len, alloc_size);
      |                                     ^
In file included from /<<PKGBUILDDIR>>/src/include/denc.h:42,
                 from /<<PKGBUILDDIR>>/src/include/encoding.h:40,
                 from /<<PKGBUILDDIR>>/src/include/compact_map.h:16,
                 from /<<PKGBUILDDIR>>/src/include/mempool.h:32,
                 from /<<PKGBUILDDIR>>/src/os/bluestore/BlueStore.h:36,
                 from /<<PKGBUILDDIR>>/src/os/bluestore/BlueStore.cc:25:
/<<PKGBUILDDIR>>/src/include/intarith.h:57:20: note: candidate: ‘template<class T> constexpr T p2align(T, T)’
   57 | constexpr inline T p2align(T x, T align) {
      |                    ^~~~~~~
/<<PKGBUILDDIR>>/src/include/intarith.h:57:20: note:   template argument deduction/substitution failed:
/<<PKGBUILDDIR>>/src/os/bluestore/BlueStore.cc:5539:37: note:   deduced conflicting types for parameter ‘T’ (‘unsigned int’ and ‘long long unsigned int’)
 5539 |     total += p2align(len, alloc_size);

As far as I understand it the available_freespace should at least be
able to return the same number as alloc_size, so we should use uint64_t
instead of size_t here, similar to
10a953afc8f803e50c96354470fb114b33e62599

Fixes: https://tracker.ceph.com/issues/43451
Signed-off-by: Bernd Zeimetz <bernd@bzed.de>
5 years agoMerge pull request #32474 from kalebskeithley/fedora32
Kefu Chai [Sat, 4 Jan 2020 15:17:56 +0000 (23:17 +0800)]
Merge pull request #32474 from kalebskeithley/fedora32

do_cmake.sh: fedora-32 (rawhide) build with python-3.8

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32481 from tchaikov/wip=admin-build-doc-python3
Kefu Chai [Sat, 4 Jan 2020 14:16:16 +0000 (22:16 +0800)]
Merge pull request #32481 from tchaikov/wip=admin-build-doc-python3

admin/build-doc: always install python3-* for build deps

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
5 years agoadmin/build-doc: always install python3-* for build deps 32481/head
Kefu Chai [Sat, 4 Jan 2020 04:05:50 +0000 (12:05 +0800)]
admin/build-doc: always install python3-* for build deps

since we've dropped the support of python36-*, i.e. python packages
provided by EPEL7 before RHEL7/CentOS7 included python3. as before the
inclusion of python3 as supported python3, python packages are named
python36-*. and they don't provide python3-*. so we had to install
python36-* explicitly. now that we are able to use the python3-*
packages, we can just install python3-*.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa: fix various py3 cephfs qa bugs 32467/head
Patrick Donnelly [Fri, 3 Jan 2020 04:41:57 +0000 (20:41 -0800)]
qa: fix various py3 cephfs qa bugs

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoqa: use -D_GNU_SOURCE when compiling fsync-tester.c 32480/head
Patrick Donnelly [Fri, 3 Jan 2020 23:45:52 +0000 (15:45 -0800)]
qa: use -D_GNU_SOURCE when compiling fsync-tester.c

Otherwise loff_t is unavailable for some distributions.

Fixes: https://tracker.ceph.com/issues/43460
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoqa: add comment about fsync-tester distribution
Patrick Donnelly [Fri, 3 Jan 2020 23:45:14 +0000 (15:45 -0800)]
qa: add comment about fsync-tester distribution

I was initially confused why this would not be included in the QA suite.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #32451 from rs-fabrica/doc_rados_operations_crush-map-edits
Neha Ojha [Fri, 3 Jan 2020 23:20:33 +0000 (15:20 -0800)]
Merge pull request #32451 from rs-fabrica/doc_rados_operations_crush-map-edits

doc/rados/operations/crush-map-edits: recompile and set instructions

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #32442 into master
Patrick Donnelly [Fri, 3 Jan 2020 22:43:22 +0000 (14:43 -0800)]
Merge PR #32442 into master

* refs/pull/32442/head:
doc/developer: fix dev mailing list address

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agodoc/developer: fix dev mailing list address 32442/head
Willem Jan Withagen [Sun, 29 Dec 2019 16:32:49 +0000 (17:32 +0100)]
doc/developer: fix dev mailing list address

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agodo_cmake.sh: fedora-32 (rawhide) build with python-3.8 32474/head
Kaleb S. KEITHLEY [Fri, 3 Jan 2020 13:34:37 +0000 (08:34 -0500)]
do_cmake.sh: fedora-32 (rawhide) build with python-3.8

Fedora-32 now has python-3.8.

Fedora-29 is EOL. All non-EOL versions of Fedora have python-3.7, except
Fedora-32

(Unclear to me why PYBUILD="3" isn't used, like Ubuntu and FreeBSD. That
would eliminate breakage when pyhon versions change in Rawhide.)

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
5 years agomon/OSDMonitor: Don't update mon cache settings if rocksdb is not used 32473/head
Sridhar Seshasayee [Fri, 3 Jan 2020 09:26:13 +0000 (14:56 +0530)]
mon/OSDMonitor: Don't update mon cache settings if rocksdb is not used

Currently any update to mon cache config settings like 'mon_memory_target'
or 'rocksdb_cache_size' will cause a crash in case rocksdb and priority
cache manager is not being used.

If rocksdb (and therefore priority cache manager) is not being used, then
the update to the mon caches is ignored. Also, reduce the log levels of
some important log messages to help in debugging.

Fixes: https://tracker.ceph.com/issues/43454
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
5 years agoMerge PR #32457 into master
Patrick Donnelly [Fri, 3 Jan 2020 02:26:03 +0000 (18:26 -0800)]
Merge PR #32457 into master

* refs/pull/32457/head:
doc: fix Getting Started with CephFS

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #31309 from matthewoliver/rgw_swift_auth_note
Casey Bodley [Thu, 2 Jan 2020 20:59:36 +0000 (15:59 -0500)]
Merge pull request #31309 from matthewoliver/rgw_swift_auth_note

doc: Add a RGW swift auth note

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #31432 from zhangsw/rgw-cleanup-cls-reshard-const
Casey Bodley [Thu, 2 Jan 2020 20:33:02 +0000 (15:33 -0500)]
Merge pull request #31432 from zhangsw/rgw-cleanup-cls-reshard-const

rgw:cleanup the "magic string" usage in cls_rgw_client.cc

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agoMerge pull request #31429 from zhangsw/rgw-cleanup-cls-guard-bucket-resharding
Casey Bodley [Thu, 2 Jan 2020 15:56:54 +0000 (10:56 -0500)]
Merge pull request #31429 from zhangsw/rgw-cleanup-cls-guard-bucket-resharding

rgw: correct some error log about reshard in cls_rgw.cc.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #31404 from zhangsw/rgw-cleanup-deletelc
Yuval Lifshitz [Thu, 2 Jan 2020 15:56:27 +0000 (17:56 +0200)]
Merge pull request #31404 from zhangsw/rgw-cleanup-deletelc

rgw:cleanup:remove un-used class member in RGWDeleteLC

5 years agoMerge pull request #31345 from zhangsw/rgw-cleanup-rgw-admin-check-instance
Casey Bodley [Thu, 2 Jan 2020 15:51:23 +0000 (10:51 -0500)]
Merge pull request #31345 from zhangsw/rgw-cleanup-rgw-admin-check-instance

rgw:cleanup:remove un-used create_new_bucket_instance in rgw_admin.cc

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #32351 from mykaul/osd_fsid
Jan Fajerski [Thu, 2 Jan 2020 14:32:55 +0000 (15:32 +0100)]
Merge pull request #32351 from mykaul/osd_fsid

ceph-volume/lvm/activate.py: clarify error message: fsid refers to osd_fsid

5 years agoMerge pull request #27792 from smithfarm/wip-make-dist
Nathan Cutler [Thu, 2 Jan 2020 13:14:17 +0000 (14:14 +0100)]
Merge pull request #27792 from smithfarm/wip-make-dist

make-dist: drop Python 2/3 autoselect

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agolvm/activate.py: clarify error message: fsid refers to osd_fsid 32351/head
Yaniv Kaul [Thu, 19 Dec 2019 14:54:58 +0000 (16:54 +0200)]
lvm/activate.py: clarify error message: fsid refers to osd_fsid

Users complained[1] the error message isn't clear, and they thought
it referred to the cluster fsid instead of the osd_fsid.
Made it clearer.

[1] rook/rook#4547

Fixes: https://tracker.ceph.com/issues/43442
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
5 years agodoc: fix Getting Started with CephFS 32457/head
Jos Collin [Thu, 2 Jan 2020 06:34:50 +0000 (12:04 +0530)]
doc: fix Getting Started with CephFS

Signed-off-by: Jos Collin <jcollin@redhat.com>
5 years agodoc: Add a RGW swift auth note 31309/head
Matthew Oliver [Fri, 1 Nov 2019 01:02:39 +0000 (01:02 +0000)]
doc: Add a RGW swift auth note

Swift accounts are not like normal accounts, they are more akin to a
bank account that multile people could share. Or in the case of a cloud
it is usually mapped to the tenant.

Radosgw deals with this with a user and subuser, which is great, but a
little confusing. So this patch adds a note to those used to the Swift
API to make it more clear.

Signed-off-by: Matthew Oliver <moliver@suse.com>
5 years agomsg/async: don't forget dec(Worker::references) when met error. 31929/head
Jianpeng Ma [Mon, 2 Dec 2019 05:34:37 +0000 (13:34 +0800)]
msg/async: don't forget dec(Worker::references) when met error.

This will cause unbalance between workes.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
5 years agomsg/async: dec(l_msgr_active_connections) when unregister anonymous connection
Jianpeng Ma [Tue, 31 Dec 2019 02:20:16 +0000 (10:20 +0800)]
msg/async: dec(l_msgr_active_connections) when unregister anonymous connection

When do all in one test,  l_msgr_active_connection don't decrease when
client shutdown.
This bug introduced by 5b41e12fdb445.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
5 years agodoc/rados/operations/crush-map-edits: including recompile and set crushmapo instructions 32451/head
Rodrigo Severo [Mon, 30 Dec 2019 21:13:25 +0000 (18:13 -0300)]
doc/rados/operations/crush-map-edits: including recompile and set crushmapo instructions

Including missing recompile and set crushmap sections in crush-map-edits

Signed-off-by: Rodrigo Severo <rodrigo@fabricadeideias.com>
5 years agoMerge pull request #32433 from tchaikov/wip-43414 32472/head
Kefu Chai [Mon, 30 Dec 2019 05:44:43 +0000 (13:44 +0800)]
Merge pull request #32433 from tchaikov/wip-43414

rgw: svc.bucket: assign to optional<> using "="

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
5 years agoMerge PR #32415 into master
Sage Weil [Sun, 29 Dec 2019 02:31:33 +0000 (20:31 -0600)]
Merge PR #32415 into master

* refs/pull/32415/head:
include/cpp-btree: use inline variable to define btree_is_key_compare_to
include/cpp-btree: use std::conditional_t<>
include/cpp-btree: use static_assert()
include/interval_set: use interval_set when appropriate
include/interval_set: rename some types
include/cpp-btree: add emplace_hint()

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32399 from dillaman/wip-41556-2
Mykola Golub [Sat, 28 Dec 2019 07:03:56 +0000 (09:03 +0200)]
Merge pull request #32399 from dillaman/wip-41556-2

rbd-mirror: continue to isolate journal replay logic

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #32427 from tchaikov/qa-devices-schema-with-path
Kefu Chai [Sat, 28 Dec 2019 04:18:15 +0000 (12:18 +0800)]
Merge pull request #32427 from tchaikov/qa-devices-schema-with-path

qa: add "path" to "device" output schema

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32430 from tchaikov/wip-rgw-rgw_log_entry
Kefu Chai [Sat, 28 Dec 2019 04:18:05 +0000 (12:18 +0800)]
Merge pull request #32430 from tchaikov/wip-rgw-rgw_log_entry

rgw: initialize member variables of rgw_log_entry

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32438 from tchaikov/wip-vstart-runner-py3
Kefu Chai [Sat, 28 Dec 2019 04:16:55 +0000 (12:16 +0800)]
Merge pull request #32438 from tchaikov/wip-vstart-runner-py3

qa/tasks/vstart_runner: write string to StringIO

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoqa/tasks/vstart_runner: write string to StringIO 32438/head
Kefu Chai [Fri, 27 Dec 2019 15:40:53 +0000 (23:40 +0800)]
qa/tasks/vstart_runner: write string to StringIO

we use `six.StringIO` for stdout when writing output messages from
`self.subproc.communicate()`, and `six.StringIO` accepts strings, so we
need to decode the output before sending them to `six.StringIO`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomake-dist: drop Python 2/3 autoselect 27792/head
Nathan Cutler [Fri, 27 Dec 2019 09:55:21 +0000 (10:55 +0100)]
make-dist: drop Python 2/3 autoselect

virtualenv will prefer Python 3 over Python 2 if both are available.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agorgw: svc.bucket: assign to optional<> using "=" 32433/head
Kefu Chai [Fri, 27 Dec 2019 03:38:06 +0000 (11:38 +0800)]
rgw: svc.bucket: assign to optional<> using "="

instead of using

*optional_val = value;

we should use:

optional_val = value;

otherwise we will have following runtime assertion failure like

/usr/include/c++/8/optional:945: constexpr _Tp& std::_Optional_base<_Tp, true, true>::_M_get() [with _Tp = RGWBucketInfo*]: Assertion 'this->_M_is_engaged()' failed.

when compiled with the `_GLIBCXX_ASSERTIONS` macro defined. and recent
`redhat-rpm-config` adds `-D_GLIBCXX_ASSERTIONS` to
`__global_compiler_flags`, which is in turn included by `optflags`. and
`optflags` is pratically used everywhere.

Fixes: https://tracker.ceph.com/issues/43414
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agorgw: svc.bucket: move _orig_info out of "if" block
Kefu Chai [Fri, 27 Dec 2019 03:33:37 +0000 (11:33 +0800)]
rgw: svc.bucket: move _orig_info out of "if" block

so `*orig_info` is valid out of the `if` block if it's set to
`&_orig_info`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa: add "path" to "device" output schema 32427/head
Kefu Chai [Thu, 26 Dec 2019 08:00:47 +0000 (16:00 +0800)]
qa: add "path" to "device" output schema

"path" was added by 2c0fd7d86827aa76b8d923870018365cdae4a6ad, so update
the test accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agorbd-mirror: set proper state after journal replay shut down 32399/head
Jason Dillaman [Thu, 26 Dec 2019 13:58:58 +0000 (08:58 -0500)]
rbd-mirror: set proper state after journal replay shut down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorgw: initialize member variables of rgw_log_entry 32430/head
Kefu Chai [Thu, 26 Dec 2019 13:42:18 +0000 (21:42 +0800)]
rgw: initialize member variables of rgw_log_entry

`check-generated.sh` tests the dencoder of a class by:

ceph-dencoder type rgw_log_entry select_test 2 dump_json > /tmp/foo
ceph-dencoder type rgw_log_entry select_test 2 encode decode dump_json > /tmp/bar
cmp /tmp/foo /tmp/bar

but the second test instance created by
`rgw_log_entry::generate_test_instances` is created using the default
constructor of `rgw_log_entry`. if any of the member variable is created
using random bits in the heap, there is chance that the test fails like:

2 rgw_log_entry
/tmp/typ-l5omDhmDf /tmp/typ-4aoRVkoiV differ: char 315, line 15
**** rgw_log_entry test 2 dump_json check failed ****
   ceph-dencoder type rgw_log_entry select_test 2 dump_json > /tmp/typ-l5omDhmDf
   ceph-dencoder type rgw_log_entry select_test 2 encode decode dump_json > /tmp/typ-4aoRVkoiV
15c15
<     "obj_size": 809908640,
---
>     "obj_size": 1122974112,

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agorbd-mirror: do not log error upon bootstrap cancel
Jason Dillaman [Thu, 26 Dec 2019 13:32:01 +0000 (08:32 -0500)]
rbd-mirror: do not log error upon bootstrap cancel

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32150 from ricardoasmarques/set-osd-device-class
Kefu Chai [Thu, 26 Dec 2019 10:59:47 +0000 (18:59 +0800)]
Merge pull request #32150 from ricardoasmarques/set-osd-device-class

mgr/dashboard: Explicitly set/change the device class of an OSD

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agoMerge pull request #32396 from toliu/restful-api-handle-execv
Kefu Chai [Thu, 26 Dec 2019 10:54:03 +0000 (18:54 +0800)]
Merge pull request #32396 from toliu/restful-api-handle-execv

mgr: close restful socket after exec

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32406 from neha-ojha/wip-43364
Kefu Chai [Thu, 26 Dec 2019 10:04:44 +0000 (18:04 +0800)]
Merge pull request #32406 from neha-ojha/wip-43364

mon/PGMap.h: disable network stats in dump_osd_stats

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31722 from tchaikov/wip-mon-deprecated-tell
Kefu Chai [Thu, 26 Dec 2019 10:03:13 +0000 (18:03 +0800)]
Merge pull request #31722 from tchaikov/wip-mon-deprecated-tell

mon: make "compact" tell command, and add deprecate/obsolete check for tell commands

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31829 from zjcmszh/xattrs
Kefu Chai [Thu, 26 Dec 2019 09:58:35 +0000 (17:58 +0800)]
Merge pull request #31829 from zjcmszh/xattrs

pybind: add WriteOp::set_xattr() & rm_xattr()

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #32420 from pkulijiawei/issues-43417
Kefu Chai [Thu, 26 Dec 2019 09:57:56 +0000 (17:57 +0800)]
Merge pull request #32420 from pkulijiawei/issues-43417

common: skip interfaces starting with "lo" in find_ipv{4,6}_in_subnet()

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32421 from tchaikov/wip-43416
Kefu Chai [Thu, 26 Dec 2019 09:56:27 +0000 (17:56 +0800)]
Merge pull request #32421 from tchaikov/wip-43416

mgr/restful: jsonify lists instead of maps

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoqa/tasks/mgr/test_orchestrator_cli: fix "mon update" test 32428/head
Kefu Chai [Thu, 26 Dec 2019 08:30:19 +0000 (16:30 +0800)]
qa/tasks/mgr/test_orchestrator_cli: fix "mon update" test

we need at least one of "hosts" and "label" since
1498170aaa31368e20d8b07abeb920f6d953c7ad

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/orchestrator_cli: avoid negated conditions
Kefu Chai [Thu, 26 Dec 2019 08:29:52 +0000 (16:29 +0800)]
mgr/orchestrator_cli: avoid negated conditions

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #32424 into master
Sage Weil [Wed, 25 Dec 2019 20:17:58 +0000 (14:17 -0600)]
Merge PR #32424 into master

* refs/pull/32424/head:
mgr/balancer: sort pool names in 'balancer ls' output

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #32340 into master
Sage Weil [Wed, 25 Dec 2019 20:16:58 +0000 (14:16 -0600)]
Merge PR #32340 into master

* refs/pull/32340/head:
cephadm: support deployment of node-exporter

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32417 into master
Sage Weil [Wed, 25 Dec 2019 19:48:03 +0000 (13:48 -0600)]
Merge PR #32417 into master

* refs/pull/32417/head:
mgr/test_orchestrator: fix update_mgrs assert

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/test_orchestrator: fix update_mgrs assert 32417/head
Sage Weil [Tue, 24 Dec 2019 15:22:42 +0000 (09:22 -0600)]
mgr/test_orchestrator: fix update_mgrs assert

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocommon: skip interfaces starting with "lo" in find_ipv{4,6}_in_subnet() 32420/head
lijaiwei1 [Tue, 24 Dec 2019 14:34:46 +0000 (22:34 +0800)]
common: skip interfaces starting with "lo" in find_ipv{4,6}_in_subnet()

This will solve the issue that the osd can't restart after seting a
virtual local loopback IP.
In find_ipv4_in_subnet() and find_ipv6_in_subnet(), I use
boost::starts_with(addrs->ifa_name, "lo") to ship the interfaces
starting with "lo".

Fixes: https://tracker.ceph.com/issues/43417
Signed-off-by: Jiawei Li <lijiawei1@chinatelecom.cn>
5 years agomgr/balancer: sort pool names in 'balancer ls' output 32424/head
Sage Weil [Wed, 25 Dec 2019 15:40:35 +0000 (09:40 -0600)]
mgr/balancer: sort pool names in 'balancer ls' output

Otherwise this will vary based on the internal key sort order the dict it
was generated from.

Signed-off-by: Sage Weil <sage@redhat.com>