]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agodoc/man/8/ceph-volume: specify "program" for subcommands 42333/head
Kefu Chai [Wed, 14 Jul 2021 12:54:50 +0000 (20:54 +0800)]
doc/man/8/ceph-volume: specify "program" for subcommands

as per
https://www.sphinx-doc.org/en/master/usage/restructuredtext/domains.html

> Like py:currentmodule, this directive produces no output. Instead, it
> serves to notify Sphinx that all following option directives document
> options for the program called name.
> ...
> The program name may contain spaces (in case you want to document
> subcommands like svn add and svn commit separately).

and to avoid the warnings like:

doc/man/8/ceph-volume.rst:424: WARNING: Duplicate explicit target name:
"cmdoption-ceph-volume-h".

we should specify different "program" for different set of options.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42367 from tchaikov/wip-cmake-Og
Kefu Chai [Wed, 21 Jul 2021 03:38:22 +0000 (11:38 +0800)]
Merge pull request #42367 from tchaikov/wip-cmake-Og

cmake: add "-Og" to CMAKE_C_FLAGS_DEBUG

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
4 years agoMerge pull request #42427 from tchaikov/wip-seastore-metric-cleanup
Kefu Chai [Wed, 21 Jul 2021 03:25:40 +0000 (11:25 +0800)]
Merge pull request #42427 from tchaikov/wip-seastore-metric-cleanup

crimson/os/seastore: trade a map with a plain array

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
4 years agoMerge pull request #42429 from neha-ojha/wip-51638-cleanup
Kefu Chai [Wed, 21 Jul 2021 03:24:40 +0000 (11:24 +0800)]
Merge pull request #42429 from neha-ojha/wip-51638-cleanup

