crimson/os/seastore/omap: remove unnecessary extent loads when clearing.

Signed-off-by: Xinyu Huang <xinyu.huang@intel.com>

Merge pull request #46911 from ifed01/wip-ifed-fix-mempool-cache-other

os/bluestore: fix AU accounting in bluestore_cache_other mempool.

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>

Merge pull request #47106 from idryomov/wip-56561

rbd: don't default empty pool name unless namespace is specified

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>

Merge pull request #46741 from Matan-B/wip-matanb-docker-debug

script: CentOS 8 EOL, use archived mirror in ceph-debug-docker.sh

Reviewed-by: Nitzan Mordechai nmordech@redhat.com
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #46375 from ceph/cv-loop-devs

ceph-volume: Optionally consume loop devices

Merge pull request #47113 from zhscn/fix-split-test

crimson/os/seastore: fix bugs in test_map_existing_extent_concurrent

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

Merge pull request #47025 from adamemerson/wip-55765

rgw: Guard against malformed bucket URLs

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #46897 from rkachach/fix_issue_55808

mgr/cephadm: check for events key before accessing it

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #47011 from s0nea/wip-prevent-alert-redirects

mgr/dashboard: prevent alert redirect

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #44217 from CongMinYin/fix-pwl-recovery-test

qa/suites/rbd/pwl-cache: ensure recovery is actually tested

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

rbd: drop unused default_empty_pool_name argument

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

rbd: don't default empty pool name unless namespace is specified

Commit 96f05a7956b3 ("rbd: delay determination of default pool name")
broke "rbd perf image iostat" and "rbd perf image iotop" GLOBAL_POOL_KEY
support (the ability to blend all rbd pools together into a single
view).

Fixes: https://tracker.ceph.com/issues/56561
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

qa/tasks: rename persistent write log cache trash task

It doesn't really thrash anything, just repeatedly restarts the
workload on top of a dirty cache file.  rbd_pwl_cache_recovery is
more on point and gets covered by existing CODEOWNERS.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #47109 from zdover23/wip-doc-2022-07-15-start-hw-recs-cleanup-1

doc/start: update hardware recs

Reviewed-by: Anthony D'Atri

Merge pull request #46908 from mlausch/snapshot_key_conversion

osd/SnapMapper: fix legacy key conversion in snapmapper class

Reviewed-by: Matan Breizman <mbreizma@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

rgw: Guard against malformed bucket URLs

Misplaced colons can result in radosgw thinking is has a bucket URL
but with no bucket name, leading to a crash later on.

Fixes: https://tracker.ceph.com/issues/55765
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

rgw: Fix `rgw::sal::Bucket::empty` static method signatures

`unique_ptr` overload should take by reference.

Both should be const.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

Merge pull request #47052 from neha-ojha/wip-cot-label

.github/labeler.yml: add core label to some tools

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #47115 from ceph/fix-mib

ceph.spec.in: fix path for mib file and properly mark in %files

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #47035 from idryomov/wip-56516

rbd-mirror: remove bogus completed_non_primary_snapshots_exist check

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

ceph.spec.in: fix path for mib file and properly mark in %files

Fixes typos introduced in https://github.com/ceph/ceph/pull/46918

Signed-off-by: Justin Caratzas <jcaratza@redhat.com>

Merge pull request #47028 from xxhdx1985126/wip-seastore-backref-cache-refactor

crimson/os/seastore: simplify backref cache

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

crimson/os/seastore: fix bugs in test_map_existing_extent_concurrent

Signed-off-by: Zhang Song <zhangsong325@gmail.com>

crimson/os/seastore: simplify backref cache

Currently, the following transaction exec sequence would lead to
loss of backref:

1. Trans `A` merge a alloc backref for extent `X`
2. Trans `B` add a release backref for extent `X` to backref cache,
   during which it finds an in-cache alloc backref for extent `X` and
   decide not to add the release backref to cache
3. Trans `A` commit

In the above sequece, the release backref for extent `X` is lost.

This is a regression introduced when we try to optimize the backref cache.

This commit fix the issue by caching inflight backrefs in a multiset,
alloc/release ops that happen on the same paddr are queued in the order of
their happening. When doing gc, all those backrefs are merged.

Fixes: https://tracker.ceph.com/issues/56519
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

doc/start: update hardware recs

This PR picks up the parts of
https://github.com/ceph/ceph/pull/44466
that were not merged back in January, when that
pull request was raised.

