Commit Graph

124162 Commits

Author SHA1 Message Date
Patrick Donnelly
fa6e05872e
mon/MDSMonitor: fix whitespace in debug message
So it doesn't look like:

    2021-06-16T14:37:52.953+0000 7fec41d7c700 10 mon.a@0(leader).mds e10 check_sub: is_mds=0, fscid= 1

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2021-06-16 11:57:08 -07:00
Kefu Chai
08661e6f57
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>
2021-06-16 22:09:28 +08:00
Kefu Chai
cd0bb38b2b
Merge pull request #41885 from tchaikov/wip-crimson-os-cleanups
crimson/os: cleanups and reformat

Reviewed-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2021-06-16 20:36:32 +08:00
Kefu Chai
d8ee9e4f68 crimson/osd: reindent
for less indent, hence better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-16 20:30:03 +08:00
Kefu Chai
3e28e640de crimson/osd: wrap line at 80
for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-16 20:28:10 +08:00
Kefu Chai
728fc4a0f0 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>
2021-06-16 20:28:01 +08:00
Kefu Chai
84c71bc22f 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>
2021-06-16 19:58:50 +08:00
Sebastian Wagner
6ce6874bae
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>
2021-06-16 13:54:31 +02:00
Kefu Chai
11216507aa 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>
2021-06-16 19:09:04 +08:00
Kefu Chai
2e66a657ae 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>
2021-06-16 19:09:04 +08:00
Kefu Chai
bb253d769b crimson/os: remove unnecessary parentheses
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-16 19:09:04 +08:00
Kefu Chai
44863f48aa crimson/os: fix the indent
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-16 19:09:04 +08:00
Kefu Chai
e41f7e3b41 crimson/os: do not capture unused variables
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-16 19:09:04 +08:00
Sebastian Wagner
04e586f90a
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>
2021-06-16 12:37:46 +02:00
Kefu Chai
1a44046339 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>
2021-06-16 18:29:10 +08:00
Kefu Chai
57aefd9250
Merge pull request #41881 from tchaikov/wip-crimson-alien
crimson: adapt to the new alien API

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-06-16 18:28:33 +08:00
Kefu Chai
e53ea0886f 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>
2021-06-16 17:14:40 +08:00
Igor Fedotov
0a44cd16a9
Merge pull request #41825 from tchaikov/wip-avl-cleanup
os/bluestore/AvlAllocator: specialize _block_picker() and cleanups

Reviewed-by: Igor Fedotov <ifedotov@suse,com>
2021-06-16 12:02:38 +03:00
Sebastian Wagner
2381725447
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>
2021-06-16 10:53:33 +02:00
Sebastian Wagner
deadde21af
Merge pull request #41813 from adk3798/repo
cephadm: Use gpg rather than asc key for add-repo

Reviewed-by: Sage Weil <sage@newdream.net>
2021-06-16 10:51:53 +02:00
Sebastian Wagner
c2b7b68598
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>
2021-06-16 10:51:38 +02:00
Samuel Just
845d430abc
Merge pull request #41041 from myoungwon/wip-randomblockmanager-part1
seastore: RandomBlockManager part1

Reviewed-by: Samuel Just <sjust@redhat.com>
2021-06-16 00:29:18 -07:00
Kefu Chai
6f58a26281
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>
2021-06-16 09:38:45 +08:00
Kefu Chai
395fdaeca7
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>
2021-06-16 07:44:00 +08:00
Patrick Donnelly
319b578b14
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>
2021-06-15 14:57:44 -07:00
Bobby Alex Philip
0a87c47d4d doc/start/hardware-recommendations.rst: Corrected typo
129GB - >128GB
Signed-off-by: Bobby Philip bobbyphilip@gmail.com
2021-06-15 22:53:27 +02:00
Sage Weil
091a32e130 Merge PR #41844 into master
* refs/pull/41844/head:
	qa/suites/orch/cephadm/dashboard: remove remaining bits

Reviewed-by: Michael Fritch <mfritch@suse.com>
2021-06-15 15:42:26 -04:00
Patrick Donnelly
174b8ad30b
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>
2021-06-15 10:34:18 -07:00
Patrick Donnelly
03674f5197
Merge PR #41821 into master
* refs/pull/41821/head:
	qa: specify distro for fs:bugs

Reviewed-by: Rishabh Dave <ridave@redhat.com>
2021-06-15 10:33:38 -07:00
Patrick Donnelly
dc772fa348
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>
2021-06-15 10:32:49 -07:00
Patrick Donnelly
8cb34b3849
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>
2021-06-15 10:32:06 -07:00
myoungwon oh
2dedb397ef seastore/rbm: remove changes related to transaction/cache
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2021-06-16 00:43:34 +09:00
Kefu Chai
e3c7234771
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>
2021-06-15 23:34:01 +08:00
Kefu Chai
31380f1f3b
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>
2021-06-15 23:05:11 +08:00
Radoslaw Zarzynski
2b14df40ef crimson/osd: fix missed OpSequencer::abort() on primary change.
Commit b5efdc6f1c 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>
2021-06-15 14:32:39 +00:00
Radoslaw Zarzynski
f40109f64b crimson/osd: fix debug in IOInterruptCondition::new_interval_created().
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-06-15 14:29:06 +00:00
Samuel Just
c323e59930
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>
2021-06-15 07:01:07 -07:00
Sebastian Wagner
0667a70c60
Merge pull request #41854 from sebastian-philipp/fix-mypy-yaml-representation
mgr/orch: fix mypy errors

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
2021-06-15 13:59:54 +02:00
Sebastian Wagner
6251e217a9
Merge pull request #41846 from batrick/i51214
doc: fix typo in option

Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
2021-06-15 11:39:37 +02:00
Sebastian Wagner
73e7698958 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>
2021-06-15 11:24:34 +02:00
Sebastian Wagner
90c9980e8f 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>
2021-06-15 10:19:40 +02:00
Kefu Chai
61976503f7
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>
2021-06-15 14:26:05 +08:00
Jinyong Ha
8fc7c4783a seastore: add protected_read interface to nvmedevice
Signed-off-by: Jinyong Ha <jy200.ha@samsung.com>
2021-06-15 11:09:06 +09:00
myoungwon oh
f865954761 seastore/rbm: use const
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2021-06-15 11:09:06 +09:00
myoungwon oh
f7ac64dbaa seastore/rbm: return std::list in get_data_health()
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2021-06-15 11:09:06 +09:00
myoungwon oh
4073a89a9e seastore/rbm: remove unused bits in nvmedevice.h
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2021-06-15 11:09:06 +09:00
myoungwon oh
4c90949681 seastore/rbm: replace blk_paddr_t with size_t in free_extent()
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2021-06-15 11:09:06 +09:00
myoungwon oh
d2cfc48676 seastore/rbm: relocate file layout like SegmentManager
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2021-06-15 11:09:06 +09:00
myoungwon oh
dbde4ff9be seastore/rbm: fix wrong loop condition
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2021-06-15 11:09:06 +09:00
myoungwon oh
a8001931b2 seastore/rbm: fix wrong statement
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
2021-06-15 11:09:06 +09:00