]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agocrimson: add parallel_for_each to errorator
Xuehan Xu [Thu, 10 Jun 2021 06:21:01 +0000 (14:21 +0800)]
crimson: add parallel_for_each to errorator

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
4 years agoMerge pull request #41041 from myoungwon/wip-randomblockmanager-part1
Samuel Just [Wed, 16 Jun 2021 07:29:18 +0000 (00:29 -0700)]
Merge pull request #41041 from myoungwon/wip-randomblockmanager-part1

seastore: RandomBlockManager part1

Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #27465 from tchaikov/wip-38219
Kefu Chai [Wed, 16 Jun 2021 01:38:45 +0000 (09:38 +0800)]
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>
4 years agoMerge pull request #41873 from bobbyphilip/patch-1
Kefu Chai [Tue, 15 Jun 2021 23:44:00 +0000 (07:44 +0800)]
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>
4 years agoMerge PR #40972 into master
Patrick Donnelly [Tue, 15 Jun 2021 21:57:44 +0000 (14:57 -0700)]
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>
4 years agodoc/start/hardware-recommendations.rst: Corrected typo 41873/head
Bobby Alex Philip [Tue, 15 Jun 2021 20:32:23 +0000 (22:32 +0200)]
doc/start/hardware-recommendations.rst: Corrected typo

129GB - >128GB
Signed-off-by: Bobby Philip bobbyphilip@gmail.com
4 years agoMerge PR #41844 into master
Sage Weil [Tue, 15 Jun 2021 19:42:26 +0000 (15:42 -0400)]
Merge PR #41844 into master

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

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge PR #41840 into master
Patrick Donnelly [Tue, 15 Jun 2021 17:34:18 +0000 (10:34 -0700)]
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>
4 years agoMerge PR #41821 into master
Patrick Donnelly [Tue, 15 Jun 2021 17:33:38 +0000 (10:33 -0700)]
Merge PR #41821 into master

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

Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge PR #41773 into master
Patrick Donnelly [Tue, 15 Jun 2021 17:32:49 +0000 (10:32 -0700)]
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>
4 years agoMerge PR #41771 into master
Patrick Donnelly [Tue, 15 Jun 2021 17:32:06 +0000 (10:32 -0700)]
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>
4 years agoseastore/rbm: remove changes related to transaction/cache 41041/head
myoungwon oh [Tue, 15 Jun 2021 15:43:34 +0000 (00:43 +0900)]
seastore/rbm: remove changes related to transaction/cache

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoMerge pull request #41864 from rzarzynski/wip-crimson-iointrcond-fix-debug
Kefu Chai [Tue, 15 Jun 2021 15:34:01 +0000 (23:34 +0800)]
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>
4 years agoMerge pull request #41865 from rzarzynski/wip-crimson-opseq-fix-dropped-abort
Kefu Chai [Tue, 15 Jun 2021 15:05:11 +0000 (23:05 +0800)]
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>
4 years agocrimson/osd: fix missed OpSequencer::abort() on primary change. 41865/head
Radoslaw Zarzynski [Tue, 15 Jun 2021 00:05:20 +0000 (00:05 +0000)]
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>
4 years agocrimson/osd: fix debug in IOInterruptCondition::new_interval_created(). 41864/head
Radoslaw Zarzynski [Mon, 14 Jun 2021 22:32:07 +0000 (22:32 +0000)]
crimson/osd: fix debug in IOInterruptCondition::new_interval_created().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #41801 from liu-chunmei/seastore-fix-get-retired-extent
Samuel Just [Tue, 15 Jun 2021 14:01:07 +0000 (07:01 -0700)]
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>
4 years agoMerge pull request #41854 from sebastian-philipp/fix-mypy-yaml-representation
Sebastian Wagner [Tue, 15 Jun 2021 11:59:54 +0000 (13:59 +0200)]
Merge pull request #41854 from sebastian-philipp/fix-mypy-yaml-representation

