]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agorgw: fail as expected when set/delete-bucket-website attempted on a non-existent... 43424/head
mengxiangrui [Tue, 6 Jul 2021 11:58:55 +0000 (19:58 +0800)]
rgw: fail as expected when set/delete-bucket-website attempted on a non-existent bucket, rgw should return HTTP 404 and NoSuchBucket.

Fixes: https://tracker.ceph.com/issues/51536
Signed-off-by: xiangrui meng <mengxr@chinatelecom.cn>
(cherry picked from commit c623aa45d35b269c6701a57e44ac05bb29a79dc8)

Conflicts:
- src/rgw/rgw_op.cc

Cherry-pick notes:
- rgw_op.cc forward_reqeuest_to_master takes different arguments in Octopus vs. Quincy

3 years agoMerge pull request #43349 from cfsnyder/wip-52351-octopus
Yuri Weinstein [Mon, 4 Oct 2021 19:32:06 +0000 (12:32 -0700)]
Merge pull request #43349 from cfsnyder/wip-52351-octopus

octopus: rgw: fix sts memory leak

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #43270 from cfsnyder/wip-51778-octopus
Daniel Gryniewicz [Mon, 4 Oct 2021 16:59:23 +0000 (12:59 -0400)]
Merge pull request #43270 from cfsnyder/wip-51778-octopus

octopus: rgw : add check for tenant provided in RGWCreateRole

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoMerge pull request #43265 from cfsnyder/wip-52331-octopus
Yuri Weinstein [Mon, 4 Oct 2021 15:26:05 +0000 (08:26 -0700)]
Merge pull request #43265 from cfsnyder/wip-52331-octopus

octopus: cmake: s/Python_EXECUTABLE/Python3_EXECUTABLE/

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #43234 from MrFreezeex/wip-51838-octopus
Yuri Weinstein [Mon, 4 Oct 2021 15:19:57 +0000 (08:19 -0700)]
Merge pull request #43234 from MrFreezeex/wip-51838-octopus

octopus: ceph.spec: selinux scripts respect CEPH_AUTO_RESTART_ON_UPGRADE

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoMerge pull request #43369 from tchaikov/octopus-pr-39602
Yuri Weinstein [Mon, 4 Oct 2021 15:14:10 +0000 (08:14 -0700)]
Merge pull request #43369 from tchaikov/octopus-pr-39602

octopus: mgr/influx: use "N/A" for unknown hostname

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #43352 from rhcs-dashboard/wip-52773-octopus
Yuri Weinstein [Mon, 4 Oct 2021 15:13:06 +0000 (08:13 -0700)]
Merge pull request #43352 from rhcs-dashboard/wip-52773-octopus

octopus: qa/mgr/dashboard: add extra wait to test

Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agomgr/influx: use "N/A" for unknown hostname 43369/head
Kefu Chai [Mon, 22 Feb 2021 05:53:42 +0000 (13:53 +0800)]
mgr/influx: use "N/A" for unknown hostname

in theory, there is chance that get_metadata() returns None, so let use
"N/A" in this case.

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

3 years agoqa/mgr/dashboard: add extra wait to test 43352/head
Ernesto Puerta [Wed, 22 Sep 2021 12:10:28 +0000 (14:10 +0200)]
qa/mgr/dashboard: add extra wait to test

Fixes: https://tracker.ceph.com/issues/49344
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 9ff778cdaa1ef40fcfa04f221a1da786a0e19655)

3 years agorgw: fix sts memory leak 43349/head
yuliyang_yewu [Tue, 17 Aug 2021 03:04:02 +0000 (11:04 +0800)]
rgw: fix sts memory leak

fix https://tracker.ceph.com/issues/52290

Signed-off-by: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
(cherry picked from commit ef921bcdaa78d33ed0611a60ec58826d8e6ccb45)

3 years agorgw : add check for tenant provided in RGWCreateRole 43270/head
cao.leilc [Thu, 17 Jun 2021 12:04:23 +0000 (20:04 +0800)]
rgw : add check for tenant provided in RGWCreateRole

Fixes: https://tracker.ceph.com/issues/51206
Signed-off-by: caolei <halei15848934852@163.com>
(cherry picked from commit 3c99ac14080c9f5b1611c9bbe4a223a9fd2927a0)

Conflicts:
src/rgw/rgw_rest_role.cc

- Octopus constructs role explicitly vs. using store->get_role(), and does not wrap in a unique_ptr

3 years agoMerge pull request #43094 from mgfritch/use-quay-octopus
Sebastian Wagner [Mon, 27 Sep 2021 20:22:21 +0000 (22:22 +0200)]
Merge pull request #43094 from mgfritch/use-quay-octopus

octopus: cephadm: use quay, not docker

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
3 years agoMerge pull request #43266 from cfsnyder/wip-51555-octopus
Yuri Weinstein [Mon, 27 Sep 2021 20:11:57 +0000 (13:11 -0700)]
Merge pull request #43266 from cfsnyder/wip-51555-octopus

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

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42616 from neha-ojha/wip-51967-octopus
Yuri Weinstein [Mon, 27 Sep 2021 20:09:21 +0000 (13:09 -0700)]
Merge pull request #42616 from neha-ojha/wip-51967-octopus

octopus: common/options: Set osd_client_message_cap to 256.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoMerge pull request #43024 from ifed01/wip-ifed-fix-bluefs-replay-crc-oct
Yuri Weinstein [Fri, 24 Sep 2021 15:24:30 +0000 (08:24 -0700)]
Merge pull request #43024 from ifed01/wip-ifed-fix-bluefs-replay-crc-oct

octopus: os/bluestore: accept undecodable multi-block bluefs transactions on log

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #43133 from mgfritch/octopus-backport-43010
Yuri Weinstein [Fri, 24 Sep 2021 15:23:20 +0000 (08:23 -0700)]
Merge pull request #43133 from mgfritch/octopus-backport-43010

