Merge PR #41890 into master

* refs/pull/41890/head:
doc/cephadm: removing "Octopus" from procedure

Reviewed-by: Sage Weil <sage@redhat.com>

doc/cephadm: removing "Octopus" from procedure

This PR removes "Octopus" from the curl-based installation
procedure.

After we moved on to Pacific, referring to Octopus looks wrong.
It looks wrong because it now is wrong.

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

Merge pull request #41882 from tchaikov/wip-crimson-int-safty

crimson/osd: guard non-pg-op handling with with_sequencer()

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

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

crimson/os: cleanups and reformat

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

crimson/osd: reindent

for less indent, hence better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: wrap line at 80

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: guard non-pg-op handling with with_sequencer()

because we should only ensure the ordering of the requests touching
the objects, the other requests like pgls should not be ordered along
with them. so as the second step, guard the non-pg-op handling with
with_sequencer().

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/os: use reference for loop variable

for better performance, also silences the warning like:

../src/crimson/os/seastore/random_block_manager/nvme_manager.cc:444:23: warning: loop variable ‘b’ creates a copy from type ‘const crimson::os::seastore::rbm_alloc_delta_t’ [-Wrange-loop-construct]
  444 |       for (const auto b : alloc_blocks) {
      |                       ^

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #41859 from sebastian-philipp/mypy-constrains.txt

global,tox.ini: add mypy-constrains.txt

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>

crimson/os: return seastar::now() in "finally()" block

so finally() is able to identify the return is a future, and discard it
manually.
otherwise the return value will be discarded even the future is marked
[[nodiscard]], hence the C++ compiler warns.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/os: remove unnecessary now()

the previous continuation in the chain already returns a future, no need
to hook up another now().

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/os: remove unnecessary parentheses

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/os: fix the indent

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/os: do not capture unused variables

Signed-off-by: Kefu Chai <kchai@redhat.com>

global,tox.ini: add mypy-constrains.txt

let's avoid getting new versions of those packages by accident.
Unfortunately this means we have to manually update those
packages regurarly.

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

crimson/osd: extract with_sequencer() method out

because we should only ensure the ordering of the requests touching
the objects, the other requests like pgls should not be ordered along
with them, so as the first step, let's extract with_sequencer() method
out, so we can differentiate these two cases with minimal repeatings.

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #41881 from tchaikov/wip-crimson-alien

crimson: adapt to the new alien API

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

crimson: adapt to the new alien API

since seastar now deprecates the old alien::submit_to() API, and
replaced it with a variant which requires a new parameter of "alien"
instance, let's pick it up, to amortize the cost to catch up with
the seastar master HEAD.

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #41825 from tchaikov/wip-avl-cleanup

os/bluestore/AvlAllocator: specialize _block_picker() and cleanups

Reviewed-by: Igor Fedotov <ifedotov@suse,com>

Merge pull request #41346 from adk3798/enough-mds-upgrade

mgr/cephadm: skip ok-to-stop for mds in upgrade if not enough mds daemons

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>

Merge pull request #41813 from adk3798/repo

cephadm: Use gpg rather than asc key for add-repo

Reviewed-by: Sage Weil <sage@newdream.net>

Merge pull request #41820 from mgfritch/cephadm-not-a-mon-ip

cephadm: raise Error() when unable to bind to an ip

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>

Merge pull request #41041 from myoungwon/wip-randomblockmanager-part1

seastore: RandomBlockManager part1

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

Merge pull request #27465 from tchaikov/wip-38219

ceph-monstore-tool: use a large enough paxos/{first,last}_committed

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

Merge pull request #41873 from bobbyphilip/patch-1

doc/start/hardware-recommendations.rst: Corrected typo

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

Merge PR #40972 into master

* refs/pull/40972/head:
doc: add missing note about restoring allow_standby_replay
doc: clarify distributed ephemeral pins new mechanism
doc: update mds_autoscaler documentation to reflect recent changes

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

doc/start/hardware-recommendations.rst: Corrected typo

129GB - >128GB
Signed-off-by: Bobby Philip bobbyphilip@gmail.com

Merge PR #41844 into master

* refs/pull/41844/head:
qa/suites/orch/cephadm/dashboard: remove remaining bits

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #41840 into master

* refs/pull/41840/head:
qa: update cli syntax to conventional

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>

Merge PR #41821 into master

* refs/pull/41821/head:
qa: specify distro for fs:bugs

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

Merge PR #41773 into master

* refs/pull/41773/head:
test/pybind/test_ceph_argparse: add a test where args contains comma
cmake: run nose test using "python3 -m nose"
test/pybind/test_ceph_argparse: check for expected argument
test/pybind/test_ceph_argparse: decorate helper method with @nottest
test/pybind: do not test obsoleted command
test/pybind: drop forward and readforward from test
test/pybind: do not use tab for indent
pybind/ceph_argparse: validate csv if desc.N
test/pybind: pep8 cleanups

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

Merge PR #41771 into master

* refs/pull/41771/head:
qa: update scrub start code to use comma sep scrubopts

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

seastore/rbm: remove changes related to transaction/cache

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

Merge pull request #41864 from rzarzynski/wip-crimson-iointrcond-fix-debug

crimson/osd: fix debug in IOInterruptCondition::new_interval_created().

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #41865 from rzarzynski/wip-crimson-opseq-fix-dropped-abort

crimson/osd: fix missed OpSequencer::abort() on primary change.

Reviewed-by: Kefu Chai <kchai@redhat.com>

crimson/osd: fix missed OpSequencer::abort() on primary change.

Commit b5efdc6f1c9563357d7dfd33a8f379053592a215 has unified
the interruption handling among `InternalClientRequest` and
`ClientRequest`. Unfortunately, a call to `abort()` of
`OpSequencer` has been overlooked and dropped. This was causing
crashes at Sepia after after fixing the ordering issues in
`ClientRequest`.

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

crimson/osd: fix debug in IOInterruptCondition::new_interval_created().

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

Merge pull request #41801 from liu-chunmei/seastore-fix-get-retired-extent

crimson/seastore: fix cache::get_extent got retired extent

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

Merge pull request #41854 from sebastian-philipp/fix-mypy-yaml-representation

mgr/orch: fix mypy errors

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>

Merge pull request #41846 from batrick/i51214

doc: fix typo in option

Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>

pyhton-common: fix mypy errors

Fixes:

```
py3 run-test: commands[2] | mypy --config-file=../mypy.ini -p ceph
ceph/deployment/service_spec.py: note: In member "yaml_representer" of class "ServiceSpec":
ceph/deployment/service_spec.py:659: error: Argument 1 to "represent_dict" of "SafeRepresenter" has incompatible type "_OrderedDictItemsView[str, Any]"; expected "Mapping[Any, Any]"
```

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

mgr/orch: fix mypy errors

Fixes:

```
orchestrator/__init__.py:6: note: In module imported here:
orchestrator/_interface.py: note: In member "yaml_representer" of class "DaemonDescription":
orchestrator/_interface.py:1039: error: Argument 1 to "represent_dict" of "SafeRepresenter" has incompatible type "ItemsView[Any, Any]"; expected "Mapping[Any, Any]"
orchestrator/_interface.py: note: In member "yaml_representer" of class "ServiceDescription":
orchestrator/_interface.py:1178: error: Argument 1 to "represent_dict" of "SafeRepresenter" has incompatible type "ItemsView[Any, Any]"; expected "Mapping[Any, Any]"
orchestrator/_interface.py: note: At top level:
orchestrator/_interface.py:1181: error: Argument 2 to "add_representer" has incompatible type "Callable[[SafeDumper, DaemonDescription], Any]"; expected "Callable[[SafeDumper, ServiceDescription], Node]"
Found 3 errors in 1 file (checked 29 source files)
```

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>

Merge pull request #41841 from ljflores/patch-1

doc: update testing.rst and build-integration test to say ./run-make-check.sh

Reviewed-by: Kefu Chai <kchai@redhat.com>

seastore: add protected_read interface to nvmedevice

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>

seastore/rbm: use const

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

seastore/rbm: return std::list in get_data_health()

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

seastore/rbm: remove unused bits in nvmedevice.h

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

seastore/rbm: replace blk_paddr_t with size_t in free_extent()

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

seastore/rbm: relocate file layout like SegmentManager

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

seastore/rbm: fix wrong loop condition

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

seastore/rbm: fix wrong statement

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

seastore/rbm: remove newline before function name

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

seastore/rbm: add check_bitmap_blocks when open()

This commits adds check_bitmap_blocks to check free_block_count
is correct whenever open() is called

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

seastore/rbm: fix wrong statement

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

seastore/rbm: use move()

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

seastore/nvmedevice: use the necessary capture value and fix typo

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

seastore: move implementation of TestMemory to nvmeblockdevice.cc

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>

seastore: utilize errorator as a return type of discard()

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>

seastore: utilize unique_ptr as a return value of create()

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>

seastore: change class name NormalNBD to PosixNVMeDevice

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>

seastore: replace POSIX call to seastar::file in NormalNBD

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>

seastore: add abort_allocation

when aborting uncommitted transaction, abort_allocation
should be called to cancel in-flight allocations in
in-memory allocator.

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

test: add more tests

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

test: modify existing unit test to cover range based operations

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

seastore: fix wrong operator

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

seastore: make multiple bitmap block initialization to work correctly

when initializing bitmap area, this commit corrects multiple
block initialization.

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

seastore: continous range based free_extent()

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

seastore: continous range based complete_allocation()

To work with a range of allocated blocks as a input,
this commit modify complete_allocation().

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

seastore: introduce rbm_sync_block_bitmap_by_range()

To set continous range of block id at once, this commit adds
rbm_sync_block_bitmap_by_range().

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

seastore: make alloc_extent to allocate continuous blocks

If there is no continous blocks, alloc_extent() returns nospc

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

seastore: use deltas to deliver allocated info

alloc_extent() will allocates continous blocks (e.g., block 1 ~ 4).
To deliver such informations to journal efficiently,
this commit adds a member variable regarding only modified range in the deltas

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

seastore: add NormalNBD

NormalNBD - NVMe Block device with seastar file
 1. Support preffered write granularity/alignment which is reported
 from NVMe SSD. User should follow this write guidance for enhancing write
 performance.
 2. Support multi-stream IO in NVMe SSD.

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>

seastore: randomblockmanager inital commit

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

crimson/seastore: fix cache::get_extent got retired extent

one transaction got an extent whose state is MUTATION_PENDINGat that time.
but another transaction do split and set the extent state to RETIRED.
when the first transaction resume and do continuation, the state of the extent
has been changed to RETIRED. So need eagain to try again.

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>

doc: fix typo in option

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

qa/suites/orch/cephadm/dashboard: remove remaining bits

Signed-off-by: Sage Weil <sage@newdream.net>

qa: update cli syntax to conventional

This was using an obscure syntax that worked at one time and wasn't
documented (AFAIK).

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

script/build-integration-branch: update print statement based on update to documentation

The print statement originally suggested to the user to run "make && ctest -j12", but that is outdated. The user should execute "./run-make-check.sh" instead.

Signed-off-by: Laura Flores <lflores@redhat.com>

doc/dev: should be ./run-make-check.sh

Updating the initial pull request. The smoke test line should read "./run-make-check.sh" instead of "make && ctest -j12".

Signed-off-by: Laura Flores <lflores@redhat.com>

doc/dev: update testing.rst to say ninja

The current version of Ceph uses "ninja" rather than "make," so the testing documentation needs to be updated.

Signed-off-by: Laura Flores <lflores@redhat.com>

Merge PR #41799 into master

* refs/pull/41799/head:
cephadm: validate `--fsid` during bootstrap

Reviewed-by: Sebastian Wagner <swagner@suse.com>

Merge PR #41805 into master

* refs/pull/41805/head:
cephadm: set TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES=134217728

Reviewed-by: Sebastian Wagner <swagner@suse.com>

Merge pull request #39624 from sebastian-philipp/mypy-812

src,qa: Upgrade to mypy 0.901

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #41632 from jmolmo/fix_osd_rm_help_msg

mgr/cephadm: fix errors in command <ceph orch osd> help and documentation

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>

Merge pull request #41556 from adk3798/daemon-count

mgr/cephadm: fix --service-type flag in orch ls when service has id

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>

Merge PR #41827 into master

* refs/pull/41827/head:
qa: move dashboard e2e from cephadm -> rados suite

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

Merge pull request #41796 from rzarzynski/wip-crimson-cltreq-dbgs

crimson/osd: improve debugs in ClientRequest

Reviewed-by: Kefu Chai <kchai@redhat.com>

crimson/osd: improve debugs in OpSequencer.

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

crimson/osd: should_abort_request() dumps Operation's details.

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

crimson/osd: print prev_op_id in ClientRequest's debugs.

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

Merge pull request #41832 from inspur-wyq/patch-4

os/ObjectStore: fix typo in comments

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

Merge PR #41786 into master

* refs/pull/41786/head:
mon/MonCommands: remove obsolete mds commands
mon/MonCommands: remove obsolete mon commands

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

Merge PR #41580 into master

* refs/pull/41580/head:
cephfs: make ceph_fallocate() platform independent

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge PR #41482 into master

* refs/pull/41482/head:
qa: remove obsolete deactivate routines

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

Merge PR #41481 into master

* refs/pull/41481/head:
client: Add ceph.caps vxattr

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>

Merge PR #41431 into master

* refs/pull/41431/head:
mds: progress the recover queue immediately after the inode is enqueued
mds: switch to mdr->get_client()

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

Merge PR #41422 into master

* refs/pull/41422/head:
qa/tasks/cephfs/test_sessionmap: reap connections immediately
msg/async: configurable threshold for reaping dead connections

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

Merge PR #41403 into master

* refs/pull/41403/head:
mgr/volumes: Add config to insert delay at the beginning of the clone

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

os/ObjectStore: fix typo in comments

Signed-off-by: wangyunqing <wangyunqing@inspur.com>

test/pybind/test_ceph_argparse: add a test where args contains comma

to ensure the support for the new syntax of "prefix --name bon,jour"
does not break existing behavior of "prefix hello cruel,world" where value2
contains reads "hello,world", and the parsed result should be

prefix="prefix"
value=["hello", "cruel,world"]

instead of something like

prefix="prefix"
value=["hello", "cruel", "world"]

or

prefix="prefix"
value=["cruel", "world"]

the above test only applies to the test where "value" is a CephString.
if "value" is a CephChoices, the parsed argument should be

prefix="prefix"
value=["hello", "cruel", "world"]

Signed-off-by: Kefu Chai <kchai@redhat.com>