]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agomon/OSDMonitor: Ensure kvmon() is writeable before handling "osd new" cmd 46691/head
Sridhar Seshasayee [Fri, 27 May 2022 08:59:07 +0000 (14:29 +0530)]
mon/OSDMonitor: Ensure kvmon() is writeable before handling "osd new" cmd

Before proceeding to handle "osd new" mon command as part of
OSDMonitor::prepare_command_impl(), a check is made to verify if the
authmon is writeable. Later on, prepare_command_osd_new() invokes
KVMonitor::do_osd_new() to create pending dmcrypt keys and calls
propose_pending(). The propose could fail (with an assertion failure)
if there was a prior mon command that resulted in the kvmon invoking
propose_pending().

In order to avoid such a situation, introduce a check to verify that
kvmon is also writeable in OSDMonitor::prepare_command_impl(). If it
is not writeable, the op is pushed into the wait_for_active context
queue to be retried later.

Fixes: https://tracker.ceph.com/issues/55773
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit 9a0d42c9fbcf64711a791edcf9cafdba57d901d7)

3 years agoMerge pull request #46456 from rhcs-dashboard/wip-55590-pacific
Ernesto Puerta [Tue, 14 Jun 2022 16:36:39 +0000 (18:36 +0200)]
Merge pull request #46456 from rhcs-dashboard/wip-55590-pacific

pacific: mgr/dashboard:  WDC multipath bug fixes

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: nSedrickm <NOT@FOUND>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #46653 from zdover23/wip-doc-2022-06-13-backport-46637-pacific...
zdover23 [Tue, 14 Jun 2022 06:23:44 +0000 (16:23 +1000)]
Merge pull request #46653 from zdover23/wip-doc-2022-06-13-backport-46637-pacific-hardware-recs-network

pacific: doc/start: rewrite hardware-recs networks section

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #46656 from zdover23/wip-doc-2022-06-13-backport-46583-pacific...
zdover23 [Tue, 14 Jun 2022 06:17:58 +0000 (16:17 +1000)]
Merge pull request #46656 from zdover23/wip-doc-2022-06-13-backport-46583-pacific-hardware-recs-osd-and-mds-acros

pacific: doc/start: make OSD and MDS structures parallel

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #46657 from zdover23/wip-doc-2022-06-13-backport-46633-pacific...
zdover23 [Tue, 14 Jun 2022 06:15:12 +0000 (16:15 +1000)]
Merge pull request #46657 from zdover23/wip-doc-2022-06-13-backport-46633-pacific-start-intro-crush-para-rewrite

pacific: doc/start: rewrite CRUSH para

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #46368 from tchaikov/pacific-pr-46355
Yuri Weinstein [Mon, 13 Jun 2022 23:43:27 +0000 (16:43 -0700)]
Merge pull request #46368 from tchaikov/pacific-pr-46355

pacific: ceph.spec.in: disable annobin plugin if compile with gcc-toolset

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
3 years agoMerge pull request #46365 from tchaikov/pacific-pr-44007
Yuri Weinstein [Mon, 13 Jun 2022 23:42:02 +0000 (16:42 -0700)]
Merge pull request #46365 from tchaikov/pacific-pr-44007

pacific: cmake: check for python(\d)\.(\d+) when building boost

Reviewed-by: Dirk Mueller <dmueller@suse.com>
Reviewed-by: Tim Serong <tserong@suse.com>
3 years agoMerge pull request #46312 from b-ranto/wip-alerts-pacific
Yuri Weinstein [Mon, 13 Jun 2022 23:39:22 +0000 (16:39 -0700)]
Merge pull request #46312 from b-ranto/wip-alerts-pacific

[pacific] mgr/alerts: Add Message-Id and Date header to sent emails

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
3 years agoMerge pull request #46255 from tserong/wip-55616-pacific
Yuri Weinstein [Mon, 13 Jun 2022 23:38:16 +0000 (16:38 -0700)]
Merge pull request #46255 from tserong/wip-55616-pacific

pacific: test: No direct use of nose

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agodoc/start: rewrite CRUSH para 46657/head
Zac Dover [Sun, 12 Jun 2022 23:41:28 +0000 (09:41 +1000)]
doc/start: rewrite CRUSH para

This PR supersedes https://github.com/ceph/ceph/pull/46584
and makes changes suggested by Anthony D'Atri that improve
the coherence and consistency of the paragraph that explains
the basics of the CRUSH algorithm.

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

3 years agodoc/start: make OSD and MDS structures parallel 46656/head
Zac Dover [Wed, 8 Jun 2022 19:19:16 +0000 (05:19 +1000)]
doc/start: make OSD and MDS structures parallel

This PR makes the "Ceph OSDs" and "MDSs" bullet points
parallel by naming "object storage daemon" before referring
to the (admittedly more common and colloquial, but surely
unknown to people who genuinely require a document called
'Intro') acronym "OSD".

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

3 years agodoc/start: rewrite hardware-recs networks section 46653/head
Zac Dover [Mon, 13 Jun 2022 04:34:36 +0000 (14:34 +1000)]
doc/start: rewrite hardware-recs networks section