octopus: cephadm: add thread ident to log messages

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #43186 from rhcs-dashboard/wip-52616-octopus
Yuri Weinstein [Fri, 24 Sep 2021 15:19:23 +0000 (08:19 -0700)]
Merge pull request #43186 from rhcs-dashboard/wip-52616-octopus

octopus: mgr/dashboard: Incorrect MTU mismatch warning

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #43140 from ifed01/wip-ifed-fix-migrate-oct
Yuri Weinstein [Fri, 24 Sep 2021 15:18:10 +0000 (08:18 -0700)]
Merge pull request #43140 from ifed01/wip-ifed-fix-migrate-oct

octopus: os/bluestore: fix bluefs migrate command

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #43008 from ifed01/wip-ifed-fix-52311-oct
Yuri Weinstein [Fri, 24 Sep 2021 15:17:08 +0000 (08:17 -0700)]
Merge pull request #43008 from ifed01/wip-ifed-fix-52311-oct

octopus: os/bluestore: fix using incomplete bluefs log when dumping it.

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
3 years agoMerge pull request #42975 from idryomov/wip-51419-octopus
Yuri Weinstein [Fri, 24 Sep 2021 15:16:35 +0000 (08:16 -0700)]
Merge pull request #42975 from idryomov/wip-51419-octopus

octopus: common/buffer: fix SIGABRT in  rebuild_aligned_size_and_memory

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
3 years agoMerge pull request #43273 from cfsnyder/wip-52052-octopus
Yuri Weinstein [Fri, 24 Sep 2021 15:15:13 +0000 (08:15 -0700)]
Merge pull request #43273 from cfsnyder/wip-52052-octopus

octopus: rgw: when deleted obj removed in versioned bucket, extra del-marker added

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoMerge pull request #43272 from cfsnyder/wip-51330-octopus
Yuri Weinstein [Fri, 24 Sep 2021 15:13:57 +0000 (08:13 -0700)]
Merge pull request #43272 from cfsnyder/wip-51330-octopus

octopus: rgw: avoid infinite loop when deleting a bucket

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoMerge pull request #43271 from cfsnyder/wip-51012-octopus
Yuri Weinstein [Fri, 24 Sep 2021 15:13:30 +0000 (08:13 -0700)]
Merge pull request #43271 from cfsnyder/wip-51012-octopus

octopus: rgw: remove quota soft threshold

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agorgw: remove quota soft threshold 43271/head
Zulai Wang [Sat, 22 May 2021 13:21:10 +0000 (21:21 +0800)]
rgw: remove quota soft threshold

Remove quota soft threshold, which causes expensive checks for sharded buckets

Fixes: 14eabd4aa7b8a2e2c0c43fe7f877ed2171277526
Signed-off-by: Zulai Wang <wangzl31@outlook.com>
(cherry picked from commit 32a39705765af0f87bec9101e5d337b797e05fea)

Conflicts:
src/common/options/rgw.yaml.in
src/rgw/rgw_quota.cc

Cherry-pick notes:
- Options defined in src/common/options.cc in Octopus vs src/common/options/rgw.yaml.in
- RGWQuotaCache::get_stats does not take optional_yeild or DoutPrefixProvider arguments in Octopus

3 years agorgw: when deleted obj removed in versioned bucket, extra del-marker added 43273/head
J. Eric Ivancich [Tue, 15 Jun 2021 19:20:33 +0000 (15:20 -0400)]
rgw: when deleted obj removed in versioned bucket, extra del-marker added

After initial checks are complete, this will read the OLH earlier than
previously to check the delete-marker flag and under the bug's
conditions will return -ENOENT rather than create a spurious delete
marker.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 69d7589fb1305b7d202ffd126c3c835e7cd0dda3)

Conflicts:
src/cls/rgw/cls_rgw_types.h
src/rgw/rgw_rados.cc

Cherry-pick notes:
- RGWRados::apply_olh_log does not take DoutPrefixProvider in Octopus
- change to use some namespace-qualified names in cls_rgw_types

3 years agorgw: avoid infinite loop when deleting a bucket 43272/head
Jeegn Chen [Wed, 25 Nov 2020 09:15:25 +0000 (17:15 +0800)]
rgw: avoid infinite loop when deleting a bucket

When deleting a bucket with an incomplete multipart upload that
has about 2000 parts uploaded, we noticed an infinite loop, which
stopped s3cmd from deleting the bucket forever.
Per check, when the bucket index was sharded (for example 128
shards), the original logic in
RGWRados::cls_bucket_list_unordered() did not calculate
the bucket shard ID correctly when the index key of a data
part was taken as the marker.

The issue is not necessarily reproduced each time. It will depend
on the key of the object. To reproduce it in 128-shard bucket,
we use 334 as the key for the incomplete multipart upload,
which will be located in Shard 127 (known by experiment). In this
setup, the original logic will usually come out a shard ID smaller
than 127 (since 127 is the largest one) from the marker and
thus a circle is constructed, which results in an infinite loop.

PS: Some times the bucket ID calculation may incorrectly going forward
instead of backward. Thus, the check logic may skip some shards,
which may have regular keys. In such scenarios, some non-empty buckets may
be deleted by accident.

Fixes: http://tracker.ceph.com/issues/49206
Signed-off-by: Jeegn Chen <jeegnchen@tencent.com>
(cherry picked from commit 3cafe5774a5a453d58a3a6bed1f02d3200c4bb1d)

Conflicts:
src/rgw/rgw_rados.cc

Cherry-pick notes:
- Octopus cls_bucket_list_unordered doesn't take DoutPrefixProvider as first arg

3 years agomon: return -EINVAL when handling unknown option in 'ceph osd pool get' 43266/head
Zhao Cuicui [Mon, 5 Jul 2021 08:53:17 +0000 (16:53 +0800)]
mon: return -EINVAL when handling unknown option in 'ceph osd pool get'

