]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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 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>
2 years agoMerge pull request #47260 from rhcs-dashboard/fix-frontend-monitor-port-fields
Nizamudeen A [Fri, 29 Jul 2022 07:07:01 +0000 (12:37 +0530)]
Merge pull request #47260 from rhcs-dashboard/fix-frontend-monitor-port-fields

mgr/dashboard: add required validation for frontend and monitor port

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #47284 from anthonyeleven/anthonyeleven/prom-localrules-tweaks
Anthony D'Atri [Fri, 29 Jul 2022 07:06:06 +0000 (00:06 -0700)]
Merge pull request #47284 from anthonyeleven/anthonyeleven/prom-localrules-tweaks

monitoring/ceph-mixin: clean up prometheus_alerts.yml

2 years agocrimson/os/seastore/async_cleaner: improve log gc status
Yingxin Cheng [Fri, 29 Jul 2022 05:31:08 +0000 (13:31 +0800)]
crimson/os/seastore/async_cleaner: improve log gc status

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agotest/crimson/seastore/transaction_manager_test_state: improve logs
Yingxin Cheng [Fri, 29 Jul 2022 04:56:31 +0000 (12:56 +0800)]
test/crimson/seastore/transaction_manager_test_state: improve logs

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agoMerge pull request #47328 from liu-chunmei/crimson-cmpext
Liu-Chunmei [Fri, 29 Jul 2022 03:06:47 +0000 (20:06 -0700)]
Merge pull request #47328 from liu-chunmei/crimson-cmpext

crimson: for cmp_fail error, return -MAX_ERRNO-index

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agocrimson/test: check env variable "CRIMSON_COMPAT"
chunmei-liu [Wed, 27 Jul 2022 00:40:13 +0000 (17:40 -0700)]
crimson/test: check env variable "CRIMSON_COMPAT"

when "CRIMSON_COMPAT" is set, to skip EC and some test cases.

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
2 years agomonitoring/ceph-mixin: clean up prometheus_alerts.yml 47284/head
Anthony D'Atri [Tue, 26 Jul 2022 16:06:27 +0000 (09:06 -0700)]
monitoring/ceph-mixin: clean up prometheus_alerts.yml

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
2 years agoMerge pull request #47291 from cyx1231st/wip-seastore-journal-head
Yingxin [Fri, 29 Jul 2022 01:31:19 +0000 (09:31 +0800)]
Merge pull request #47291 from cyx1231st/wip-seastore-journal-head

crimson/os/seastore: fixes to trimming

Reviewed-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2 years agoMerge pull request #47275 from myoungwon/wip-rbm-cleanup
Kefu Chai [Fri, 29 Jul 2022 00:10:22 +0000 (08:10 +0800)]
Merge pull request #47275 from myoungwon/wip-rbm-cleanup

seastore: RBM clean-ups

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agocrimson: for cmp_fail error, return -MAX_ERRNO-index 47328/head
chunmei-liu [Thu, 28 Jul 2022 06:44:47 +0000 (23:44 -0700)]
crimson: for cmp_fail error, return -MAX_ERRNO-index

instead of cmp_fail error code.

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
2 years agoMerge pull request #47308 from mdw-at-linuxbox/wip-master-implanon
Casey Bodley [Thu, 28 Jul 2022 21:38:28 +0000 (17:38 -0400)]
Merge pull request #47308 from mdw-at-linuxbox/wip-master-implanon

rgw: better tenant id from the uri on anonymous access

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2 years agoMerge pull request #47170 from guits/dep-dev-inventory
Guillaume Abrioux [Thu, 28 Jul 2022 20:19:31 +0000 (22:19 +0200)]
Merge pull request #47170 from guits/dep-dev-inventory

ceph-volume: report slave devices in inventory

2 years agoceph-volume/tests: migrate to pyfakefs 47170/head
Guillaume Abrioux [Wed, 27 Jul 2022 11:41:41 +0000 (13:41 +0200)]
ceph-volume/tests: migrate to pyfakefs

ceph-volume unit tests shouldn't actually create contents on the
filesystem from where it runs (even though they are written in a tmp
dir), let's use pyfakefs.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2 years agoceph-volume/tests: fix test_path_is_valid()
Guillaume Abrioux [Wed, 27 Jul 2022 12:28:10 +0000 (14:28 +0200)]
ceph-volume/tests: fix test_path_is_valid()

When ceph-volume tests are run from a host where there's no `/dev/sda`
device, this test fails.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2 years agoceph-volume: report slave devices in inventory
Guillaume Abrioux [Tue, 19 Jul 2022 12:06:10 +0000 (12:06 +0000)]
ceph-volume: report slave devices in inventory

`ceph-volume inventory` currently reports the following:

