]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agorgw/rgw_file: Fix the return value of read() and readlink() 42654/head
luo rixin [Tue, 29 Dec 2020 06:39:21 +0000 (14:39 +0800)]
rgw/rgw_file: Fix the return value of read() and readlink()

Fixes: https://tracker.ceph.com/issues/49189
Signed-off-by: Dai zhiwei <daizhiwei3@huawei.com>
Signed-off-by: luo rixin <luorixin@huawei.com>
(cherry picked from commit bfd83e8fa142873a0bdf09a4d1ad1b04127f5885)

4 years agoMerge pull request #42629 from rhcs-dashboard/wip-52049-pacific
Ernesto Puerta [Wed, 4 Aug 2021 14:52:49 +0000 (16:52 +0200)]
Merge pull request #42629 from rhcs-dashboard/wip-52049-pacific

pacific: mgr/dashboard: show perf. counters for rgw svc. on Cluster > Hosts

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #42628 from rhcs-dashboard/wip-52048-pacific
Ernesto Puerta [Wed, 4 Aug 2021 14:49:17 +0000 (16:49 +0200)]
Merge pull request #42628 from rhcs-dashboard/wip-52048-pacific

pacific: mgr/dashboard: fix ssl cert validation for rgw service creation

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agomgr/dashboard: show perf. counters for rgw svc. on Cluster > Hosts 42629/head
Alfonso Martínez [Wed, 4 Aug 2021 09:11:50 +0000 (11:11 +0200)]
mgr/dashboard: show perf. counters for rgw svc. on Cluster > Hosts

- Use service_map_id to retrieve perf. counters for rgw services.
- Move logic from controller to CephService.

Fixes: https://tracker.ceph.com/issues/52022
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 69a87a1dea6fe148f2a81b1d7775f5ade9626c09)

4 years agomgr/dashboard: Cluster > Hosts > Performance Counters: do not show context bar.
Alfonso Martínez [Tue, 3 Aug 2021 13:20:54 +0000 (15:20 +0200)]
mgr/dashboard: Cluster > Hosts > Performance Counters: do not show context bar.

Do not show the context bar (Object Gateway selection).

Fixes: https://tracker.ceph.com/issues/52022
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 73acb9b60d23e79bdcdd03437b0a813487420e33)

4 years agomgr/dashboard: fix ssl cert validation for rgw service creation 42628/head
Avan Thakkar [Thu, 29 Jul 2021 22:53:43 +0000 (04:23 +0530)]
mgr/dashboard: fix ssl cert validation for rgw service creation

Fixes: https://tracker.ceph.com/issues/51965
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 5f52c00e5291b53b4fe9ab7f9fae5d499017f91b)

4 years agoMerge pull request #42585 from rhcs-dashboard/wip-51994-pacific
Ernesto Puerta [Tue, 3 Aug 2021 15:35:17 +0000 (17:35 +0200)]
Merge pull request #42585 from rhcs-dashboard/wip-51994-pacific

pacific: mgr/dashboard: cephadm-e2e job script: improvements

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agomgr/dashboard: cephadm-e2e script: improvements 42585/head
Alfonso Martínez [Tue, 27 Jul 2021 08:51:18 +0000 (10:51 +0200)]
mgr/dashboard: cephadm-e2e script: improvements

Improvements and some adaptations related to the jenkins job.

Fixes: https://tracker.ceph.com/issues/51612
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 65b75000b7694cb3cbe617bbec28c513a2522be8)

4 years agoMerge pull request #42480 from smithfarm/wip-51836-pacific
Yuri Weinstein [Fri, 30 Jul 2021 16:03:21 +0000 (09:03 -0700)]
Merge pull request #42480 from smithfarm/wip-51836-pacific

pacific: rpm: drop use of $FIRST_ARG in ceph-immutable-object-cache

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 years agoMerge pull request #42482 from MrFreezeex/wip-51840-pacific
Yuri Weinstein [Fri, 30 Jul 2021 14:50:14 +0000 (07:50 -0700)]
Merge pull request #42482 from MrFreezeex/wip-51840-pacific

pacific: osd: log snaptrim message to dout

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42426 from ifed01/wip-ifed-compact-after-upgrade-pac
Yuri Weinstein [Wed, 28 Jul 2021 18:34:01 +0000 (11:34 -0700)]
Merge pull request #42426 from ifed01/wip-ifed-compact-after-upgrade-pac

pacific: os/bluestore: compact db after bulk omap naming upgrade.

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42424 from ifed01/wip-ifed-bluefs-safer-flush-pac
Yuri Weinstein [Wed, 28 Jul 2021 18:27:03 +0000 (11:27 -0700)]
Merge pull request #42424 from ifed01/wip-ifed-bluefs-safer-flush-pac

pacific: os/bluestore: Remove possibility of replay log and file inconsistency

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42477 from tchaikov/pacific-pr-40961
Yuri Weinstein [Wed, 28 Jul 2021 15:27:23 +0000 (08:27 -0700)]
Merge pull request #42477 from tchaikov/pacific-pr-40961

pacific: bind on loopback address if no other addresses are available

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #42472 from tchaikov/pacific-pr-42464
Yuri Weinstein [Wed, 28 Jul 2021 15:26:58 +0000 (08:26 -0700)]
Merge pull request #42472 from tchaikov/pacific-pr-42464

pacific: cmake, ceph.spec.in: build with header only fmt on RHEL

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #42458 from vshankar/wip-51819
Yuri Weinstein [Wed, 28 Jul 2021 15:24:14 +0000 (08:24 -0700)]
Merge pull request #42458 from vshankar/wip-51819

pacific: cephfs-mirror: record directory path cancel in DirRegistry

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #42299 from callithea/wip-51374-pacific
Ernesto Puerta [Tue, 27 Jul 2021 17:22:24 +0000 (19:22 +0200)]
Merge pull request #42299 from callithea/wip-51374-pacific