Signed-off-by: Zhao Cuicui <brucen1030@163.com>
(cherry picked from commit 7ed494076e2390f8e6a386278346632d00ee718a)

3 years agocmake: s/Python_EXECUTABLE/Python3_EXECUTABLE/ 43265/head
Michael Fritch [Tue, 17 Aug 2021 21:36:50 +0000 (15:36 -0600)]
cmake: s/Python_EXECUTABLE/Python3_EXECUTABLE/

pass the python3 exec when creating the ceph-volume build venv
fixup for 5fc657b40dc7

Fixes: https://tracker.ceph.com/issues/52304
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 7db830598507d90d1c9e1f4468f818bebce58037)

3 years agocephadm: quay.io for non-ceph images too 43094/head
Sage Weil [Wed, 11 Aug 2021 16:21:32 +0000 (12:21 -0400)]
cephadm: quay.io for non-ceph images too

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit dbc1d6303f4c2a22f5fa59218aa032fc92073906)

3 years agomgr/cephadm: Put together default container images references
Juan Miguel Olmo Martínez [Fri, 12 Feb 2021 13:09:17 +0000 (14:09 +0100)]
mgr/cephadm: Put together default container images references

Placed all in the same location in order to make easy downstream modifications
and future changes

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit ce246479443a64b292c7cff2a662161c8a598e09)

3 years agoMerge pull request #43189 from rhcs-dashboard/wip-51275-octopus
Ernesto Puerta [Tue, 21 Sep 2021 10:00:13 +0000 (12:00 +0200)]
Merge pull request #43189 from rhcs-dashboard/wip-51275-octopus

octopus: mgr/dashboard: deprecated variable usage in Grafana dashboards

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: p-se <NOT@FOUND>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
3 years agoceph.spec: selinux scripts respect CEPH_AUTO_RESTART_ON_UPGRADE 43234/head
Dan van der Ster [Mon, 12 Jul 2021 13:35:39 +0000 (15:35 +0200)]
ceph.spec: selinux scripts respect CEPH_AUTO_RESTART_ON_UPGRADE

In /etc/sysconfig/ceph we allow operators to define if ceph daemons
should be restarted on upgrade: CEPH_AUTO_RESTART_ON_UPGRADE.

But the post selinux scripts will stop ceph.target regardless if this
is set to `no`, leading to operators adding various hacks to prevent
these unexpected or inconvenient daemon restarts. By now, if users
are using rpms directly, they are likely orchestrating their own
daemon restarts so should not rely on the rpm itself to do this.

Fixes: https://tracker.ceph.com/issues/21672
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 092a6e3e83e9ef8e37cb6f1033c345dcb5224cfc)

3 years agomgr/dashboard: deprecated variable usage in Grafana dashboards 43189/head
Patrick Seidensal [Tue, 30 Mar 2021 18:20:49 +0000 (20:20 +0200)]
mgr/dashboard: deprecated variable usage in Grafana dashboards

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

3 years agomgr/dashboard: Incorrect MTU mismatch warning 43186/head
Aashish Sharma [Thu, 2 Sep 2021 06:27:57 +0000 (11:57 +0530)]
mgr/dashboard: Incorrect MTU mismatch warning

The MTU mismatch warning was being fired for those NIC's as well that are in down state. This PR intends to fix this issue

Fixes:https://tracker.ceph.com/issues/52028
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 58d635455d1f59921d5ad821168f31b6f937588a)

3 years agoMerge pull request #42533 from liewegas/use-quay-octopus
Yuri Weinstein [Wed, 15 Sep 2021 16:28:58 +0000 (09:28 -0700)]
Merge pull request #42533 from liewegas/use-quay-octopus

octopus: cephadm: default to quay.io, not docker.io

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #43102 from ideepika/wip-octopus-52279
Yuri Weinstein [Wed, 15 Sep 2021 14:50:55 +0000 (07:50 -0700)]
Merge pull request #43102 from ideepika/wip-octopus-52279

octopus: qa/suites/rados: use centos_8.3_container_tools_3.0.yaml

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
3 years agoMerge pull request #42862 from ideepika/wip-52337-octopus
Yuri Weinstein [Wed, 15 Sep 2021 14:50:08 +0000 (07:50 -0700)]
Merge pull request #42862 from ideepika/wip-52337-octopus

octopus: mon/PGMap: remove DIRTY field in `ceph df detail` when cache tiering  is not in use

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42694 from tchaikov/octopus-pr-41215
Yuri Weinstein [Wed, 15 Sep 2021 14:49:39 +0000 (07:49 -0700)]
Merge pull request #42694 from tchaikov/octopus-pr-41215

octopus: cmake: Replace boost download url

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
3 years agoMerge pull request #42674 from callithea/wip-51980-octopus
Yuri Weinstein [Wed, 15 Sep 2021 14:49:00 +0000 (07:49 -0700)]
Merge pull request #42674 from callithea/wip-51980-octopus

octopus: mgr/prometheus: Fix metric types from gauge to counter

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
3 years agoMerge pull request #42670 from callithea/wip-51949-octopus
Yuri Weinstein [Wed, 15 Sep 2021 14:46:52 +0000 (07:46 -0700)]
Merge pull request #42670 from callithea/wip-51949-octopus

octopus: Don't persist report data

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #42666 from SUSE/wip-fix-52064
Yuri Weinstein [Wed, 15 Sep 2021 14:45:48 +0000 (07:45 -0700)]
Merge pull request #42666 from SUSE/wip-fix-52064

octopus: mgr/cephadm: pass --container-init to cephadm if specified

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
3 years agoMerge pull request #42498 from ideepika/wip-51741-octopus
Yuri Weinstein [Wed, 15 Sep 2021 14:42:20 +0000 (07:42 -0700)]
Merge pull request #42498 from ideepika/wip-51741-octopus

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

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoos/bluestore: fix bluefs migrate command 43140/head
Igor Fedotov [Tue, 31 Aug 2021 12:54:23 +0000 (15:54 +0300)]
os/bluestore: fix bluefs migrate command

