]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agodocs: minor doc fixes of showing in progress clones for a snapshot 47214/head
Nikhilkumar Shelke [Thu, 21 Jul 2022 16:58:27 +0000 (22:28 +0530)]
docs: minor doc fixes of showing in progress clones for a snapshot

Signed-off-by: Nikhilkumar Shelke <nshelke@redhat.com>
2 years agoMerge pull request #47449 from tchaikov/rpm-gts-11
Kefu Chai [Thu, 4 Aug 2022 13:30:51 +0000 (21:30 +0800)]
Merge pull request #47449 from tchaikov/rpm-gts-11

ceph.spec.in: build with gcc-toolset-11

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #46876 from neesingh-rh/feature_55821
Venky Shankar [Thu, 4 Aug 2022 13:10:10 +0000 (18:40 +0530)]
Merge pull request #46876 from neesingh-rh/feature_55821

mgr/volumes: add interface to check the presence of subvolumegroups/subvolumes

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agocmake: disable LTO when building pmdk 47449/head
Kefu Chai [Thu, 4 Aug 2022 05:09:11 +0000 (13:09 +0800)]
cmake: disable LTO when building pmdk

See-also: https://tracker.ceph.com/issues/54473
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agodebian: use dpkg/default.mk to init popular make variables
Kefu Chai [Thu, 4 Aug 2022 06:12:34 +0000 (14:12 +0800)]
debian: use dpkg/default.mk to init popular make variables

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47263 from rhcs-dashboard/fix-host-service-instances
Nizamudeen A [Thu, 4 Aug 2022 07:28:03 +0000 (12:58 +0530)]
Merge pull request #47263 from rhcs-dashboard/fix-host-service-instances

mgr/dashboard: host list tables doesn't show all services deployed

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
2 years agoMerge pull request #46213 from ceph/feature-exporter
Avan [Thu, 4 Aug 2022 06:18:54 +0000 (11:48 +0530)]
Merge pull request #46213 from ceph/feature-exporter

exporter: per node metric exporter

Reviewed-by: MrFreezeex <NOT@FOUND>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
2 years agoceph.spec.in: BuildRequires gcc-toolset-11-libatomic-devel for aarch64
Kefu Chai [Thu, 4 Aug 2022 03:57:05 +0000 (11:57 +0800)]
ceph.spec.in: BuildRequires gcc-toolset-11-libatomic-devel for aarch64

to address following failure when generating the building system
using CMake:

```
-- Performing Test HAVE_LIBATOMIC
-- Performing Test HAVE_LIBATOMIC - Failed
CMake Error at cmake/modules/CheckCxxAtomic.cmake:66 (message):
  Host compiler /opt/rh/gcc-toolset-11/root/usr/bin/c++ requires libatomic,
but it is not found
```

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoceph.spec.in: call %enable_devtoolset11 on centos8
Kefu Chai [Thu, 4 Aug 2022 01:00:29 +0000 (09:00 +0800)]
ceph.spec.in: call %enable_devtoolset11 on centos8

before this change %enable_devtoolset11 is called only when building
with crimson on centos8.

after this change %enable_devtoolset11 is called when building on
centos8. because we've started using gcc-toolset-11 for building
rpm packages on centos8 after the C++20 migration. so, to build
with gcc-11, we need to enable it.

also, because gcc-toolset-11 is used, we have to disable
annotated_build.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47299 from hookak/loki-dependency
Adam King [Wed, 3 Aug 2022 19:52:07 +0000 (15:52 -0400)]
Merge pull request #47299 from hookak/loki-dependency

mgr/cephadm: Add loki dependency to grafana, promtail

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #47165 from NitzanMordhai/wip-nitzan-librados-ioctx-destroy-Segmen...
Yuri Weinstein [Wed, 3 Aug 2022 15:04:58 +0000 (08:04 -0700)]
Merge pull request #47165 from NitzanMordhai/wip-nitzan-librados-ioctx-destroy-Segmentation-fault

librados: rados_ioctx_destroy check for initialized ioctx

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 years agoMerge pull request #47138 from kamoltat/wip-ksirivad-fix-test-pool-min-size
Yuri Weinstein [Wed, 3 Aug 2022 15:03:52 +0000 (08:03 -0700)]
Merge pull request #47138 from kamoltat/wip-ksirivad-fix-test-pool-min-size

qa/tasks/ceph_manager.py: increase test_pool_min_size timeout

Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #47065 from ifed01/wip-ifed-fix-blufs-unlink-fsync
Yuri Weinstein [Wed, 3 Aug 2022 15:03:24 +0000 (08:03 -0700)]
Merge pull request #47065 from ifed01/wip-ifed-fix-blufs-unlink-fsync

os/bluestore: do not signal deleted dirty file to bluefs log

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
2 years agoMerge pull request #46838 from pdvian/wip-version-mgrupdate
Yuri Weinstein [Wed, 3 Aug 2022 15:02:33 +0000 (08:02 -0700)]
Merge pull request #46838 from pdvian/wip-version-mgrupdate

mgr: Remove service_daemon handling from MMgrUpdate

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2 years agoMerge pull request #46507 from aclamk/wip-memstore-leak
Yuri Weinstein [Wed, 3 Aug 2022 15:01:45 +0000 (08:01 -0700)]
Merge pull request #46507 from aclamk/wip-memstore-leak