This rewrites the first two-thirds of the "Networks"
section of the Hardware Recommendations page in the
Intro to Ceph document. I have tried to divide the
techincal content in this section into subsections
that foreground the various subjects covered.

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

3 years agoMerge pull request #46211 from idryomov/wip-use-system-libpmem-on-c9s-pacific
Yuri Weinstein [Fri, 10 Jun 2022 20:47:03 +0000 (13:47 -0700)]
Merge pull request #46211 from idryomov/wip-use-system-libpmem-on-c9s-pacific

pacific: rpm: use system libpmem on Centos 9 Stream

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #45991 from idryomov/wip-make-check-enable-rbd-caches-pacific
Yuri Weinstein [Fri, 10 Jun 2022 20:46:09 +0000 (13:46 -0700)]
Merge pull request #45991 from idryomov/wip-make-check-enable-rbd-caches-pacific

pacific: run-make-check.sh: enable RBD persistent caches

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agocmake: pass -Wno-error when building PMDK 45991/head
Ilya Dryomov [Thu, 9 Jun 2022 11:42:01 +0000 (13:42 +0200)]
cmake: pass -Wno-error when building PMDK

It's hitting pacific with a nuisance -Werror=array-parameter= const
char * vs const char[37] mismatch.  Follow commit 91a616b26e83 ("cmake:
pass RTE_DEVEL_BUILD=n when building dpdk") and just disable -Werror.

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

3 years agoMerge pull request #46297 from dparmar18/pacific_put_get_backport
Yuri Weinstein [Fri, 10 Jun 2022 14:19:17 +0000 (07:19 -0700)]
Merge pull request #46297 from dparmar18/pacific_put_get_backport

pacific: cephfs-shell: fix put and get cmd

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #46183 from vshankar/tr-55427
Yuri Weinstein [Fri, 10 Jun 2022 14:18:39 +0000 (07:18 -0700)]
Merge pull request #46183 from vshankar/tr-55427

pacific: mds: include encoded stray inode when sending dentry unlink message to replicas

Reviewed-by: Kotresh HR <khiremat@redhat.com>
3 years agoMerge pull request #46180 from lxbsz/wip-55343
Yuri Weinstein [Fri, 10 Jun 2022 14:18:00 +0000 (07:18 -0700)]
Merge pull request #46180 from lxbsz/wip-55343

Pacific: mds: reset heartbeat when fetching or committing entries

Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #46179 from lxbsz/wip-55346
Yuri Weinstein [Fri, 10 Jun 2022 14:17:12 +0000 (07:17 -0700)]
Merge pull request #46179 from lxbsz/wip-55346

Pacific: client: stop forwarding the request when exceeding 256 times

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
3 years agoMerge pull request #46146 from neesingh-rh/wip-55539-pacific
Yuri Weinstein [Fri, 10 Jun 2022 14:15:38 +0000 (07:15 -0700)]
Merge pull request #46146 from neesingh-rh/wip-55539-pacific

pacific: cephfs-top: Multiple filesystem support

Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #46470 from gregsfortytwo/wip-55747-pacific
Yuri Weinstein [Thu, 9 Jun 2022 13:28:40 +0000 (06:28 -0700)]
Merge pull request #46470 from gregsfortytwo/wip-55747-pacific

pacific: Implement CIDR blocklisting

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agorun-make-check.sh: enable RBD persistent caches
Ilya Dryomov [Tue, 19 Apr 2022 09:21:06 +0000 (11:21 +0200)]
run-make-check.sh: enable RBD persistent caches

This was attempted in commit 69a7ed4eab36 ("run-make-check: enable
WITH_RBD_RWL when WITH_PMEM is true") but never completed.  We soon
bumped the requirement on libpmem, so WITH_SYSTEM_PMDK=ON wouldn't
have worked anyway.

Enable the RWL mode conditionally based on WITH_RBD_RWL variable.
Enable the SSD mode unconditionally as it has no special dependencies
and can be built on any architecture.

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

Conflicts:
run-make-check.sh [ commit 69a7ed4eab36 ("run-make-check:
  enable WITH_RBD_RWL when WITH_PMEM is true") not in pacific ]

3 years agotest/encoding/check-generated.sh: show diff if binary reencode check fails
Ilya Dryomov [Tue, 19 Apr 2022 09:21:06 +0000 (11:21 +0200)]
test/encoding/check-generated.sh: show diff if binary reencode check fails

Take bf0b161115aa ("test/encoding/check-generated.sh: show diff if cmp
fails") a bit further.  Suggesting "cmp $tmp1 $tmp2" isn't very helpful
since cmp would report just the mismatch offset.

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

3 years agolibrbd/cache/pwl: WriteLogCacheEntry constructor must initialize flags
Ilya Dryomov [Tue, 19 Apr 2022 09:21:05 +0000 (11:21 +0200)]
librbd/cache/pwl: WriteLogCacheEntry constructor must initialize flags

Initializing the individual bit field members leaves the remaining two
bits uninitialized and that garbage state gets persisted.

In general, using bit fields in a structure where the layout actually
matters is not desirable.  Even with a few single bits, such as here,
their order, strictly speaking, is not guaranteed:

    An implementation may allocate any addressable storage unit large
    enough to hold a bit-field. If enough space remains, a bit-field
    that immediately follows another bit-field in a structure shall be
    packed into adjacent bits of the same unit. If insufficient space
    remains, whether a bit-field that does not fit is put into the next
    unit or overlaps adjacent units is implementation-defined. The
    order of allocation of bit-fields within a unit (high-order to
    low-order or low-order to high-order) is implementation-defined.
    The alignment of the addressable storage unit is unspecified.

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

3 years agolibrbd/cache/pwl: initialize generate_test_instances() objects
Ilya Dryomov [Tue, 19 Apr 2022 09:21:05 +0000 (11:21 +0200)]
librbd/cache/pwl: initialize generate_test_instances() objects

... to prevent check-generated.sh failures such as:

**** librbd::cache::pwl::WriteLogPoolRoot test 1 dump_json check failed ****
   ceph-dencoder type librbd::cache::pwl::WriteLogPoolRoot select_test 1 dump_json > /tmp/typ-cAoWrqlHC
   ceph-dencoder type librbd::cache::pwl::WriteLogPoolRoot select_test 1 encode decode dump_json > /tmp/typ-ES5yHpfGL
5c5
<     "flushed_sync_gen": 0,
---
>     "flushed_sync_gen": 255,

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

Conflicts:
src/librbd/cache/pwl/Types.cc [ commit 6eb14774fec0 ("librbd:
  build without "using namespace std"") not in pacific ]
src/librbd/cache/pwl/ssd/Types.h [ ditto ]

3 years agolibrbd/cache/pwl: fix -Wunused-lambda-capture warnings
Ilya Dryomov [Tue, 19 Apr 2022 09:21:05 +0000 (11:21 +0200)]
librbd/cache/pwl: fix -Wunused-lambda-capture warnings

Reported by clang on "make check" and "make check arm64" builds.

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

3 years agoMerge pull request #46556 from adk3798/pacific-fqdn-autotune
Adam King [Wed, 8 Jun 2022 23:57:44 +0000 (19:57 -0400)]
Merge pull request #46556 from adk3798/pacific-fqdn-autotune

pacific: mgr/cephadm: use host shortname for osd memory autotuning

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #45698 from tserong/wip-55097-pacific
Adam King [Wed, 8 Jun 2022 21:15:26 +0000 (17:15 -0400)]
Merge pull request #45698 from tserong/wip-55097-pacific

pacific: ceph.spec.in: remove build directory at end of %install

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #46545 from adk3798/pacific-raw-osd-fixup
Adam King [Wed, 8 Jun 2022 21:13:54 +0000 (17:13 -0400)]
Merge pull request #46545 from adk3798/pacific-raw-osd-fixup

pacific: mgr/cephadm: don't redeploy osds seen in raw list if cephadm knows them

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agoMerge pull request #46552 from guits/bkp-pacific-46481
Adam King [Wed, 8 Jun 2022 21:13:03 +0000 (17:13 -0400)]
Merge pull request #46552 from guits/bkp-pacific-46481

pacific: backport of cephadm: fix osd adoption with custom cluster name

Reviewed-by: Adam King <adking@redhat.com>
3 years agoMerge pull request #46555 from adk3798/pacific-allow-crush-class
Adam King [Wed, 8 Jun 2022 21:11:59 +0000 (17:11 -0400)]
Merge pull request #46555 from adk3798/pacific-allow-crush-class

pacific: python-common: allow crush device class to be set from osd service spec

Reviewed-by: Cory Snyder <csnyder@iland.com>
3 years agoMerge pull request #46429 from pdvian/wip-55309-pacific
Yuri Weinstein [Wed, 8 Jun 2022 15:25:51 +0000 (08:25 -0700)]
Merge pull request #46429 from pdvian/wip-55309-pacific

pacific: mgr, mgr/prometheus: Fix regression with prometheus metrics

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoMerge pull request #46427 from pdvian/wip-55308-pacific
Yuri Weinstein [Wed, 8 Jun 2022 15:25:14 +0000 (08:25 -0700)]
Merge pull request #46427 from pdvian/wip-55308-pacific

pacific: mgr, mon: Keep upto date metadata with mgr for MONs

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agomgr/cephadm: use hostname from crush map for osd memory autotuning 46556/head
Adam King [Fri, 3 Jun 2022 01:32:53 +0000 (21:32 -0400)]
mgr/cephadm: use hostname from crush map for osd memory autotuning

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

3 years agopython-common: allow crush device class to be set from osd service spec 46555/head
Cory Snyder [Wed, 1 Jun 2022 09:39:11 +0000 (05:39 -0400)]
python-common: allow crush device class to be set from osd service spec

Adds crush_device_class parameter to DriveGroupSpec so that device class
can be set via service specs with cephadm.

Fixes: https://tracker.ceph.com/issues/55813
Signed-off-by: Cory Snyder <csnyder@iland.com>
(cherry picked from commit c2f314ab8c187b54f12c04ec26034d451bd82273)

Conflicts:
src/python-common/ceph/deployment/drive_group.py

3 years agoMerge pull request #46215 from rzarzynski/wip-tests-bl-fix-rebuild-pacific
Yuri Weinstein [Tue, 7 Jun 2022 16:04:18 +0000 (09:04 -0700)]
Merge pull request #46215 from rzarzynski/wip-tests-bl-fix-rebuild-pacific

pacific: test/bufferlist: ensure rebuild_aligned_size_and_memory() always rebuilds.

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #46120 from myoungwon/backport-50806
Yuri Weinstein [Tue, 7 Jun 2022 16:03:21 +0000 (09:03 -0700)]
Merge pull request #46120 from myoungwon/backport-50806

pacific: osd: fix wrong input when calling recover_object()

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45870 from idryomov/wip-stretch-last-force-resend-pacific
Yuri Weinstein [Tue, 7 Jun 2022 16:02:41 +0000 (09:02 -0700)]
Merge pull request #45870 from idryomov/wip-stretch-last-force-resend-pacific

pacific: mon/OSDMonitor: properly set last_force_op_resend in stretch mode

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
3 years agoMerge pull request #45171 from pponnuvel/wip-53391-pacific
Yuri Weinstein [Tue, 7 Jun 2022 16:01:33 +0000 (09:01 -0700)]
Merge pull request #45171 from pponnuvel/wip-53391-pacific

pacific: Fix data corruption in bluefs truncate()

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
3 years agoMerge pull request #46252 from rzarzynski/wip-45529-pacific
Neha Ojha [Tue, 7 Jun 2022 15:33:26 +0000 (08:33 -0700)]
Merge pull request #46252 from rzarzynski/wip-45529-pacific

pacific: osd/PGLog.cc: Trim duplicates by number of entries

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
3 years agoMerge pull request #46549 from MrFreezeex/wip-55652-pacific
Ernesto Puerta [Tue, 7 Jun 2022 15:03:19 +0000 (17:03 +0200)]
Merge pull request #46549 from MrFreezeex/wip-55652-pacific

pacific: ceph-mixin: backport of recent cleanups

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agocephadm: fix osd adoption with custom cluster name 46552/head
Guillaume Abrioux [Wed, 1 Jun 2022 11:24:50 +0000 (13:24 +0200)]
cephadm: fix osd adoption with custom cluster name

When adopting Ceph OSD containers from a Ceph cluster with a custom name, it fails
because the name isn't propagated in unit.run.
The idea here is to change the lvm metadata and enforce 'ceph.cluster_name=ceph'
given that cephadm doesn't support custom names anyway.

Fixes: https://tracker.ceph.com/issues/55654
Signed-off-by: Adam King <adking@redhat.com>
Co-authored-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit e720a658d6a1582c0497bdf709ef4bd26bb5bb73)

3 years agoMerge pull request #46541 from idryomov/wip-rbd-codeowners-pacific
Ilya Dryomov [Tue, 7 Jun 2022 08:21:37 +0000 (10:21 +0200)]
Merge pull request #46541 from idryomov/wip-rbd-codeowners-pacific

pacific: CODEOWNERS: add RBD team

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoceph-mixin: remove timepicker override in every dashboards 46549/head
Arthur Outhenin-Chalandre [Wed, 18 May 2022 08:12:25 +0000 (10:12 +0200)]
ceph-mixin: remove timepicker override in every dashboards

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit 37add644d1e65b4d6375a63dcbef742420a5a4c3)

3 years agoceph-mixin: rationalize local helper functions to utils
Arthur Outhenin-Chalandre [Wed, 18 May 2022 10:16:13 +0000 (12:16 +0200)]
ceph-mixin: rationalize local helper functions to utils

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit 5db37300fde5c6cc2ec9f3ead34ea1b93126f5bf)

3 years agoceph-mixin: fix typos
Arthur Outhenin-Chalandre [Wed, 18 May 2022 08:02:54 +0000 (10:02 +0200)]
ceph-mixin: fix typos

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit 0b7cc6bc998fec47a29abfa94224cacee2dd598d)

3 years agoceph-mixin: fix test with rate and label changes
Arthur Outhenin-Chalandre [Tue, 17 May 2022 07:42:29 +0000 (09:42 +0200)]
ceph-mixin: fix test with rate and label changes

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit c8f086c182b87f1a813cb37fd58ad1e753a6b0bf)

3 years agoceph-mixin: don't add cluster matcher if showcluster is disabled
Arthur Outhenin-Chalandre [Tue, 17 May 2022 07:41:21 +0000 (09:41 +0200)]
ceph-mixin: don't add cluster matcher if showcluster is disabled

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit 3b6356c8724ee2b299743d20ff5df0401181228b)

3 years agoceph-mixin: refactor the structure of _config and utils
Arthur Outhenin-Chalandre [Mon, 16 May 2022 11:46:20 +0000 (13:46 +0200)]
ceph-mixin: refactor the structure of _config and utils

Before this refactor we couln't override the config externally. Now the
_config is correctly propagated and not only taken from the
config.libsonnet file.

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit fd4f484d220d98ba684878c87488cd74c502b4ff)