mgr/orch: fix mypy errors

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
4 years agoMerge pull request #41846 from batrick/i51214
Sebastian Wagner [Tue, 15 Jun 2021 09:39:37 +0000 (11:39 +0200)]
Merge pull request #41846 from batrick/i51214

doc: fix typo in option

Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
4 years agopyhton-common: fix mypy errors 41854/head
Sebastian Wagner [Tue, 15 Jun 2021 09:24:34 +0000 (11:24 +0200)]
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>
4 years agomgr/orch: fix mypy errors
Sebastian Wagner [Tue, 15 Jun 2021 08:19:40 +0000 (10:19 +0200)]
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>
4 years agoMerge pull request #41841 from ljflores/patch-1
Kefu Chai [Tue, 15 Jun 2021 06:26:05 +0000 (14:26 +0800)]
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>
4 years agoseastore: add protected_read interface to nvmedevice
Jinyong Ha [Fri, 11 Jun 2021 09:21:59 +0000 (18:21 +0900)]
seastore: add protected_read interface to nvmedevice

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>
4 years agoseastore/rbm: use const
myoungwon oh [Fri, 11 Jun 2021 13:59:13 +0000 (22:59 +0900)]
seastore/rbm: use const

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/rbm: return std::list in get_data_health()
myoungwon oh [Fri, 11 Jun 2021 13:57:17 +0000 (22:57 +0900)]
seastore/rbm: return std::list in get_data_health()

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/rbm: remove unused bits in nvmedevice.h
myoungwon oh [Fri, 11 Jun 2021 13:35:05 +0000 (22:35 +0900)]
seastore/rbm: remove unused bits in nvmedevice.h

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/rbm: replace blk_paddr_t with size_t in free_extent()
myoungwon oh [Fri, 11 Jun 2021 13:17:23 +0000 (22:17 +0900)]
seastore/rbm: replace blk_paddr_t with size_t in free_extent()

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/rbm: relocate file layout like SegmentManager
myoungwon oh [Fri, 11 Jun 2021 12:00:16 +0000 (21:00 +0900)]
seastore/rbm: relocate file layout like SegmentManager

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/rbm: fix wrong loop condition
myoungwon oh [Thu, 10 Jun 2021 08:47:56 +0000 (17:47 +0900)]
seastore/rbm: fix wrong loop condition

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/rbm: fix wrong statement
myoungwon oh [Thu, 10 Jun 2021 07:09:06 +0000 (16:09 +0900)]
seastore/rbm: fix wrong statement

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/rbm: remove newline before function name
myoungwon oh [Wed, 26 May 2021 11:41:18 +0000 (20:41 +0900)]
seastore/rbm: remove newline before function name

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/rbm: add check_bitmap_blocks when open()
myoungwon oh [Wed, 26 May 2021 07:19:47 +0000 (16:19 +0900)]
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>
4 years agoseastore/rbm: fix wrong statement
myoungwon oh [Tue, 25 May 2021 07:55:34 +0000 (16:55 +0900)]
seastore/rbm: fix wrong statement

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/rbm: use move()
myoungwon oh [Tue, 25 May 2021 07:45:48 +0000 (16:45 +0900)]
seastore/rbm: use move()

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore/nvmedevice: use the necessary capture value and fix typo
myoungwon oh [Tue, 25 May 2021 07:26:38 +0000 (16:26 +0900)]
seastore/nvmedevice: use the necessary capture value and fix typo

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore: move implementation of TestMemory to nvmeblockdevice.cc
Jinyong Ha [Mon, 24 May 2021 09:45:24 +0000 (18:45 +0900)]
seastore: move implementation of TestMemory to nvmeblockdevice.cc

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>
4 years agoseastore: utilize errorator as a return type of discard()
Jinyong Ha [Mon, 24 May 2021 09:41:15 +0000 (18:41 +0900)]
seastore: utilize errorator as a return type of discard()

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>
4 years agoseastore: utilize unique_ptr as a return value of create()
Jinyong Ha [Mon, 24 May 2021 09:37:37 +0000 (18:37 +0900)]
seastore: utilize unique_ptr as a return value of create()

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>
4 years agoseastore: change class name NormalNBD to PosixNVMeDevice
Jinyong Ha [Mon, 24 May 2021 09:34:46 +0000 (18:34 +0900)]
seastore: change class name NormalNBD to PosixNVMeDevice

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>
4 years agoseastore: replace POSIX call to seastar::file in NormalNBD
Jinyong Ha [Mon, 24 May 2021 09:33:02 +0000 (18:33 +0900)]
seastore: replace POSIX call to seastar::file in NormalNBD

Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>
4 years agoseastore: add abort_allocation
myoungwon oh [Mon, 24 May 2021 15:36:58 +0000 (00:36 +0900)]
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>
4 years agotest: add more tests
myoungwon oh [Mon, 24 May 2021 14:48:11 +0000 (23:48 +0900)]
test: add more tests

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agotest: modify existing unit test to cover range based operations
myoungwon oh [Mon, 24 May 2021 14:44:12 +0000 (23:44 +0900)]
test: modify existing unit test to cover range based operations

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore: fix wrong operator
myoungwon oh [Mon, 24 May 2021 14:39:46 +0000 (23:39 +0900)]
seastore: fix wrong operator

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore: make multiple bitmap block initialization to work correctly
myoungwon oh [Mon, 24 May 2021 14:31:49 +0000 (23:31 +0900)]
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>
4 years agoseastore: continous range based free_extent()
myoungwon oh [Mon, 24 May 2021 14:29:29 +0000 (23:29 +0900)]
seastore: continous range based free_extent()

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agoseastore: continous range based complete_allocation()
myoungwon oh [Mon, 24 May 2021 14:27:31 +0000 (23:27 +0900)]
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>
4 years agoseastore: introduce rbm_sync_block_bitmap_by_range()
myoungwon oh [Mon, 24 May 2021 14:19:49 +0000 (23:19 +0900)]
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>
4 years agoseastore: make alloc_extent to allocate continuous blocks
myoungwon oh [Thu, 20 May 2021 04:45:33 +0000 (13:45 +0900)]
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>
4 years agoseastore: use deltas to deliver allocated info
myoungwon oh [Fri, 21 May 2021 05:00:02 +0000 (14:00 +0900)]
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>
4 years agoseastore: add NormalNBD
Jinyong Ha [Fri, 16 Apr 2021 08:12:55 +0000 (17:12 +0900)]
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>
4 years agoseastore: randomblockmanager inital commit
Myoungwon Oh [Wed, 7 Apr 2021 09:30:32 +0000 (18:30 +0900)]
seastore: randomblockmanager inital commit

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
4 years agocrimson/seastore: fix cache::get_extent got retired extent 41801/head
chunmei-liu [Thu, 10 Jun 2021 03:37:07 +0000 (20:37 -0700)]
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>
4 years agodoc: fix typo in option 41846/head
Patrick Donnelly [Mon, 14 Jun 2021 20:37:29 +0000 (13:37 -0700)]
doc: fix typo in option

