]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agocephadm: verify config file exists when inferring it
Adam King [Tue, 15 Mar 2022 20:41:15 +0000 (16:41 -0400)]
cephadm: verify config file exists when inferring it

Fixes: https://tracker.ceph.com/issues/54571
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 1568875a281d56b413e75b244c9c75311cf353a0)

3 years agomgr/cephadm: adding HostSpec validation
Redouane Kachach [Mon, 7 Mar 2022 13:03:07 +0000 (14:03 +0100)]
mgr/cephadm: adding HostSpec validation
Fixes: https://tracker.ceph.com/issues/54342
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 15ba147a2a4cae8ca69437382136d328a1f416f2)

3 years agodoc/cephadm/adoption.rst: fix typos
wangyunqing [Wed, 9 Mar 2022 08:55:13 +0000 (16:55 +0800)]
doc/cephadm/adoption.rst: fix typos

Signed-off-by: wangyunqing <wangyunqing@inspur.com>
(cherry picked from commit e4db28f6b294909e0f177e82dbda8cfcc8129846)

3 years agocephadm: still set container_image when --no-assimilate-config is provided
Adam King [Mon, 21 Feb 2022 21:34:47 +0000 (16:34 -0500)]
cephadm: still set container_image when --no-assimilate-config is provided

Fixes: https://tracker.ceph.com/issues/54141
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 59d004cb901eb6d84fb6907cb88314fd31b87904)

3 years agoqa/tasks/cephadm_cases: increase timeouts in test_cli.py
Adam King [Thu, 10 Feb 2022 01:42:42 +0000 (20:42 -0500)]
qa/tasks/cephadm_cases: increase timeouts in test_cli.py

These seem to be failing sometimes but in my testing
sometimes these events are happening a few seconds after
we hit the timeout. Trying to see if this makes the tests
more consistent. No need to mark the test as failed
if we report something up in 34 seconds vs 25 especially
when cephadm works on a cyclic daemon refresh.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 46f939f057bd05a885eaf750663310375f9dd929)

Conflicts:
qa/tasks/cephadm_cases/test_cli.py

3 years agoMerge pull request #45654 from ljflores/wip-pacific-fast-shutdown-backports
Yuri Weinstein [Mon, 4 Apr 2022 21:50:43 +0000 (14:50 -0700)]
Merge pull request #45654 from ljflores/wip-pacific-fast-shutdown-backports

Pacific fast shutdown backports

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
3 years agoMerge pull request #45586 from idryomov/wip-pool-reverse-lookup-osdmap-pacific
Yuri Weinstein [Mon, 4 Apr 2022 21:47:26 +0000 (14:47 -0700)]
Merge pull request #45586 from idryomov/wip-pool-reverse-lookup-osdmap-pacific

pacific: librados: check latest osdmap on ENOENT in pool_reverse_lookup()

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45753 from ceph/wip-pacific-debug
David Galloway [Mon, 4 Apr 2022 21:33:06 +0000 (17:33 -0400)]
Merge pull request #45753 from ceph/wip-pacific-debug

build: Add some debugging messages

3 years agoMerge pull request #45638 from idryomov/wip-diff-iterate-striping-fix-pacific
Yuri Weinstein [Mon, 4 Apr 2022 15:59:41 +0000 (08:59 -0700)]
Merge pull request #45638 from idryomov/wip-diff-iterate-striping-fix-pacific

pacific: librbd: make diff-iterate in fast-diff mode sort and merge reported extents

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agobuild: Add some debugging messages 45753/head
David Galloway [Fri, 25 Mar 2022 21:29:44 +0000 (17:29 -0400)]
build: Add some debugging messages

Having a unique string like "CI_DEBUG" will help me know where we are in the build process in Jenkins logs.

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit 57edb76ea46893294a70aa080916bc723fb35f9e)

3 years agoMerge pull request #45620 from s0nea/wip-55036-pacific
Yuri Weinstein [Tue, 29 Mar 2022 20:20:56 +0000 (13:20 -0700)]
Merge pull request #45620 from s0nea/wip-55036-pacific

pacific: mgr/cephadm: try to get FQDN for configuration files

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Adam King adking@redhat.com
3 years agoMerge pull request #45374 from ronen-fr/wip-rf-42684-pacific
Yuri Weinstein [Mon, 28 Mar 2022 21:54:43 +0000 (14:54 -0700)]
Merge pull request #45374 from ronen-fr/wip-rf-42684-pacific

pacific: osd/scrub: tag replica scrub messages to identify stale events

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45355 from mgfritch/backport-45347-pacific
Yuri Weinstein [Mon, 28 Mar 2022 21:53:37 +0000 (14:53 -0700)]
Merge pull request #45355 from mgfritch/backport-45347-pacific

pacific: cephadm: preserve `authorized_keys` file during upgrade