3 years agoceph-mixin: fix makefile dashboards dependency
Arthur Outhenin-Chalandre [Thu, 12 May 2022 15:23:56 +0000 (17:23 +0200)]
ceph-mixin: fix makefile dashboards dependency

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit 4595e9af23205e82a5232ecc3da408054b30d520)

3 years agoceph-mixin: fix linting issue and add cluster template support
Arthur Outhenin-Chalandre [Thu, 12 May 2022 15:24:35 +0000 (17:24 +0200)]
ceph-mixin: fix linting issue and add cluster template support

Fix most of the issues reported by dashboards-linter:
- Add matcher/template for job (and also cluster)
- use $__rate_interval everywhere

Also this change all the irate functions to rate as most of irate where
not actually used correctly. While using irate on graph for instance you
can easily miss some of the metrics values as irate only take the two
last values and the query steps can be quite large if you want a graph
for a few hours/a day or more.

Fixes: https://tracker.ceph.com/issues/55003
Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
ceph-mixin: add config with matchers and tags

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit faeea8d165342245929ea26441ee0cbb8957e3a7)

3 years agoceph-mixin: rewrite promql queries to multiline
Arthur Outhenin-Chalandre [Wed, 23 Mar 2022 11:50:20 +0000 (12:50 +0100)]
ceph-mixin: rewrite promql queries to multiline

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