pacific: monitoring: Clean up Grafana dashboards

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: p-se <NOT@FOUND>
4 years agoMerge pull request #42213 from rhcs-dashboard/wip-51542-pacific
Ernesto Puerta [Tue, 27 Jul 2021 17:21:17 +0000 (19:21 +0200)]
Merge pull request #42213 from rhcs-dashboard/wip-51542-pacific

pacific: radosgw: include realm_{id,name} in service map

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #42363 from k0ste/wip-51699-pacific
Yuri Weinstein [Tue, 27 Jul 2021 15:15:43 +0000 (08:15 -0700)]
Merge pull request #42363 from k0ste/wip-51699-pacific

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

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42490 from dsavineau/wip-51851-pacific
Guillaume Abrioux [Mon, 26 Jul 2021 20:03:34 +0000 (22:03 +0200)]
Merge pull request #42490 from dsavineau/wip-51851-pacific

pacific: ceph-volume/tests: update ansible environment variables in tox

4 years agoMerge pull request #42398 from satoru-takeuchi/wip-50900-pacific
Yuri Weinstein [Mon, 26 Jul 2021 19:17:08 +0000 (12:17 -0700)]
Merge pull request #42398 from satoru-takeuchi/wip-50900-pacific

pacific: osd/scrub: separate between PG state flags and internal scrubber operation

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41783 from pponnuvel/wip-51140-pacific
Yuri Weinstein [Mon, 26 Jul 2021 19:15:09 +0000 (12:15 -0700)]
Merge pull request #41783 from pponnuvel/wip-51140-pacific

pacific: rgw: Improve error message on email id reuse

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoceph-volume/tests: use ansible_facts 42490/head
Dimitri Savineau [Thu, 22 Jul 2021 13:58:03 +0000 (09:58 -0400)]
ceph-volume/tests: use ansible_facts

Since inject_facts_as_vars is set to false in the ansible.cfg file then we
have to update the references to use ansible_facts[<thing>] instead of
ansible_<thing>.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 842fc2b605a2321a031a240c4aa4348c1be24e14)

4 years agoceph-volume/tests: use pytest rerunfailures
Dimitri Savineau [Wed, 21 Jul 2021 21:07:24 +0000 (17:07 -0400)]
ceph-volume/tests: use pytest rerunfailures

We already install the dependency from ceph-ansible requirements.txt and to
avoid false positive (like after rebooting a node) we can retry failing test.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 95056a24e4fbc19307f5b32724bfdb459a42f7ab)

4 years agoceph-volume/tests: set ANSIBLE_CONFIG env var
Dimitri Savineau [Wed, 21 Jul 2021 20:54:57 +0000 (16:54 -0400)]
ceph-volume/tests: set ANSIBLE_CONFIG env var

Without loading the ansible.cfg file from ceph-ansible project, we don't
have the pipelining enabled which can result in significant performance
improvement.
This removes the ANSIBLE_ACTION_PLUGINS, ANSIBLE_RETRY_FILES_ENABLED and
ANSIBLE_SSH_RETRIES environment variables as it is already included in the
ansible.cfg file.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit b758fdd829e3b4d7b790e6d35a02c97f3962d13e)

4 years agoceph-volume/tests: update ansible ssh_args env var
Dimitri Savineau [Wed, 21 Jul 2021 20:44:57 +0000 (16:44 -0400)]
ceph-volume/tests: update ansible ssh_args env var

The ansible ssh_args parameter is usually defined in the ansible.cfg file.
Currently this variable is overrided in tox to manage the vagrant ssh file
but we lost all default values.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 0ad615bab555d9965aec36d025acb28708b07cf0)

4 years agoosd: log snaptrim message to dout 42482/head
Arthur Outhenin-Chalandre [Fri, 23 Jul 2021 07:27:00 +0000 (09:27 +0200)]
osd: log snaptrim message to dout

This log message is not an error and is done on every tick of the
snaptrim process. Replace the derr logging to dout(10) to not log it
by default.

Fixes: https://tracker.ceph.com/issues/51799
Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit e2b2faef11c18df6c2f1f083d32d279e51b63e82)

4 years agorpm: drop use of $FIRST_ARG in ceph-immutable-object-cache 42480/head
Nathan Cutler [Thu, 22 Jul 2021 20:52:39 +0000 (22:52 +0200)]
rpm: drop use of $FIRST_ARG in ceph-immutable-object-cache

The use of $FIRST_ARG was probably required because the SUSE-specific
%service_* rpm macros were playing tricks on the shell positional parameters.
This is bad practice and error-prone, so let's assume that no macros should do
that anymore and hence it's safe to assume that positional parameters remain
unchanged after any rpm macro call.

Thanks to Franck Bui for providing the original patch
926433f5d45e557c42f050b43798ba29dc495e02 that this patch is modeled after.

NOTE: the use of FIRST_ARG had already been eliminated by
926433f5d45e557c42f050b43798ba29dc495e02 but was re-introduced later by
9466d7098573dafcfede5e9c852374fbbd99f9e7

Fixes: 9466d7098573dafcfede5e9c852374fbbd99f9e7
Fixes: https://tracker.ceph.com/issues/51797
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 1cb84a1160ed4108cae30100682b1e3ee7c7721d)

4 years agocommon/pick_address: define in_addr_t if it is not defined 42477/head
Kefu Chai [Sat, 1 May 2021 15:30:18 +0000 (23:30 +0800)]
common/pick_address: define in_addr_t if it is not defined

neither mingw not not have in_addr_t defined, see
https://docs.microsoft.com/en-us/windows/win32/api/winsock2/ns-winsock2-in_addr,
so define it if it is not defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a06f8edeca0a1d08ff181d18f913bcfe7570bdcd)

Conflicts:
cmake/modules/CephChecks.cmake: trivial resolution

4 years agocommon/pick_addr: use grading machinery to refactor pick_address()
Kefu Chai [Thu, 22 Apr 2021 17:03:54 +0000 (01:03 +0800)]
common/pick_addr: use grading machinery to refactor pick_address()