Reviewed-by: Adam King adking@redhat.com
3 years agoMerge pull request #45591 from vumrao/wip-vumrao-55020
Yuri Weinstein [Mon, 28 Mar 2022 15:51:51 +0000 (08:51 -0700)]
Merge pull request #45591 from vumrao/wip-vumrao-55020

pacific: osd/PrimaryLogPG.cc: CEPH_OSD_OP_OMAPRMKEYRANGE should mark omap dirty

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
3 years agoMerge pull request #45203 from rhcs-dashboard/wip-54113-pacific
Yuri Weinstein [Mon, 28 Mar 2022 15:51:01 +0000 (08:51 -0700)]
Merge pull request #45203 from rhcs-dashboard/wip-54113-pacific

pacific: mgr/dashboard: perform daemon actions

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
3 years agoMerge pull request #45173 from kamoltat/wip-ksirivad-backport-pacific-44054
Yuri Weinstein [Mon, 28 Mar 2022 15:47:56 +0000 (08:47 -0700)]
Merge pull request #45173 from kamoltat/wip-ksirivad-backport-pacific-44054

pacific: osd: add pg_num_max value & pg_num_max reordering

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45588 from ljflores/wip-pacific-perfcounter-fix
Laura Flores [Mon, 28 Mar 2022 15:39:57 +0000 (10:39 -0500)]
Merge pull request #45588 from ljflores/wip-pacific-perfcounter-fix

pacific: common: fix missing name in PriorityCache perf counters

3 years agoMerge pull request #45561 from idryomov/wip-readv-writev-overflow-pacific
Yuri Weinstein [Mon, 28 Mar 2022 14:23:30 +0000 (07:23 -0700)]
Merge pull request #45561 from idryomov/wip-readv-writev-overflow-pacific

pacific: librbd: readv/writev fix iovecs length computation overflow

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
3 years agoMerge pull request #45474 from nmshelke/wip-54573-pacific
Yuri Weinstein [Mon, 28 Mar 2022 14:19:58 +0000 (07:19 -0700)]
Merge pull request #45474 from nmshelke/wip-54573-pacific

pacific: mgr/volumes: the 'mode' should honor idempotent subvolume creation

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #45464 from cfsnyder/wip-53471-pacific
Yuri Weinstein [Mon, 28 Mar 2022 14:19:13 +0000 (07:19 -0700)]
Merge pull request #45464 from cfsnyder/wip-53471-pacific

pacific: common: avoid pthread_mutex_unlock twice

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45436 from cfsnyder/wip-51783-pacific
Yuri Weinstein [Mon, 28 Mar 2022 14:17:47 +0000 (07:17 -0700)]
Merge pull request #45436 from cfsnyder/wip-51783-pacific

pacific: qa/rgw: add failing tempest test to blocklist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45163 from dvanders/wip-52635-pacific
Yuri Weinstein [Mon, 28 Mar 2022 14:16:18 +0000 (07:16 -0700)]
Merge pull request #45163 from dvanders/wip-52635-pacific

pacific: mds: ensure that we send the btime in cap messages

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #45565 from ajarr/wip-52875-pacific
Yuri Weinstein [Mon, 28 Mar 2022 14:15:32 +0000 (07:15 -0700)]
Merge pull request #45565 from ajarr/wip-52875-pacific

pacific: qa: fsync dir for asynchronous creat on stray tests

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #45564 from ajarr/wip-52427-pacific
Yuri Weinstein [Mon, 28 Mar 2022 14:13:50 +0000 (07:13 -0700)]
Merge pull request #45564 from ajarr/wip-52427-pacific

pacific: qa: ignore expected metadata cluster log error

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #44771 from pdvian/wip-53944-pacific
Yuri Weinstein [Fri, 25 Mar 2022 19:01:00 +0000 (12:01 -0700)]
Merge pull request #44771 from pdvian/wip-53944-pacific

pacific: osd/OSD: Log aggregated slow ops detail to cluster logs

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #44664 from gregsfortytwo/wip-53933-pacific
Yuri Weinstein [Fri, 25 Mar 2022 18:59:57 +0000 (11:59 -0700)]
Merge pull request #44664 from gregsfortytwo/wip-53933-pacific

pacific: osd: PeeringState: fix selection order in calc_replicated_acting_stretch

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45491 from cfsnyder/wip-54077-pacific
David Galloway [Fri, 25 Mar 2022 18:48:44 +0000 (14:48 -0400)]
Merge pull request #45491 from cfsnyder/wip-54077-pacific

pacific: rgw: bucket chown bad memory usage

3 years agoMerge pull request #45557 from vshankar/wip-53911
David Galloway [Fri, 25 Mar 2022 18:45:54 +0000 (14:45 -0400)]
Merge pull request #45557 from vshankar/wip-53911

pacific: Revert "mds: kill session when mds do ms_handle_remote_reset"