3 years agomgr/cephadm: don't redeploy osds seen in raw list if cephadm knows them 46545/head
Adam King [Mon, 6 Jun 2022 21:39:31 +0000 (17:39 -0400)]
mgr/cephadm: don't redeploy osds seen in raw list if cephadm knows them

As is already done when checking the lvm list
results and should also be done for checking raw
list but is missing do ot a backporting mistake

Tachnically a partial backport of #44228 that
was not included in #44627 because raw osd support
was not in pacific then

Signed-off-by: Adam King <adking@redhat.com>
3 years agoCODEOWNERS: add RBD team 46541/head
Ilya Dryomov [Wed, 1 Jun 2022 07:22:15 +0000 (09:22 +0200)]
CODEOWNERS: add RBD team

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

3 years agoMerge pull request #46520 from neha-ojha/wip-46415-pacific
Neha Ojha [Mon, 6 Jun 2022 16:39:14 +0000 (09:39 -0700)]
Merge pull request #46520 from neha-ojha/wip-46415-pacific

pacific: .github/CODEOWNERS: tag core devs on core PRs

Reviewed-by: Laura Flores lflores@redhat.com
3 years agoMerge pull request #46484 from zdover23/wip-doc-2022-06-02-backport-46430-pacific...
zdover23 [Fri, 3 Jun 2022 21:17:58 +0000 (07:17 +1000)]
Merge pull request #46484 from zdover23/wip-doc-2022-06-02-backport-46430-pacific-2nd-attempt