qa/*/test_envlibrados_for_rocksdb.sh: remove OS specific configuration

Reviewed-by: David Galloway <dgallowa@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/os/seastore: trade a map with a plain array 42427/head
Kefu Chai [Tue, 20 Jul 2021 17:09:40 +0000 (01:09 +0800)]
crimson/os/seastore: trade a map with a plain array

simpler this way, as we don't need a std::map<> at all.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42261 from cyx1231st/wip-seastore-metrics-2
Kefu Chai [Tue, 20 Jul 2021 17:06:51 +0000 (01:06 +0800)]
Merge pull request #42261 from cyx1231st/wip-seastore-metrics-2

crimson/os/seastore: implement metrics at cache level

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42386 from liu-chunmei/seastore-metrics
Kefu Chai [Tue, 20 Jul 2021 17:05:34 +0000 (01:05 +0800)]
Merge pull request #42386 from liu-chunmei/seastore-metrics

crimson/seastore: add seastore operation latency metrics

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41929 from sebastian-philipp/fix-qa-tox
Kefu Chai [Tue, 20 Jul 2021 16:36:59 +0000 (00:36 +0800)]
Merge pull request #41929 from sebastian-philipp/fix-qa-tox

qa: Various make check fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42419 from dsavineau/fix_typo_radosgw_admin_max_entries
Kefu Chai [Tue, 20 Jul 2021 15:40:13 +0000 (23:40 +0800)]
Merge pull request #42419 from dsavineau/fix_typo_radosgw_admin_max_entries

doc/man/8/radosgw-admin: fix typo on max entries

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42289 from mgfritch/cephadm-test-create-daemon-dirs-prom
Sebastian Wagner [Tue, 20 Jul 2021 15:35:09 +0000 (17:35 +0200)]
Merge pull request #42289 from mgfritch/cephadm-test-create-daemon-dirs-prom

cephadm: use pyfakefs during test_create_daemon_dirs_prometheus

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
4 years agoMerge pull request #42028 from mgfritch/cephadm-infer-mismatch-fsid
Sebastian Wagner [Tue, 20 Jul 2021 15:34:15 +0000 (17:34 +0200)]
Merge pull request #42028 from mgfritch/cephadm-infer-mismatch-fsid

cephadm: infer fsid from ceph.conf

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #41280 from sebastian-philipp/test_cephadm-stdin
Sebastian Wagner [Tue, 20 Jul 2021 15:33:20 +0000 (17:33 +0200)]
Merge pull request #41280 from sebastian-philipp/test_cephadm-stdin

qa/workunits/test_cephadm: Also test stdin

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agodoc/man/8/radosgw-admin: fix typo on max entries 42419/head
Dimitri Savineau [Tue, 20 Jul 2021 14:49:02 +0000 (10:49 -0400)]
doc/man/8/radosgw-admin: fix typo on max entries

This fixes a typo for the --max-entries option.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
4 years agocmake: use string(APPEND ...) to concat strings 42367/head
Kefu Chai [Tue, 20 Jul 2021 08:16:07 +0000 (16:16 +0800)]
cmake: use string(APPEND ...) to concat strings

less repeating this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: add "-Og" to CMAKE_C_FLAGS_DEBUG
Kefu Chai [Fri, 16 Jul 2021 02:37:23 +0000 (10:37 +0800)]
cmake: add "-Og" to CMAKE_C_FLAGS_DEBUG

without specifying -Og, -O0 is used. as per
https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html

> -O0
>  Reduce compilation time and make debugging produce the expected
>  results. This is the default.

and

> -Og
>  Optimize debugging experience. -Og should be the optimization level of
>  choice for the standard edit-compile-debug cycle, offering a reasonable
>  level of optimization while maintaining fast compilation and a good
>  debugging experience. It is a better choice than -O0 for producing
>  debuggable code because some compiler passes that collect debug
>  information are disabled at -O0.

and Debug is the default built type if .git directory is found under
the root source directory, so by adding "-Og -g" to CMAKE_C_FLAGS_DEBUG,
developers can have better debugging experience when testing Ceph
built from a git repo. but the downside is that it might take longer
to build the tree.

this change should also enable us to link crimson on aarch64.

the same applies to Clang,

> -O0 Means “no optimization”: this level compiles the fastest and generates the most debuggable code.
> -O1 Somewhere between -O0 and -O2.
> -O2 Moderate level of optimization which enables most optimizations.
> -Og Like -O1. In future versions, this option might disable different optimizations in order to improve debuggability.

see
https://clang.llvm.org/docs/CommandGuide/clang.html#cmdoption-o0

see also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101448

Fixes: https://tracker.ceph.com/issues/51441
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42413 from galsalomon66/fix_s3tests_yaml
Casey Bodley [Tue, 20 Jul 2021 12:04:59 +0000 (08:04 -0400)]
Merge pull request #42413 from galsalomon66/fix_s3tests_yaml

RGW:revert force-branch to be ceph-master (s3-tests)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42304 from sebastian-philipp/doc-dameon-add-note
Sebastian Wagner [Tue, 20 Jul 2021 10:09:33 +0000 (12:09 +0200)]
Merge pull request #42304 from sebastian-philipp/doc-dameon-add-note

doc/cephadm: add notes to `orch daemon add`

Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge pull request #42372 from sebastian-philipp/doc-cephadm-rgw-ssl
Sebastian Wagner [Tue, 20 Jul 2021 10:09:20 +0000 (12:09 +0200)]
Merge pull request #42372 from sebastian-philipp/doc-cephadm-rgw-ssl

doc/cephadm: Add RGW ssl

Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agorevert force-branch to be ceph-master 42413/head
galsalomon66 [Tue, 20 Jul 2021 09:48:00 +0000 (12:48 +0300)]
revert force-branch to be ceph-master

Signed-off-by: galsalomon66 <gal.salomon@gmail.com>
4 years agocrimson/os/seastore/cache: report dirty extents usage 42261/head
Yingxin Cheng [Thu, 15 Jul 2021 08:24:39 +0000 (16:24 +0800)]
crimson/os/seastore/cache: report dirty extents usage

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/os/seastore/cache: report cached extents usage
Yingxin Cheng [Thu, 15 Jul 2021 08:09:51 +0000 (16:09 +0800)]
crimson/os/seastore/cache: report cached extents usage

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/os/seastore: measure read transaction efforts that are successful
Yingxin Cheng [Thu, 15 Jul 2021 06:36:09 +0000 (14:36 +0800)]
crimson/os/seastore: measure read transaction efforts that are successful

In order to calculate the ratio of discarded vs successful effort from
read-only transactions.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/os/seastore: measure transactional efforts that are discarded or committed
Yingxin Cheng [Thu, 15 Jul 2021 02:26:02 +0000 (10:26 +0800)]
crimson/os/seastore: measure transactional efforts that are discarded or committed

The efforts of a transaction include the number and bytes of its read,
mutate, retire and fresh extents, and the bytes of delta generated.

This helps to understand the following aspects:
* The ratio of discarded efforts vs committed efforts;
* The average efforts of a transaction;
* The distribution of read/mutate/delta/retire/fresh efforts;
* The memory overhead and potential disk overhead of a transaction;
* How early a transaction invalidation happens;
* The average extent length;

It is possible to extend the effort metrics to be labeled by extent
types, in case we want to distinguish and profile the efforts at the
sub-component level.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/os/seastore: assert the committing delta is not empty
Yingxin Cheng [Thu, 15 Jul 2021 02:17:38 +0000 (10:17 +0800)]
crimson/os/seastore: assert the committing delta is not empty

It makes no sense to commit an empty delta. It is mostly an issue that
user forget to generate delta during mutation, or there are futile
copy-on-write operations.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/os/seastore/cache: cleanup to use Cache::invalidate(t, conflicting_extent)
Yingxin Cheng [Wed, 14 Jul 2021 08:05:20 +0000 (16:05 +0800)]
crimson/os/seastore/cache: cleanup to use Cache::invalidate(t, conflicting_extent)

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocrimson/os/seastore/cache: count transactional cache access/hit
Yingxin Cheng [Fri, 9 Jul 2021 07:09:55 +0000 (15:09 +0800)]
crimson/os/seastore/cache: count transactional cache access/hit

Labeled by source and extent-type.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agoMerge pull request #42396 from ronen-fr/wip-ronenf-debug-docker-1
Ronen Friedman [Tue, 20 Jul 2021 07:59:04 +0000 (10:59 +0300)]
Merge pull request #42396 from ronen-fr/wip-ronenf-debug-docker-1

script: fix a bug in naming the source branch in ceph-debug-docker.sh

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42355 from yuvalif/wip-yuval-fix-51681
Yuval Lifshitz [Tue, 20 Jul 2021 07:55:16 +0000 (10:55 +0300)]
Merge pull request #42355 from yuvalif/wip-yuval-fix-51681

rgw/notifications: send correct size in case of delete marker creation

4 years agoMerge pull request #42358 from yuvalif/wip-yuval-fix-51687
Yuval Lifshitz [Tue, 20 Jul 2021 07:54:55 +0000 (10:54 +0300)]
Merge pull request #42358 from yuvalif/wip-yuval-fix-51687

rgw/notification: send current time in complete multipart upload event

4 years agoMerge pull request #42189 from yuvalif/wip-yuval-fix-51530
Yuval Lifshitz [Tue, 20 Jul 2021 07:54:38 +0000 (10:54 +0300)]
Merge pull request #42189 from yuvalif/wip-yuval-fix-51530

rgw/http/notifications: support content type in HTTP POST messages

4 years agocrimson/seastore: add seastore operation latency metrics 42386/head
chunmei-liu [Thu, 15 Jul 2021 04:37:23 +0000 (21:37 -0700)]
crimson/seastore: add seastore operation latency metrics

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
4 years agoREADME.md: recommend -Og instead of -O0
Kefu Chai [Fri, 16 Jul 2021 02:32:33 +0000 (10:32 +0800)]
README.md: recommend -Og instead of -O0

per https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html

> -Og
>  Optimize debugging experience. -Og should be the optimization level of
>  choice for the standard edit-compile-debug cycle, offering a reasonable
>  level of optimization while maintaining fast compilation and a good
>  debugging experience. It is a better choice than -O0 for producing
>  debuggable code because some compiler passes that collect debug
>  information are disabled at -O0.

so instead of using -O0, for better developer experience, -Og is
recommended.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42388 from tchaikov/wip-crimson-alien
Kefu Chai [Tue, 20 Jul 2021 00:08:21 +0000 (08:08 +0800)]
Merge pull request #42388 from tchaikov/wip-crimson-alien

crimson/osd: use app.alien() to initialize AlienStore::alien

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #42392 from tchaikov/wip-test-test_ipaddr
Kefu Chai [Tue, 20 Jul 2021 00:07:45 +0000 (08:07 +0800)]
Merge pull request #42392 from tchaikov/wip-test-test_ipaddr

test/test_ipaddr: always set ifa_flags

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42188 from votdev/issue_51408_motd
Ernesto Puerta [Mon, 19 Jul 2021 17:56:50 +0000 (19:56 +0200)]
Merge pull request #42188 from votdev/issue_51408_motd

mgr/dashboard: Add configurable MOTD or wall notification

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: sebastian-philipp <NOT@FOUND>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #42102 from Matan-B/lua-request-userId
Yuval Lifshitz [Mon, 19 Jul 2021 15:01:27 +0000 (18:01 +0300)]
Merge pull request #42102 from Matan-B/lua-request-userId

rgw: Added request field to lua scripting

4 years agoMerge pull request #41927 from Matan-B/rfe-51193-add-luarocks-version
Yuval Lifshitz [Mon, 19 Jul 2021 15:00:51 +0000 (18:00 +0300)]
Merge pull request #41927 from Matan-B/rfe-51193-add-luarocks-version

rgw: add package version support to lua scripting

4 years agoMerge pull request #42074 from ljflores/wip-lflores-perf-channel
Josh Durgin [Mon, 19 Jul 2021 14:59:32 +0000 (07:59 -0700)]
Merge pull request #42074 from ljflores/wip-lflores-perf-channel

mgr/telemetry: add new 'perf' channel that shares aggregated perf counter metrics of a cluster

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
4 years agoscript: fix a bug in naming the source branch in ceph-debug-docker.sh 42396/head
Ronen Friedman [Mon, 19 Jul 2021 09:57:33 +0000 (09:57 +0000)]
script: fix a bug in naming the source branch in ceph-debug-docker.sh

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
4 years agoMerge pull request #42391 from kelubo/master
Sebastian Wagner [Mon, 19 Jul 2021 09:07:34 +0000 (11:07 +0200)]
Merge pull request #42391 from kelubo/master

doc/cephadm: positions of words are interchanged

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #42393 from tchaikov/wip-cmake-cleanups
Kefu Chai [Mon, 19 Jul 2021 07:57:45 +0000 (15:57 +0800)]
Merge pull request #42393 from tchaikov/wip-cmake-cleanups

cmake: require CMake v3.16 and cleanups

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agocmake: do not check policies introduced before 3.16 42393/head
Kefu Chai [Wed, 10 Feb 2021 17:14:07 +0000 (01:14 +0800)]
cmake: do not check policies introduced before 3.16

see

- https://cmake.org/cmake/help/latest/policy/CMP0065.html
- https://cmake.org/cmake/help/latest/policy/CMP0074.html
...
- https://cmake.org/cmake/help/latest/policy/CMP0093.html

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: use add_compile_options() to pass compile options
Kefu Chai [Mon, 19 Jul 2021 04:44:38 +0000 (12:44 +0800)]
cmake: use add_compile_options() to pass compile options

add_definitions() is for adding "-D" define flags, while "-include" does
not define flags, so let's be explicit and use add_compile_options()
instead.

this change partially reverts 5fb90bb79671b8e22f507728e4b4b948a591f98f.
back then, we were using ubuntu bionic for building windows packages.
but since we've switched to ubuntu focal, where cmake 3.16 is available,
there is no reason to stick with add_definitions() anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agodoc/cephadm: add missing "ceph" 42391/head
wangfei [Mon, 19 Jul 2021 04:03:30 +0000 (12:03 +0800)]
doc/cephadm: add missing "ceph"

The word ceph is missing.

Signed-off-by: "Wang,Fei" <wf.ab@126.com>
4 years agodoc/cephadm: correct a transposed word error
wangfei [Mon, 19 Jul 2021 01:53:40 +0000 (09:53 +0800)]
doc/cephadm: correct a transposed word error

The positions of two words are interchanged:
scans each cluster in the host ----> scans each host in the cluster

Signed-off-by: "Wang,Fei" <wf.ab@126.com>
4 years agocmake: require CMake v3.16
Kefu Chai [Mon, 19 Jul 2021 04:55:57 +0000 (12:55 +0800)]
cmake: require CMake v3.16

since we dropped the support of bionic, we now have the luxury of using
newer CMake! and by using CMake 3.16, we now have access to

* add_compile_definitions(), which was introduced in cmake 3.12

also, drop the comment of

> remove cmake/modules/FindPython* once 3.12 is required

because we need to support python 3.10 in future, better off keeping
the FindPython files around, so we can backport cmake changes from
upstream when necessary.

we are allowed to bump up the CMake's required to 3.16, because:

- ubuntu focal ships with cmake 3.16.3
- RHEL/CentOS8's AppStream has cmake 3.18

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/test_ipaddr: avoid reinterpret cast 42392/head
Kefu Chai [Mon, 19 Jul 2021 03:26:50 +0000 (11:26 +0800)]
test/test_ipaddr: avoid reinterpret cast

drop couple occurrences of C-style cast, for better readability.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/test_ipaddr: always set ifa_flags
Kefu Chai [Mon, 19 Jul 2021 03:22:18 +0000 (11:22 +0800)]
test/test_ipaddr: always set ifa_flags

do not rely on the uninitialized bits on stack for testing, otherwise
there is chance that we have following test failure:

64: ../src/test/test_ipaddr.cc:226: Failure
64: Expected equality of these values:
64:   two.ifa_addr
64:     Which is: 127.0.0.1:57677
64:   result
64:     Which is: 127.0.0.1:57677

the root cause is just that the "result" is actually `one.ifa_addr`,
which is marked UP as that's what the uninitialized bits on stack
indicate.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: s/FuturizedStore*/FuturizedStore&/ in OSDMeta and PGMeta's ctors 42388/head
Kefu Chai [Mon, 19 Jul 2021 01:17:29 +0000 (09:17 +0800)]
crimson/osd: s/FuturizedStore*/FuturizedStore&/ in OSDMeta and PGMeta's ctors