3 years agoqa/standalone: Fix test_activate_osd() test in ceph-helpers.sh 45654/head
Sridhar Seshasayee [Fri, 25 Mar 2022 16:40:31 +0000 (22:10 +0530)]
qa/standalone: Fix test_activate_osd() test in ceph-helpers.sh

Modify test_activate_osd() to get the type of scheduler in use and then
verify the value of osd_max_backfills. This is because mclock scheduler
overrides this option to 1000 upon OSD initialization.

The test earlier used to pass because the OSD daemon was killed but not
marked down and upon being brought up, the wait for OSD up check was
passing quickly. But the OSD still didn't have the latest config values.

But now upon killing the OSD, the osd_fast_shutdown sequence notifies the
mon (see PR: https://github.com/ceph/ceph/pull/44807) and is marked down
and dead. Upon bringing it up, the wait for OSD up check takes a longer
time and this is sufficient for the config values to be updated. This
results in the correct values being read from the config 'Values' map.

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit 3aa2df2e0f6f5bafadc96fd72935e5cf8b2fcf17)

3 years agoosd/OSD: osd_fast_shutdown_notify_mon not quite right
Nitzan Mordechai [Thu, 27 Jan 2022 13:13:28 +0000 (15:13 +0200)]
osd/OSD: osd_fast_shutdown_notify_mon not quite right

When osd_fast_shutdown and osd_fast_shutdown_notify_mon set as true, OSD marked as Down
it should be marked as Dead,

Fixed: https://tracker.ceph.com/issues/53327

Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
nd

nd

(cherry picked from commit 07302d5e41c49c885c9398c1c478638023e3f264)

3 years agoosd: make osd_fast_shutdown_notify_mon option true by default
Satoru Takeuchi [Thu, 18 Nov 2021 20:48:18 +0000 (20:48 +0000)]
osd: make osd_fast_shutdown_notify_mon option true by default

osd_fast_shutdown_notify_mon option is false by default. So users suffer
from error log flood, slow ops, and the long I/O timeouts on voluntary OS
shutdown before they are aware of the existence of this option. Let's
make this option true by default.

Fixes: https://tracker.ceph.com/issues/53328
Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
(cherry picked from commit 729a5b85a6586b47d16acbba2cf8e765e498cd65)

 Conflicts:
src/common/options/global.yaml.in
- global.yaml.in does not exist in Pacific; rather,
  these configs were handled in options.cc.

3 years agoMerge pull request #45489 from cfsnyder/wip-54041-pacific
David Galloway [Fri, 25 Mar 2022 16:50:15 +0000 (12:50 -0400)]
Merge pull request #45489 from cfsnyder/wip-54041-pacific

pacific: rgw: remove bucket API returns NoSuchKey than NoSuchBucket

3 years agoMerge pull request #45543 from ajarr/rraja-pacific-backport-pr-44795
David Galloway [Fri, 25 Mar 2022 16:49:33 +0000 (12:49 -0400)]
Merge pull request #45543 from ajarr/rraja-pacific-backport-pr-44795

pacific: mgr/nfs: allow dynamic update of cephfs nfs export

3 years agoMerge pull request #45502 from cfsnyder/wip-54148-pacific
David Galloway [Fri, 25 Mar 2022 16:48:12 +0000 (12:48 -0400)]
Merge pull request #45502 from cfsnyder/wip-54148-pacific

pacific: rgw: RGWPostObj::execute() may lost data.

3 years agoMerge pull request #45500 from cfsnyder/wip-54147-pacific
David Galloway [Fri, 25 Mar 2022 16:47:35 +0000 (12:47 -0400)]
Merge pull request #45500 from cfsnyder/wip-54147-pacific

pacific: rgw/admin: fix radosgw-admin datalog list max-entries issue

3 years agoMerge pull request #45497 from cfsnyder/wip-54092-pacific
David Galloway [Fri, 25 Mar 2022 16:46:16 +0000 (12:46 -0400)]
Merge pull request #45497 from cfsnyder/wip-54092-pacific

pacific: rgwlc:  warn on missing RGW_ATTR_LC

3 years agoMerge pull request #45495 from cfsnyder/wip-54083-pacific
David Galloway [Fri, 25 Mar 2022 16:45:58 +0000 (12:45 -0400)]
Merge pull request #45495 from cfsnyder/wip-54083-pacific

pacific: librgw: make rgw file handle versioned

3 years agoMerge pull request #45487 from mchangir/wip-54532-pacific
David Galloway [Fri, 25 Mar 2022 16:44:12 +0000 (12:44 -0400)]
Merge pull request #45487 from mchangir/wip-54532-pacific

pacific: mds,client: add new getvxattr op

3 years agoMerge pull request #45555 from idryomov/wip-rbd-du-validate-pacific
Yuri Weinstein [Fri, 25 Mar 2022 14:48:41 +0000 (07:48 -0700)]
Merge pull request #45555 from idryomov/wip-rbd-du-validate-pacific