os/memstore: Fix memory leak

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #44774 from rishabh-d-dave/qa-cleanup
Yuri Weinstein [Wed, 3 Aug 2022 15:01:00 +0000 (08:01 -0700)]
Merge pull request #44774 from rishabh-d-dave/qa-cleanup

qa/ceph_manager: clean up CephManager.do_rados()

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #47327 from rosinL/fix-op-release
Kefu Chai [Wed, 3 Aug 2022 14:27:15 +0000 (22:27 +0800)]
Merge pull request #47327 from rosinL/fix-op-release

crimson/osd/osd_operation: fix abort caused by op be deleted ahead

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47026 from lxbsz/wip-56517
Venky Shankar [Wed, 3 Aug 2022 14:18:27 +0000 (19:48 +0530)]
Merge pull request #47026 from lxbsz/wip-56517

fuse_ll: fix compile error when libfuse version is larger than 3.0

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Luis Henriques <lhenriques@suse.de>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #47412 from rzarzynski/wip-crimson-monc-nothrow-on-renewal
Kefu Chai [Wed, 3 Aug 2022 13:32:27 +0000 (21:32 +0800)]
Merge pull request #47412 from rzarzynski/wip-crimson-monc-nothrow-on-renewal

crimson/net: don't throw on failure when renewing tickets and keyrings

Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47434 from guits/cv-fix-test-get-file-content
Guillaume Abrioux [Wed, 3 Aug 2022 11:28:51 +0000 (13:28 +0200)]
Merge pull request #47434 from guits/cv-fix-test-get-file-content

ceph-volume/tests: fix test_exception_returns_default

2 years agoMerge pull request #47177 from yuvalif/wip-yuval-backport-doc-fix
Yuval Lifshitz [Wed, 3 Aug 2022 11:13:52 +0000 (14:13 +0300)]
Merge pull request #47177 from yuvalif/wip-yuval-backport-doc-fix

doc: change "master" to "main" in backport doc

reviewed-by: anthonyeleven, ljflores, zdover23

2 years agoexporter: per node metric exporter 46213/head
Avan Thakkar [Mon, 1 Aug 2022 06:50:53 +0000 (12:20 +0530)]
exporter: per node metric exporter

Fixes: https://tracker.ceph.com/issues/55046
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
2 years agoMerge pull request #47428 from tchaikov/wip-crimson-strong-ordering
Kefu Chai [Wed, 3 Aug 2022 10:49:10 +0000 (18:49 +0800)]
Merge pull request #47428 from tchaikov/wip-crimson-strong-ordering

crimson: use std::strong_ordering mechinary

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agoMerge pull request #46863 from bryanmontalvan/dashboard-matcher
Nizamudeen A [Wed, 3 Aug 2022 10:26:17 +0000 (15:56 +0530)]
Merge pull request #46863 from bryanmontalvan/dashboard-matcher

mgr/dashboard: Simplified silence-form matchers list layout

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agomgr/dashboard: add cephadm e2e tests for checking count for services instances 47263/head
Avan Thakkar [Wed, 3 Aug 2022 08:45:02 +0000 (14:15 +0530)]
mgr/dashboard: add cephadm e2e tests for checking count for services instances

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
2 years agocrimson/os: do not use WRITE_*_OPERATORS_{3,4}() 47428/head
Kefu Chai [Wed, 3 Aug 2022 03:03:19 +0000 (11:03 +0800)]
crimson/os: do not use WRITE_*_OPERATORS_{3,4}()

the default-generated comparison operator is able to fulfill our needs
already.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoceph-volume/tests: fix test_exception_returns_default 47434/head
Guillaume Abrioux [Wed, 3 Aug 2022 09:16:36 +0000 (11:16 +0200)]
ceph-volume/tests: fix test_exception_returns_default

There are cases, like running tests as root user, where this test fails
because root user can always read the file content.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2 years agodoc: change "master" to "main" in backport doc 47177/head
yuval Lifshitz [Tue, 19 Jul 2022 18:04:31 +0000 (21:04 +0300)]
doc: change "master" to "main" in backport doc

also fix the alias setting example

Signed-off-by: yuval Lifshitz <ylifshit@redhat.com>
2 years agoMerge pull request #47418 from rhcs-dashboard/token-logs-no-good
Nizamudeen A [Wed, 3 Aug 2022 06:55:49 +0000 (12:25 +0530)]
Merge pull request #47418 from rhcs-dashboard/token-logs-no-good

mgr/dashboard: remove token logging

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2 years agoMerge pull request #47429 from SUSE/wip-suse-gcc11-or-greater
Tim Serong [Wed, 3 Aug 2022 06:45:06 +0000 (16:45 +1000)]
Merge pull request #47429 from SUSE/wip-suse-gcc11-or-greater

ceph.spec.in: set BuildRequires: gcc-c++ >= 11 for SUSE distros

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47426 from cyx1231st/wip-seastore-silence-this
Yingxin [Wed, 3 Aug 2022 05:20:32 +0000 (13:20 +0800)]
Merge pull request #47426 from cyx1231st/wip-seastore-silence-this

crimson: capture this explicitly to silence warnings

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoceph.spec.in: set BuildRequires: gcc-c++ >= 11 for SUSE distros 47429/head
Tim Serong [Wed, 3 Aug 2022 05:20:23 +0000 (15:20 +1000)]
ceph.spec.in: set BuildRequires: gcc-c++ >= 11 for SUSE distros

This is much simpler than explicitly requiring gcc 11, and
anyway, openSUSE Tumbleweed is up to gcc 12 now.