since we always pass a valid store reference to these ctors, there is no
reason to use a pointer. let's use a reference instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: create store in main()
Kefu Chai [Sun, 18 Jul 2021 14:44:59 +0000 (22:44 +0800)]
crimson/osd: create store in main()

to initialize an alienstore with a reference of
seastar::alien::instance is but the internal of AlienStore, would be
better if we could avoid exposing it as a part of the interface of
crimson::osd::OSD().

so, in this change, instead of creating FuturizedStore in OSD(), we
create it in main() where the app is available, so we can just create
FuturizedStore without passing the alien instance all the way down to
OSD().

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: use app.alien() to initialize AlienStore::alien
Kefu Chai [Sun, 18 Jul 2021 14:01:13 +0000 (22:01 +0800)]
crimson/osd: use app.alien() to initialize AlienStore::alien

in e53ea0886fba9073904f59ea85fb73d854565921, the new alien::submit_to() API
is used in the place of the old one. but seastar::alien::instance::_qs
should be initialized before we are able to use the alien instance, just
creating an instance of alien::instance is not enough.

in this change, instead of creating an instance of alien::instance using
make_unique<>, the return value of app.alien() is used to initialize the
alien member variable of AlienStore. app.alien() is always properly
initialized by reactor.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42360 from noviicee/noviicee
Kefu Chai [Sun, 18 Jul 2021 03:16:39 +0000 (11:16 +0800)]
Merge pull request #42360 from noviicee/noviicee