Fixes: https://tracker.ceph.com/issues/51214
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa/suites/orch/cephadm/dashboard: remove remaining bits 41844/head
Sage Weil [Mon, 14 Jun 2021 18:00:45 +0000 (13:00 -0500)]
qa/suites/orch/cephadm/dashboard: remove remaining bits

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa: update cli syntax to conventional 41840/head
Patrick Donnelly [Mon, 14 Jun 2021 14:49:11 +0000 (07:49 -0700)]
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>
4 years agoscript/build-integration-branch: update print statement based on update to documentation 41841/head
Laura Flores [Mon, 14 Jun 2021 17:03:01 +0000 (12:03 -0500)]
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>
4 years agodoc/dev: should be ./run-make-check.sh
Laura Flores [Mon, 14 Jun 2021 16:23:54 +0000 (11:23 -0500)]
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>
4 years agodoc/dev: update testing.rst to say ninja
Laura Flores [Mon, 14 Jun 2021 16:01:15 +0000 (11:01 -0500)]
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>
4 years agoMerge PR #41799 into master
Sage Weil [Mon, 14 Jun 2021 15:02:31 +0000 (11:02 -0400)]
Merge PR #41799 into master

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

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agoMerge PR #41805 into master
Sage Weil [Mon, 14 Jun 2021 15:02:16 +0000 (11:02 -0400)]
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>
4 years agoMerge pull request #39624 from sebastian-philipp/mypy-812
Kefu Chai [Mon, 14 Jun 2021 14:53:02 +0000 (22:53 +0800)]
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>
4 years agoMerge pull request #41632 from jmolmo/fix_osd_rm_help_msg
Sebastian Wagner [Mon, 14 Jun 2021 14:09:07 +0000 (16:09 +0200)]
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>
4 years agoMerge pull request #41556 from adk3798/daemon-count
Sebastian Wagner [Mon, 14 Jun 2021 14:08:46 +0000 (16:08 +0200)]
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>
4 years agoMerge PR #41827 into master
Sage Weil [Mon, 14 Jun 2021 13:11:04 +0000 (09:11 -0400)]
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>
4 years agoMerge pull request #41796 from rzarzynski/wip-crimson-cltreq-dbgs
Kefu Chai [Mon, 14 Jun 2021 13:00:04 +0000 (21:00 +0800)]
Merge pull request #41796 from rzarzynski/wip-crimson-cltreq-dbgs