Signed-off-by: Tim Serong <tserong@suse.com>
2 years agocrimson: do not use WRITE_{EQ,CMP}_OPERATORS_2()
Kefu Chai [Wed, 3 Aug 2022 02:52:20 +0000 (10:52 +0800)]
crimson: do not use WRITE_{EQ,CMP}_OPERATORS_2()

the default-generated comparison operators can fulfill our needs.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agocrimson: capture this explicitly 47426/head
Yingxin Cheng [Wed, 3 Aug 2022 03:34:56 +0000 (11:34 +0800)]
crimson: capture this explicitly

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agomgr/dashboard: remove token logging 47418/head
Pere Diaz Bou [Tue, 2 Aug 2022 16:56:49 +0000 (18:56 +0200)]
mgr/dashboard: remove token logging

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agomgr/dashboard: Simplified silence-form matchers list 46863/head
bryanmontalvan [Mon, 27 Jun 2022 19:43:58 +0000 (15:43 -0400)]
mgr/dashboard: Simplified silence-form matchers list

This commit removes unmeaning icons on the matchers-list component, and
now only displays the information/content needed when viewing and editing
matchers.

Fixes: https://tracker.ceph.com/issues/42306
Signed-off-by: Bryan Montalvan <bmontalv@redhat.com>
2 years agocrimson/net: don't throw on failure when renewing tickets and keyrings 47412/head
Radoslaw Zarzynski [Tue, 2 Aug 2022 13:42:01 +0000 (13:42 +0000)]
crimson/net: don't throw on failure when renewing tickets and keyrings

In the classical `MonClient` renewal of tickets and rotating
secrets, generally speaking, doesn't verify the `MAuthReply`.
The only difference is breaking the renewal loop:

```cpp
void MonClient::_finish_auth(int auth_err)
{
  // ...
  if (!auth_err && active_con) {
    ceph_assert(auth);
    _check_auth_tickets();
  }
  // ...
}
```

However, `crimson::mon::Client` throws `error::negotiation_failure`
which is finally handled in `Gated::dispatch()`. As the handler
there doesn't expect this particular error, it aborts the entire
process. This was the reason for failing one of the jobs at Sepia:

```
rzarzynski@teuthology:/a/rzarzynski-2022-08-01_11:01:29-crimson-rados-main-distro-default-smithi/6954468$ less ./remote/smithi174/log/ceph-osd.1.log.gz
...
DEBUG 2022-08-01 11:26:13,772 [shard 0] monc - renew_rotating_keyring secrets are up-to-date (they expire after 1659353143.772506)
INFO  2022-08-01 11:26:13,772 [shard 0] monc - renew_tickets: retrieving new tickets
INFO  2022-08-01 11:26:13,772 [shard 0] monc - sending auth(proto 2 132 bytes epoch 0) v1
INFO  2022-08-01 11:26:13,772 [shard 0] monc - waiting
INFO  2022-08-01 11:26:13,773 [shard 0] monc - handle_auth_reply mon v2:172.21.15.174:6802/101543 => v2:172.21.15.174:3300/0 returns auth_reply(proto 2 0 (0) Success) v1: 0
INFO  2022-08-01 11:26:13,773 [shard 0] monc - handle_auth_reply
INFO  2022-08-01 11:26:13,773 [shard 0] monc - renew_tickets: retrieving new tickets
INFO  2022-08-01 11:26:13,773 [shard 0] monc - sending auth(proto 2 132 bytes epoch 0) v1
DEBUG 2022-08-01 11:26:13,773 [shard 0] monc - renew_rotating_keyring secrets are up-to-date (they expire after 1659353143.7732666)
INFO  2022-08-01 11:26:13,773 [shard 0] monc - waiting
INFO  2022-08-01 11:26:13,773 [shard 0] monc - do_auth_single: mon v2:172.21.15.174:6802/101543 => v2:172.21.15.174:3300/0 returns auth_reply(proto 2 0 (0) Success) v1: 0
INFO  2022-08-01 11:26:13,773 [shard 0] monc - handle_auth_reply mon v2:172.21.15.174:6802/101543 => v2:172.21.15.174:3300/0 returns auth_reply(proto 2 0 (0) Success) v1: 0
INFO  2022-08-01 11:26:13,773 [shard 0] monc - handle_auth_reply
INFO  2022-08-01 11:26:13,773 [shard 0] monc - do_auth_single: mon v2:172.21.15.174:6802/101543 => v2:172.21.15.174:3300/0 returns auth_reply(proto 2 0 (0) Success) v1: 0
WARN  2022-08-01 11:26:13,773 [shard 0] auth - cephx client: could not verify service_ticket reply
ERROR 2022-08-01 11:26:13,773 [shard 0] monc - do_auth_single: got error -13 on mon v2:172.21.15.174:3300/0
DEBUG 2022-08-01 11:26:13,773 [shard 0] monc - renew_tickets: don't need new tickets
DEBUG 2022-08-01 11:26:13,774 [shard 0] monc - renew_rotating_keyring secrets are up-to-date (they expire after 1659353143.773988)
ERROR 2022-08-01 11:26:13,774 [shard 0] osd - mon.osd.1 dispatch() ms_dispatch caught exception: std::system_error (error crimson::net:3, negotiation failure)
```