pacific: test/librbd: add test to verify diff_iterate size

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #44551 from lxbsz/wip-53759
Yuri Weinstein [Fri, 25 Mar 2022 14:40:14 +0000 (07:40 -0700)]
Merge pull request #44551 from lxbsz/wip-53759

pacific: mds: reset heartbeat in each MDSContext complete()

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agolibrbd: make diff-iterate in fast-diff mode sort and merge reported extents 45638/head
Ilya Dryomov [Sun, 20 Mar 2022 11:10:52 +0000 (12:10 +0100)]
librbd: make diff-iterate in fast-diff mode sort and merge reported extents

Various users, the most notable example being the QEMU driver, assume
that extents are reported in image offset order.

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

3 years agoMerge pull request #45509 from cfsnyder/wip-54152-pacific
Yuri Weinstein [Thu, 24 Mar 2022 23:30:07 +0000 (16:30 -0700)]
Merge pull request #45509 from cfsnyder/wip-54152-pacific

pacific: rgw: in bucket reshard list, clarify new num shards is tentative

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45508 from phlogistonjohn/jjm-backport-pacific-pr-44845-44870...
Adam King [Thu, 24 Mar 2022 20:51:35 +0000 (16:51 -0400)]
Merge pull request #45508 from phlogistonjohn/jjm-backport-pacific-pr-44845-44870-45211

pacific: mgr/nfs: support managing exports without orchestration enabled

Reviewed-by: Ramana Raja <rraja@redhat.com>
3 years agoMerge pull request #45569 from mgfritch/backport-45420-pacific
Adam King [Thu, 24 Mar 2022 20:50:09 +0000 (16:50 -0400)]
Merge pull request #45569 from mgfritch/backport-45420-pacific

pacific: cephadm: infer the default container image during pull

Reviewed-by: Adam King <adking@redhat.com>
3 years agoMerge pull request #45582 from idryomov/wip-rbd-nbd-cookie-pacific
Yuri Weinstein [Thu, 24 Mar 2022 20:26:08 +0000 (13:26 -0700)]
Merge pull request #45582 from idryomov/wip-rbd-nbd-cookie-pacific

pacific: backport nbd cookie support

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #45580 from idryomov/wip-fix-pids-limit-pacific
Yuri Weinstein [Thu, 24 Mar 2022 20:25:25 +0000 (13:25 -0700)]
Merge pull request #45580 from idryomov/wip-fix-pids-limit-pacific

pacific: cephadm: Remove containers pids-limit

Reviewed-by: Adam King adking@redhat.com
3 years agoMerge pull request #45477 from cfsnyder/wip-53637-pacific
Yuri Weinstein [Thu, 24 Mar 2022 20:21:45 +0000 (13:21 -0700)]
Merge pull request #45477 from cfsnyder/wip-53637-pacific

pacific: test/rgw: disable cls_rgw_gc test cases with defer_gc()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45476 from cfsnyder/wip-53518-pacific
Yuri Weinstein [Thu, 24 Mar 2022 20:21:04 +0000 (13:21 -0700)]
Merge pull request #45476 from cfsnyder/wip-53518-pacific

pacific: rgw: add object null point judging when listing pubsub  topics

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45484 from cfsnyder/wip-53835-pacific
Yuri Weinstein [Thu, 24 Mar 2022 14:55:41 +0000 (07:55 -0700)]
Merge pull request #45484 from cfsnyder/wip-53835-pacific

pacific: rgw: document S3 bucket replication support

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45483 from cfsnyder/wip-53818-pacific
Yuri Weinstein [Thu, 24 Mar 2022 14:55:05 +0000 (07:55 -0700)]
Merge pull request #45483 from cfsnyder/wip-53818-pacific

pacific: rgw: RadosBucket::get_bucket_info() updates RGWBucketEnt

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45480 from cfsnyder/wip-53654-pacific
Yuri Weinstein [Thu, 24 Mar 2022 14:54:28 +0000 (07:54 -0700)]
Merge pull request #45480 from cfsnyder/wip-53654-pacific

pacific: rgw: init bucket index only if putting bucket instance info succeeds

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45478 from cfsnyder/wip-53639-pacific
Yuri Weinstein [Thu, 24 Mar 2022 14:52:23 +0000 (07:52 -0700)]
Merge pull request #45478 from cfsnyder/wip-53639-pacific

pacific: rgw/amqp: add default case to silence compiler warning

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45463 from cfsnyder/wip-53254-pacific
Yuri Weinstein [Thu, 24 Mar 2022 14:38:43 +0000 (07:38 -0700)]
Merge pull request #45463 from cfsnyder/wip-53254-pacific

pacific: rgw: fix rgw.none statistics

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agomgr/cephadm: try to get FQDN for inventory address 45620/head
Tatjana Dehler [Wed, 9 Mar 2022 15:23:49 +0000 (16:23 +0100)]
mgr/cephadm: try to get FQDN for inventory address