```

Device Path               Size        rotates available Model name
/dev/mapper/mpatha        50.00 GB    True    True
/dev/mapper/mpathaa       6.00 GB     True    True
/dev/mapper/mpathab       6.00 GB     True    True
/dev/mapper/mpathac       6.00 GB     True    True
/dev/mapper/mpathad       6.00 GB     True    True
/dev/mapper/mpathae       6.00 GB     True    True
```

whereas something like following would be useful:

```

Device Path               Size         Device nodes    rotates available Model name
/dev/mapper/mpatha        50.00 GB     sdf,sde         True    True
/dev/mapper/mpathaa       6.00 GB      sdbe,sdat       True    True
/dev/mapper/mpathab       6.00 GB      sdav,sdbf       True    True
/dev/mapper/mpathac       6.00 GB      sdbb,sdbl       True    True
/dev/mapper/mpathad       6.00 GB      sdas,sdbc       True    True
/dev/mapper/mpathae       6.00 GB      sdax,sdbh       True    True
```

Fixes: https://tracker.ceph.com/issues/56624
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2 years agoMerge pull request #47169 from guits/improve-mpath-reporting
Guillaume Abrioux [Thu, 28 Jul 2022 18:11:30 +0000 (20:11 +0200)]
Merge pull request #47169 from guits/improve-mpath-reporting

ceph-volume: improve mpath devices reporting

2 years agoMerge pull request #46893 from guits/ceph-volume-symlinks-guits
Guillaume Abrioux [Thu, 28 Jul 2022 18:11:03 +0000 (20:11 +0200)]
Merge pull request #46893 from guits/ceph-volume-symlinks-guits

ceph-volume: allow symlinks as devices

2 years agocephadm: Fix repo_gpgkey should return 2 vars
Laurent Barbe [Thu, 28 Jul 2022 07:30:59 +0000 (09:30 +0200)]
cephadm: Fix repo_gpgkey should return 2 vars

when option --gpg-url is specified, the name used for the gpg filename is missing and throws an exception
this adds the string "manual" to the gpg key : /etc/apt/trusted.gpg.d/ceph.manual.gpg

Fixes: https://tracker.ceph.com/issues/56950
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2 years agotools/ceph-dencoder: register dencoders in "lib" in dev env 47336/head
Kefu Chai [Thu, 28 Jul 2022 15:11:08 +0000 (23:11 +0800)]
tools/ceph-dencoder: register dencoders in "lib" in dev env

if "CMakeCache.txt" is found in current directory, try to load
dencoder shared libraries  from ./lib. this heuristics is used by
`ceph.in` also for relaunching itself to get access to python
bindings.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47310 from tchaikov/ceph-context-formatting
Kefu Chai [Thu, 28 Jul 2022 14:39:33 +0000 (22:39 +0800)]
Merge pull request #47310 from tchaikov/ceph-context-formatting

common/ceph_context: fix the formatting

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
2 years agomonitoring/ceph-mixin: OSD overview typo fix 47334/head
Tatjana Dehler [Thu, 28 Jul 2022 13:15:32 +0000 (15:15 +0200)]
monitoring/ceph-mixin: OSD overview typo fix

Correct a wrongly set bracket on ceph-dashboard -> OSD Overview ->
OSD Objectstore Types resulting in a parser error.

Fixes: https://tracker.ceph.com/issues/56948
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
2 years agoMerge pull request #46996 from rhcs-dashboard/html-injection-bug
Pere Diaz Bou [Thu, 28 Jul 2022 07:38:41 +0000 (09:38 +0200)]
Merge pull request #46996 from rhcs-dashboard/html-injection-bug

mgr/dashboard: added pattern validaton for form input

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agoMerge pull request #46970 from ronen-fr/wip-rf-unlocked-logs
Ronen Friedman [Thu, 28 Jul 2022 05:48:37 +0000 (08:48 +0300)]
Merge pull request #46970 from ronen-fr/wip-rf-unlocked-logs

osd/scrub: pre-prepare the description text of the current state

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agoMerge pull request #46024 from sirtoobii/patch-2
zdover23 [Thu, 28 Jul 2022 04:38:28 +0000 (14:38 +1000)]
Merge pull request #46024 from sirtoobii/patch-2

doc/radosgw/STS: sts_key and user capabilities

Reviewed-by: Zac Dover <zac.dover@gmail.com>
2 years agoseastore/rbm: rename nvme_device to random_block_device 47275/head
myoungwon oh [Wed, 27 Jul 2022 13:06:14 +0000 (22:06 +0900)]
seastore/rbm: rename nvme_device to random_block_device

rename nvme_device namespace to random_block_device, and
introduce random_block_device::nvme

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2 years agoMerge pull request #44039 from richael02/update-isal-crypto-source
Kefu Chai [Thu, 28 Jul 2022 02:29:28 +0000 (10:29 +0800)]
Merge pull request #44039 from richael02/update-isal-crypto-source