```
2022-08-01T11:26:13.798 INFO:tasks.ceph.osd.1.smithi174.stderr:ceph-osd: /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/giga
ntic/release/17.0.0-13947-g4f4eedf5/rpm/el8/BUILD/ceph-17.0.0-13947-g4f4eedf5/src/crimson/common/gated.h:36: crimson::common::Gated::dispatch<crimson::mon::Client::ms_dispatch(crimson::net::ConnectionRef, MessageRef)::<lambda()>&, crimson::mon::Client>(const char*, crimson::mon::Client&, crimson::mon::Client::ms_dispatch(crimson::net::ConnectionRef, MessageRef)::<lambda()>&)::<lambda(std::__exception_ptr::exception_ptr)>: Assertion `*eptr.__cxa_exception_type() == typeid(seastar::gate_closed_exception)' failed.
2022-08-01T11:26:13.811 INFO:tasks.ceph.osd.1.smithi174.stderr:Aborting on shard 0.
```

```cpp
class Gated {
  // ...
  template <typename Func, typename T>
  inline seastar::future<> dispatch(const char* what, T& who, Func&& func) {
    return seastar::with_gate(pending_dispatch, std::forward<Func>(func)
    ).handle_exception([what, &who] (std::exception_ptr eptr) {
      if (*eptr.__cxa_exception_type() == typeid(system_shutdown_exception)) {
        gated_logger().debug(
            "{}, {} skipped, system shutdown", who, what);
        return;
      }
      gated_logger().error(
          "{} dispatch() {} caught exception: {}", who, what, eptr);
      assert(*eptr.__cxa_exception_type()
        == typeid(seastar::gate_closed_exception));
    });
  }
```

See: http://pulpito.front.sepia.ceph.com/rzarzynski-2022-08-01_11:01:29-crimson-rados-main-distro-default-smithi/6954468/

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 years agoMerge pull request #47261 from rhcs-dashboard/fix-duplicate-service-creation
Nizamudeen A [Tue, 2 Aug 2022 08:09:18 +0000 (13:39 +0530)]
Merge pull request #47261 from rhcs-dashboard/fix-duplicate-service-creation

mgr/dashboard: Show error on creating service with duplicate service id

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agomgr/dashboard: Show error on creating service with duplicate service id 47261/head
Aashish Sharma [Mon, 25 Jul 2022 08:18:39 +0000 (13:48 +0530)]
mgr/dashboard: Show error on creating service with duplicate service id

Fixes: https://tracker.ceph.com/issues/56689
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
2 years agoMerge pull request #47398 from tchaikov/wip-crimson-capture-this
Kefu Chai [Tue, 2 Aug 2022 02:33:55 +0000 (10:33 +0800)]
Merge pull request #47398 from tchaikov/wip-crimson-capture-this

crimson: capture "this" explicitly

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agocrimson: capture "this" explicitly 47398/head
Kefu Chai [Mon, 1 Aug 2022 23:59:42 +0000 (07:59 +0800)]
crimson: capture "this" explicitly

to silence warnings like:

```
alien_store.cc:577:64: warning: implicit capture of ‘this’ via ‘[=]’ is
deprecated in C++20 [-Wdeprecated]
  577 |     return tp->submit(ch->get_cid().hash_to_shard(tp->size()),
      [=, &bl] {
      |                                                                ^
```

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #45133 from cbodley/wip-cxx20-fixes
Kefu Chai [Mon, 1 Aug 2022 22:49:03 +0000 (06:49 +0800)]
Merge pull request #45133 from cbodley/wip-cxx20-fixes

enable c++20

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47197 from ceph/boost-docs
David Galloway [Mon, 1 Aug 2022 18:55:14 +0000 (14:55 -0400)]
Merge pull request #47197 from ceph/boost-docs

doc/dev: Elaborate on boost .deb creation

2 years agoMerge pull request #47262 from shriya-deshmukh/fix-delete-bucket-tagging-issue
Ali Maredia [Mon, 1 Aug 2022 18:06:34 +0000 (14:06 -0400)]
Merge pull request #47262 from shriya-deshmukh/fix-delete-bucket-tagging-issue

rgw: Return correct status code in case of DeleteBucketTagging API.

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2 years agomgr/dashboard: cluster > hosts: host list tables doesn't show all services deployed
Avan Thakkar [Mon, 25 Jul 2022 13:49:22 +0000 (19:19 +0530)]
mgr/dashboard: cluster > hosts: host list tables doesn't show all services deployed

Fixes: https://tracker.ceph.com/issues/53210
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Service instances was displaying only the ceph services, but with these changes it'll display instances
of cephadm services as well.

2 years agoMerge pull request #47385 from rhcs-dashboard/fix-flake8
Adam King [Mon, 1 Aug 2022 15:14:13 +0000 (11:14 -0400)]
Merge pull request #47385 from rhcs-dashboard/fix-flake8

mgr: fix flake8:missing whitespace after keyword for assert() & yield()

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
2 years agomgr/cephadm: fix flake8 47385/head
Avan Thakkar [Mon, 1 Aug 2022 09:23:14 +0000 (14:53 +0530)]
mgr/cephadm: fix flake8

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
2 years agoMerge pull request #47334 from s0nea/wip-osd-objectstore-types-fix
Nizamudeen A [Mon, 1 Aug 2022 08:17:03 +0000 (13:47 +0530)]
Merge pull request #47334 from s0nea/wip-osd-objectstore-types-fix

monitoring/ceph-mixin: OSD overview typo fix

Reviewed-by: MrFreezeex <NOT@FOUND>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agomgr/cephadm: Add loki dependency to grafana, promtail 47299/head
jinhong.kim [Wed, 27 Jul 2022 10:49:04 +0000 (19:49 +0900)]
mgr/cephadm: Add loki dependency to grafana, promtail

- Add loki dependency in order to be consistent with _calc_daemon_deps()
- Add dependency for all loki daemon

Signed-off-by: jinhong.kim <jinhong.kim0@navercorp.com>
2 years agoMerge pull request #45602 from soumyakoduri/wip-skoduri-dbstore-obj-versioning
Soumya Koduri [Mon, 1 Aug 2022 04:05:43 +0000 (09:35 +0530)]
Merge pull request #45602 from soumyakoduri/wip-skoduri-dbstore-obj-versioning

rgw/dbstore: Object versioning feature support

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2 years agoMerge pull request #47345 from cyx1231st/wip-seastore-log-improvements
Yingxin [Mon, 1 Aug 2022 01:15:27 +0000 (09:15 +0800)]
Merge pull request #47345 from cyx1231st/wip-seastore-log-improvements

crimson/os/seastore: misc fixes and log improvements

Reviewed-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2 years agoMerge pull request #47280 from adk3798/remove-error-upgrade-unpause
Adam King [Sun, 31 Jul 2022 18:11:09 +0000 (14:11 -0400)]
Merge pull request #47280 from adk3798/remove-error-upgrade-unpause

mgr/cephadm: clear error message when resuming upgrade

Reviewed-by: John Mulligan <jmulligan@redhat.com>
2 years agoMerge pull request #47318 from adk3798/rescan-parser-name
Adam King [Sun, 31 Jul 2022 18:10:31 +0000 (14:10 -0400)]
Merge pull request #47318 from adk3798/rescan-parser-name

cephadm: give disk rescan its own parser object

Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
2 years agoMerge pull request #47338 from ksperis/master
Adam King [Sun, 31 Jul 2022 18:09:01 +0000 (14:09 -0400)]
Merge pull request #47338 from ksperis/master

cephadm: Fix repo_gpgkey should return 2 vars

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #47361 from guits/fix-simple-scan
Adam King [Sun, 31 Jul 2022 18:07:57 +0000 (14:07 -0400)]
Merge pull request #47361 from guits/fix-simple-scan

ceph-volume: fix simple scan

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #47367 from tchaikov/wip-osd-capture-this
Kefu Chai [Sat, 30 Jul 2022 13:56:02 +0000 (21:56 +0800)]
Merge pull request #47367 from tchaikov/wip-osd-capture-this

osd/PG: capture this explicitly

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
2 years agoosd/PG: capture variables explicitly 47367/head
Kefu Chai [Sat, 30 Jul 2022 11:18:40 +0000 (19:18 +0800)]
osd/PG: capture variables explicitly

to silence warning if compiled with -std=c++20:

src/osd/PG.h:571:7: warning: implicit capture of ‘this’ via ‘[=]’ is
deprecated in C++20 [-Wdeprecated]
  571 |       [=](auto &history, auto &stats) {
      |       ^

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoosd/PG: capture variables explicitly 45133/head
Kefu Chai [Sat, 30 Jul 2022 11:18:40 +0000 (19:18 +0800)]
osd/PG: capture variables explicitly

to silence warning if compiled with -std=c++20:

src/osd/PG.h:571:7: warning: implicit capture of ‘this’ via ‘[=]’ is
deprecated in C++20 [-Wdeprecated]
  571 |       [=](auto &history, auto &stats) {
      |       ^

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47300 from kotreshhr/fips-md5-issue
Ramana Raja [Sat, 30 Jul 2022 11:40:41 +0000 (07:40 -0400)]
Merge pull request #47300 from kotreshhr/fips-md5-issue

mgr/volumes: Fix subvolume creation in FIPS enabled system.

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2 years agoMerge pull request #47202 from SUSE/wip-fix-56658
Kefu Chai [Sat, 30 Jul 2022 11:30:01 +0000 (19:30 +0800)]
Merge pull request #47202 from SUSE/wip-fix-56658

cephfs-shell: move source to separate subdirectory

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47246 from liu-chunmei/crimson-test-case
Kefu Chai [Sat, 30 Jul 2022 06:44:35 +0000 (14:44 +0800)]
Merge pull request #47246 from liu-chunmei/crimson-test-case

crimson/test: comment out EC test cases and some cases not supported now

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2 years agotest/common: disable tests for commutativity of operator==()
Kefu Chai [Sat, 30 Jul 2022 04:27:37 +0000 (12:27 +0800)]
test/common: disable tests for commutativity of operator==()

older C++ compiler like GCC-9 does not rewrite operator==() so that
`a == b` implies `b == a`, in other words:
operator==(const LHS& lhs, const RHS& rhs) is equivalent to
operator==(const RHS& rhs, const LHS& lhs). see
section 1.2 in https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0515r3.pdf

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agocommon/static_ptr: make free operator==() a member
Kefu Chai [Tue, 26 Jul 2022 00:13:22 +0000 (08:13 +0800)]
common/static_ptr: make free operator==() a member

since operator==() is now considered commutative in C++20, we can
make it a member function.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agodebian: pin gcc-11
Casey Bodley [Wed, 6 Apr 2022 21:54:19 +0000 (14:54 -0700)]
debian: pin gcc-11

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2 years agoceph.spec.in: add gcc-toolset-11-annobin-plugin-gcc
Casey Bodley [Wed, 6 Apr 2022 21:02:45 +0000 (17:02 -0400)]
ceph.spec.in: add gcc-toolset-11-annobin-plugin-gcc

gcc-toolset-11-annobin is already installed, but ceph.spec.in adds
"-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" which needs the gcc
plugin too

resolves this failure during the cmake configure step:

-- Check for working CXX compiler: /opt/rh/gcc-toolset-11/root/usr/bin/c++
-- Check for working CXX compiler: /opt/rh/gcc-toolset-11/root/usr/bin/c++ - broken
CMake Error at /usr/share/cmake/Modules/CMakeTestCXXCompiler.cmake:59 (message):
  The C++ compiler

    "/opt/rh/gcc-toolset-11/root/usr/bin/c++"

  is not able to compile a simple test program.

  It fails with the following output:

    Change Dir: /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11497-gfae772b8/rpm/el8/BUILD/ceph-17.0.0-11497-gfae772b8/x86_64-redhat-linux-gnu/CMakeFiles/CMakeTmp

    Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_09421/fast && /usr/bin/gmake  -f CMakeFiles/cmTC_09421.dir/build.make CMakeFiles/cmTC_09421.dir/build
    gmake[1]: Entering directory '/home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11497-gfae772b8/rpm/el8/BUILD/ceph-17.0.0-11497-gfae772b8/x86_64-redhat-linux-gnu/CMakeFiles/CMakeTmp'
    Building CXX object CMakeFiles/cmTC_09421.dir/testCXXCompiler.cxx.o
    /opt/rh/gcc-toolset-11/root/usr/bin/c++   -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection  -o CMakeFiles/cmTC_09421.dir/testCXXCompiler.cxx.o -c /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11497-gfae772b8/rpm/el8/BUILD/ceph-17.0.0-11497-gfae772b8/x86_64-redhat-linux-gnu/CMakeFiles/CMakeTmp/testCXXCompiler.cxx
    cc1plus: fatal error: inaccessible plugin file plugin/annobin.so expanded from short plugin name annobin: No such file or directory
    compilation terminated.

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2 years agoinstall-deps: remove use of update-alternatives
Casey Bodley [Sun, 13 Mar 2022 16:18:45 +0000 (12:18 -0400)]
install-deps: remove use of update-alternatives

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2 years agotest: Fix implicit-this lambda capture warning
Adam C. Emerson [Tue, 8 Mar 2022 03:09:46 +0000 (22:09 -0500)]
test: Fix implicit-this lambda capture warning

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2 years agorgw: Silence deprecation warnings from s3select
Adam C. Emerson [Tue, 8 Mar 2022 01:42:39 +0000 (20:42 -0500)]
rgw: Silence deprecation warnings from s3select

Since it's a submodule.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2 years agorgw: Fix implicit capture of this warnings
Adam C. Emerson [Tue, 8 Mar 2022 01:26:04 +0000 (20:26 -0500)]
rgw: Fix implicit capture of this warnings

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2 years agoosd: Fix implicit capture of this warnings
Adam C. Emerson [Tue, 8 Mar 2022 00:11:25 +0000 (19:11 -0500)]
osd: Fix implicit capture of this warnings

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2 years agocommon/static_ptr: drop ambiguous operator==()
Kefu Chai [Thu, 3 Mar 2022 07:30:59 +0000 (15:30 +0800)]
common/static_ptr: drop ambiguous operator==()

because in C++20, comparison operator is considered reversed also. so
drop the reversed operators.

otherwise we'd have following FTBFS:

../src/test/common/test_static_ptr.cc:64:20: error: use of overloaded operator '==' is ambiguous (with operand types 'static_ptr<base, sizeof(grandchild)>' and 'nullptr_t')
    EXPECT_FALSE(p == nullptr);
                 ~ ^  ~~~~~~~
../src/googletest/googletest/include/gtest/gtest.h:1984:25: note: expanded from macro 'EXPECT_FALSE'
  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
                        ^~~~~~~~~

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agotest/common/test_allocate_unique: drop hint parameter from allocate()
Kefu Chai [Thu, 3 Mar 2022 07:18:34 +0000 (15:18 +0800)]
test/common/test_allocate_unique: drop hint parameter from allocate()

the "hint" parameter was dropped from C++20.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agocrimson/os/seastore: drop != operator and use friend operator==
Kefu Chai [Tue, 1 Mar 2022 16:10:32 +0000 (00:10 +0800)]
crimson/os/seastore: drop != operator and use friend operator==

C++20 is able to create != from == operator. so drop the != overload.
this helps to address following FTBFS:

/var/ssd/ceph/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc:141:19: error: use of overloaded operator '!=' is ambiguous (with operand types 'crimson::os::seastore::omap_manager::StringKVInnerN$
  assert(child_pt != iter_end());
         ~~~~~~~~ ^  ~~~~~~~~~~
/usr/include/assert.h:93:27: note: expanded from macro 'assert'
     (static_cast <bool> (expr)                                         \
                          ^~~~
/var/ssd/ceph/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h:380:10: note: candidate function
    bool operator==(const iter_t &rhs) const {
         ^

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agocrimson/common: add alternative overload for FixedKVNodeLayout<>::iter_t
Kefu Chai [Mon, 28 Feb 2022 15:12:22 +0000 (23:12 +0800)]
crimson/common: add alternative overload for FixedKVNodeLayout<>::iter_t

otherwise we'd have following FTBFS with C++20 and clang13:

In file included from /var/ssd/ceph/src/crimson/os/seastore/lba_manager.cc:7:
In file included from /var/ssd/ceph/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h:24:
/var/ssd/ceph/src/crimson/os/seastore/lba_manager/btree/lba_btree.h:474:26: error: use of overloaded operator '==' is ambiguous (with operand types 'crimson::common::FixedKVNodeLayout<254, crimson::os::seastore::l$
    auto end = next_iter == parent->end()
               ~~~~~~~~~ ^  ~~~~~~~~~~~~~
/var/ssd/ceph/src/crimson/common/fixed_kv_node_layout.h:127:10: note: candidate function
    bool operator==(const iter_t &rhs) const {
         ^
/var/ssd/ceph/src/crimson/common/fixed_kv_node_layout.h:127:10: note: candidate function (with reversed parameter order)

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agorpm: BuildRequires gcc-toolset-10-gcc-c++ >= 10.2
Casey Bodley [Thu, 24 Feb 2022 19:26:08 +0000 (14:26 -0500)]
rpm: BuildRequires gcc-toolset-10-gcc-c++ >= 10.2

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2 years agocrimson/test: skip EC class SetUp 47246/head
chunmei-liu [Fri, 29 Jul 2022 10:33:17 +0000 (03:33 -0700)]
crimson/test: skip EC class SetUp

otherwise crimson will hang

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
2 years agoinstall-deps.sh: centos/rhel require gcc 10.2 and devtoolset-10
Casey Bodley [Thu, 24 Feb 2022 18:26:13 +0000 (13:26 -0500)]
install-deps.sh: centos/rhel require gcc 10.2 and devtoolset-10

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2 years agoRevert "install-deps.sh: drop devtoolset(DTS) check for centos"
Casey Bodley [Thu, 24 Feb 2022 18:23:12 +0000 (13:23 -0500)]
Revert "install-deps.sh: drop devtoolset(DTS) check for centos"

This reverts commit 66e81b8b08b1a48a48c16b5b89450aeced9de5f9.

Signed-off-by: Casey Bodley <cbodley@redhat.com>
Conflicts:
install-deps.sh for centos/rhel 8 instead of 7

2 years agocmake: raise CMAKE_CXX_STANDARD from 17 to 20
Casey Bodley [Wed, 23 Feb 2022 17:39:31 +0000 (12:39 -0500)]
cmake: raise CMAKE_CXX_STANDARD from 17 to 20

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2 years agoinstall-deps: enable ubuntu toolchain ppa for gcc11 on focal
Casey Bodley [Wed, 23 Feb 2022 17:39:16 +0000 (12:39 -0500)]
install-deps: enable ubuntu toolchain ppa for gcc11 on focal

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2 years agoqa: Fix use of 'sudo' args 47300/head
Kotresh HR [Sat, 30 Jul 2022 00:02:27 +0000 (05:32 +0530)]
qa: Fix use of 'sudo' args

https://tracker.ceph.com/issues/56727
Signed-off-by: Kotresh HR <khiremat@redhat.com>
2 years agomgr/cephadm: clear error message when resuming upgrade 47280/head
Adam King [Tue, 26 Jul 2022 13:55:05 +0000 (09:55 -0400)]
mgr/cephadm: clear error message when resuming upgrade

the message field in the output of "ceph orch upgrade status"
will first take the value of the error field of the UpgradeState,
and if only if it blank/None, display an info string we periodically
update throughout the upgrade with useful info such as that
we're upgrading a daemon of a particular type or pulling an image
on a certain host. When an upgrade fails, we set the error field
of the UpgradeState, pause the upgrade and raise a health warning.
Sometimes, the user is able to resolve the issue and simply resume
the upgrade. The issue here is, in that case, the error field of
the UpgradeState is still set, so instead of seeing the useful info
messages, it will continue to display an error message that may
no longer be relevant. By emptying the error field of the UpgradeState
when upgrades are resumed, we return to normal behavior of
displaying the info string, and will only show another error message
if another error actually occurs.

Fixes: https://tracker.ceph.com/issues/56714
Signed-off-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #46248 from linuxbox2/wip-rgwlc-tryharder
J. Eric Ivancich [Fri, 29 Jul 2022 19:12:39 +0000 (15:12 -0400)]
Merge pull request #46248 from linuxbox2/wip-rgwlc-tryharder

rgwlc: try hard to get lc locks when saving policy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
2 years agoMerge pull request #47363 from tchaikov/boost-phoenix
Kefu Chai [Fri, 29 Jul 2022 17:33:40 +0000 (01:33 +0800)]
Merge pull request #47363 from tchaikov/boost-phoenix

mgr/MgrCap: include <boost/phoenix.hpp>

Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agomgr/volumes: Fix subvolume creation in FIPS enabled system.
Kotresh HR [Wed, 27 Jul 2022 11:09:08 +0000 (16:39 +0530)]
mgr/volumes: Fix subvolume creation in FIPS enabled system.

The md5 checksum is used in the construction of legacy
subvolume config filename. It's not used for security reason.
Hence marking the 'usedforsecurity' flag to false to
make it FIPs compliant.

The usage of md5 was always in there. The commit 373a04cf734
made it to get exercised in 'open_subvol' which is pre-requisite
for all the subvolume operations and hence subvolume
creation has failed.

Fixes: https://tracker.ceph.com/issues/56727
Signed-off-by: Kotresh HR <khiremat@redhat.com>
2 years agorgwlc: define RGWLC::thr_name() and use it to name lc lock cookies 46248/head
Matt Benjamin [Wed, 25 May 2022 19:37:36 +0000 (15:37 -0400)]
rgwlc:  define RGWLC::thr_name() and use it to name lc lock cookies

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2 years agoMerge pull request #47336 from tchaikov/wip-ceph-dencoder-for-dev
Kefu Chai [Fri, 29 Jul 2022 16:33:08 +0000 (00:33 +0800)]
Merge pull request #47336 from tchaikov/wip-ceph-dencoder-for-dev

tools/ceph-dencoder: register dencoders in "lib" in dev env

Reviewed-by: Xiubo Li <xiubli@redhat.com>
2 years agorgwlc: try hard to get lc locks when saving policy
Matt Benjamin [Thu, 12 May 2022 16:38:59 +0000 (12:38 -0400)]
rgwlc: try hard to get lc locks when saving policy

During active lifecycle processing, there can be high contention for
lifecycle shard locks.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2 years agoMerge pull request #47187 from cfsnyder/wip-cfsnyder-56646
J. Eric Ivancich [Fri, 29 Jul 2022 16:16:22 +0000 (12:16 -0400)]
Merge pull request #47187 from cfsnyder/wip-cfsnyder-56646

rgw: optimizations for handling ECANCELED errors from within get_obj_state

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #47343 from ceph/ljflores-patch-1
David Galloway [Fri, 29 Jul 2022 16:04:13 +0000 (12:04 -0400)]
Merge pull request #47343 from ceph/ljflores-patch-1

doc/releases: write a note about the "invalid regex" mgr bug

2 years agodoc/releases: add release note about "invalid regex" bug in mgr 47343/head
Laura Flores [Thu, 28 Jul 2022 23:04:03 +0000 (23:04 +0000)]
doc/releases: add release note about "invalid regex" bug in mgr

Signed-off-by: Laura Flores <lflores@redhat.com>
2 years agomgr/MgrCap: include <boost/phoenix.hpp> 47363/head
Kefu Chai [Fri, 29 Jul 2022 14:35:19 +0000 (22:35 +0800)]
mgr/MgrCap: include <boost/phoenix.hpp>

instead of include `spirit/include/phoenix.hpp`, include
`<boost/phoenix.hpp>` to silence the warning from boost, like:

/opt/ceph/include/boost/spirit/include/phoenix.hpp:12:1: note: ‘#pragma
message: This header is deprecated. Use <boost/phoenix.hpp> instead.’
   12 | BOOST_HEADER_DEPRECATED("<boost/phoenix.hpp>")
      | ^~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoceph-volume: fix simple scan 47361/head
Guillaume Abrioux [Fri, 29 Jul 2022 13:58:05 +0000 (15:58 +0200)]
ceph-volume: fix simple scan

When the class `Device` is instantiated with a path instead of a
block device, it fails like following.

```
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/usr/lib/python3.6/site-packages/ceph_volume/util/device.py", line 130, in __init__
    self._parse()
  File "/usr/lib/python3.6/site-packages/ceph_volume/util/device.py", line 233, in _parse
    self.ceph_device = disk.has_bluestore_label(self.path)
  File "/usr/lib/python3.6/site-packages/ceph_volume/util/disk.py", line 906, in has_bluestore_label
    with open(device_path, "rb") as fd:
IsADirectoryError: [Errno 21] Is a directory: '/var/lib/ceph/osd/ceph-0/'
```

passing a path instead of a block device is valid, `simple scan` needs it.

Fixes: https://tracker.ceph.com/issues/56969
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2 years agoMerge pull request #47190 from dang/wip-dang-zipper-filter
Daniel Gryniewicz [Fri, 29 Jul 2022 14:01:04 +0000 (10:01 -0400)]
Merge pull request #47190 from dang/wip-dang-zipper-filter

RGW - Zipper - Base filter implementation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #47347 from anthonyeleven/anthonyeleven/essthree
zdover23 [Fri, 29 Jul 2022 09:03:37 +0000 (19:03 +1000)]
Merge pull request #47347 from anthonyeleven/anthonyeleven/essthree

doc/radosgw: Uppercase s3

Reviewed-by: Zac Dover <zac.dover@gmail.com>
2 years agocrimson/os/seastore: misc fixes and log adjustments 47345/head
Yingxin Cheng [Fri, 29 Jul 2022 06:24:03 +0000 (14:24 +0800)]
crimson/os/seastore: misc fixes and log adjustments

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agocrimson/os/seastore: unify segment info formatting
Yingxin Cheng [Fri, 29 Jul 2022 06:23:19 +0000 (14:23 +0800)]
crimson/os/seastore: unify segment info formatting

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agocrimson/os/seastore: collect stats during replay
Yingxin Cheng [Fri, 29 Jul 2022 06:06:47 +0000 (14:06 +0800)]
crimson/os/seastore: collect stats during replay

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agocephadm: ceph.manual.gpg cleanup 47338/head
Laurent Barbe [Fri, 29 Jul 2022 07:33:36 +0000 (09:33 +0200)]
cephadm: ceph.manual.gpg cleanup

Cleanup file /etc/apt/trusted.gpg.d/ceph.manual.gpg when repo is removed

Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2 years agodoc/radosgw: Uppercase s3 47347/head
Anthony D'Atri [Fri, 29 Jul 2022 07:11:22 +0000 (00:11 -0700)]
doc/radosgw: Uppercase s3

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>