Fixes: https://tracker.ceph.com/issues/54502
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 4f14993b1667fff309cd9cd6f9dad638a5a7e502)

Conflicts:
src/pybind/mgr/cephadm/services/monitoring.py
Fixed conflict because ceph#44751 has not been backported to
pacific (yet).

3 years agomgr/cephadm: unify way to get the host address
Tatjana Dehler [Wed, 9 Mar 2022 15:10:49 +0000 (16:10 +0100)]
mgr/cephadm: unify way to get the host address

There are two different ways to get the host address. From the
inventory of the mgr object directly or via the `_inventory_get_addr`
method of `CephadmService`. Update the code in order to use the
`_inventory_get_addr` method only.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 30385068eed7a4f93179e8d2748dd6e01bba6ffd)

3 years agoMerge pull request #45596 from neha-ojha/wip-45512-pacific
Ilya Dryomov [Wed, 23 Mar 2022 20:52:49 +0000 (21:52 +0100)]
Merge pull request #45596 from neha-ojha/wip-45512-pacific

pacific: ceph/admin: s/master/main

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
3 years agoMerge pull request #45532 from idryomov/wip-fix-schedule-status-pacific
Yuri Weinstein [Wed, 23 Mar 2022 20:28:57 +0000 (13:28 -0700)]
Merge pull request #45532 from idryomov/wip-fix-schedule-status-pacific

pacific: mgr/rbd_support: cast pool_id from int to str when collecting LevelSpec

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agorgw: fix rgw.none statistics 45463/head
J. Eric Ivancich [Wed, 8 Sep 2021 18:58:02 +0000 (14:58 -0400)]
rgw: fix rgw.none statistics

Only unaccount for objects being removed if they exist.

Also, clean up some formatting.

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

3 years agoceph/admin: s/master/main 45596/head
Zac Dover [Thu, 17 Mar 2022 23:05:45 +0000 (09:05 +1000)]
ceph/admin: s/master/main

This PR changes the name "master" to "main" so
that builds (and, I assume, a great many other
things) will not fail.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 6a1dd3a8a2f3dc9fe8615d402c9041273516ff89)

3 years agoosd/PrimaryLogPG.cc: CEPH_OSD_OP_OMAPRMKEYRANGE should mark omap dirty 45591/head
Neha Ojha [Wed, 16 Mar 2022 18:37:19 +0000 (18:37 +0000)]
osd/PrimaryLogPG.cc: CEPH_OSD_OP_OMAPRMKEYRANGE should mark omap dirty

We should mark_omap_dirty() for all omap write ops, just like we did
in cb927925af1f3df4b9c31df85cf31f982aae1988.

Currently, for CEPH_OSD_OP_OMAPRMKEYRANGE ops, clean_omap gets set to true,
which results in incomplete recovery of objects and results in
inconsistent PGs after a scrub.

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

3 years agocommon: fix missing name in PriorityCache perf counters 45588/head
Laura Flores [Mon, 12 Jul 2021 18:47:53 +0000 (18:47 +0000)]
common: fix missing name in PriorityCache perf counters

There was a problem with PriorityCache perf counters, where part of the name was missing (i.e. "mon.a.cache_bytes" instead of "mon.a.prioritycache.cache_bytes"). The problem was happening because a 'this' pointer was missing in the original implementation.

Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit 9e07175b3c9a5c69b8694bc05e0baa26a351582d)

3 years agolibrados: check latest osdmap on ENOENT in pool_reverse_lookup() 45586/head
Ilya Dryomov [Wed, 16 Mar 2022 19:05:56 +0000 (20:05 +0100)]
librados: check latest osdmap on ENOENT in pool_reverse_lookup()

Avoid spurious ENOENT errors from rados_pool_reverse_lookup() and
Rados::pool_reverse_lookup().

This makes lookup by id consistent with lookup by name: the latter
has been checking latest osdmap since commit 7e5669b11b14 ("rados: we
need to get the latest osdmap when pool does not exists").

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

3 years agomon, pybind/mgr: Add additional debug level logs for pool options 45173/head
Kamoltat [Wed, 2 Mar 2022 16:52:57 +0000 (16:52 +0000)]
mon, pybind/mgr: Add additional debug level logs for pool options

We find that these logs helped with
the debugging process issues like:
https://tracker.ceph.com/issues/54263.

Added debug level logs to `do_set_pool()` in
src/mon/OSDMonitor.cc.

Added debug level logs to `_maybe_adjust()` in
src/pybind/mgr/pg_autoscaler/module.py.

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit ee40c2d2431825f36a01108115b3913112e2ef54)

3 years agoupgrade/pacific-x/parallel: Added mds.a and mds.b
Kamoltat [Mon, 28 Feb 2022 21:40:43 +0000 (21:40 +0000)]
upgrade/pacific-x/parallel: Added mds.a and mds.b