as picking iface on the same NUMA node is not a hard requirement, the
grading machinery is a nice fit for this purpose.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 329d51c68ec6bf1864aa9430a62d65a93362a1b9)

4 years agocommon/pick_address: prefer non-loopback addresses
Kefu Chai [Wed, 21 Apr 2021 11:50:48 +0000 (19:50 +0800)]
common/pick_address: prefer non-loopback addresses

instead of filtering out loopback ifaces, check for loopback addresses,
and prefer non-loopback addresses over loopback addresses.

before this change, iface named "lo" is filtered out by default,
and "lo" is allowed if `ms_bind_exclude_lo_iface` is false.

after this change, iface with address out of 127/8 is prefered.
the iface marked down is not considered.

the option of "ms_bind_exclude_lo_iface" is removed. the tests are
updated accordingly.

Fixes: https://tracker.ceph.com/issues/50456
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a9b9bcd53215a07608a28ac2c8e4a8c8b8e80e66)

Conflicts:
src/common/options/global.yaml.in: global.yaml.in was introduced
in master only, so, in this change src/common/options.cc is updated
instead.

4 years agocommon/pick_address: Allow binding on loopback iface
Kefu Chai [Fri, 26 Mar 2021 12:03:09 +0000 (20:03 +0800)]
common/pick_address: Allow binding on loopback iface

in 6147c0917157efd2d35610e759685656a4989abb, "lo" is also skipped when
daemon is trying to find an address to bind. but that change reverts the
fix of 201b59204374ebdab91bb554b986577a97b19c36, to address the problem.

an option named "ms_bind_exclude_lo_iface" is added, it defaults to
"true". but it can be changed to false to allow daemon to bind on "lo".

Fixes: https://tracker.ceph.com/issues/50012
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7f01d36a2ca0576f1ff103ae3fa7c3662e93b722)

4 years agocommon/pick_address: document find_ip_in_subnet_list()
Kefu Chai [Fri, 26 Mar 2021 07:36:21 +0000 (15:36 +0800)]
common/pick_address: document find_ip_in_subnet_list()

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b106ec0bbf7fa726062989114f461f2d0a1f93a9)

4 years agocommon/pick_address: pass string by reference
Kefu Chai [Sat, 27 Mar 2021 02:03:02 +0000 (10:03 +0800)]
common/pick_address: pass string by reference

to silence warnings from clang-tidy.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 6d0ed81f796209f27b96811f9140b7fff16a7940)

4 years agocommon/pick_addr: refactor pick_address.cc and ipaddr.cc
Kefu Chai [Fri, 26 Mar 2021 10:23:35 +0000 (18:23 +0800)]
common/pick_addr: refactor pick_address.cc and ipaddr.cc

* do not replicate the same logic in IPv4 and IPv6 paths
* use helpers returning bool for filtering the candidate addresses
  for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 52785d5a3607b2f2ee6d41069d18a154b3eb5d45)

4 years agocommon/pick_address: use scope_guard for freeifaddrs()
Kefu Chai [Fri, 26 Mar 2021 10:34:32 +0000 (18:34 +0800)]
common/pick_address: use scope_guard for freeifaddrs()

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit c3c110b5763ac420c4b88f8a545c1c87a71ce59a)

4 years agoceph.spec.in: build with header only fmt on RHEL 42472/head
Kefu Chai [Fri, 23 Jul 2021 10:02:36 +0000 (18:02 +0800)]
ceph.spec.in: build with header only fmt on RHEL

because fmt is packaged in EPEL, while librados is packaged
in RHEL, so we cannot have fmt as a runtime dependency of librados.
to address this issue, we should compile librados either with static library
or with header-only library of fmt. but because the fedora packaging
guideline does no encourage us to package static libraries, and it would
be complicated to package both static and dynamic library for fmt.

the simpler solution would be to compile Ceph with the header-only
version of fmt.

in this change, we compile ceph with the header-only version of fmt
on RHEL to address the runtime dependency issue.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5419131499f4c4b5f6ba520342c39f9766e0cf4d)

Conflicts:
ceph.spec.in: trivial resolution

4 years agocmake: add an option "WITH_FMT_HEADER_ONLY"
Kefu Chai [Fri, 23 Jul 2021 09:52:12 +0000 (17:52 +0800)]
cmake: add an option "WITH_FMT_HEADER_ONLY"

in this change:

* an interface library named "fmt-header-only" is introduced. it brings
  the support to the header only fmt library.
* fmt::fmt is renamed to fmt
* an option named "WITH_FMT_HEADER_ONLY" is introduced
* fmt::fmt is an alias of "fmt-header-only" if "WITH_FMT_HEADER_ONLY"
  is "ON", and an alias of "fmt" otherwise.

because fmt is packaged in EPEL, while librados is packaged
in RHEL, so we cannot have fmt as a runtime dependency of librados.
to address this issue an option "WITH_FMT_HEADER_ONLY" is introduced, so
that we can enable it when building Ceph with the header version of fmt.
and the built packages won't have runtime dependency of fmt.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d81478b5690f9e3d36a7738223c737fc96a34d28)

Conflicts:
src/CMakeLists.txt
src/common/CMakeLists.txt: trivial resolution

4 years agoosdc/Objecter: move LingerOp's ctor to .cc
Kefu Chai [Fri, 23 Jul 2021 16:09:58 +0000 (00:09 +0800)]
osdc/Objecter: move LingerOp's ctor to .cc

so the linkage of fmt::fmt does not spill out to other compilation
units.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0e0d320525437ce6868ac6dd532ccd4c7e4a6fff)

4 years agoMerge pull request #42423 from ifed01/wip-ifed-fix-missing-shared-blob-pac
Yuri Weinstein [Fri, 23 Jul 2021 22:01:11 +0000 (15:01 -0700)]
Merge pull request #42423 from ifed01/wip-ifed-fix-missing-shared-blob-pac