After migrating DB volume to a slow one RocksDB still
needs to be provided with slow.db path to properly access relevant files under db.slow subfolder.
Without that specification it tries to access them under 'db' one which
results in "not-found" error.

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

3 years agoqa/osd-bluefs-volume-ops: reproduce bluefs migrate bug
Igor Fedotov [Tue, 31 Aug 2021 12:54:04 +0000 (15:54 +0300)]
qa/osd-bluefs-volume-ops: reproduce bluefs migrate bug

Reproduces: https://tracker.ceph.com/issues/40434
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 0b0f8ef12fcc53666809b5bea6d24d07a8777425)

 Conflicts:
qa/standalone/osd/osd-bluefs-volume-ops.sh (more args for test
cases in octopus)

3 years agocephadm: add thread ident to log messages 43133/head
Michael Fritch [Mon, 30 Aug 2021 15:18:15 +0000 (09:18 -0600)]
cephadm: add thread ident to log messages

can be used to filter msgs from a specific cephadm command

Fixes: https://tracker.ceph.com/issues/52484
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2f1482890bad99cf29623585c6e4f8abf15cecc5)

3 years agoMerge pull request #43117 from guits/wip-52561-octopus
Guillaume Abrioux [Thu, 9 Sep 2021 16:02:06 +0000 (18:02 +0200)]
Merge pull request #43117 from guits/wip-52561-octopus

octopus: ceph-volume: fix lvm activate arguments

3 years agoMerge pull request #43111 from guits/wip-52555-octopus
Guillaume Abrioux [Thu, 9 Sep 2021 14:53:39 +0000 (16:53 +0200)]
Merge pull request #43111 from guits/wip-52555-octopus

octopus: ceph-volume: fix lvm migrate without args

3 years agoceph-volume: fix lvm activate arguments 43117/head
Dimitri Savineau [Thu, 26 Aug 2021 21:11:12 +0000 (17:11 -0400)]
ceph-volume: fix lvm activate arguments

When using the `lvm activate` subcommand without any osd ID or osd FSID
then ceph-volume fails.

Currently we can either activate with:
 - both osd ID and osd FSID
 - only the osd FSID (because it's unique)

The remaining scenarios aren't covered and generate a stack trace:
 - only the osd ID
 - no osd ID nor osd FSID

This ends up with an error like:

-->  UnboundLocalError: local variable 'tags' referenced before assignment

Fixes: https://tracker.ceph.com/issues/50665
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit b77ed5f99d3cb14a46bb36bb74e4136c22edf48a)

3 years agoceph-volume: fix lvm migrate without args 43111/head
Dimitri Savineau [Fri, 3 Sep 2021 14:45:18 +0000 (10:45 -0400)]
ceph-volume: fix lvm migrate without args

When running the `lvm migrate` subcommand without any args then the
ceph-volume command fails with a stack trace.

Traceback (most recent call last):
  File "/usr/lib/python3.6/site-packages/ceph_volume/decorators.py", line 59, in newfunc
    return f(*a, **kw)
  File "/usr/lib/python3.6/site-packages/ceph_volume/main.py", line 151, in main
    terminal.dispatch(self.mapper, subcommand_args)
  File "/usr/lib/python3.6/site-packages/ceph_volume/terminal.py", line 194, in dispatch
    instance.main()
  File "/usr/lib/python3.6/site-packages/ceph_volume/devices/lvm/main.py", line 46, in main
    terminal.dispatch(self.mapper, self.argv)
  File "/usr/lib/python3.6/site-packages/ceph_volume/terminal.py", line 194, in dispatch
    instance.main()
  File "/usr/lib/python3.6/site-packages/ceph_volume/devices/lvm/migrate.py", line 520, in main
    self.migrate_osd()
  File "/usr/lib/python3.6/site-packages/ceph_volume/decorators.py", line 16, in is_root
    return func(*a, **kw)
  File "/usr/lib/python3.6/site-packages/ceph_volume/devices/lvm/migrate.py", line 403, in migrate_osd
    if self.args.osd_id:
AttributeError: 'Migrate' object has no attribute 'args'

That's because we're exiting the parse_argv function but we continue to
execute the migrate_osd function. We should instead exit from the main function.

This update the parsing argument to have the same code than new-db and
new-wal classes.
Now the parsing is done in the make_parser function but the argv testing is
done in the main function allowing to exit the program and displaying the
help message when no arguments are provided.

Fixes: https://tracker.ceph.com/issues/51811
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 98de3306127cb758e5517a322f6da9e636f91036)

3 years agoMerge pull request #43092 from guits/wip-52544-octopus
Guillaume Abrioux [Thu, 9 Sep 2021 07:30:32 +0000 (09:30 +0200)]
Merge pull request #43092 from guits/wip-52544-octopus

octopus: ceph-volume: support no_systemd with lvm migrate

3 years agoMerge pull request #43097 from guits/wip-52546-octopus
Guillaume Abrioux [Thu, 9 Sep 2021 07:30:17 +0000 (09:30 +0200)]
Merge pull request #43097 from guits/wip-52546-octopus

octopus: ceph-volume: remove --all ref from deactivate help

3 years agoqa/distro: Add centos_8.2_container_tools_3.0.yaml 43102/head
Sebastian Wagner [Fri, 20 Aug 2021 08:53:11 +0000 (10:53 +0200)]
qa/distro: Add centos_8.2_container_tools_3.0.yaml

Let's avoid latest kubic stable

trivial fix: skipped mgr-nfs-upgrade, dashboard symlinks
Fixes: https://tracker.ceph.com/issues/52279
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit e436483c77adf7f876533c25a11c14d19a2d32a4)