Added mds daemons so that it can create
cephFS pools and set options using
`do_set_pool()` in FSCommand.cc. Such that
we can cover corner cases like that in

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

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 1bc51f057fa80b3e34d8bac06ea22ea168fb8cf8)

Conflicts:
qa/suites/upgrade/pacific-x/parallel/0-start.yaml
- File doesn't exist in pacific,
- pacific-p2p-parallel/point-to-point-upgrade.yaml
- is already running mds, so we can delete
- pacific-x/parallel/0-start.yaml.

3 years agoosd/osd_types: reorder pg_num_max
Kamoltat [Mon, 28 Feb 2022 21:38:34 +0000 (21:38 +0000)]
osd/osd_types: reorder pg_num_max

moved `pg_num_max` to be at the end of the
list in src/osd/osd_types.cc and
src/osd/osd_types.h.

Added comments to `opt_mapping` and `pool_opts_t`
about the importance of the order of options
in the list and class.

Fixes: https://tracker.ceph.com/issues/54263
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit e44c469f59eaef18ecd3c3b348981939043eae02)

3 years agodoc/rados/operations: document pg_num_max
Sage Weil [Wed, 15 Dec 2021 15:09:37 +0000 (10:09 -0500)]
doc/rados/operations: document pg_num_max

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

3 years agomgr: set max of 32 pgs for .mgr pool
Sage Weil [Mon, 22 Nov 2021 21:42:57 +0000 (16:42 -0500)]
mgr: set max of 32 pgs for .mgr pool

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

Conflicts:
src/pybind/mgr/mgr_module.py
- made changes in ../src/pybind/mgr/devicehealth/module.py
  instead since there is no .mgr pool but instead devicehealth

3 years agoqa/workunits/rbd: test map/attach with --show-cookie/--cookie options 45582/head
Prasanna Kumar Kalever [Mon, 17 May 2021 08:47:53 +0000 (14:17 +0530)]
qa/workunits/rbd: test map/attach with --show-cookie/--cookie options

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 2adfe55bcce08f8f46989e9ddbf46aa74e681992)

3 years agorbd-nbd: allow user to specify cookie at map
Prasanna Kumar Kalever [Wed, 11 Aug 2021 10:02:25 +0000 (15:32 +0530)]
rbd-nbd: allow user to specify cookie at map

Allow user to specify cookie of choice at the time of map

$ rbd device attach rbd-pool/image --device /dev/nbd0 \
--cookie 6f85d970-10b2-456b-8baf-676aa4d782e4 --options try-netlink

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 16404dede832f3908d48fc36c7714891bfcfde20)

3 years agorbd: add --show-cookie/--cookie option for map/attach commands
Prasanna Kumar Kalever [Fri, 18 Jun 2021 06:48:35 +0000 (12:18 +0530)]
rbd: add --show-cookie/--cookie option for map/attach commands

Example:
$ rbd device map rbd-pool/image --show-cookie --try-netlink --device-type nbd

$ rbd device attach rbd-pool/image --device /dev/nbd0 \
      --cookie 6f85d970-10b2-456b-8baf-676aa4d782e4 --device-type nbd

older Kernel versions can use --force to skip the cookie validation

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 6df06c7a62bdd6e9ce61b26c738dcd1509e68273)

Conflicts:
src/tools/rbd/action/Device.cc [ commit e1b4811bc324 ("rbd: add
  missing switch arguments for recognition by get_command_spec()")
  already in pacific -- re-add show-cookie ]

3 years agorbd-nbd: allow attach without --cookie for old kernel versions
Prasanna Kumar Kalever [Thu, 17 Jun 2021 13:35:20 +0000 (19:05 +0530)]
rbd-nbd: allow attach without --cookie for old kernel versions

For backward compatibility allow attach without --cookie option:

[root@linux-vm1]# rbd-nbd attach rbd-pool/image0 --device /dev/nbd0
/dev/nbd0

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 833e71282ad82023237c5eb407b9fa4630280c15)

3 years agorbd-nbd: show per device cookie with list command
Prasanna Kumar Kalever [Thu, 13 May 2021 07:09:25 +0000 (12:39 +0530)]
rbd-nbd: show per device cookie with list command

[root@linux-vm1]# rbd-nbd list-mapped
id    pool      namespace  image   snap  device     cookie
8133  rbd-pool             image0  -     /dev/nbd0  c704cb91-c6cf-466e-a335-0e935c0d5e47

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit efeb255d107075516c95f719f9a2ec9375d5bb2f)

3 years agorbd-nbd: mandate device cookie for attach command
Prasanna Kumar Kalever [Thu, 13 May 2021 08:22:25 +0000 (13:52 +0530)]
rbd-nbd: mandate device cookie for attach command

[root@linux-vm1]# rbd-nbd attach rbd-pool/image0 --device /dev/nbd0 \
                          --cookie c704cb91-c6cf-466e-a335-0e935c0d5e47