mgr/devicehealth: replace CLICommand with CLIReadCommand

Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #42379 from liewegas/cephadm-keyring-help
Kefu Chai [Sun, 18 Jul 2021 03:15:00 +0000 (11:15 +0800)]
Merge pull request #42379 from liewegas/cephadm-keyring-help

mgr/cephadm: add help strings for 'orch client-keyring ...' commands

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge pull request #42036 from kamoltat/wip-pg-autoscaler-overlap
Kefu Chai [Sun, 18 Jul 2021 03:07:42 +0000 (11:07 +0800)]
Merge pull request #42036 from kamoltat/wip-pg-autoscaler-overlap

pybind/mgr/autoscaler: don't scale pools with overlapping roots

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #42357 from cbodley/wip-cmake-legacy-option-headers-dep
Kefu Chai [Sun, 18 Jul 2021 03:01:54 +0000 (11:01 +0800)]
Merge pull request #42357 from cbodley/wip-cmake-legacy-option-headers-dep

cmake: add transitive dependency on legacy-option-headers

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42283 from orozery/op_target_t_constructor
Kefu Chai [Sun, 18 Jul 2021 03:01:25 +0000 (11:01 +0800)]
Merge pull request #42283 from orozery/op_target_t_constructor

common: optimize op_target_t and hobject_t constructors

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42366 from liewegas/mon-down-grace
Kefu Chai [Sun, 18 Jul 2021 02:59:54 +0000 (10:59 +0800)]
Merge pull request #42366 from liewegas/mon-down-grace

