Merge pull request #46943 from kalaspuffar/python39

mgr/diskprediction_local: Support Python 3.9 for disk prediction module.

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

Merge pull request #47672 from Matan-B/wip-matanb-buffer-next

include/buffer: clear_and_dispose() fix implicitly-declared operator= usage

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>

Merge pull request #47710 from tchaikov/denc-concept

include/denc: define is_const_iterator as a concept

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

Merge pull request #47718 from tchaikov/wip-no-isp2

*: replace functions in intarith.h with the ones provided by standard library

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #46419 from Matan-B/wip-matanb-c-snaps

crimson/osd: Snaps IO path

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

Merge pull request #47182 from lxbsz/wip-56638

libcephfs: define AT_NO_ATTR_SYNC back for backward compatibility

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>

Merge pull request #47737 from ceph/release-docs2

admin: Fix check if PR or release branch docs build

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

Merge pull request #47542 from batrick/i56140

tools/cephfs: add basic detection/cleanup tool for dentry first damage

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #43771 from rhcs-dashboard/wip-52701-master

mgr/dashboard: add backend-driven UI tables

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: sherrif10 <NOT@FOUND>
Reviewed-by: Zac Dover <zac.dover@gmail.com>

Merge pull request #46599 from kotreshhr/rename_config_on_flush

mgr/volumes: Better handle config file on osd full scenario

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>

Merge pull request #47063 from lxbsz/wip-56529

mds/client: fail the request if the peer MDS doesn't support getvxattr op

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

Merge pull request #47132 from lxbsz/_rmsnap_finish_clean

mds: remove useless code in _rmsnap_finish()

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>

Merge pull request #47384 from lxbsz/wip-56633

mds: add more debug logs before crashing the MDS

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>

Merge pull request #47613 from cbodley/wip-56920

rgw/coroutine: check for null stack on wakeup

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

Merge PR #47732 into main

* refs/pull/47732/head:
Revert "Merge pull request #47092 from dparmar18/wip-dparmar-cephadm-simple-1"

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

rgw/coroutine: check for null stack on wakeup

Fixes: https://tracker.ceph.com/issues/56920
Signed-off-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #47690 from mty22/update-inactive-ceph-mirrors

doc: Remove inactive Ceph mirrors.

admin: Fix check if PR or release branch docs build

Uses built-in RTD vars.  https://docs.readthedocs.io/en/stable/environment-variables.html.

Follow up to https://github.com/ceph/ceph/pull/46917#discussion_r942359130.

Signed-off-by: David Galloway <dgallowa@redhat.com>

Merge pull request #45552 from wxypro/man-cephfs-mirror

doc/man/cephfs-mirror.rst: Update missing options for cephfs-mirror

Merge pull request #47727 from snosratiershad/docs/correct-radosgw-admin-doc-bucket-name

doc/man/8: Remove slash behind bucket name in radosgw-admin.rst

Revert "Merge pull request #47092 from dparmar18/wip-dparmar-cephadm-simple-1"

This reverts commit 1c4da3dbd20d9683fe681cd7083478809cbb19b9, reversing
changes made to ee1e163b1e69c4db558cdf6b857c7c82cd4820d8.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

doc/man/8: Remove slash behind bucket name in radosgw-admin.rst

Signed-off-by: Salar Nosrati-Ershad <snosratiershad@gmail.com>

Merge pull request #47371 from rhcs-dashboard/mstart-configurable

mstart: make some mstart env variables configurable

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #47207 from oOHenry/rgw-dashboard-ssl-error

mgr/dashboard: fix rgw connect when using ssl

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
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 #47720 from tchaikov/wip-mgr-dashboard-test-with-headers

qa/tasks/mgr/dashboard: accept headers as a param

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

Merge pull request #47716 from MalteJ/patch-1

doc: virtio discard is supported since kernel 5.0

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

include/intarith: drop popcount()

as it is not used anymore.

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

common, test: use std::popcount() when appropriate

prefer the facilities provided by standard library over the homebrew
ones for better readability and maintainability.

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

include/intarith: drop clz()

it is not used anymore

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

os/bluestore: use std::countl_zero() when appropriate

prefer the facilities provided by standard library over the homebrew
ones for better readability and maintainability.

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

include/intarith: rewrite cbits() in C++20

rewrite cbits() using concept and std::countl_zero(), for better
readability and maintanability.

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

include/intarith: drop isp2()

as it is not used anymore.

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

*: s/isp2/has_single_bit/

prefer the facilities provided by standard library over the homebrew
ones for better readability and maintainability.

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

doc: virtio discard is supported since kernel 5.0

Signed-off-by: Malte Janduda <mail@janduda.net>

Merge pull request #46702 from rhcs-dashboard/expand-cluster-hide-maintenance

mgr/dashboard: Hide maintenance option on expand cluster

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>