Matters added here:
* improved organzation of matter
* emphasis of IOPs per core over cores per OSD

Signed-off-by: Zac Dover <zac.dover@gmail.com>

Merge pull request #46546 from mgfritch/vstart-stop-mds

src/stop.sh: stop existing ceph-mds daemons

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>

Merge pull request #46014 from vrushch/rbd_form_fix

mgr/dashboard: rbd striping setting pre-population and pop-over

Reviewed-by: Pegonzal <NOT@FOUND>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #47066 from adk3798/osd-removal-docs-update

doc/cephadm: add note about OSDs being recreated to OSD removal section

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #47062 from guits/update-latest-stable-default

cephadm: update LATEST_STABLE_RELEASE

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #46260 from CongMinYin/wip-enable-ndctl

cmake: enable ndctl when building PMDK for WITH_BLUESTORE_PMEM

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #46644 from rhcs-dashboard/rbd-list-pagination

mgr/dashboard: rbd image pagination

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #45981 from rhcs-dashboard/box-no-more-ultron

cephadm/box: Rootless podman box implementation

Reviewed-by: Pegonzal <NOT@FOUND>
Reviewed-by: anthonyeleven <NOT@FOUND>
Reviewed-by: melissa-kun-li <NOT@FOUND>

osd/SnapMapper: fix pacific legacy key conversion and introduce test

Octopus modified the SnapMapper key format from

  <LEGACY_MAPPING_PREFIX><snapid>_<shardid>_<hobject_t::to_str()>

to

  <MAPPING_PREFIX><pool>_<snapid>_<shardid>_<hobject_t::to_str()>

When this change was introduced, 94ebe0ea also introduced a conversion
with a crucial bug which essentially destroyed legacy keys by mapping them
to

  <MAPPING_PREFIX><poolid>_<snapid>_

without the object-unique suffix.  This commit fixes this conversion going
forward, but a fix for existing clusters still needs to be developed.

Fixes: https://tracker.ceph.com/issues/56147
Signed-off-by: Manuel Lausch <manuel.lausch@1und1.de>
Signed-off-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #46650 from faithuniterh/Modifying-boto3-examples

Modifying boto3 examples

reviewed-by: ylifshit@redhat.com

Merge pull request #47039 from rosinL/fix-perf-cirmson-msgr

tools/crimson/perf_crimson_msgr：fix perf_crimson_msgr abort

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

Merge pull request #47081 from zhscn/fix-map-exist

crimson/os/seastore: fix bug of Transaction::is_retired

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

doc/cephadm: add note about OSDs being recreated to OSD removal section

Signed-off-by: Adam King <adking@redhat.com>

Merge pull request #46918 from bigjust/wip-jcaratza-mib-rpm

monitoring:package SNMP MIB file as an rpm

mgr/dashboard: fix rbdconfiguration init type

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: prevent alert redirect

Prevent Alertmanager alerts from being redirected to the active mgr
dashboard instance. There are two reasons for it:

1. It doesn't bring any additional benefit. The Alertmanager config
   includes all available mgr instances - active and passive ones. In
   case of an alert, it will be sent to all of them. It ensures that
   the active mgr dashboard will receive the alert in any case.
2. The redirect URL includes the mgr IP and NOT the FQDN. This leads
   to issues in environments where an SSL certificate is configured and
   matches the FQDNs, only.

Fixes: https://tracker.ceph.com/issues/56401
Signed-off-by: Tatjana Dehler <tdehler@suse.com>

cephadm/box: Choose between docker or podman with --engine

With ./box.py --engine docker you can specify you want to use docker
instead of podman. With docker box.py command should be run with sudo.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #46114 from myoungwon/wip-dedup-tool-object-dedup-snapshot

tool/ceph-dedup-tool: add performing dedup option on cloned object

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #47021 from aisakaki/wip-cache-opt

crimson/os/seastore/cache: fine-grained lru cache control with GC

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

crimson/os/seastore: fix bug of Transaction::is_retired

The retired extent may exist as a RetiredExtentPlaceholder, casting
this extent to LogicalCachedExtent will cause undefined behavior.

Signed-off-by: Zhang Song <zhangsong325@gmail.com>

Merge pull request #46898 from rhcs-dashboard/cleanup-55720-master

mgr/dashboard: don't log tracebacks on 404s

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #46987 from rhcs-dashboard/fix-ingress-backend-service-filter

mgr/dashboard: ingress backend service should list all supported services

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>

Merge pull request #47006 from teuchert/fix_56269