mon: allow a MON_DOWN grace period after cluster mkfs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #42315 from TheJJ/fix-op-duration-calculation
Kefu Chai [Sun, 18 Jul 2021 02:59:18 +0000 (10:59 +0800)]
Merge pull request #42315 from TheJJ/fix-op-duration-calculation

osd: fix op event duration calculation

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42385 from tchaikov/wip-crimson-test-alien
Kefu Chai [Sat, 17 Jul 2021 05:35:33 +0000 (13:35 +0800)]
Merge pull request #42385 from tchaikov/wip-crimson-test-alien

test/crimson/test_alien_echo: fixes

Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
4 years agoMerge pull request #42351 from SoftIron/softiron-distro
Kefu Chai [Sat, 17 Jul 2021 02:34:12 +0000 (10:34 +0800)]
Merge pull request #42351 from SoftIron/softiron-distro

build/qa: Add SoftIron Linux as valid distro in build and test scripts

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agotest/crimson/test_alien_echo: msgr->stop() before shutdown 42385/head
Kefu Chai [Sat, 17 Jul 2021 02:23:20 +0000 (10:23 +0800)]
test/crimson/test_alien_echo: msgr->stop() before shutdown

it is required to remove all registered dispatchers before shutting down a
messenger. otherwise assert(dispatchers.empty()) in SocketMessenger::shutdown() fails.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/crimson/test_alien_echo: drop msgr v1 support
Kefu Chai [Sat, 17 Jul 2021 02:05:08 +0000 (10:05 +0800)]
test/crimson/test_alien_echo: drop msgr v1 support