/dev/nbd0

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 6ca70ee4f078aba86a6edd013bd8d95f690a46a1)

3 years agorbd-nbd: provide a flag to show device cookie with map command
Prasanna Kumar Kalever [Wed, 12 May 2021 13:03:54 +0000 (18:33 +0530)]
rbd-nbd: provide a flag to show device cookie with map command

[root@linux-vm1]# rbd-nbd map rbd-pool/image0 --try-netlink --show-cookie
/dev/nbd0 c704cb91-c6cf-466e-a335-0e935c0d5e47

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 59c08eabf12fdcf155b54dc422fb0f67d6ad747e)

3 years agorbd-nbd: generate and send device cookie with netlink connect request
Prasanna Kumar Kalever [Wed, 12 May 2021 13:00:46 +0000 (18:30 +0530)]
rbd-nbd: generate and send device cookie with netlink connect request

[root@linux-vm1]# rbd-nbd map rbd-pool/image0 --try-netlink
/dev/nbd0

[root@linux-vm1]# cat /sys/block/nbd0/backend
c704cb91-c6cf-466e-a335-0e935c0d5e47

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit eee8d8a32e3f39440ac417b2e9ea46d93d4a1d73)

3 years agoqa/workunits/rbd: use rbd cli for device attach/detach commands
Prasanna Kumar Kalever [Tue, 25 May 2021 12:24:29 +0000 (17:54 +0530)]
qa/workunits/rbd: use rbd cli for device attach/detach commands

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit e2aa4128f1e451a85200441f70a13336e843dad6)

3 years agorbd: improve conditional compilation specific checks
Prasanna Kumar Kalever [Mon, 17 May 2021 09:40:45 +0000 (15:10 +0530)]
rbd: improve conditional compilation specific checks

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 4d7db9e86a246bf77e8545d0d4e220d90f48ac29)

3 years agorbd: promote rbd-nbd attach and detach at rbd integrated cli
Prasanna Kumar Kalever [Thu, 6 May 2021 07:27:56 +0000 (12:57 +0530)]
rbd: promote rbd-nbd attach and detach at rbd integrated cli

Example:
$ rbd device attach rbd-pool/image --device /dev/nbd0 --device-type nbd --force
$ rbd device detach rpool/image --device-type nbd

for now returning EOPNOTSUPP with krbd, ggate and wnbd

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 35e5352f719857bed99caa4c76ae19bb68918c8e)

Conflicts:
src/tools/rbd/action/Device.cc [ commit e1b4811bc324 ("rbd: add
  missing switch arguments for recognition by get_command_spec()")
  already in pacific ]
src/tools/rbd/action/Wnbd.cc [ ditto ]

3 years agoqa/suites/orch/cephadm: restrict test_iscsi_pids_limit to CentOS 45580/head
Ilya Dryomov [Tue, 22 Mar 2022 10:36:18 +0000 (11:36 +0100)]
qa/suites/orch/cephadm: restrict test_iscsi_pids_limit to CentOS

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

[ commit 1f714da81440 ("qa: fix or add missing .qa links") not in
  pacific -- added qa/suites/orch/cephadm/workunits/task/.qa ]

3 years agocephadm: remove containers pids-limit
Teoman ONAY [Thu, 11 Nov 2021 15:05:49 +0000 (15:05 +0000)]
cephadm: remove containers pids-limit

The default pids-limit (docker 4096/podman 2048) prevent some
customization from working (http threads on RGW) or limits the number
of luns per iscsi target.

Fixes: https://tracker.ceph.com/issues/52898
Signed-off-by: Teoman ONAY <tonay@redhat.com>
(cherry picked from commit de8b3c2676e65eb61df54c65cfd3b3af1e68da56)

3 years agomgr/dashboard: expect pg_num_max property for pools
Sage Weil [Mon, 22 Nov 2021 21:42:46 +0000 (16:42 -0500)]
mgr/dashboard: expect pg_num_max property for pools

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

3 years agomon/OSDMonitor: add option --pg-num_max arg for create pool
Sage Weil [Mon, 22 Nov 2021 21:42:25 +0000 (16:42 -0500)]
mon/OSDMonitor: add option --pg-num_max arg for create pool

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

Conflicts:
src/mon/OSDMonitor.cc
- change from quincy to pacific osd_release
- use cmd_getval instead of cmd_getval_or.

Signed-off-by: Kamoltat <ksirivad@redhat.com>
3 years agoMerge pull request #45426 from cfsnyder/wip-51348-pacific
Yuri Weinstein [Wed, 23 Mar 2022 01:05:10 +0000 (18:05 -0700)]
Merge pull request #45426 from cfsnyder/wip-51348-pacific

pacific: rgw/notification: send correct size in COPY events

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45236 from k0ste/wip-54451-pacific
Yuri Weinstein [Wed, 23 Mar 2022 01:03:42 +0000 (18:03 -0700)]
Merge pull request #45236 from k0ste/wip-54451-pacific

pacific: mgr/prometheus: Added `avail_raw` field for Pools DF Prometheus mgr module

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45397 from kamoltat/wip-ksirivad-pacific-backport-45078
Yuri Weinstein [Tue, 22 Mar 2022 23:43:54 +0000 (16:43 -0700)]
Merge pull request #45397 from kamoltat/wip-ksirivad-pacific-backport-45078

pacific: mon/MonCommands.h: fix target_size_ratio range

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45376 from ronen-fr/wip-rf-43303-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:43:36 +0000 (16:43 -0700)]
Merge pull request #45376 from ronen-fr/wip-rf-43303-pacific