mgr/snap_schedule: Use rados.Ioctx.remove_object() instead of remove().

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

qa/tasks: add thrash test for persistent write log cache

add thrash test for persistent write log cache. run rbd bench
on persistent write log cache, thrashes rbd bench, test the
recovery function of persistent write log cache.

Signed-off-by: Yin Congmin <congmin.yin@intel.com>

crimson/os/seastore/cache: fine-grained lru cache control with GC

GC transaction is not sourced by user behaviors, so the extent read
operations from GC transaction don’t satisfy the time locality
principle. These extents should not be added to LRU cache.

Signed-off-by: Xinyu Huang <xinyu.huang@intel.com>

Merge pull request #47064 from rzarzynski/wip-crimson-fix-client-request-leak

crimson/osd: don't leak ClientRequests on stopping OSD

Reviewed-by: Samuel Just <sjust@redhat.com>

ceph-volume: Remove refs to get_block_devs_lsblk

It's been replaced by get_block_devs_sysfs

Signed-off-by: Zack Cerza <zack@redhat.com>

ceph-volume: Rename env var; add warning

So that we can have a nice big warning that fires once per invocation, I
think using a callable class with a class attribute seems like a decent
approach. A closure could work too.

Signed-off-by: Zack Cerza <zack@redhat.com>

ceph-volume: Optionally consume loop devices

A similar proposal was rejected in #24765; I understand the logic
behind the rejection, but this will allow us to run Ceph clusters on
machines that lack disk resources for testing purposes. We just need to
make it impossible to accidentally enable, and make it clear it is
unsupported.

Signed-off-by: Zack Cerza <zack@redhat.com>

mgr/dashboard: fix api tests + lint

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: cleanups

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: RbdConfiguration.list reuse image context.

Image contexts are reopen even though we pass the context as an
argument. This commit changes that so you can forget about reopening
a rbd image context again.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: change sort char to '+' and page icons

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: fix linting errors

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: add rbd list sorting support

Support sorting with name, pool name and namespace

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: update rbd list api version to 2

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: debounce reload data with serverSide

Whenever we use serverSide (paginate through backend) we should
debounce reloadData since it might call api calls too much times.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: add rbd list search and disable sorting

- Disable sorting in each column because it will not be possible to
sort with this pagination implementation.
- Add search capabilities to the rbd list pagination endpoint.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: fix rbd list tests

X-Total-Count header was missing from rbdservice.list spy mock

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: fix frontend unit tests

Signed-off-by: Nizamudeen A <nia@redhat.com>

mgr/dashboard: if null tablecontext then create empty one

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: more linting

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: fix tests and iscsi rbd list

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: bind serverSide to externalPaging

Count won't be used unless externalPaging is set to true.
remove paginated import

task list service needed to be updated in order to have extra
params. This commit introduces that param.

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: rbd pagination poc

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

crimson/osd: improve debugs along stopping OperationRegistry

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

crimson/osd: stop ShardServices when stopping OSD

This patch fixes leaks of `ClientReqtest` instances observed
previously on OSD's stop.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #46510 from nSedrickm/accessibility-improvements

mgr/dashboard: improve accessibility of login page

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

examples/boto3: Updating Python examples to work with Python 3

Signed-off-by: dux <faithuniterh@tutanota.com>

cephadm: update LATEST_STABLE_RELEASE

The latest stable release of Ceph is Quincy.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

Merge pull request #46764 from Matan-B/wip-matanb-osd-cleanup

osd: MOSDPGCreate, MOSDScrub cleanup

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #46950 from dparmar18/fix_dirfrags_doc

doc/cephfs/dirfrags: clarify the unit of threshold limits

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>

cmake: add ndctl and daxctl to build pmdk

In order to enable the pmem character device, add ndctl=y to the parameter
of compiling the pmdk library when WITH_BLUESTORE_PMEM is ON. Because
after find_ndctl and find_daxctl are added, the dependency packages
required by WITH_BLUESTORE_PMEM and WITH_RBD_RWL become more different.
So separated these two. libpmem has no version required. libpmemobj
required version >=1.8.

Signed-off-by: Yin Congmin <congmin.yin@intel.com>

cmake: add findndctl and finddaxctl function

In order to support the character device of pmem usage in bluestore via
libpmem built by Ceph itself, we need to enable daxctl and ndctl
dependency. add the installation of ndctl and find it. the version of
ndctl and daxctl library requires >63. "apt-get install" meet the version
under ubuntu focal.