crimson/osd: improve debugs in ClientRequest

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: improve debugs in OpSequencer. 41796/head
Radoslaw Zarzynski [Wed, 9 Jun 2021 20:55:34 +0000 (20:55 +0000)]
crimson/osd: improve debugs in OpSequencer.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: should_abort_request() dumps Operation's details.
Radoslaw Zarzynski [Wed, 9 Jun 2021 19:18:33 +0000 (19:18 +0000)]
crimson/osd: should_abort_request() dumps Operation's details.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: print prev_op_id in ClientRequest's debugs.
Radoslaw Zarzynski [Wed, 9 Jun 2021 19:16:56 +0000 (19:16 +0000)]
crimson/osd: print prev_op_id in ClientRequest's debugs.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #41832 from inspur-wyq/patch-4
Kefu Chai [Mon, 14 Jun 2021 10:13:21 +0000 (18:13 +0800)]
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>
4 years agoMerge PR #41786 into master 41599/head
Patrick Donnelly [Mon, 14 Jun 2021 02:57:37 +0000 (19:57 -0700)]
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>
4 years agoMerge PR #41580 into master
Patrick Donnelly [Mon, 14 Jun 2021 02:57:05 +0000 (19:57 -0700)]
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>
4 years agoMerge PR #41482 into master
Patrick Donnelly [Mon, 14 Jun 2021 02:56:34 +0000 (19:56 -0700)]
Merge PR #41482 into master

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

Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge PR #41481 into master
Patrick Donnelly [Mon, 14 Jun 2021 02:56:04 +0000 (19:56 -0700)]
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>
4 years agoMerge PR #41431 into master
Patrick Donnelly [Mon, 14 Jun 2021 02:54:45 +0000 (19:54 -0700)]
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>
4 years agoMerge PR #41422 into master
Patrick Donnelly [Mon, 14 Jun 2021 02:52:48 +0000 (19:52 -0700)]
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>
4 years agoMerge PR #41403 into master
Patrick Donnelly [Mon, 14 Jun 2021 02:51:52 +0000 (19:51 -0700)]
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>
4 years agoos/ObjectStore: fix typo in comments 41832/head
wangyunqing [Mon, 14 Jun 2021 02:42:14 +0000 (10:42 +0800)]
os/ObjectStore: fix typo in comments