crimson msgr dropped the v1 support back in
7a7e869c0a7d96e1e242929755c3af73085d00ac. so there is no point to offer
an option to use v1 protocol.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoqa/*/test_envlibrados_for_rocksdb.sh: remove OS specific configuration 42429/head
Neha Ojha [Fri, 16 Jul 2021 17:20:34 +0000 (17:20 +0000)]
qa/*/test_envlibrados_for_rocksdb.sh: remove OS specific configuration

Details in https://tracker.ceph.com/issues/51638#note-3

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agomgr/cephadm: add help strings for 'orch client-keyring ...' commands 42379/head
Sage Weil [Fri, 16 Jul 2021 04:46:27 +0000 (00:46 -0400)]
mgr/cephadm: add help strings for 'orch client-keyring ...' commands

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agorgw/notifications: send correct size in case of delete marker creation 42355/head
Yuval Lifshitz [Thu, 15 Jul 2021 13:40:06 +0000 (16:40 +0300)]
rgw/notifications: send correct size in case of delete marker creation

Fixes: https://tracker.ceph.com/issues/51681
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
4 years agodoc/cephadm: Add RGW ssl 42372/head
Sebastian Wagner [Fri, 16 Jul 2021 10:54:00 +0000 (12:54 +0200)]
doc/cephadm: Add RGW ssl

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
4 years agorgw/http/notifications: support content type in HTTP POST messages 42189/head
Yuval Lifshitz [Mon, 5 Jul 2021 19:13:58 +0000 (22:13 +0300)]
rgw/http/notifications: support content type in HTTP POST messages

Fixes: https://tracker.ceph.com/issues/51530
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
4 years agoMerge PR #42338 into master
Sage Weil [Fri, 16 Jul 2021 04:47:41 +0000 (00:47 -0400)]
Merge PR #42338 into master

* refs/pull/42338/head:
mon/LogMonitor: tolerate external_log_to in the future

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/devicehealth:replace CLICommand with CLIReadCommand 42360/head
Anamika [Thu, 15 Jul 2021 15:38:32 +0000 (21:08 +0530)]
mgr/devicehealth:replace CLICommand with CLIReadCommand

Fixes: https://tracker.ceph.com/issues/51631
Signed-off-by: Anamika <cseanamika3@gmail.com>
4 years agomon: allow a MON_DOWN grace period after cluster mkfs 42366/head
Sage Weil [Thu, 15 Jul 2021 20:17:23 +0000 (15:17 -0500)]
mon: allow a MON_DOWN grace period after cluster mkfs

During teuthology tests, the initial cluster bootstrap often starts up
the mon sbut doesn't include all mons in the initial quorum, due to
mon startup misalignment and random delays.  Provide a short grace period
where we will not raise a MON_DOWN alert even though the quorum is not
complete.

Fixes: https://tracker.ceph.com/issues/43584
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge PR #42341 into master
Patrick Donnelly [Thu, 15 Jul 2021 19:41:56 +0000 (12:41 -0700)]
Merge PR #42341 into master

* refs/pull/42341/head:
doc/cephadm: operations.rst typo

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #42200 from cbodley/wip-47781
Casey Bodley [Thu, 15 Jul 2021 19:27:11 +0000 (15:27 -0400)]
Merge pull request #42200 from cbodley/wip-47781

rgw: RadosBucket::get_bucket_info() updates RGWBucketEnt

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #36213 from joke-lee/BulkUpload_md5
Casey Bodley [Thu, 15 Jul 2021 18:19:51 +0000 (14:19 -0400)]
Merge pull request #36213 from joke-lee/BulkUpload_md5

rgw: fix md5 not match for RGWBulkUploadOp upload when enable rgw com…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42126 from paulreece42/wip-copyobject-urldecode
Casey Bodley [Thu, 15 Jul 2021 18:18:42 +0000 (14:18 -0400)]
Merge pull request #42126 from paulreece42/wip-copyobject-urldecode

rgw: url_decode before parsing copysource in copyobject

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #41579 from trociny/wip-50932
Casey Bodley [Thu, 15 Jul 2021 18:17:41 +0000 (14:17 -0400)]
Merge pull request #41579 from trociny/wip-50932

rgw: allow to set ssl options and ciphers for beast frontend

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42195 from xrmeng8756/master
Casey Bodley [Thu, 15 Jul 2021 18:17:04 +0000 (14:17 -0400)]
Merge pull request #42195 from xrmeng8756/master