pacific: osd: fix the truncation of an int by int division

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45373 from smithfarm/wip-54276-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:43:04 +0000 (16:43 -0700)]
Merge pull request #45373 from smithfarm/wip-54276-pacific

pacific: common: fix FTBFS due to dout & need_dynamic on GCC-12

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
3 years agoMerge pull request #45323 from ljflores/wip-54466-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:41:57 +0000 (16:41 -0700)]
Merge pull request #45323 from ljflores/wip-54466-pacific

pacific: osd: require osd_pg_max_concurrent_snap_trims > 0

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Dan van der Ster <daniel.vanderster@cern.ch>
3 years agoMerge pull request #45319 from ljflores/wip-52078-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:40:56 +0000 (16:40 -0700)]
Merge pull request #45319 from ljflores/wip-52078-pacific

pacific: test: fix wrong alarm (HitSetWrite)

Reviewed-by: Myoungwon Oh <omwmw@sk.com>
3 years agoMerge pull request #45152 from chrisphoffman/wip-53644-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:38:12 +0000 (16:38 -0700)]
Merge pull request #45152 from chrisphoffman/wip-53644-pacific

pacific: mon: Omit MANY_OBJECTS_PER_PG warning when autoscaler is on

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kamoltat (Junior) Sirivadhna <ksirivad@redhat.com>
3 years agoMerge pull request #43698 from cfsnyder/wip-52636-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:36:46 +0000 (16:36 -0700)]
Merge pull request #43698 from cfsnyder/wip-52636-pacific

pacific: mon: do not quickly mark mds laggy when MON_DOWN

Reviewed-by: Venky Shankar vshankar@redhat.com
Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45459 from cfsnyder/wip-53079-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:30:17 +0000 (16:30 -0700)]
Merge pull request #45459 from cfsnyder/wip-53079-pacific

pacific: src/rgw: Fix for malformed url

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45457 from cfsnyder/wip-53036-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:29:48 +0000 (16:29 -0700)]
Merge pull request #45457 from cfsnyder/wip-53036-pacific

pacific: rgw: cls_bucket_list_unordered() might return one redundent entry every time is_truncated is true

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45442 from cfsnyder/wip-52107-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:29:23 +0000 (16:29 -0700)]
Merge pull request #45442 from cfsnyder/wip-52107-pacific

pacific: radosgw-admin: 'sync status' is not behind if there are no mdlog entries

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45440 from cfsnyder/wip-52071-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:28:54 +0000 (16:28 -0700)]
Merge pull request #45440 from cfsnyder/wip-52071-pacific

pacific: rgw: add the condition of lock mode conversion to PutObjRentention

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45427 from cfsnyder/wip-51351-pacific
Yuri Weinstein [Tue, 22 Mar 2022 23:28:19 +0000 (16:28 -0700)]
Merge pull request #45427 from cfsnyder/wip-51351-pacific

pacific: rgw/amqp: remove the explicit "disconnect()" interface

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45445 from cfsnyder/wip-52115-pacific
Yuri Weinstein [Tue, 22 Mar 2022 21:58:04 +0000 (14:58 -0700)]
Merge pull request #45445 from cfsnyder/wip-52115-pacific

pacific: qa/rgw: update apache-maven mirror for rgw/hadoop-s3a

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45439 from cfsnyder/wip-52050-pacific
Yuri Weinstein [Tue, 22 Mar 2022 21:57:25 +0000 (14:57 -0700)]
Merge pull request #45439 from cfsnyder/wip-52050-pacific

pacific: rgw: default ms_mon_client_mode = secure

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45434 from cfsnyder/wip-51777-pacific
Yuri Weinstein [Tue, 22 Mar 2022 21:56:47 +0000 (14:56 -0700)]
Merge pull request #45434 from cfsnyder/wip-51777-pacific

pacific: rgw: forward request in multisite for RGWDeleteBucketPolicy and RGWDeleteBucketPublicAccessBlock

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45430 from cfsnyder/wip-51701-pacific
Yuri Weinstein [Tue, 22 Mar 2022 21:56:08 +0000 (14:56 -0700)]
Merge pull request #45430 from cfsnyder/wip-51701-pacific

pacific: rgw: url_decode before parsing copysource in copyobject