Signed-off-by: wangyunqing <wangyunqing@inspur.com>
4 years agotest/pybind/test_ceph_argparse: add a test where args contains comma 41773/head
Kefu Chai [Sun, 13 Jun 2021 11:56:26 +0000 (19:56 +0800)]
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>
4 years agocmake: run nose test using "python3 -m nose"
Kefu Chai [Wed, 9 Jun 2021 03:37:41 +0000 (11:37 +0800)]
cmake: run nose test using "python3 -m nose"

otherwise the tests are not performed at all.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/pybind/test_ceph_argparse: check for expected argument
Kefu Chai [Sun, 13 Jun 2021 04:03:11 +0000 (12:03 +0800)]
test/pybind/test_ceph_argparse: check for expected argument

instead of comparing the validated argument with empty dict, check for
its content for better coverage of testing.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/pybind/test_ceph_argparse: decorate helper method with @nottest
Kefu Chai [Wed, 9 Jun 2021 03:24:37 +0000 (11:24 +0800)]
test/pybind/test_ceph_argparse: decorate helper method with @nottest

otherwise nose tries to run it as a test as its name contains "test", like

E.
======================================================================
ERROR: Runs validate in different arg/kargs ways.
----------------------------------------------------------------------
TypeError: arg_kwarg_test() missing 3 required positional arguments: 'prefix', 'args', and 'sig'

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/pybind: do not test obsoleted command
Kefu Chai [Wed, 9 Jun 2021 03:11:40 +0000 (11:11 +0800)]
test/pybind: do not test obsoleted command

"scrub" command was marked obsoleted in
e9a5ce0897efc6126caeebea9900bf05ec3d2174, so the test_ceph_argparse
cannot retrieve its command description using "get_command_descriptions"
cli tool anymore, let's drop the related test accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/pybind: drop forward and readforward from test
Kefu Chai [Wed, 9 Jun 2021 03:01:20 +0000 (11:01 +0800)]
test/pybind: drop forward and readforward from test

these two write modes were dropped in
a0a3ed324a130a9934735927600f01d1fa65bc0d, so update the test
accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/pybind: do not use tab for indent
Kefu Chai [Wed, 9 Jun 2021 02:57:32 +0000 (10:57 +0800)]
test/pybind: do not use tab for indent

the python source file is idented using spaces.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/ceph_argparse: validate csv if desc.N
Kefu Chai [Wed, 9 Jun 2021 02:01:35 +0000 (10:01 +0800)]
pybind/ceph_argparse: validate csv if desc.N

if desc.N is not None, we should take the argument as a comma separated
values, and validate the values individually.

restructure the validate() function and its helpers to pass the
validated args if desc.N explicitly, as desc.instance.val should only
hold a single value of desc.instance type, otherwise we need to reset
it after collecting all the argument in a CSV string value is parsed.

this change would be less consistent and hackish.

and update a test to verify this behavior.

Fixes: https://tracker.ceph.com/issues/51145
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/pybind: pep8 cleanups
Kefu Chai [Wed, 9 Jun 2021 02:00:08 +0000 (10:00 +0800)]
test/pybind: pep8 cleanups

* do not import unused symbols
* add two empty lines before method
* aligned indents

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40740 from batrick/i50278
Kefu Chai [Sun, 13 Jun 2021 15:30:20 +0000 (23:30 +0800)]
Merge pull request #40740 from batrick/i50278

pybind/mgr: add support for common sqlite3 databases

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41809 from linuxbox2/wip-returnvec-64
Kefu Chai [Sun, 13 Jun 2021 15:27:58 +0000 (23:27 +0800)]
Merge pull request #41809 from linuxbox2/wip-returnvec-64