3 years ago.github/CODEOWNERS: tag core devs on core PRs 46520/head
Neha Ojha [Fri, 27 May 2022 19:34:57 +0000 (19:34 +0000)]
.github/CODEOWNERS: tag core devs on core PRs

Start with everything that is present under core in .github/labeler.yml.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 8303c6b911154ee936adb46e7c3491b174d22df8)

3 years agodoc: (squash) adding :orphan: to security/index 46484/head
Zac Dover [Fri, 3 Jun 2022 20:00:44 +0000 (06:00 +1000)]
doc: (squash) adding :orphan: to security/index

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agodoc: (squash) fix s3-select-feature-table link
Zac Dover [Fri, 3 Jun 2022 19:39:21 +0000 (05:39 +1000)]
doc: (squash) fix s3-select-feature-table link

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agodoc: (squash) removing extraneous toc entry
Zac Dover [Fri, 3 Jun 2022 19:28:32 +0000 (05:28 +1000)]
doc: (squash) removing extraneous toc entry

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge branch 'pacific' into wip-doc-2022-06-02-backport-46430-pacific-2nd-attempt
zdover23 [Fri, 3 Jun 2022 19:18:08 +0000 (05:18 +1000)]
Merge branch 'pacific' into wip-doc-2022-06-02-backport-46430-pacific-2nd-attempt

3 years agodoc: (squash) adding pacific.rst to toctree
Zac Dover [Wed, 1 Jun 2022 14:44:02 +0000 (00:44 +1000)]
doc: (squash) adding pacific.rst to toctree

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc/start: update "memory" in hardware-recs.rst

This PR corrects some usage errors in the "Memory" section
of the hardware-recommendations.rst file. It also closes
some opened but never closed parentheses.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 429bbdea65188df6708832efee188e0a40e1cde2)
(cherry picked from commit e63b048a98a33e82e35d76c2d67ed8de184fed57)
Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc: (squash) adding security/ dir