3 years agoqa/cephadm: centos_8.3_container_tools_3.0.yaml
Sebastian Wagner [Thu, 19 Aug 2021 14:30:32 +0000 (16:30 +0200)]
qa/cephadm: centos_8.3_container_tools_3.0.yaml

Let's avoid latest stable

Fixes: https://tracker.ceph.com/issues/52279
octopus cherry pick resolve: do not use rhel and orch symlinks, octopus
does not have them.

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit c6bd968eff96666da7e321fb5787c82dc66ddbb7)

3 years agoceph-volume: support no_systemd with lvm migrate 43092/head
Dimitri Savineau [Fri, 3 Sep 2021 16:47:25 +0000 (12:47 -0400)]
ceph-volume: support no_systemd with lvm migrate

The `ceph-volume lvm migrate/new-db/new-wal` commands don't support
running on non systemd systems or within containers.
Like other ceph-volume commands (lvm activate/batch/zap or raw activate)
we also need to be able to use the --no-systemd flag.

Fixes: https://tracker.ceph.com/issues/51854
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 96d84acf5aedc9cf462230fd5fb685f0562a1371)

3 years agoceph-volume: remove --all ref from deactivate help 43097/head
Dimitri Savineau [Fri, 3 Sep 2021 23:06:42 +0000 (19:06 -0400)]
ceph-volume: remove --all ref from deactivate help

Until the `--all` feature is implemented.

This was partially removed in c13901f but not from the help command.

Fixes: https://tracker.ceph.com/issues/50109
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 3a385bc38686e45c734ffaa182a23837aaceaaa2)

3 years agoMerge pull request #43077 from guits/wip-52524-octopus
Guillaume Abrioux [Wed, 8 Sep 2021 15:30:45 +0000 (17:30 +0200)]
Merge pull request #43077 from guits/wip-52524-octopus

octopus: ceph-volume: pvs --noheadings replace pvs --no-heading

3 years agoMerge pull request #43088 from guits/wip-52540-octopus
Guillaume Abrioux [Wed, 8 Sep 2021 15:24:04 +0000 (17:24 +0200)]
Merge pull request #43088 from guits/wip-52540-octopus

octopus: ceph-volume: fix raw list with logical partition

3 years agoMerge pull request #43090 from guits/wip-52543-octopus
Guillaume Abrioux [Wed, 8 Sep 2021 15:21:57 +0000 (17:21 +0200)]
Merge pull request #43090 from guits/wip-52543-octopus

octopus: doc/ceph-volume: add lvm migrate/new-db/new-wal

3 years agoMerge pull request #42978 from idryomov/wip-52063-octopus
Yuri Weinstein [Wed, 8 Sep 2021 15:15:33 +0000 (08:15 -0700)]
Merge pull request #42978 from idryomov/wip-52063-octopus

octopus: rbd-mirror: fix potential async op tracker leak in start_image_replayers

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
3 years agoMerge pull request #42971 from idryomov/wip-51867-octopus
Yuri Weinstein [Wed, 8 Sep 2021 15:14:57 +0000 (08:14 -0700)]
Merge pull request #42971 from idryomov/wip-51867-octopus

octopus: pybind/rbd: fix mirror_image_get_status

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agodoc/ceph-volume: add lvm migrate/new-db/new-wal 43090/head
Dimitri Savineau [Fri, 3 Sep 2021 19:44:39 +0000 (15:44 -0400)]
doc/ceph-volume: add lvm migrate/new-db/new-wal

The inital PR was implementing those new commands only adds the man page
and not the online documentation.

Fixes: https://tracker.ceph.com/issues/51814
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 22de626220e6145fce8e1fd963802170f099f733)

3 years agoceph-volume: test the lsblk command in list.py 43088/head
Guillaume Abrioux [Tue, 7 Sep 2021 13:38:33 +0000 (15:38 +0200)]
ceph-volume: test the lsblk command in list.py

Let's test we use the expected args when we build the `lsblk` command
to list the devices present on the node.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 959ea33c0ba118984d678403b234e7628ccac3dc)

3 years agoceph-volume: fix raw list with logical partition
Dimitri Savineau [Fri, 3 Sep 2021 18:24:48 +0000 (14:24 -0400)]
ceph-volume: fix raw list with logical partition

This is a regression introduced by 9212420, when the host is using a
logical partition then lsblk reports that partition as a child from the
physical device.
That logical partition is prefixed by the `└─` character.

This leads the `raw list` subcommand to show the lsblk error on the stderr.

```
$ ceph-volume raw list
{}
 stderr: lsblk: `-/dev/sda1: not a block device