libcephfs: define AT_NO_ATTR_SYNC back for backward compatibility

This was introduce by commit e2a67f2a65553ad45721bb391081bc61aa97e0e9,
for the third part applications they may still use the old macro.

Add it back and marked it as deprecated.

Fixes: https://tracker.ceph.com/issues/56638
Signed-off-by: Xiubo Li <xiubli@redhat.com>

qa/tasks/mgr/dashboard: accept headers as an option param

* add optional "headers" parameter to _request() and _get()
* correct the test of test_force_no_gzip, as the header in response
  should be "application/vnd.ceph.api.v1.0+json", not "application/json"

with this change, we are able to pass headers to _get() in dashboard api
tests.

without this change, we'd have following error when testing
`test_force_no_gzip` defined by `tasks.mgr.dashboard.test_requests.RequestsTest`:

raceback (most recent call last):
  File "/home/jenkins-build/build/workspace/ceph-api/src/pybind/mgr/dashboard/services/exception.py", line 47, in dashboard_exception_handler
    return handler(*args, **kwargs)
  File "/usr/lib/python3/dist-packages/cherrypy/_cpdispatch.py", line 54, in __call__
    return self.callable(*self.args, **self.kwargs)
  File "/home/jenkins-build/build/workspace/ceph-api/src/pybind/mgr/dashboard/controllers/_base_controller.py", line 263, in inner
    ret = func(*args, **kwargs)
TypeError: Summary.__call__() got an unexpected keyword argument 'headers'

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

mgr/dashboard: add out_client dir to api and e2e checks

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

vstart: isolate the client logs

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

mstart: make some mstart env variables configurable

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

Merge pull request #47711 from tchaikov/wip-crimson-os-cleanups

crimson/os: cleanups

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

Merge pull request #47715 from maryfrances01/wip-doc-punctuation-error

doc/radosgw: Fix punctuation and grammar in encryption.rst

doc: Fixes a punctuation and grammar issue

include/buffer: avoid it = it->next() usage

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #47639 from ronen-fr/wip-rf-scrubmap-swap

osd: fix ScrubMap::swap() to include all ScrubMap data members
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

include/denc: use concept to define denc_traits

to be more specific, define denc_traits for types with ext types

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

include/denc: rewrite ExtType with is_any_of<>

just for better readability

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

include/denc: rewrite denc_traits for enums

for better readability

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

include/denc: rewrite is_any_of using concept

just for better readability

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

include/denc: redefine is_const_iterator

to just check for the return type of `it.get_pos_add(n)`, this
is exactly what we expect from a buffer::ptr::const_iterator.
it is more specific and less confusing.

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

include/denc: define is_const_iterator as a concept

just for better readability

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

doc: Fixes a punctuation and grammar issue

Signed-off-by: Mary Frances Hull mhull@redhat.com

Merge pull request #44356 from SMIL-Infra/clog

common,mon: use fmt::print(cerr, ...) for stderr logging

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

crimson/os: use IsFullKey in *::estimate_insert()

to fade out KeyT, so we can have more straightforward definitions.

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

crimson/os: use use IsFullKey in node_fields_2_t::insert_at()

to fade out KeyT, so we can have more straightforward definitions.

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

Merge pull request #47325 from CongMinYin/fix-owner-lock-ordering

librbd/cache/pwl: narrow the scope of m_lock in write_image_cache_state()

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

crimson/os: use IsFullKey in _node_fields_013_t::append_key()

to fade out KeyT, so we can have more straightforward definitions.

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

crimson/os: avoid using KeyT in is_valid_key()

and we don't need to specify KeyT when instantiating this template
function.

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

crimson/os: avoid using KeyT in ns_oid_view_t

so we don't need to use it when instantiating the template member
functions of this class.

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

include/denc: initialize local variable

to silence warning like:

../src/include/denc.h:834:27: warning: variable 'len' is uninitialized when used here [-Wuninitialized]
    v.push_back(p.get_ptr(len));
                          ^~~

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

Merge pull request #47628 from mkogan1/wip-fix-tcmalloc-link

rgw: fix linking with tcmalloc when specified by -DALLOCATOR

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

osd: modify two ScrubMap data members from fields to full variables

as there is no size advantage in this specific case.

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

osd: fix ScrubMap::swap() to include all ScrubMap data members

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

Merge pull request #47632 from linuxbox2/wip-rgw-53455

rgw/s3: add conditional json output for s3:ListBucket

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

Merge pull request #46443 from ybwang0211/head_obj

rgw: The error reported in the "rgw_s3_prepare_decrypt" function is unreasonable

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

Merge pull request #46547 from Huber-ming/check_appendable

rgw: check object appendable when check_disk_state

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

Merge pull request #47228 from Huber-ming/multi_meta