the installation of ndctl-devel in ceph.spec.in has not been verified.

Signed-off-by: Yin Congmin <congmin.yin@intel.com>

.github/labeler.yml: add core label to some tools

Signed-off-by: Neha Ojha <nojha@redhat.com>

Merge pull request #47045 from zdover23/wip-doc-2022-07-12-dev-guide-dependabot-GitHub-typo

doc/dev: s/github/GitHub/ in essentials.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #47031 from zdover23/wip-doc-2022-07-10-internals-cephfs-delayed-deletion-edit

doc/dev: edit delayed-delete.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/dev: s/github/GitHub/ in essentials.rst

This addresses a typo that Anthony D'Atri pointed out in
PR#47032. It didn't get addressed there, so it's being
addressed here.

Signed-off-by: Zac Dover <zac.dover@gmail.com>

Merge pull request #47032 from zdover23/wip-doc-2022-07-10-dev-guide-dependabot

doc/dev: add Dependabot section to essentials.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

doc/dev: add Dependabot section to essentials.rst

This PR adds a section to the Developer Guide chapter
"Essentials" that explains what Dependabot is. This
section is adapted from an email from Ernesto Puerta
to the CLT that was sent on 08 Jul 2022.

Co-authored-by: Ernesto Puerta <epuertat@redhat.com>>
Signed-off-by: Zac Dover <zac.dover@gmail.com>

tools/crimson/perf_crimson_msgr: correct default addr to msgr v2 version

As msgr protocol V1 is no longer supported, correct default addr
to msgr v2 version and replace the option 'v1-crc-enabled' to
'crc-enabled'.

Fixes: https://tracker.ceph.com/issues/56520
Signed-off-by: luo rixin <luorixin@huawei.com>

tools/crimson/perf_crimson_msgr: init ConfigPorxy when pref_crimson_msgr start running

While constructing socket connections, there are some config items needed(
`ceph::msgr::v2::FrameAssembler` need the value of `common::local_conf()->ms_crc_data`,
Access `common::local_conf()->ms_crc_data` will cause SIGSEGV without the ConfigProxy init).
So adding ConfigPorxy init before pref_crimson_msgr start running.

Fixes: https://tracker.ceph.com/issues/56520
Signed-off-by: luo rixin <luorixin@huawei.com>

Merge pull request #45519 from zhscn/wip-split-extent

crimson: split ObjectDataBlock when overwriting

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #47036 from tchaikov/wip-spec-with-crimson

ceph.spec.in: fixes for "with seastar"

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

test/crimson/seastore: add test case for splitting ObjectDataBlock

Signed-off-by: Zhang Song <zhangsong325@gmail.com>

test/crimson/seastore: add test case for TransactionManager::map_existing_extent

Signed-off-by: Zhang Song <zhangsong325@gmail.com>

crimson/os/seastore: update TransactionManager::get_extent_if_live

TransactionManager::get_extents_if_live should return a list of
extents that are located in range paddr~len. When SegmentCleaner
invokes get_extents_if_live, the target extent may have been split into
multiple pieces by other transaction, so only search the paddr as key
will lose other pieces need to be rewritten.

Signed-off-by: Zhang Song <zhangsong325@gmail.com>

crimson/os/seastore: split ObjectDataBlock when overwriting

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
fix obj

crimson/os/seastore: introduce TransactionManager::map_existing_extent

Signed-off-by: Zhang Song <zhangsong325@gmail.com>

crimson/os/seastore: new extent state: EXIST_CLEAN and EXIST_MUTATION_PENDING

Signed-off-by: Zhang Song <zhangsong325@gmail.com>

Merge pull request #47029 from tchaikov/wip-link-against-ceph-common

cmake: link librados applications against ceph-common

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #47030 from tchaikov/wip-crimson-cleanup

crimson/osd: drop unused .cc file

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #47033 from tchaikov/wip-crimson-modified-by

crimson/osd: use a named type for user_modify

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

ceph.spec.in: disable WITH_JAEGER if "with seastar"

this is an intermediate solution for building crimson rpm packages.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

ceph.spec.in: enable WITH_SEASTAR if "with seastar"

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

doc/dev: edit delayed-delete.rst

This PR improves the English in the "CephFS Delayed
Deletion" chapter of the Ceph Internals Guide (which
is stored in the doc/dev/ directory).

There was no pressing need to rewrite this. I just saw
that it could be tightened up, and I had the fifteen
minutes I needed to do it.

Co-author: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@gmail.com>