This adds the security/ directory from the main branch.
This is done so that all references in the pacific.rst
file find destinations. This means that Sphinx will re-
cognize the document as coherent and that Sphinx will
permit it to build.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc: (squash) add security/index.rst to toctree

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc: remove :confvals: from bluestore-config-ref

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc: (squash) linking to s3-feature-table

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc: (squash) repair refs to cephfs-top

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc: (squash) fix link to snap-schedule

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc: (squash) fix link to ceph-dokan

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc: (squash) fixing active-releases link

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc: testing security/index toctree link

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #46511 from adk3798/pacific-fix-activate
Guillaume Abrioux [Fri, 3 Jun 2022 12:14:00 +0000 (14:14 +0200)]
Merge pull request #46511 from adk3798/pacific-fix-activate

pacific: ceph-volume: fix activate

3 years agoMerge pull request #46485 from zdover23/wip-doc-2022-06-02-backport-rocksdb-sharding...
zdover23 [Thu, 2 Jun 2022 23:02:54 +0000 (09:02 +1000)]
Merge pull request #46485 from zdover23/wip-doc-2022-06-02-backport-rocksdb-sharding-to-pacific

doc/rados: update bluestore-config-ref.rst

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoceph-volume: fix generic activate 46511/head
Guillaume Abrioux [Tue, 1 Mar 2022 23:38:17 +0000 (00:38 +0100)]
ceph-volume: fix generic activate

afd8be7eac5e996c3bd07656601a4534053e2516 broke it.
It has dropped`block_wal` and `block_db` from
`ceph_volume.devices.raw.activate.activate_bluestore` but
`activate.main.Activate.main` still passes those arguments when
calling `RAWActivate([]).activate()`

Fixes: https://tracker.ceph.com/issues/54441
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 3337b62e859673cba908bf8e12c7f3f23fddf2c2)

3 years agomgr/cephadm: add some debug output for serve loop
Sage Weil [Wed, 24 Nov 2021 14:17:03 +0000 (09:17 -0500)]
mgr/cephadm: add some debug output for serve loop

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

Conflicts:
src/pybind/mgr/cephadm/serve.py

3 years agoceph-volume: adjust arguments for 'ceph-volume raw activate'
Sage Weil [Sat, 20 Nov 2021 15:19:36 +0000 (10:19 -0500)]
ceph-volume: adjust arguments for 'ceph-volume raw activate'

Take a list of devices, so that we can selectively activate a raw osd
with db/wal.

Remove the argument type kludge introduced in 2c228a9a409176c0f1679f176443fd3ead219c7a
since it is no longer needed.

Note that we're making this change because (1) it allows db/wal and (2)
because there are no known users of 'raw activate'.  The only known user
is via 'ceph-volume activate' and we've fixed that caller in this commit.

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

Conflicts:
src/ceph-volume/ceph_volume/devices/raw/list.py

3 years agoceph-volume: add raw support for db/wal for list and activate
Sage Weil [Fri, 19 Nov 2021 20:15:18 +0000 (15:15 -0500)]
ceph-volume: add raw support for db/wal for list and activate

Currently 'prepare' doesn't support db/wal, but we want it in list and
activate because 'ceph-volume activate ...' tries raw before lvm.

Note that I'm not sure we really want to accept --block.db and --block.wal
here at all.

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

3 years agoMerge pull request #46504 from rhcs-dashboard/wip-55832-pacific
Ernesto Puerta [Thu, 2 Jun 2022 16:56:45 +0000 (18:56 +0200)]
Merge pull request #46504 from rhcs-dashboard/wip-55832-pacific

pacific: qa: fix teuthology master branch ref

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoqa: fix teuthology master branch ref 46504/head
Ernesto Puerta [Thu, 2 Jun 2022 10:27:02 +0000 (12:27 +0200)]
qa: fix teuthology master branch ref

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

Conflicts:
qa/tox.ini
        - accept only master-main rename

3 years agoMerge pull request #46490 from ceph/pacific-nobranch
David Galloway [Wed, 1 Jun 2022 20:19:33 +0000 (16:19 -0400)]
Merge pull request #46490 from ceph/pacific-nobranch

pacific: qa: remove .teuthology_branch file

3 years agoqa: remove .teuthology_branch file 46490/head
Jeff Layton [Wed, 1 Jun 2022 18:26:33 +0000 (14:26 -0400)]
qa: remove .teuthology_branch file

This was originally added to help support the py2 -> py3 conversion.
That's long since complete so we should be able to just remove this file
now.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 81430de9b70be16a439bf2445f3345b83035a861)

3 years agoMerge pull request #46459 from rhcs-dashboard/wip-55601-pacific
Ernesto Puerta [Wed, 1 Jun 2022 16:44:12 +0000 (18:44 +0200)]
Merge pull request #46459 from rhcs-dashboard/wip-55601-pacific

pacific: mgr/dashboard: introduce memory and cpu usage for daemons

Reviewed-by: Sarthak Gupta <sarthak.dev.0702@gmail.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: nSedrickm <NOT@FOUND>
Reviewed-by: sunilangadi2 <NOT@FOUND>
3 years agoqa: drop get_blocklisted_instances in TestMirroring 46470/head
Jos Collin [Fri, 6 May 2022 10:58:23 +0000 (16:28 +0530)]
qa: drop get_blocklisted_instances in TestMirroring

drop get_blocklisted_instances in TestMirroring and use
is_addr_blocklisted instead.

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 0e66107c89a127bec4f1a3c83894ff858919c8f3)