rados: increase osd_max_write_op_reply_len default to 64 bytes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41746 from strenuous-life/wip-cephadm-osd-create
Kefu Chai [Sun, 13 Jun 2021 15:26:46 +0000 (23:26 +0800)]
Merge pull request #41746 from strenuous-life/wip-cephadm-osd-create

mgr/cephadm: When create osd which include db, _create_daemon will be…

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
4 years agoMerge PR #41781 into master
Sage Weil [Sat, 12 Jun 2021 13:02:19 +0000 (09:02 -0400)]
Merge PR #41781 into master

* refs/pull/41781/head:
mgr/mgr_module:delete invalid judgment

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #41699 into master
Sage Weil [Sat, 12 Jun 2021 13:01:38 +0000 (09:01 -0400)]
Merge PR #41699 into master

* refs/pull/41699/head:
mgr/telemetry: pass leaderboard flag even w/o ident

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
4 years agoqa: move dashboard e2e from cephadm -> rados suite 41827/head
Sage Weil [Sat, 12 Jun 2021 12:52:42 +0000 (07:52 -0500)]
qa: move dashboard e2e from cephadm -> rados suite

This test fails ~20% of the time.

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa: choose victim pg from rbd pool 40740/head
Patrick Donnelly [Sat, 12 Jun 2021 03:04:53 +0000 (20:04 -0700)]
qa: choose victim pg from rbd pool

Right now scrub_test picks any pg in ceph. Unfortunately, it picked the
.mgr pool's only pg in [1]:

2021-05-16T11:36:35.035 DEBUG:teuthology.orchestra.run.smithi049:> adjust-ulimits ceph-coverage /home/ubuntu/cephtest/archive/coverage rados --cluster ceph --pool rbd setomapval main.db-journal.0000000000000000 key val

Instead, only pick a pg in the rbd pool.

[1] /ceph/teuthology-archive/kchai-2021-05-16_11:19:39-rados-wip-kefu-testing-2021-05-16-1043-distro-basic-smithi/6117396/teuthology.log

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa,pybind/mgr: allow disabling .mgr pool
Patrick Donnelly [Sat, 1 May 2021 02:31:35 +0000 (19:31 -0700)]
qa,pybind/mgr: allow disabling .mgr pool

This is mostly for testing: a lot of tests assume that there are no
existing pools. These tests relied on a config to turn off creating the
"device_health_metrics" pool which generally exists for any new Ceph
cluster. It would be better to make these tests tolerant of the new .mgr
pool but clearly there's a lot of these. So just convert the config to
make it work.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agodoc: document new .mgr pool
Patrick Donnelly [Tue, 13 Apr 2021 02:42:57 +0000 (19:42 -0700)]
doc: document new .mgr pool

And that pool names beginning with `.` are reserved names.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: add upgrade test for devicehealth
Patrick Donnelly [Mon, 19 Apr 2021 19:58:01 +0000 (12:58 -0700)]
qa: add upgrade test for devicehealth

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: fix api test failures
Patrick Donnelly [Sun, 11 Apr 2021 20:16:25 +0000 (13:16 -0700)]
qa: fix api test failures

"device_health_metrics" pool is gone -- .mgr pool is in.

I don't think the pool removal code in some test cases is necessary any
longer with recent changes to remove those warnings; so that code is
gone too.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agopybind/mgr/devicehealth: load legacy device metrics pool
Patrick Donnelly [Fri, 9 Apr 2021 23:56:53 +0000 (16:56 -0700)]
pybind/mgr/devicehealth: load legacy device metrics pool

Fixes: https://tracker.ceph.com/issues/50278
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agopybind/mgr/devicehealth: update to store metrics in sqlite
Patrick Donnelly [Fri, 9 Apr 2021 22:00:06 +0000 (15:00 -0700)]
pybind/mgr/devicehealth: update to store metrics in sqlite

This commit just modifies the module to use the sqlite3 database for
storing health metrics. A followup commit loads the legacy pool's data.

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