.gitmodules: update isa-l_crypto source address

Reviewed-by: Yibo Cai <yibo.cai@arm.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2 years agocephadm: give disk rescan its own parser object 47318/head
Adam King [Thu, 28 Jul 2022 00:27:54 +0000 (20:27 -0400)]
cephadm: give disk rescan its own parser object

It was using the same name as the agent. Missed this
in https://github.com/ceph/ceph/pull/46420/commits/6584c49bdf254e8750d23ed529478e6a9289e12f

Signed-off-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #46420 from pcuzner/add-disk-rescan
Adam King [Wed, 27 Jul 2022 23:50:59 +0000 (19:50 -0400)]
Merge pull request #46420 from pcuzner/add-disk-rescan

mgr/cephadm: Add disk rescan feature to the orchestrator

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
2 years agoMerge pull request #47286 from tchaikov/wip-fmt-ranges
Kefu Chai [Wed, 27 Jul 2022 23:50:43 +0000 (07:50 +0800)]
Merge pull request #47286 from tchaikov/wip-fmt-ranges

osd: use fmt/ranges.h for printing ranges

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 years agoMerge pull request #46883 from adk3798/custom-config
Adam King [Wed, 27 Jul 2022 23:49:44 +0000 (19:49 -0400)]
Merge pull request #46883 from adk3798/custom-config

mgr/cephadm: support for miscellaneous config files for daemons

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
2 years agoMerge pull request #46955 from hookak/monitoring-stack
Adam King [Wed, 27 Jul 2022 23:48:09 +0000 (19:48 -0400)]
Merge pull request #46955 from hookak/monitoring-stack

cephadm: Add promtail and loki when bootstrap

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #47088 from adk3798/cephadm-logging
Adam King [Wed, 27 Jul 2022 23:47:16 +0000 (19:47 -0400)]
Merge pull request #47088 from adk3798/cephadm-logging

cephadm: reduce spam to cephadm.log

Reviewed-by: John Mulligan <jmulligan@redhat.com>
2 years agocommon/ceph_context: fix the formatting 47310/head
Kefu Chai [Wed, 27 Jul 2022 23:46:55 +0000 (07:46 +0800)]
common/ceph_context: fix the formatting

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #47178 from adk3798/logrotate-owner
Adam King [Wed, 27 Jul 2022 23:46:04 +0000 (19:46 -0400)]
Merge pull request #47178 from adk3798/logrotate-owner

cephadm: add "su root root" to cephadm.log logrotate config

Reviewed-by: Guillaume Abrioux gabrioux@redhat.com
2 years agoMerge pull request #46618 from aclamk/wip-dout-for-alien
Kefu Chai [Wed, 27 Jul 2022 23:45:39 +0000 (07:45 +0800)]
Merge pull request #46618 from aclamk/wip-dout-for-alien

crimson/alienstore: Add douts

Reviewed-by: Samuel Just <sjust@redhat.com>
2 years agoMerge pull request #47269 from adk3798/fix-repo-test
Adam King [Wed, 27 Jul 2022 23:45:11 +0000 (19:45 -0400)]
Merge pull request #47269 from adk3798/fix-repo-test

qa/workunits/cephadm: update test_repos master -> main

Reviewed-by: Guillaume Abrioux gabrioux@redhat.com
2 years ago.gitmodules: update isa-l_crypto source address 44039/head
Richael Zhuang [Mon, 22 Nov 2021 02:37:48 +0000 (10:37 +0800)]
.gitmodules: update isa-l_crypto source address

Update address to https://github.com/intel/isa-l_crypto for it's
moved under intel repo.

Signed-off-by: Richael Zhuang <richael.zhuang@arm.com>
2 years agoMerge pull request #44499 from SMIL-Infra/fix-missed-lease-ack
Kefu Chai [Wed, 27 Jul 2022 23:40:09 +0000 (07:40 +0800)]
Merge pull request #44499 from SMIL-Infra/fix-missed-lease-ack

osd/PeeringState: fix missed recheck_readable from laggy

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2 years agoMerge pull request #45135 from lmlg/fix-32-bit
Kefu Chai [Wed, 27 Jul 2022 23:39:00 +0000 (07:39 +0800)]
Merge pull request #45135 from lmlg/fix-32-bit

rgw,test: Fix build errors in 32 bit platforms

Reviewed-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2 years agoMerge pull request #43005 from wxypro/timeout_conn_msg_opt
Kefu Chai [Wed, 27 Jul 2022 23:38:14 +0000 (07:38 +0800)]
Merge pull request #43005 from wxypro/timeout_conn_msg_opt

msg: Add target_addr to log when connections timed out

Reviewed-by: Kefu Chai <kchai@redhat.com>