3 years agoqa: fix is_addr_blocklisted() to get blocklisted clients from 'osd dump'
Jos Collin [Wed, 4 May 2022 13:03:12 +0000 (18:33 +0530)]
qa: fix is_addr_blocklisted() to get blocklisted clients from 'osd dump'

By the introduction of range blocklist, the 'blocklist ls' command outputs
two lists. It's also straightforward to get the blocklisted clients directly
from 'osd dump' to avoid regression.

Fixes: https://tracker.ceph.com/issues/55516
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 47de5d79b8190458847072aae1c29db7d6a9b66b)

3 years agodoc/rados: update bluestore-config-ref.rst 46485/head
Zac Dover [Wed, 1 Jun 2022 14:54:40 +0000 (00:54 +1000)]
doc/rados: update bluestore-config-ref.rst

This PR updates bluestore-config-ref.rst so that
other PRs that refer to material in it can be
backported.

In order to ensure the coherence of this document,
all :confval: declarations have been removed. The
module that interprets those is called ceph_confval
and is available only in Quincy.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #46461 from rhcs-dashboard/wip-55116-pacific
Ernesto Puerta [Wed, 1 Jun 2022 10:54:24 +0000 (12:54 +0200)]
Merge pull request #46461 from rhcs-dashboard/wip-55116-pacific

pacific: mgr/dashboard:  don't log 3xx as errors

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: nSedrickm <NOT@FOUND>
3 years agotest: use the same address input format as output will generate
Greg Farnum [Sat, 23 Apr 2022 00:00:59 +0000 (00:00 +0000)]
test: use the same address input format as output will generate

Otherwise, our grep fails!

Fixes: https://tracker.ceph.com/issues/55419
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 63db714890c083c90e3adf12bf498dcb64d90fc9)

3 years agotest: osd: add a /0 cidr test for 32-bit...
Greg Farnum [Thu, 21 Apr 2022 00:16:22 +0000 (00:16 +0000)]
test: osd: add a /0 cidr test for 32-bit...

...and make the OSDMap handle it.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit c454d0d1d3f6d4ea4962a746cbed20d1aa003f6e)

3 years agotest: add a /0 cidr test that blocklists EVERYTHING
Greg Farnum [Wed, 20 Apr 2022 15:59:01 +0000 (15:59 +0000)]
test: add a /0 cidr test that blocklists EVERYTHING

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 8244586cf57426fe4f493d855ba3dd95126ae0e7)

Conflicts:
src/test/osd/TestOSDMap.cc
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
3 years agotest: add a 128-bit range blocklist test
Greg Farnum [Wed, 20 Apr 2022 15:06:33 +0000 (15:06 +0000)]
test: add a 128-bit range blocklist test

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 138daff1dcb35510c7444f803be7a55c62532f67)

3 years agotest: add 32-bit ipv4 and 64-bit ipv6 blocklist testing
Greg Farnum [Wed, 20 Apr 2022 14:51:09 +0000 (14:51 +0000)]
test: add 32-bit ipv4 and 64-bit ipv6 blocklist testing

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 6a997da13dd40d512a903036a487c8e0c4c59148)

3 years agotest: add a 30-bit range mask to ipv6 blocklisting tests
Greg Farnum [Wed, 20 Apr 2022 01:50:46 +0000 (01:50 +0000)]
test: add a 30-bit range mask to ipv6 blocklisting tests

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit f107f2124d94c35261f752d1f04f95875a7d05da)

3 years agotest: split up ip- and range-based blocklisting tests
Greg Farnum [Wed, 20 Apr 2022 00:38:21 +0000 (00:38 +0000)]
test: split up ip- and range-based blocklisting tests

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 42910b432d8a2f77f6443c99314b8a47fd2c87db)

3 years agotest: check range blocklist in cephtool/test.sh
Greg Farnum [Wed, 1 Dec 2021 16:18:50 +0000 (16:18 +0000)]
test: check range blocklist in cephtool/test.sh

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 1ca89ca76dbbae355831dc81065f22e6eb7e37ca)

3 years agotest: fix negative blocklist tests
Greg Farnum [Wed, 1 Dec 2021 16:16:18 +0000 (16:16 +0000)]
test: fix negative blocklist tests

These tests are supposed to be validating we don't accept invalid IPs,
but they left out the "add" subcommand so they're all failing on that!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 824689217248128cec67317d1410624fd94d276c)

3 years agodoc: update blocklist doc for ranges and up-to-date-ness
Greg Farnum [Wed, 1 Dec 2021 16:10:03 +0000 (16:10 +0000)]
doc: update blocklist doc for ranges and up-to-date-ness

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit e15cfa7ecded4a43df9c127abbc79a0e19c6adc6)

3 years agotest: test OSDMap::is_blocklisted in unit tests
Greg Farnum [Tue, 30 Nov 2021 18:27:54 +0000 (18:27 +0000)]
test: test OSDMap::is_blocklisted in unit tests

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 952af3388466d530c6268ff9b98bcdd725cce738)