rgw: fail as expected when set/delete-bucket-website attempted on a non-exis…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42359 from idryomov/wip-15.2.13-linkage
Ilya Dryomov [Thu, 15 Jul 2021 16:05:43 +0000 (18:05 +0200)]
Merge pull request #42359 from idryomov/wip-15.2.13-linkage

doc/releases: add linkage for 15.2.13

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
4 years agodoc/releases: add linkage for 15.2.13 42359/head
Ilya Dryomov [Thu, 15 Jul 2021 15:47:44 +0000 (17:47 +0200)]
doc/releases: add linkage for 15.2.13

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
4 years agorgw/notification: send current time in complete multipart upload event 42358/head
Yuval Lifshitz [Thu, 15 Jul 2021 15:42:27 +0000 (18:42 +0300)]
rgw/notification: send current time in complete multipart upload event

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
Fixes: https://tracker.ceph.com/issues/51687
4 years agoMerge PR #42343 into master
Sage Weil [Thu, 15 Jul 2021 15:23:28 +0000 (11:23 -0400)]
Merge PR #42343 into master

* refs/pull/42343/head:
qa/suites/upgrade/pacific-x: do distro before tasks
qa/suites/orch/cephadm/smoke: centos 8.2 -> 8.3

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #42073 into master 42364/head
Sage Weil [Thu, 15 Jul 2021 15:05:22 +0000 (11:05 -0400)]
Merge PR #42073 into master

* refs/pull/42073/head:
doc/mgr/nfs: fix 'export apply', pool name
PendingReleaseNotes: document workaround for NFS storage change
qa/tasks/mgr/test_orchestrator_cli: fix test
qa/suites/orch/cephadm/mgr-nfs-upgrade: add test for nfs migration
mgr/cephadm: migrate nfs grace file
mgr/nfs: migrate pre-pacific nfs.ganesha-foo clusters to nfs.foo
doc/cephfs/fs-nfs-exports: document new export apply capabilities
qa/tasks/cephfs/test_nfs: define NFS_POOL_NAME
mgr/nfs: use NFS_POOL_NAME in test_nfs.py
mgr/nfs: test export apply on JSON list
mgr/nfs: add test for ganesha conf apply/import
qa/tasks/cephfs/test_nfs: retry mount a few times
mgr/cephadm: migrate all legacy nfs exports to new .nfs pool
mgr/nfs: adjust cephfs export caps if necessary
python-common: don't accept pool/ns for NFSServiceSpec
mgr/orchestrator: drop rados_config_location ServiceDescription property
mgr/cephadm: move rados_config_location() out of NFSServiceSpec
mgr/nfs: change nfs pool to .nfs
mgr/nfs/export: accept a JSON or ganesha EXPORT config
mgr/nfs: allow 'nfs export apply' to take a list of exports
python-common: remove pool + namespace from NFSServiceSpec
mgr/nfs: used fixed pool + ns
mgr/rook: used fixed pool + ns
mgr/dashboard: use fixed pool + ns
mgr/cephadm: always use fixed pool and namespace
mgr/nfs: adjust test to match pool name
mgr/nfs: always create ganesha pool with well-defined name

Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agocmake: add transitive dependency on legacy-option-headers 42357/head
Casey Bodley [Thu, 15 Jul 2021 14:58:51 +0000 (10:58 -0400)]
cmake: add transitive dependency on legacy-option-headers

the legacy-option-headers target is only marked as a dependency of the
common-objs and common-common-objs. because those targets are OBJECT
libraries, their dependencies aren't inherited by the targets that link
common-objs or common-common-objs

this adds the dependencies manually, so that changes to the config
yaml files will cause legacy-option-headers to regenerate the headers

Signed-off-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42290 from javicacheiro/fix_cephadm_selinux 42470/head
Sebastian Wagner [Thu, 15 Jul 2021 14:36:45 +0000 (16:36 +0200)]
Merge pull request #42290 from javicacheiro/fix_cephadm_selinux

cephadm: fetch the real selinux status

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
4 years agoMerge pull request #42220 from dsavineau/issue_51546
Sebastian Wagner [Thu, 15 Jul 2021 14:23:38 +0000 (16:23 +0200)]
Merge pull request #42220 from dsavineau/issue_51546

mgr/cephadm/iscsi: check if dashboard is enabled

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agodoc/mgr/nfs: fix 'export apply', pool name 42073/head
Sage Weil [Thu, 15 Jul 2021 13:43:16 +0000 (09:43 -0400)]
doc/mgr/nfs: fix 'export apply', pool name

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoMerge pull request #42339 from cbodley/wip-revert-vstart-system
Casey Bodley [Thu, 15 Jul 2021 13:25:47 +0000 (09:25 -0400)]
Merge pull request #42339 from cbodley/wip-revert-vstart-system