```

The lsblk command output looks like:

```
$ lsblk --paths --output=NAME --noheadings
/dev/sda
└─/dev/sda1
/dev/sdb
/dev/sdc
/dev/sdd
```

Using the `--list` option with lsblk solves the issue.

```
$ lsblk --list --paths --output=NAME --noheadings
/dev/sda
/dev/sda1
/dev/sdb
/dev/sdc
/dev/sdd
```

Fixes: https://tracker.ceph.com/issues/52504
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 7a6486bf4ddb2d789cc16047d8163baa8473e253)

3 years agoceph-volume: pvs --noheadings replace pvs --no-heading 43077/head
FengJiankui [Wed, 1 Sep 2021 09:37:25 +0000 (17:37 +0800)]
ceph-volume: pvs --noheadings replace pvs --no-heading

Fixes: https://tracker.ceph.com/issues/52482
Signed-off-by: FengJiankui <fengjiankui@inspur.com>
(cherry picked from commit 7083c4ffc63274bdd3103e9c5296bc70acbe745f)

3 years agoos/bluestore: accept undecodable multi-block bluefs transactions on log 43024/head
Igor Fedotov [Wed, 18 Aug 2021 10:39:02 +0000 (13:39 +0300)]
os/bluestore: accept undecodable multi-block bluefs transactions on log
replay.

We should proceed with OSD startup when detecting undecodable bluefs
transaction spanning multiple disk blocks during log replay.
The rationale is that such a transaction might appear during unexpected
power down - just not every disk block is written to disk. Hence we can
consider this a normal log replay stop condition.

https://tracker.ceph.com/issues/52079

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

 Conflicts:
src/os/bluestore/BlueFS.cc (trivial)

3 years agoMerge pull request #42892 from rhcs-dashboard/wip-52377-octopus
Ernesto Puerta [Wed, 1 Sep 2021 10:24:56 +0000 (12:24 +0200)]
Merge pull request #42892 from rhcs-dashboard/wip-52377-octopus

octopus: mgr/dashboard: stats=false not working when listing buckets

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoos/bluestore: fix using incomplete bluefs log when dumping it. 43008/head
Igor Fedotov [Tue, 9 Feb 2021 15:16:09 +0000 (18:16 +0300)]
os/bluestore: fix using incomplete bluefs log when dumping it.

BlueFS superblock might contain incomplete list of physical extents for
bluefs log. Hence we should alway replay ops for ino 1 to get them properly.

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

3 years agoMerge pull request #42968 from idryomov/wip-krbd-escape-match-sysattr-octopus
Ilya Dryomov [Tue, 31 Aug 2021 21:39:48 +0000 (23:39 +0200)]
Merge pull request #42968 from idryomov/wip-krbd-escape-match-sysattr-octopus

octopus: krbd: escape udev_enumerate_add_match_sysattr values

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agokrbd: escape udev_enumerate_add_match_sysattr values 42968/head
Ilya Dryomov [Sat, 28 Aug 2021 09:05:28 +0000 (11:05 +0200)]
krbd: escape udev_enumerate_add_match_sysattr values

libudev uses fnmatch(3) for matching attributes, meaning that shell
glob pattern matching is employed instead of literal string matching.
Escape glob metacharacters to suppress pattern matching.

Fixes: https://tracker.ceph.com/issues/52425
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 8841029b0a4705825ba394541240b3cb4eb2cf5c)

Conflicts:
src/test/cli-integration/rbd/unmap.t [ drop --no-progress,
  "rbd snap create" does not show progress in octopus ]

3 years agorbd-mirror: fix potential async op tracker leak in start_image_replayers 42978/head
Mykola Golub [Thu, 5 Aug 2021 07:03:20 +0000 (08:03 +0100)]
rbd-mirror: fix potential async op tracker leak in start_image_replayers

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

3 years agocommon/buffer: fix SIGABRT in rebuild_aligned_size_and_memory 42975/head
Yin Congmin [Wed, 30 Jun 2021 08:56:23 +0000 (16:56 +0800)]
common/buffer: fix SIGABRT in  rebuild_aligned_size_and_memory

There is such a bl, which needs to satisfy two conditions:
1)all ptrs' length sum except last ptr is aligned with 4K;
2)the length of last ptr is 0.
This bl will cause stack corruption when calling
bufferlist::rebuild_aligned_size_and_memory().

Deal with this special scenario in rebuild_aligned_size_and_memory() to
solve the bug. And added a specialtest-case to reproduce this scenario.

Fixes: https://tracker.ceph.com/issues/51419
Signed-off-by: Yin Congmin <congmin.yin@intel.com>
(cherry picked from commit 05a49aeeb3897a41e26d005c5143fdfe739d5c1b)

3 years agopybind/rbd: explain why "primary" isn't exposed in mirror_image_status_list() 42971/head
Ilya Dryomov [Tue, 27 Jul 2021 16:45:20 +0000 (18:45 +0200)]
pybind/rbd: explain why "primary" isn't exposed in mirror_image_status_list()

"primary" is part of mirror image info (rbd_mirror_image_info_t) and
is exposed in mirror_image_get_status().  mirror_image_status_list(),
even though it is often thought of as an equivalent of repeated calls
to mirror_image_get_status(), doesn't actually fetch the mirror image
info.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 1d2a142108b2aa102103e62ccdf3bd17688b783b)

3 years agopybind/rbd: actually append site_status dict to remote_statuses
Ilya Dryomov [Tue, 27 Jul 2021 15:20:08 +0000 (17:20 +0200)]
pybind/rbd: actually append site_status dict to remote_statuses

Using += operator is wrong -- only site_status keys get appended
(and repeatedly at that in case there is more than one remote site
as the keys are added one by one).

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 89888beb1266be5a661fef8643bb6bef0c720f5f)

3 years agorbd: Fix mirror_image_get_status in rbd python bindings
Will Smith [Fri, 23 Jul 2021 19:18:12 +0000 (15:18 -0400)]
rbd: Fix mirror_image_get_status in rbd python bindings

When retrieving the status of a mirrored image from the Python rbd
library, a TypeError is raised.

*To Reproduce:*

Set up two Ceph clusters for block storage, and configure image
mirroring between their pools.  Create a least one image with mirroring
enabled, then run the following script on either cluster (once the image
exists everywhere):

```python
import rados, rbd

CONF_PATH = "YOUR-CONF-PATH"
POOL_NAME = "YOUR-POOL-NAME"
IMAGE_LABEL = "YOUR-IMAGE-LABEL"

with rados.Rados(conffile=CONF_PATH) as cluster:
  with cluster.open_ioctx(POOL_NAME) as ioctx:
    with rbd.Image(ioctx, IMAGE_LABEL) as image:
      image.mirror_image_get_status()
```

This will result in the following stack trace:

```
Traceback (most recent call last):
  File "repo-bug.py", line 10, in <module>
    image.mirror_image_get_status()
  File "rbd.pyx", line 3363, in rbd.requires_not_closed.wrapper
  File "rbd.pyx", line 5209, in rbd.Image.mirror_image_get_status