rgw: 'bucket check' deletes index of multipart meta when its pending_map is nonempty

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

Merge pull request #47547 from mdw-at-linuxbox/wip-master-xamzdate-1

rgw: x-amz-date change breaks certain cases of aws sig v4.

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>

Merge pull request #45036 from rishabh-d-dave/qa-fix-is_mounted

qa/cephfs: upgrade is_mounted() in mount.py

Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>

Merge pull request #45869 from neesingh-rh/fix_55234

mgr/snap_schedule: replace .snap with the client configured snap dir name

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>

Merge pull request #46749 from ibm-s390-cloud/fsmap_switch_to_iterator

fsmap: switch to using iterator based loop

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>

Merge pull request #47691 from myoungwon/wip-cbjournal-integration

crimson/os/seastore: CBJournal integration works

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

Merge pull request #47597 from NitzanMordhai/wip-nitzan-crimson-watch-list-empty-return-code

crimson/osd: watch list empty return incorrect

Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Sam Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #47670 from rzarzynski/wip-common-ftbfs-systemd

common: fix a FTBFS in Journald.cc when building without systemd

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

Merge pull request #47680 from tchaikov/wip-crimson-cleanups

crimson: cleanups to use `IsFullKey` concept

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

crimson/os/seastore: introduce finish_commit to update tails after trim transaction

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

crimson/os/seastore/cbjournal: rename journal_tail to dirty_tail

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

crimson/os/seastore/cbjournal: make cbjournal to store alloc_tail

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

crimson/os/seastore/cbjournal: make journal_tail and written_to to use journal_seq_t instead of rbm_abs_addr

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

crimson/os/seastore: divide the role of open_device_read_header into device.mount()
and open_for_mount()

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

doc: Remove inactive Ceph mirrors.

hk.ceph.com - notified mirror maintainer list of mirror decommission on 2020-08-31
us-east.ceph.com - mirror has been offline for years.

Signed-off-by: Matthew Taylor <matthew.taylor@digitalpacific.com.au>

Merge pull request #47615 from adamemerson/wip-objv-doc

rgw: Document `RGWOvjVersionTracker`

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

librbd/cache/pwl: generate image cache state json under m_lock

The previous commit moved the entirety of write_image_cache_state()
from under m_lock.  This was a step too far because the generated image
cache state json is no longer guaranteed to be consistent.

Arrange for m_lock to still be held during image cache json generation
but released before owner_lock is grabbed.

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

qa/workunites/fs: add first damage test script

Not part of the QA test suites because we don't want to install the
associated script.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

tools/cephfs: add basic detection/cleanup tool for dentry first damage

This tool iterates through the metadata pool looking for dentries with
non-sensical "first" (snapshot) metadata. It only specifically looks for
damage of the kind where the "first" value is greater than the latest
generated snapshot for the file system. It does not detect other kinds
of genuine damage to the "first" metadata.

Fixes: https://tracker.ceph.com/issues/56140
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

crimson/os: make _node_fields_013_t::insert_at() use IsFullKey

less repeatings this way

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

Merge pull request #47288 from batrick/i56274

debian: add libsqlite3-mod-ceph dependency for ceph-mgr

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>

crimson/os: define *::from_key() with IsFullKey

more compact this way.

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

crimson: move helper classes down

so we can use the concept of `IsFullKey` for defining accessors in the
incoming commit.

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

crimson: define encode_key() with IsFullKey constrait

also, let the compiler to deduce the type of the template parameter,
less repeating and less error-prone this way.

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

include/buffer: clear_and_dispose() formatting

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

common: fix a FTBFS in Journald.cc when building without systemd

This came from Josh Salomon:

```
/home/jsalomon/src/prim_score/src/common/Journald.h:93:24: error: ‘SubsystemMap’ does not name a type
   93 |   JournaldLogger(const SubsystemMap *) {}
      |                        ^~~~~~~~~~~~
/home/jsalomon/src/prim_score/src/common/Journald.h:94:23: error: ‘Entry’ does not name a type
   94 |   int log_entry(const Entry &) {
      |
```

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>

Merge pull request #47633 from bosc0/alerts_multicluster

prometheus: add multicluster support to alerts

qa/suites/crimson-rados: Enable test_rados snap test in Crimson's suite

Re-enanling snap tests in test_rados.py.
Currently disabling rollback tests.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/osd: hold head object state before executing ops

In case that the head object will be removed, we should hold
its ObjectState before the removal.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/osd: whiteout removed head object with existing clones

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/osd/pg: with_clone_obc: avoid coid capture

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/osd: add try-catch block when decoding ObjectState

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/osd: apply stats after make_writeable

make_writeable keeps track of few stats counters (e.g num_object_clones).
Therfore, we should apply the stats after it.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/osd: pg_backend formatting changes

Signed-off-by: Matan Breizman <mbreizma@redhat.com>