Conflicts:
src/test/osd/TestOSDMap.cc
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
3 years agoosd: Check range_blocklist in is_blocklisted(): we actually blocklist ranges
Greg Farnum [Tue, 30 Nov 2021 18:29:46 +0000 (18:29 +0000)]
osd: Check range_blocklist in is_blocklisted(): we actually blocklist ranges

Carry a parallel map from cidr addresses to a new
range_bits class (stored entirely as ephemeral state) so that we
don't need to re-compute masks and bit mappings too often, and to
separate out the unpleasant ipv6 bit mapping logic. Then check
against those with range_bits::matches() the same way we check
for equality on specific-entity matches. Nice and simple loops!

Fixes: https://tracker.ceph.com/issues/53050
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 3e26209cbc61cb7fbd4e3f310a28c4cd0f6bb287)

3 years agomon: dump range blocklist when dumping regular blocklist
Greg Farnum [Tue, 16 Nov 2021 18:41:08 +0000 (18:41 +0000)]
mon: dump range blocklist when dumping regular blocklist

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit dc09905f1e95201ba8257b70c60c9985eee6ffdb)

3 years agoosdmap: convert get_blocklist() to provide the entity/IP and range blocklists
Greg Farnum [Tue, 2 Nov 2021 00:38:50 +0000 (00:38 +0000)]
osdmap: convert get_blocklist() to provide the entity/IP and range blocklists

Providing a non-range-aware blocklist accessor would just be
asking for trouble, so don't.

The ugly part of this is how the Objecter is currently just
throwing the range blocklist on the end of its own list. The in-tree
callers are okay with this, and I'd like to look at removing the
blocklist events API from librados entirely -- it exposes "OSD-only"
state to clients and, as evidenced by this patch series, is not
particularly stable.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 9c5e21a685b58e4be0360279d9d22efd513edab2)

3 years agomon: take blocklist ranges as a subcommand, not implicitly from address format
Greg Farnum [Wed, 8 Dec 2021 21:32:58 +0000 (21:32 +0000)]
mon: take blocklist ranges as a subcommand, not implicitly from address format

I discovered in testing with CephFS that this tends to interpret client IPs
(which don't have ports, but do have nonces) as invalid ranges. So give it
a separate input keyword that has to be applied first.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 73a1f1b51e586ff7476ff4f4c1682abd0a317074)

3 years agomon: check 'nonce' validity for cidr ranges
Greg Farnum [Mon, 15 Nov 2021 20:06:50 +0000 (20:06 +0000)]
mon: check 'nonce' validity for cidr ranges

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 5c903e5b0a48f60dcf644f83478f97136d7dc56c)

3 years agomon: trim range_blocklist alongside the regular one
Greg Farnum [Mon, 15 Nov 2021 20:42:35 +0000 (20:42 +0000)]
mon: trim range_blocklist alongside the regular one

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 4b08448131ff63213f65ac2c2454d53158663ca2)

3 years agomon: osdmon: simplify maybe_rm_from_pending_blocklists
Greg Farnum [Thu, 28 Oct 2021 23:04:23 +0000 (23:04 +0000)]
mon: osdmon: simplify maybe_rm_from_pending_blocklists

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 871427881a60f7a203d08373a1ae1e6db9e2976b)

3 years agomon: osdmon: allow users to enter range blocklists.
Greg Farnum [Thu, 28 Oct 2021 22:34:40 +0000 (22:34 +0000)]
mon: osdmon: allow users to enter range blocklists.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 93617f7f4c6ba3463ab4c6e2df3cc2df9b00fc12)

Conflicts:
src/include/ceph_features.h
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
3 years agomon: osdmon: don't overwrite type for entity_addr_t which is a cidr range
Greg Farnum [Wed, 27 Oct 2021 21:06:37 +0000 (21:06 +0000)]
mon: osdmon: don't overwrite type for entity_addr_t which is a cidr range

Doing so makes it no longer a cidr range entity_addr_t.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 9a1a01f8814df175d2d2c7a81f701d161cb4bab8)

3 years agomon: osdmon: extract blocklist manipulation functions into lambdas
Greg Farnum [Thu, 28 Oct 2021 20:44:49 +0000 (20:44 +0000)]
mon: osdmon: extract blocklist manipulation functions into lambdas

I'm about to add new range blocklists that match the existing IP/entity
ones, and don't want to have separate update logic.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 37fbf121fa6ee76387f07b766bccab5e2b82bbc1)

3 years agoosdmap: store new range_blocklist, updated as we do the existing blocklist
Greg Farnum [Thu, 28 Oct 2021 22:00:27 +0000 (22:00 +0000)]
osdmap: store new range_blocklist, updated as we do the existing blocklist

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit c0b87d9aca6f61ffe726ce3407059c527b319cbe)

3 years agomsg: common: allow entity_addr_t to store a CIDR address range
Greg Farnum [Mon, 25 Oct 2021 19:53:04 +0000 (19:53 +0000)]
msg: common: allow entity_addr_t to store a CIDR address range

This required very little change to the existing code. Use with care, because
existing code expects an IP address instead of a range, but it saves on
writing a new parser.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 8941450ff17336b0ed60947e365a8bffcc4a32b0)