pacific: os/bluestore: fix erroneous SharedBlob record removal during repair.

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42344 from neha-ojha/wip-51663-pacific
Yuri Weinstein [Fri, 23 Jul 2021 21:59:31 +0000 (14:59 -0700)]
Merge pull request #42344 from neha-ojha/wip-51663-pacific

pacific: qa/*/test_envlibrados_for_rocksdb.sh: install libarchive-3.3.3

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42238 from trociny/wip-51584-pacific
Yuri Weinstein [Fri, 23 Jul 2021 21:56:39 +0000 (14:56 -0700)]
Merge pull request #42238 from trociny/wip-51584-pacific

pacific: osd: move down peers out from peer_purged

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39902 from singuliere/wip-49377-pacific
Yuri Weinstein [Fri, 23 Jul 2021 21:54:13 +0000 (14:54 -0700)]
Merge pull request #39902 from singuliere/wip-49377-pacific

pacific: cmake: build static libs if they are internal ones

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42414 from votdev/wip-51731-pacific
Yuri Weinstein [Fri, 23 Jul 2021 18:31:31 +0000 (11:31 -0700)]
Merge pull request #42414 from votdev/wip-51731-pacific

pacific: mgr/dashboard: Add configurable MOTD or wall notification

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #42411 from tchaikov/pacific-pr-27465
Yuri Weinstein [Fri, 23 Jul 2021 18:30:50 +0000 (11:30 -0700)]
Merge pull request #42411 from tchaikov/pacific-pr-27465

pacific: ceph-monstore-tool: use a large enough paxos/{first,last}_committed

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42219 from ifed01/wip-ifed-migrate-pac
Yuri Weinstein [Fri, 23 Jul 2021 18:29:08 +0000 (11:29 -0700)]
Merge pull request #42219 from ifed01/wip-ifed-migrate-pac

pacific: ceph-volume: implement bluefs volume migration

Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
4 years agotest: add test for checking readd after remove for a directory path 42458/head
Venky Shankar [Thu, 15 Jul 2021 11:27:35 +0000 (07:27 -0400)]
test: add test for checking readd after remove for a directory path

Fixes: http://tracker.ceph.com/issues/51666
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 19a45c8d54bd67727a4017720d22af4fa5d34c3f)

4 years agocephfs-mirror: record directory path cancel in DirRegistry
Venky Shankar [Wed, 14 Jul 2021 09:31:43 +0000 (05:31 -0400)]
cephfs-mirror: record directory path cancel in DirRegistry

When removing a directory path from mirroring, cephfs-mirror records
this state in a thread-local storage. The replayer thread backs-off
in midst of mirroring the directory snapshots for this directory path.
However, the state (canceled state) is never cleared causing the thread
to incorrectly assume that other directory paths (which are picked up
by this thread) need backing-off, hence, marking these directory paths
as failed (to synchronize snapshots).

Fix is to store this state in the directory specific store which is
allocated when a thread picks up a directory path for synchronization.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 1a956be9baf0f21e64d81a684cd8f90cb6481f6a)

4 years agocephfs-mirror: complete context when a mirror instance is not failed or blocklisted
Venky Shankar [Thu, 15 Jul 2021 11:26:38 +0000 (07:26 -0400)]
cephfs-mirror: complete context when a mirror instance is not failed or blocklisted

Without this, the updater thread can start processing othere queued
contexts when a mirror instance is failed or blocklisted resulting
in unexpected behavior.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit c49024c90a1da7905c491897ea26e8bbc8942186)

4 years agorgw: set default ssl options for beast frontend 42363/head
Mykola Golub [Wed, 16 Jun 2021 15:41:44 +0000 (16:41 +0100)]
rgw: set default ssl options for beast frontend

to 'no_sslv2:no_sslv3:no_tlsv1:no_tlsv1_1'

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit fb31c87c2d6c02563d2d2a1e63d5b62bea2c6f91)

4 years agoqa/standalone: fixing the timings when waiting for deep-scrub to start 42398/head
Ronen Friedman [Sun, 11 Jul 2021 07:43:03 +0000 (10:43 +0300)]
qa/standalone: fixing the timings when waiting for deep-scrub to start

initiate_and_fetch_state() initiates a scrub, then polls the published
PG state looking for 'scrubbing'. Calling flush_pg_stats() as part of
the polling process might cause the scrub and the following recovery to
be missed altogether.

Note: this polling mechanism is definitely not robust. Will be
redesigned in the future.

Fixes: https://tracker.ceph.com/issues/51581
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit ed45acee34435611f8dea7f77fde54a6586cf6d9)

4 years agotest: recovery_scrub: do not display 'repair' status on auto-repair deep-scrub
Ronen Friedman [Sat, 15 May 2021 19:14:38 +0000 (22:14 +0300)]
test: recovery_scrub: do not display 'repair' status on auto-repair deep-scrub

A new test: auto_repair_bluestore_tag.

Based on auto_repair_bluestore_basic. Sets auto-repair, starts a periodic
deep-scrub, then verifies that the PG state, while scrubbing, is 'scrubbing+deep'
and not 'scrubbing+deep+repair'.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit d6eb3e3a3c29a02d6c7c088ef7c8c668a872d16e)

4 years agoosd/scrub: separate between PG state flags and internal scrubber operation
Ronen Friedman [Mon, 10 May 2021 13:15:16 +0000 (16:15 +0300)]
osd/scrub: separate between PG state flags and internal scrubber operation

Modify the scrubber to rely on internal flags for 'should we repair' and
'is this a deep scrub', instead of using PG_STATE_REPAIR & PG_STATE_DEEP_SCRUB.

This enables us to implement the 'fix-as-you-go deepscrub' functionality
of 'osd_scrub_auto_repair', without displaying REPAIR status to the user.

Fixes: https://tracker.ceph.com/issues/50446
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
Co-Authored by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 80c756b00927a306249de2d5887c4f4f64e4c679)

4 years agoos/bluestore: compact db after bulk omap naming upgrade. 42426/head
Igor Fedotov [Wed, 7 Jul 2021 13:17:52 +0000 (16:17 +0300)]
os/bluestore: compact db after bulk omap naming upgrade.

Omap naming scheme upgrade introduced recently might perform bulk data
removal and hence leave DB in a "degraded" state. Let's compact it.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 0e5c140b79a0b1809a8044696dce1eb7a36b1d41)

4 years agoos/bluestore/bluefs: Add test that detects bluefs inconsistency 42424/head
Adam Kupczyk [Mon, 24 May 2021 12:27:05 +0000 (14:27 +0200)]
os/bluestore/bluefs: Add test that detects bluefs inconsistency

Add test that detects possible scenario that will cause BlueFS to have file
that contains data that has never been written. This is done by tricking
replay log to already accept file metadata (size, allocations), but actual data
stored in these allocations is not yet synced to disk.

Scenario:
1) write to file h1 on SLOW device
2) flush h1 (and trigger h1 mark to be added to bluefs replay log)
3) write to file h2
4) fsync h2 (forces replay log to be written)

The result is:
- bluefs log now has stable state of h1
- SLOW device is not yet flushed (no fdatasync())

Test detects this condition and fails.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit c591a6e14e2c956d268adcaa9aa3e9c8a1fdea2a)

4 years agoos/bluestore/bluefs: Remove possibility of bluefs replay log containing files without...
Adam Kupczyk [Mon, 24 May 2021 12:49:51 +0000 (14:49 +0200)]
os/bluestore/bluefs: Remove possibility of bluefs replay log containing files without data

It had been possible to have a bluefs replay log to serialize file metadata (size, allocations),
but actual data stored in these allocations is not yet synced to disk.

This could happen if _flush_range(h1) allocated space for file h1 on device (like SLOW) that will not
be used when flushing future replay log. Such thing can happen when we have h2 that wrote to WAL and
out replay log is on DB. After fsync(h2) we write to replay log, wait for fdatasync on WAL and DB.
There is no waiting on SLOW, but h1 was dirty and has been serialized to replay log.

Solution is to delay notifying replay log that it has to include h1 after finishing fdatasync.

Fixes: https://tracker.ceph.com/issues/50965
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 03ac53f7d4c83e56f664ad371ffe3bc2d40e1837)

4 years agoos/bluestore: fix erroneous SharedBlob record removal during repair. 42423/head
Igor Fedotov [Fri, 9 Jul 2021 18:13:48 +0000 (21:13 +0300)]
os/bluestore: fix erroneous SharedBlob record removal during repair.

Fixes: https://tracker.ceph.com/issues/51619
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 7090930d4a2e6f2efdecaff23f9a2f795e7819fb)

4 years agomgr/dashboard: Add configurable MOTD or wall notification 42414/head
Volker Theile [Mon, 5 Jul 2021 09:49:33 +0000 (11:49 +0200)]
mgr/dashboard: Add configurable MOTD or wall notification

Fixes: https://tracker.ceph.com/issues/51408
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit f7f163e75cf5fb6cd022a8d13c28f5b923e01aed)

4 years agotasks/ceph_manager: ignore EACCES when waiting for quorum 42411/head
Kefu Chai [Thu, 10 Jun 2021 12:19:09 +0000 (20:19 +0800)]
tasks/ceph_manager: ignore EACCES when waiting for quorum

mon_tick_interval is 5 seconds by default. monitors update their
rotating keys every mon_tick_interval. before monitors forms a
quorum, the auth requests from clients are put into the wait list.
these requests are re-enqueued once the monitors form a quorum. but
there is a small window of mon_tick_interval, before they are able
to serve the auth requests even after their claim to be able to
server requests. if these re-enqueued requests happen to be served
in this window, and if authx is enabled, they will be greeted with
errors like

handle_auth_bad_method server allowed_methods [2] but i only support [2]

in the case of ceph cli, the error would look like:

[errno 13] RADOS permission denied (error connecting to the cluster)

so, to address this issue, the EACCES error is ignored when waiting
for a quorum.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7afd38f846894f11a61f697a2522cd0c30a35dc7)

4 years agotasks/ceph_manager: use safe_while() to refactor the wait for quorum
Kefu Chai [Thu, 10 Jun 2021 12:10:06 +0000 (20:10 +0800)]
tasks/ceph_manager: use safe_while() to refactor the wait for quorum

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3908c1f4cd0ebbfdcaae2d9e6de5c1609523cc55)

4 years agoceph-monstore-tool: use a large enough paxos/{first,last}_committed
Kefu Chai [Tue, 9 Apr 2019 14:07:02 +0000 (22:07 +0800)]
ceph-monstore-tool: use a large enough paxos/{first,last}_committed

so the rebuild paxos transaction won't be overwritten by the ones
created before recovery completes.

when the quorum is recovering, the leader will collect the paxos
transactions from peons. if the quorum accept the proposal for setting
the fingerprint, the peon will update the monitor with the paxos
transaction with a newer "last_committed" than the one created using
update_paxos() in ceph_monstore_tool.cc. the latter "last_committed" is
always 0.

so, to avoid this extra paxos proposal obsoleting the "rebuilding" paxos
transaction, we use a large enough number for {first,last}_committed.

Fixes: http://tracker.ceph.com/issues/38219
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5475ef7843ab4021eddee60c2789b81d616383e9)

4 years agoMerge pull request #42297 from callithea/wip-51558-pacific
Ernesto Puerta [Mon, 19 Jul 2021 17:53:20 +0000 (19:53 +0200)]
Merge pull request #42297 from callithea/wip-51558-pacific

pacific: mgr/dashboard: fix Accept-Language header parsing

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: huww98 <NOT@FOUND>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agoMerge pull request #42346 from adamemerson/wip-51674-pacific
Yuri Weinstein [Mon, 19 Jul 2021 15:04:50 +0000 (08:04 -0700)]
Merge pull request #42346 from adamemerson/wip-51674-pacific

rgw: Backport of 51674 to Pacific

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42336 from adamemerson/wip-51661-pacific
Yuri Weinstein [Mon, 19 Jul 2021 15:04:34 +0000 (08:04 -0700)]
Merge pull request #42336 from adamemerson/wip-51661-pacific

pacific: rgw: Don't segfault on datalog trim

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42166 from batrick/i51499
Yuri Weinstein [Mon, 19 Jul 2021 15:03:54 +0000 (08:03 -0700)]
Merge pull request #42166 from batrick/i51499

pacific: qa: test_ls_H_prints_human_readable_file_size failure

Reviewed-by: Jos Collin <jcollin@redhat.com>
4 years agoMerge pull request #42354 from rhcs-dashboard/wip-51685-pacific
Yuri Weinstein [Mon, 19 Jul 2021 15:02:13 +0000 (08:02 -0700)]
Merge pull request #42354 from rhcs-dashboard/wip-51685-pacific

pacific: mgr/dashboard: Fix test_error force maintenance dashboard check

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Aaryan Porwal <aaryanporwal2233@gmail.com>
4 years agopacific: qa: avoid sudo on tmpfile 42166/head
Patrick Donnelly [Mon, 12 Jul 2021 15:18:27 +0000 (08:18 -0700)]
pacific: qa: avoid sudo on tmpfile

This code does not exist in master. This is a continuation of the fix
for the backport. Resolves failures like [1].

[1] /ceph/teuthology-archive/yuriw-2021-07-08_23:33:26-fs-wip-yuri2-testing-2021-07-08-1142-pacific-distro-basic-smithi/6260232/teuthology.log

Fixes: https://tracker.ceph.com/issues/51704
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agorgw: allow to set ssl options and ciphers for beast frontend
Mykola Golub [Thu, 27 May 2021 16:09:48 +0000 (17:09 +0100)]
rgw: allow to set ssl options and ciphers for beast frontend

Two new conf keys are added for "beast" framework:

- ssl_options: a colon separated list of ssl context options,
  documented in boost's ssl::context_base;

- ssl_ciphers: a colon separated list of ciphers, documented
  in openssl's ciphers(1) manual.

Example:

  rgw frontends = beast ...  ssl_options=default_workarounds:no_tlsv1:no_tlsv1_1 ssl_ciphers=HIGH:!aNULL:!MD5

Fixes: https://tracker.ceph.com/issues/50932
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 91abede6357d167063c63eade45421d2f17bb0e7)

4 years agoMerge pull request #42228 from cfsnyder/wip-51188-pacific
Yuri Weinstein [Thu, 15 Jul 2021 15:35:30 +0000 (08:35 -0700)]
Merge pull request #42228 from cfsnyder/wip-51188-pacific

pacific: mgr/telemetry: pass leaderboard flag even w/o ident

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42229 from cfsnyder/wip-51556-pacific
Yuri Weinstein [Thu, 15 Jul 2021 15:34:41 +0000 (08:34 -0700)]
Merge pull request #42229 from cfsnyder/wip-51556-pacific

pacific: mon: return -EINVAL when handling unknown option in 'ceph osd pool get'

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42323 from cfsnyder/wip-51080-pacific
Yuri Weinstein [Thu, 15 Jul 2021 15:15:07 +0000 (08:15 -0700)]
Merge pull request #42323 from cfsnyder/wip-51080-pacific

pacific: rgw: require bucket name in bucket chown

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #42321 from cfsnyder/wip-51514-pacific
Yuri Weinstein [Thu, 15 Jul 2021 15:14:36 +0000 (08:14 -0700)]
Merge pull request #42321 from cfsnyder/wip-51514-pacific

pacific: rgw/notifications: support metadata filter in CompleteMultipartUpload and Copy events

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42320 from cfsnyder/wip-51221-pacific
Yuri Weinstein [Thu, 15 Jul 2021 15:13:55 +0000 (08:13 -0700)]
Merge pull request #42320 from cfsnyder/wip-51221-pacific

pacific: RGW - Don't move attrs before setting them

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #42226 from cfsnyder/wip-51547-pacific
Yuri Weinstein [Thu, 15 Jul 2021 14:49:12 +0000 (07:49 -0700)]
Merge pull request #42226 from cfsnyder/wip-51547-pacific

pacific: src/pybind/mgr/mirroring/fs/snapshot_mirror.py: do not assume a cephf…

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
4 years agoMerge pull request #42225 from cfsnyder/wip-51424-pacific
Yuri Weinstein [Thu, 15 Jul 2021 14:47:48 +0000 (07:47 -0700)]
Merge pull request #42225 from cfsnyder/wip-51424-pacific

pacific: mgr: set debug_mgr=2/5 (so INFO goes to mgr log by default)

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42223 from cfsnyder/wip-51498-pacific
Yuri Weinstein [Thu, 15 Jul 2021 14:47:16 +0000 (07:47 -0700)]
Merge pull request #42223 from cfsnyder/wip-51498-pacific

pacific: mgr/DaemonServer: skip redundant update of pgp_num_actual

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agomgr/dashboard: Fix test_error force maintenance dashboard check 42354/head
Nizamudeen A [Wed, 12 May 2021 10:07:40 +0000 (15:37 +0530)]
mgr/dashboard: Fix test_error force maintenance dashboard check

Fixes: https://tracker.ceph.com/issues/50771
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 871e5995cbbafaa980f6df383e375359b4364428)

4 years agorgw: Robust notify invalidates on cache timeout 42346/head
Adam C. Emerson [Wed, 14 Jul 2021 15:02:21 +0000 (11:02 -0400)]
rgw: Robust notify invalidates on cache timeout

This avoids a potential race condition in which updates are delayed.

Fixes: https://tracker.ceph.com/issues/51674
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 76247990ff38049ee32dd47d31482b9648353673)

Conflicts:
         src/rgw/services/svc_notify.cc
     - Skip the renaming, since this is a backport and that's mostly a
       matter of futureproofing.

Backport: https://tracker.ceph.com/issues/51679
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: distribute() takes RGWCacheNotifyInfo
Adam C. Emerson [Wed, 7 Jul 2021 22:47:00 +0000 (18:47 -0400)]
rgw: distribute() takes RGWCacheNotifyInfo

So we don't have to parse the bufferlist back out to find what object
to throw out of the cache.

Fixes: https://tracker.ceph.com/issues/51674
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 7f952ad80114096322f202ba58279aaa4a002313)
Backport: https://tracker.ceph.com/issues/51679
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agoqa/*/test_envlibrados_for_rocksdb.sh: install libarchive-3.3.3 42344/head
Neha Ojha [Mon, 12 Jul 2021 22:25:55 +0000 (22:25 +0000)]
qa/*/test_envlibrados_for_rocksdb.sh: install libarchive-3.3.3

To workaround the libarchive dependency issue seen with centos 8, which
has been causing consistent failures like

```
2021-06-04T04:52:51.147 INFO:tasks.workunit.client.0.smithi071.stdout:Installed:
2021-06-04T04:52:51.148 INFO:tasks.workunit.client.0.smithi071.stdout:  cmake-3.18.2-9.el8.x86_64                 cmake-data-3.18.2-9.el8.noarch
...
2021-06-04T04:52:57.554 INFO:tasks.workunit.client.0.smithi071.stderr:+ cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_TESTS=ON -DWITH_LIBRADOS=ON -DWITH_SNAPPY=ON -DWITH_GFLAGS=OFF -DFAIL_ON_WARNINGS=OFF ..
2021-06-04T04:52:57.579 DEBUG:teuthology.orchestra.run:got remote process result: 127
2021-06-04T04:52:57.580 INFO:tasks.workunit.client.0.smithi071.stderr:cmake: symbol lookup error: cmake: undefined symbol: archive_write_add_filter_zstd
```
More details in https://tracker.ceph.com/issues/51101#note-5

Fixes: https://tracker.ceph.com/issues/51101
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 345cb641ed63e5b88f799a0b50bddb4028ed2589)

4 years agoMerge pull request #42258 from sseshasa/wip-51603-pacific
Neha Ojha [Wed, 14 Jul 2021 16:49:56 +0000 (09:49 -0700)]
Merge pull request #42258 from sseshasa/wip-51603-pacific

pacific: qa/standalone: Add missing cleanups after completion of a subset of osd and scrub tests.

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42231 from cfsnyder/wip-51081-pacific
Yuri Weinstein [Wed, 14 Jul 2021 15:21:08 +0000 (08:21 -0700)]
Merge pull request #42231 from cfsnyder/wip-51081-pacific

pacific: rgw: parse tenant name out of rgwx-bucket-instance

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #42230 from cfsnyder/wip-51329-pacific
Yuri Weinstein [Wed, 14 Jul 2021 15:20:39 +0000 (08:20 -0700)]
Merge pull request #42230 from cfsnyder/wip-51329-pacific

pacific: rgw: avoid infinite loop when deleting a bucket

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agorgw: Don't segfault on datalog trim 42336/head
Adam C. Emerson [Tue, 13 Jul 2021 20:05:47 +0000 (16:05 -0400)]
rgw: Don't segfault on datalog trim

Synchronous (or yielded, basically other-than AioCompletion trim)
would try to dereference the past-the-end iterator if we were trimming
to a point in the most recent generation.

https://tracker.ceph.com/issues/51661
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 97305f03c16db1cfaceef04a74ee510bc1fc1e80)
https://tracker.ceph.com/issues/51675
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agoMerge pull request #42233 from smithfarm/wip-51579-pacific
Yuri Weinstein [Wed, 14 Jul 2021 14:25:06 +0000 (07:25 -0700)]
Merge pull request #42233 from smithfarm/wip-51579-pacific

pacific: common/Formatter: include used header

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #42221 from neha-ojha/wip-50393-pacific
Yuri Weinstein [Wed, 14 Jul 2021 14:23:45 +0000 (07:23 -0700)]
Merge pull request #42221 from neha-ojha/wip-50393-pacific

pacific: qa/workunits/mon/test_mon_config_key: use subprocess.run() instead of proc.communicate()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42165 from batrick/i51500
Yuri Weinstein [Wed, 14 Jul 2021 14:23:09 +0000 (07:23 -0700)]
Merge pull request #42165 from batrick/i51500

pacific: qa: FileNotFoundError: [Errno 2] No such file or directory: '/sys/kernel/debug/ceph/3fab6bea-f243-47a4-a956-8c03a62b61b5.client4721/mds_sessions'

Reviewed-by: Jos Collin <jcollin@redhat.com>
4 years agoMerge pull request #42088 from lxbsz/wip-51285
Yuri Weinstein [Wed, 14 Jul 2021 14:22:28 +0000 (07:22 -0700)]
Merge pull request #42088 from lxbsz/wip-51285

pacific: mds: to print the unknow type value

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge pull request #42086 from kotreshhr/wip-51200-pacific
Yuri Weinstein [Wed, 14 Jul 2021 14:21:23 +0000 (07:21 -0700)]
Merge pull request #42086 from kotreshhr/wip-51200-pacific

pacific: mgr/volumes: Add config to insert delay at the beginning of the clone

Reviewed-by: Jos Collin <jcollin@redhat.com>
4 years agoMerge pull request #39834 from sebastian-philipp/pacific-backport-39131-39373
Yuri Weinstein [Wed, 14 Jul 2021 14:18:51 +0000 (07:18 -0700)]
Merge pull request #39834 from sebastian-philipp/pacific-backport-39131-39373

pacific: mgr/rook: Add timezone info

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #42316 from rhcs-dashboard/wip-51657-pacific
Ernesto Puerta [Wed, 14 Jul 2021 11:44:02 +0000 (13:44 +0200)]
Merge pull request #42316 from rhcs-dashboard/wip-51657-pacific

pacific: mgr/dashboard: remove usage of 'rgw_frontend_ssl_key'

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agorgw: require bucket name in bucket chown 42323/head
Zulai Wang [Thu, 3 Jun 2021 05:13:15 +0000 (13:13 +0800)]
rgw: require bucket name in bucket chown

Checking and reporting missing the mandatory parameter avoid clueless error
message for bucket chown.

Signed-off-by: Zulai Wang <zl31wang@gmail.com>
(cherry picked from commit 158a1f4313c0fa206031ede6f48a26c0c7467d57)

4 years agorgw/notifications: support metadata filter in COPY events 42321/head
Yuval Lifshitz [Thu, 17 Jun 2021 13:08:32 +0000 (16:08 +0300)]
rgw/notifications: support metadata filter in COPY events

Fixes: https://tracker.ceph.com/issues/51261
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com> (cherry picked from commit
e7f30a1b278455567f1f1069f41c9a1c3ef335c2)

Conflicts:
        src/rgw/rgw_notify.cc
        src/rgw/rgw_notify.h
        src/test/rgw/bucket_notification/test_bn.py

Cherry-pick notes:
- handle differences due to renaming of rgw::sal::RGWObject to rgw::sal::Object
- handle differences due to move of test_ps_s3_metadata_on_master test from tests_ps.py to test_bn.py

4 years agoRGW - Don't move attrs before setting them 42320/head
Daniel Gryniewicz [Tue, 8 Jun 2021 16:59:56 +0000 (12:59 -0400)]
RGW - Don't move attrs before setting them

Moving the attrs into s->bucket_attrs before setting them results in
setting empty attrs into the bucket.  This means that reading them back
later gets empty attrs, which can cause a segfault.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit 4d38154f5779b01ed93430ef7405417820214796)

Conflicts:
src/rgw/rgw_op.cc

4 years agomgr/dashboard: remove usage of 'rgw_frontend_ssl_key' 42316/head
Avan Thakkar [Tue, 13 Jul 2021 12:41:10 +0000 (18:11 +0530)]
mgr/dashboard: remove usage of 'rgw_frontend_ssl_key'

Fixes: https://tracker.ceph.com/issues/51643
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Removing the usage of rgw_frontend_ssl_key from the rgw service form.

(cherry picked from commit f6afed5aa51d80257b4883c976bbae7c3b5cc524)

4 years agoMerge pull request #42264 from yuriw/wip-yuriw-p2p-pacific
Yuri Weinstein [Tue, 13 Jul 2021 15:04:19 +0000 (08:04 -0700)]
Merge pull request #42264 from yuriw/wip-yuriw-p2p-pacific

qa/tests: advanced pacific version to reflect the latest 16.2.5 point

4 years agomonitoring: remove instance label from ceph-cluster.json completely 42299/head
Patrick Seidensal [Tue, 15 Jun 2021 12:43:50 +0000 (14:43 +0200)]
monitoring: remove instance label from ceph-cluster.json completely

The `instance` label is only useful if

- the exporter returns only data about its node or instance
- the exporter provides an instance label and then may return data about
  other nodes

In this case, it's about the Prometheus mgr module, which is a single
exporter providing data about a whole cluster, so not only data related
to the node (or instance) the mgr module is running on.  It is
completely irrelevant on which node the exporter runs on, the data
provided doesn't change.  The exporter also doesn't provide `instance`
labels (which Prometheus wouldn't change due to our configuration, see
"honor_labels" setting).

(Actually there's one exception where `instance` labels are provided by
the Ceph mgr module, but that doesn't affect the Ceph Cluster
dashboard.)

Note that keeping that instance label on this particular dashboard would
enable the user to switch between a previously failed mgr instance and
the data collected from there and the currently running mgr instance (on
which the Prometheus mgr module runs on).  That'd split the data, which
I don't think is a useful feature, but rather looks broken.

Fixes: https://tracker.ceph.com/issues/51212
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 037410713f032c0a2a25243e411ae67dffcc1d1a)

4 years agomgr/dashboard: Fix Grafana Ceph Cluster health status widget
Patrick Seidensal [Mon, 14 Jun 2021 16:13:54 +0000 (18:13 +0200)]
mgr/dashboard: Fix Grafana Ceph Cluster health status widget

The health status widget doesn't show any status because it requires its
query to return a single result. But in case a mgr instance had failed,
it would return more, provided the incident has happened in the
requested time frame.

This is simply an issue of the `instant` switch being disabled for that
widget. As only one mgr instance can ever be providing data at a time,
enabling `instant` completely solves that issue.

Fixes: https://tracker.ceph.com/issues/51212
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 4270a13d6c2400162896ce5e4145729615a001e2)

4 years agomgr/dashboard: Fix decimals in OSC Capacity Utilization widget
Patrick Seidensal [Mon, 14 Jun 2021 14:17:34 +0000 (16:17 +0200)]
mgr/dashboard: Fix decimals in OSC Capacity Utilization widget

Fixes: https://tracker.ceph.com/issues/51212
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit f51cab109d5ae8536778456f3a7ea32c72641e8d)

4 years agomgr/dashboard: Remove hard-coded timezone off Grafana dashboards
Patrick Seidensal [Fri, 11 Jun 2021 09:48:00 +0000 (11:48 +0200)]
mgr/dashboard: Remove hard-coded timezone off Grafana dashboards

Remove hard-coded timezone off Grafana dashboards to enable the Grafana
administrator to decide which timezone should be used for dashboards.

If we hard-coded those values, changing the global settings in Grafana
wouldn't have an effect. And the administrators can't change the
automatically imported Grafana dashboards provided by us.

Fixes: https://tracker.ceph.com/issues/51212
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 5527c1c54f4cdc8d0ba6c86b259baa555bbd9def)

4 years agomonitoring: convert newline character to LF
Patrick Seidensal [Fri, 11 Jun 2021 08:49:11 +0000 (10:49 +0200)]
monitoring: convert newline character to LF

Convert newline character from CRLF in `rbd-details.json` to LF, so that
it will be consistent with all the other dashboard JSON files.

Fixes: https://tracker.ceph.com/issues/51212
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 8218d43e5fd8d862397c056a421def2356f32c53)