TypeError: list indices must be integers or slices, not str
```

Fixes: https://tracker.ceph.com/issues/51867
Signed-off-by: Will Smith <wsmith@linode.com>
(cherry picked from commit 5dfda932b2012bb11a1860d8a81de3208b17f622)

3 years agoMerge pull request #42761 from ceph/wip-yuriw-p2p-octopus
Yuri Weinstein [Mon, 23 Aug 2021 21:13:07 +0000 (14:13 -0700)]
Merge pull request #42761 from ceph/wip-yuriw-p2p-octopus

octopus: qa/tests: advanced version to 15.2.14 to match the latest release

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agomgr/dashboard: stats=false not working when listing buckets 42892/head
Avan Thakkar [Fri, 20 Aug 2021 09:07:17 +0000 (14:37 +0530)]
mgr/dashboard: stats=false not working when listing buckets

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

 Conflicts:
src/pybind/mgr/dashboard/controllers/rgw.py
      - rgw-list endpoint doesn't have daemon_name parameter in octopus, so adopted
changes accordingly.

3 years agoMerge pull request #42849 from ceph/wip-81356-octopus
Kefu Chai [Fri, 20 Aug 2021 14:39:21 +0000 (22:39 +0800)]
Merge pull request #42849 from ceph/wip-81356-octopus

octopus: run-make-check.sh: Increase failure output log size

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agodoc/rados/op: ceph/df show DIRTY field N/A 42862/head
Deepika Upadhyay [Wed, 23 Jun 2021 03:57:25 +0000 (09:27 +0530)]
doc/rados/op: ceph/df show DIRTY field N/A

DIRTY field should only be available if cache tiering is in use.

trivial fix: added missing documentation for fields in ceph df detail

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit ba52429897c34a132f2868aad3dc0c79de3db45d)

3 years agotest: update test for when cache tier is not available
Deepika Upadhyay [Wed, 23 Jun 2021 05:14:21 +0000 (10:44 +0530)]
test: update test for when cache tier is not available

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit e80a80c7d932ab60c5b31ad50c7b62d5fb0b37bc)

3 years agomon/PGMap: DIRTY field as N/A in `df detail` when cache tier not in use
Deepika Upadhyay [Wed, 23 Jun 2021 05:12:38 +0000 (10:42 +0530)]
mon/PGMap: DIRTY field as N/A in `df detail` when cache tier not in use

    'ceph df detail' reports a column for DIRTY objects under POOLS even
    though cache tiers not being used.  In replicated or EC pool all objects
    in the pool are reported as logically DIRTY as they have never been
    flushed .
    we display N/A for DIRTY objects if the pool is not a cache tier.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit fafebb1824eb474dbbeb4137c033954d45b508af)

3 years agorun-make-check.sh: Increase failure output log size 42849/head
David Galloway [Wed, 18 Aug 2021 17:30:22 +0000 (13:30 -0400)]
run-make-check.sh: Increase failure output log size

Fixes: https://tracker.ceph.com/issues/43566
Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit e1b55f6878cfe847112959885d2fc44e91f3c44f)

3 years agoMerge pull request #42676 from callithea/wip-51635-octopus
Alfonso Martínez [Wed, 18 Aug 2021 15:28:23 +0000 (17:28 +0200)]
Merge pull request #42676 from callithea/wip-51635-octopus

octopus: monitoring: fix Physical Device Latency unit

3 years agoMerge pull request #42752 from guits/wip-52132-octopus
Guillaume Abrioux [Wed, 18 Aug 2021 14:33:52 +0000 (16:33 +0200)]
Merge pull request #42752 from guits/wip-52132-octopus

octopus: ceph-volume: work around phantom atari partitions

3 years agoMerge pull request #42675 from callithea/wip-51993-octopus
Alfonso Martínez [Tue, 17 Aug 2021 13:37:43 +0000 (15:37 +0200)]
Merge pull request #42675 from callithea/wip-51993-octopus

octopus: monitoring/grafana/cluster: use per-unit max and limit values

3 years agoMerge pull request #42794 from rhcs-dashboard/wip-52249-octopus
Alfonso Martínez [Tue, 17 Aug 2021 10:07:54 +0000 (12:07 +0200)]
Merge pull request #42794 from rhcs-dashboard/wip-52249-octopus

octopus: mgr/dashboard: cephadm e2e start script: add --expanded option

3 years agomgr/dashboard: run-cephadm-e2e-tests.sh improvements 42794/head
Alfonso Martínez [Wed, 11 Aug 2021 08:25:42 +0000 (10:25 +0200)]
mgr/dashboard: run-cephadm-e2e-tests.sh improvements

- Jenkins env.: make sure the cluster is always started.
- PR template: add trigger phrase to the jenkins commands list.
- Cypress: add --no-install flag; clean previous reports.

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

 Conflicts:
.github/pull_request_template.md
      - Update jenkins trigger phrases: cephadm e2e; api tests.

3 years agomgr/dashboard: cephadm e2e start script: add --expanded option
Alfonso Martínez [Mon, 9 Aug 2021 13:14:21 +0000 (15:14 +0200)]
mgr/dashboard: cephadm e2e start script: add --expanded option

- Additional improvements: clean npm cache in jenkins env.; display mgr logs on error.

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

 Conflicts:
doc/dev/developer_guide/dash-devel.rst
      - Add changes to HACKING.rst (dash-devel.rst not in octopus)

3 years agoceph-volume: work around phantom atari partitions 42752/head
Blaine Gardner [Fri, 23 Jul 2021 18:56:35 +0000 (12:56 -0600)]
ceph-volume: work around phantom atari partitions

See Rook issue https://github.com/rook/rook/issues/7940 for full
information.

Ceph bluestore disks can sometimes appear as though they have "phantom"
Atari (AHDI) partitions created on them when they don't in reality. This
is due to a series of bugs in the Linux kernel when it is built with
Atari support enabled. This behavior does not appear for raw mode OSDs on
partitions, only on disks.

Changing the on-disk format of Bluestore OSDs comes with
backwards-compatibility challenges, and fixing the issue in the Kernel
could be years before users get a fix. Working around the Kernel issue
in ceph-volume is therefore the best place to fix the issue for Ceph.

To work around the issue in Ceph volume, there are two behaviors that need
adjusted:
1. `ceph-volume inventory` should not report that a partition is
   available if the parent device is a BlueStore OSD.
2. `ceph-volume raw list` should report parent disks if the disk is a
   BlueStore OSD and not report the disk's children, BUT it should still
   report children if the parent disk is not a BlueStore OSD.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
(cherry picked from commit 9212420bbc88e0caaf0b2302dd1f379f563f7d26)

3 years agoceph-volume: use safer check for bluestore label
Blaine Gardner [Mon, 19 Jul 2021 17:57:09 +0000 (11:57 -0600)]
ceph-volume: use safer check for bluestore label

Using only the exit status of `ceph-bluestore-tool show-label` to
determine if a device is a bluestore OSD could report a false negative
if there is a system error when `ceph-bluestore-tool` opens the device.

A better check is to open the device and read the bluestore device
label (the first 22 bytes of the device) to look for the bluestore
device signature ("bluestore block device"). If ceph-volume fails to
open the device due to a system error, it is safest to assume the device
is BlueStore so that an existing OSD isn't overwritten.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
(cherry picked from commit 651b28f2e3cb39dbe9c7038cd677a01523f08821)

3 years agoMerge pull request #41115 from k0ste/wip-48649-octopus
Guillaume Abrioux [Thu, 12 Aug 2021 11:10:35 +0000 (13:10 +0200)]
Merge pull request #41115 from k0ste/wip-48649-octopus

octopus: ceph-volume: disable cache for blkid calls

3 years agoqa/tests: advanced version to 15.2.14 to match the latest release 42761/head
Yuri Weinstein [Wed, 11 Aug 2021 17:05:58 +0000 (10:05 -0700)]
qa/tests: advanced version to 15.2.14 to match the latest release

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
3 years agoMerge pull request #42547 from dsavineau/wip-51959-octopus
Dimitri Savineau [Wed, 11 Aug 2021 15:45:14 +0000 (11:45 -0400)]
Merge pull request #42547 from dsavineau/wip-51959-octopus

octopus: ceph-volume/tests: retry when destroying osd

3 years agoMerge pull request #41715 from k0ste/wip-51106-octopus
Guillaume Abrioux [Wed, 11 Aug 2021 15:15:06 +0000 (17:15 +0200)]
Merge pull request #41715 from k0ste/wip-51106-octopus

octopus: ceph-volume: fix batch report and respect ceph.conf config values

3 years agoMerge pull request #42494 from dsavineau/wip-51853-octopus
Guillaume Abrioux [Wed, 11 Aug 2021 14:33:06 +0000 (16:33 +0200)]
Merge pull request #42494 from dsavineau/wip-51853-octopus

octopus: ceph-volume: lvm batch: fast_allocations(): avoid ZeroDivisionError

3 years agomgr/cephadm: pass --container-init to `cephadm deploy` if specified 42666/head
Tim Serong [Thu, 5 Aug 2021 08:48:57 +0000 (18:48 +1000)]
mgr/cephadm: pass --container-init to `cephadm deploy` if specified

This (sort of) reverts a small part of 442904bf2da, in order to
work correctly with 82d30afc413.  The problem is that the latter
commit sets CONTAINER_INIT=False, which means we need to explicitly
pass --container-init to cephadm if we want that behaviour turned on.
There's a kink though: --container-init is only valid with cephadm's
"adopt", "bootstrap" and "deploy" commands; it's not a global option.
The cephadm mgr module doesn't invoke "adopt" or "bootstrap", only
"deploy", so we're only setting it in that specific case.

Fixes: https://tracker.ceph.com/issues/52064
Signed-off-by: Tim Serong <tserong@suse.com>
3 years agocmake: Replace boost download url 42694/head
Rafał Wądołowski [Fri, 7 May 2021 08:12:43 +0000 (10:12 +0200)]
cmake: Replace boost download url

Boost has moved downloads to JFrog Artifactory
https://www.boost.org/users/news/boost_has_moved_downloads_to_jfr.html

Signed-off-by: Rafał Wądołowski <rwadolowski@cloudferro.com>
(cherry picked from commit c2c6678e488f41277022eaf7a929f7ef845abd5f)

Conflicts:
make-dist: trivial resolution

3 years ago15.2.14 v15.2.14
Jenkins Build Slave User [Thu, 5 Aug 2021 17:11:54 +0000 (17:11 +0000)]
15.2.14

3 years agomonitoring: fix Physical Device Latency unit 42676/head
Seena Fallah [Wed, 7 Jul 2021 12:30:30 +0000 (17:00 +0430)]
monitoring: fix Physical Device Latency unit

Based on the expr it should be seconds

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit feb8f784d23d6fece93a08a156e38b8bf07dde63)

3 years agomonitoring/grafana/cluster: use per-unit max and limit values 42675/head
David Caro [Wed, 16 Jun 2021 08:32:15 +0000 (10:32 +0200)]
monitoring/grafana/cluster: use per-unit max and limit values

The value we get is a perunit, so the limits and the max value should
be over 1, not 100. Note that the value being shown was correct, it
was the gauge that was not showing the correct indicators.

Signed-off-by: David Caro <david@dcaro.es>
(cherry picked from commit c98129803935e720bb068fcf3700812c550f61b4)

3 years agomgr/prometheus: Fix metric types from gauge to counter 42674/head
Patrick Seidensal [Tue, 27 Jul 2021 13:18:46 +0000 (15:18 +0200)]
mgr/prometheus: Fix metric types from gauge to counter

Affected metrics:
- ceph_pool_rd
- ceph_pool_rd_bytes
- ceph_pool_rw
- ceph_pool_rw_bytes

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