Revert "src/vstart: create rgw user with system flag"

Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #41300 from rhcs-dashboard/force-maintenance-test-error
Ernesto Puerta [Thu, 15 Jul 2021 13:24:51 +0000 (15:24 +0200)]
Merge pull request #41300 from rhcs-dashboard/force-maintenance-test-error

mgr/dashboard: Fix test_error force maintenance dashboard check

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoqa: Add SoftIron Linux as valid debian-based distro in test scripts 42351/head
Danny Abukalam [Thu, 15 Jul 2021 11:16:59 +0000 (07:16 -0400)]
qa: Add SoftIron Linux as valid debian-based distro in test scripts

Signed-off-by: Danny Abukalam <danny@softiron.com>
4 years agobuild: Add SoftIron Linux as valid debian-based distro in install-deps
Danny Abukalam [Thu, 15 Jul 2021 11:15:56 +0000 (07:15 -0400)]
build: Add SoftIron Linux as valid debian-based distro in install-deps

Signed-off-by: Danny Abukalam <danny@softiron.com>
4 years agocommon: optimize op_target_t and hobject_t constructors 42283/head
Or Ozeri [Wed, 30 Jun 2021 06:08:52 +0000 (09:08 +0300)]
common: optimize op_target_t and hobject_t constructors

Switch to passing on arguments by reference instead of copying them.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
4 years agoMerge pull request #42334 from tchaikov/wip-crimson-logging
Kefu Chai [Thu, 15 Jul 2021 03:06:34 +0000 (11:06 +0800)]
Merge pull request #42334 from tchaikov/wip-crimson-logging

crimson/common/log: print out logger.debug() when log level >=6

Reviewed-by: Mark Nelson <mnelson@readhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
4 years agoMerge pull request #42337 from rzarzynski/wip-crimson-alienstore-dedicated-subsys
Kefu Chai [Thu, 15 Jul 2021 03:04:52 +0000 (11:04 +0800)]
Merge pull request #42337 from rzarzynski/wip-crimson-alienstore-dedicated-subsys

crimson/os: give AlienStore its own debug subsystem.

Reviewed-by: Mark Nelson <mnelson@readhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42251 from adamemerson/wip-robustly-invalidate
Adam C. Emerson [Wed, 14 Jul 2021 20:49:52 +0000 (16:49 -0400)]
Merge pull request #42251 from adamemerson/wip-robustly-invalidate

rgw: Robustly Invalidate

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
4 years agoqa/suites/upgrade/pacific-x: do distro before tasks 42343/head
Sage Weil [Wed, 14 Jul 2021 20:13:12 +0000 (15:13 -0500)]
qa/suites/upgrade/pacific-x: do distro before tasks

Otherwise, we isntall new podman at the end, and the
container-selinux-policy package install triggers a bunch of selinux
errors.

Fixes: https://tracker.ceph.com/issues/50151
Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoPendingReleaseNotes: document workaround for NFS storage change
Sage Weil [Mon, 28 Jun 2021 19:54:51 +0000 (15:54 -0400)]
PendingReleaseNotes: document workaround for NFS storage change

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/tasks/mgr/test_orchestrator_cli: fix test
Sage Weil [Wed, 14 Jul 2021 12:50:17 +0000 (08:50 -0400)]
qa/tasks/mgr/test_orchestrator_cli: fix test

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa/suites/orch/cephadm/mgr-nfs-upgrade: add test for nfs migration
Sage Weil [Thu, 8 Jul 2021 13:10:01 +0000 (09:10 -0400)]
qa/suites/orch/cephadm/mgr-nfs-upgrade: add test for nfs migration

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/cephadm: migrate nfs grace file
Sage Weil [Tue, 13 Jul 2021 18:27:43 +0000 (14:27 -0400)]
mgr/cephadm: migrate nfs grace file

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomgr/nfs: migrate pre-pacific nfs.ganesha-foo clusters to nfs.foo
Sage Weil [Mon, 12 Jul 2021 18:57:10 +0000 (14:57 -0400)]
mgr/nfs: migrate pre-pacific nfs.ganesha-foo clusters to nfs.foo

In octopus, the service is nfs.ganesha-$id instead of nfs.$id

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agodoc/cephfs/fs-nfs-exports: document new export apply capabilities
Sage Weil [Fri, 9 Jul 2021 15:32:45 +0000 (11:32 -0400)]
doc/cephfs/fs-nfs-exports: document new export apply capabilities

- import list
- import ganesha conf

Signed-off-by: Sage Weil <sage@newdream.net>