jianglong01
73dd266dc8
mgr/cephadm: When test osd active, it need to add "mock call" to make sure execute correctly
...
Signed-off-by: jianglong01 <jianglong01@qianxin.com>
2021-06-11 10:56:30 +08:00
jianglong01
ca52b49351
mgr/cephadm: When create osd which include db, _create_daemon will be executed twice. So we should filter the db type
...
Signed-off-by: jianglong01 <jianglong01@qianxin.com>
2021-06-09 13:04:14 +08:00
Kefu Chai
7fc07dd728
Merge pull request #41742 from lmgdlmgd/master
...
mgr/mgr_module: correct docstring of MgrModule.get()
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-08 09:26:43 +08:00
Kefu Chai
ed4ef5a3dd
Merge pull request #41736 from rzarzynski/wip-crimson-alienstore-open_collection_dne
...
crimson/os/alienstore: open_collection() returns nullptr if DNE.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-08 08:59:36 +08:00
Kefu Chai
191cd95211
Merge pull request #41730 from tchaikov/wip-fc35-python
...
do_cmake.sh: use python3.10 for fedora 35
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2021-06-08 08:58:48 +08:00
靳登科
24ca308e10
mgr/mgr_module: correct docstring of MgrModule.get()
...
In annotation, one of param of Mgr_module.get() is "osd_crush_map_text", but in PyObject *ActivePyModules::get_python and selftest, the param is "osdmap_crush_map_text", so update annotation from "osd_crush_map_text" to "osdmap_crush_map_text"
Signed-off-by: lmgdlmgd <1105050771@qq.com>
2021-06-08 08:55:20 +08:00
Andrew Schoen
acaad279c7
Merge pull request #40659 from PepperJo/data_allocate_fraction_v2
...
ceph-volume,python-common: Data allocate fraction
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2021-06-07 14:06:52 -05:00
Radoslaw Zarzynski
04c0196b62
crimson/os/alienstore: open_collection() returns nullptr if DNE.
...
This is an AlienStore's counterpart of 9fbd60131b6b66c30b23
2021-06-07 16:47:47 +00:00
Kefu Chai
e13dbe94b3
Merge pull request #41733 from rzarzynski/wip-crimson-clientreq-cleanup
...
crimson/osd: clean up mutability and fix log in ClientRequest
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-07 23:24:46 +08:00
Radoslaw Zarzynski
fbb3b40807
crimson/osd: fix debug in ClientRequest::do_process().
...
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-06-07 14:30:48 +00:00
Radoslaw Zarzynski
7973ce3e19
crimson/osd: drop unneeded lambda mutability in ClientRequest.
...
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-06-07 14:30:48 +00:00
Sage Weil
3a2f0f0103
Merge PR #41709 into master
...
* refs/pull/41709/head:
cephadm: improve is_container_running()
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-07 10:03:09 -04:00
Sage Weil
b18427da4b
Merge PR #41509 into master
...
* refs/pull/41509/head:
common/cmdparse: fix CephBool validation for tell commands
mgr/nfs: fix 'nfs export create' argument order
common/cmdparse: emit proper json
mon/MonCommands: add -- seperator to example
qa/tasks/cephfs/test_nfs: fix export create test
mgr: make mgr commands compat with pre-quincy mon
doc/_ext/ceph_commands: handle non-positional args in docs
mgr: fix reweight-by-utilization cephbool flag
mon/MonCommands: convert some CephChoices to CephBool
mgr/k8sevents: fix help strings
pybind/mgr/mgr_module: fix help desc formatting
mgr/orchestrator: clean up 'orch {daemon add,apply} rgw' args
mgr/orchestrator: add end_positional to a few methods
mgr/orchestrator: reformat a few methods
pybind/ceph_argparse: stop parsing when we run out of positional args
pybind/ceph_argparse: remove dead code
pybind/mgr/mgr_module: infer non-positional args
pybind/mgr/mgr_module: add separator for non-positional args
command/cmdparse: use -- to separate positional from non-positional args
pybind/ceph_argparse: adjust help text for non-positional args
pybind/ceph_argparse: track a 'positional' property on cli args
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-07 10:02:52 -04:00
Kefu Chai
fac4e1a9af
Merge pull request #41725 from tchaikov/wip-cmake-prom-warning
...
cmake: do not print warning in each cmake run
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2021-06-07 21:56:38 +08:00
Kefu Chai
106c3b8c68
Merge pull request #41728 from tchaikov/wip-cmake-win32-cleanup
...
cmake: let vstart-base depend on cython_rados if NOT WIN32
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2021-06-07 21:55:39 +08:00
Kefu Chai
78fa680bc2
Merge pull request #41704 from tchaikov/wip-ceph-daemon-ann
...
pybind/ceph_daemon: add missing type annotations
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-06-07 21:46:49 +08:00
Kefu Chai
6095d1abf1
Merge pull request #41732 from rzarzynski/wip-crimson-opsequencer-prev_op-gt-last_unblocked
...
crimson/osd: fix assertion failure in OpSequencer on replay.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-07 21:43:52 +08:00
Kefu Chai
f715d5b053
Merge pull request #41705 from tchaikov/wip-script-ceph-debug-docker
...
script/ceph-debug-docker: s/x86_64/$(arch)/
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2021-06-07 21:32:02 +08:00
Radoslaw Zarzynski
26e85455a0
crimson/osd: fix assertion failure in OpSequencer on replay.
...
Commit b5efdc6f1c#1
=== osd_op(client.4453.0:5 12.6 12.7fc1f406 (undecoded) ondisk+write+known_if_redirected e52) v8 (42)
DEBUG 2021-05-26 20:24:53,988 [shard 0] osd - client_request(id=4, detail=osd_op(client.4453.0:5 12.6 12.7fc1f406 (undecoded) ondisk+write+known_if_redirected e52) v8): start
DEBUG 2021-05-26 20:24:53,988 [shard 0] osd - client_request(id=4, detail=osd_op(client.4453.0:5 12.6 12.7fc1f406 (undecoded) ondisk+write+known_if_redirected e52) v8): in repeat
DEBUG 2021-05-26 20:24:53,988 [shard 0] osd - client_request(id=4, detail=osd_op(client.4453.0:5 12.6 12.7fc1f406 (undecoded) ondisk+write+known_if_redirected e52) v8) same_interval_since: 19
DEBUG 2021-05-26 20:24:53,988 [shard 0] osd - do_recover_missing check for recovery, 12:602f83fe:::foo:head
DEBUG 2021-05-26 20:24:53,988 [shard 0] osd - client_request(id=4, detail=osd_op(client.4453.0:5 12.6 12:602f83fe:::foo:head {write 0~128 in=128b} snapc 0={} ondisk+write+known_if_redirected e52) v8): got obc lock
...
DEBUG 2021-05-26 20:25:21,810 [shard 0] osd - client_request(id=4, detail=osd_op(client.4453.0:5 12.6 12:602f83fe:::foo:head {write 0~128 in=1
28b} snapc 0={} ondisk+write+known_if_redirected e52) v8): in repeat
...
DEBUG 2021-05-26 20:25:21,809 [shard 0] osd - should_abort_request operation restart, acting set changed
...
DEBUG 2021-05-26 20:25:21,813 [shard 0] osd - client_request(id=4, detail=osd_op(client.4453.0:5 12.6 12:602f83fe:::foo:head {write 0~128 in=128b} snapc 0={} ondisk+write+known_if_redirected e52) v8) same_interval_since: 55
...
DEBUG 2021-05-26 20:25:21,813 [shard 0] osd - client_request(id=4, detail=osd_op(client.4453.0:5 12.6 12:602f83fe:::foo:head {write 0~128 in=128b} snapc 0={} ondisk+write+known_if_redirected e52) v8) same_interval_since: 55
ceph-osd: /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-4622-gaa1dc559/rpm/el8/BUILD/ceph-17.0.0-4622-gaa1dc559/src/crimson/osd/osd_operation_sequencer.h:52: seastar::futurize_t<Result> crimson::osd::OpSequencer::start_op(HandleT&, uint64_t, uint64_t, FuncT&&) [with HandleT = crimson::PipelineHandle; FuncT = crimson::interruptible::interruptor<InterruptCond>::wrap_function(Func&&) [with Func = crimson::osd::ClientRequest::start()::<lambda()> mutable::<lambda(Ref<crimson::osd::PG>)> mutable::<lambda()> mutable::<lambda()>; InterruptCond = crimson::osd::IOInterruptCondition]::<lambda()>; Result = crimson::interruptible::interruptible_future_detail<crimson::osd::IOInterruptCondition, seastar::future<> >; seastar::futurize_t<Result> = crimson::interruptible::interruptible_future_detail<crimson::osd::IOInterruptCondition, seastar::future<> >; uint64_t = long unsigned int]: Assertion `prev_op > last_unblocked' failed.
Aborting on shard 0.
Backtrace:
0# 0x000055F440239C1F in ceph-osd
1# FatalSignal::signaled(int, siginfo_t const*) in ceph-osd
2# FatalSignal::install_oneshot_signal_handler<6>()::{lambda(int, siginfo_t*, void*)#1}::_FUN(int, siginfo_t*, void*) in ceph-osd
3# 0x00007F4788336B20 in /lib64/libpthread.so.0
4# gsignal in /lib64/libc.so.6
5# abort in /lib64/libc.so.6
6# 0x00007F4786931B09 in /lib64/libc.so.6
7# 0x00007F478693FDE6 in /lib64/libc.so.6
8# 0x000055F43BA3DD17 in ceph-osd
9# 0x000055F43BA419A8 in ceph-osd
10# seastar::continuation<seastar::internal::promise_base_with_type<seastar::bool_class<seastar::stop_iteration_tag> >, seastar::noncopyable_function<seastar::future<seastar::bool_class<seastar::stop_iteration_tag> > (boost::intrusive_ptr<crimson::osd::PG>&&)>, seastar::future<boost::intrusive_ptr<crimson::osd::PG> >::then_impl_nrvo<seastar::noncopyable_function<seastar::future<seastar::bool_class<seastar::stop_iteration_tag> > (boost::intrusive_ptr<crimson::osd::PG>&&)>, seastar::future<seastar::bool_class<seastar::stop_iteration_tag> > >(seastar::noncopyable_function<seastar::future<seastar::bool_class<seastar::stop_iteration_tag> > (boost::intrusive_ptr<crimson::osd::PG>&&)>&&)::{lambda(seastar::internal::promise_base_with_type<seastar::bool_class<seastar::stop_iteration_tag> >&&, seastar::noncopyable_function<seastar::future<seastar::bool_class<seastar::stop_iteration_tag> > (boost::intrusive_ptr<crimson::osd::PG>&&)>&, seastar::future_state<boost::intrusive_ptr<crimson::osd::PG> >&&)#1}, boost::intrusive_ptr<crimson::osd::PG> >::run_and_dispose() in ceph-osd
11# 0x000055F445C5C70F in ceph-osd
```
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-06-07 13:09:10 +00:00
Kefu Chai
058d56e2c8
do_cmake.sh: use python3.10 for fedora 35
...
fedora34 was released in April 2021 with Python3.9. while fedora 35
(still Rawhide) will include python3.10. see https://fedoraproject.org/wiki/Releases/35/ChangeSet#Python_3.10
so update the script accordingly.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-07 17:53:09 +08:00
Kefu Chai
e7597405c3
do_cmake.sh: refactor code to set PYBUILD
...
so it is more consistent with rhel/centos part.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-07 17:53:09 +08:00
Kefu Chai
6eacbdcac1
cmake: let vstart-base depend on cython_rados if NOT WIN32
...
to disable this custom target if NOT WIN32 without explanations is difficult
to maintain, so add a comment, and limit the scope to just
`cython_rados`.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-07 16:02:20 +08:00
Kefu Chai
e1a081a2c4
cmake: do not print warning in each cmake run
...
cmake prints the warning of
> run-promtool-unittests is skipped due to missing promtool
everytime if the test is skipped per the test. but we only need to
get this message the first time cmake is executed. more importantly,
the value of `PROMTOOL_EXECUTABLE` is cached. so the new error message
does not provide updated information, so just stop doing so if the
cached variable is found.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-07 15:13:12 +08:00
Kefu Chai
cf8814d316
Merge pull request #41695 from tchaikov/wip-crimson-net-move
...
crimson/net: move from out_q into sent queue
Reviewed-by: Amnon Hanuhov <ahanukov@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-06-07 09:52:36 +08:00
Kefu Chai
76d882bd6d
Merge pull request #41708 from tchaikov/wip-seastore-open-coll
...
crimson/os/seastore: open_collection() returns nullptr if DNE
Reviewed-by: Samuel Just <sjust@redhat.com>
2021-06-06 09:45:16 +08:00
Sage Weil
d49b3712d3
Merge PR #41665 into master
...
* refs/pull/41665/head:
mgr/cephadm:fix alerts sent to wrong URL
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-06-05 16:43:36 -04:00
Sage Weil
4757a13dc6
cephadm: improve is_container_running()
...
The 'podman ps' command sporatically exits with 125, I suspect due
to some race/bug in podman itself.
However, our goal here is just to check if a specific container
is running. Use inspect for that instead--it's even (a bit) faster.
Fixes: https://tracker.ceph.com/issues/51109
Signed-off-by: Sage Weil <sage@newdream.net>
2021-06-05 15:39:29 -05:00
Kefu Chai
89951a1d20
Merge pull request #40652 from ronen-fr/wip-ronenf-cscrub-class
...
osd/scrub: modify "classic" OSD scrub state-machine to support Crimson
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2021-06-06 00:06:32 +08:00
Sage Weil
6bd4df3573
common/cmdparse: fix CephBool validation for tell commands
...
The tell/asok validation uses a different validation path; make it work
for CephBool arguments.
Signed-off-by: Sage Weil <sage@newdream.net>
2021-06-05 11:23:35 -04:00
Kefu Chai
0d38c8a668
Merge pull request #41154 from rzarzynski/wip-global-backtrace-bug-50647
...
global: fault handlers cope with simultaneous faults now.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-05 21:41:00 +08:00
Kefu Chai
4857c35084
Merge pull request #41604 from t-msn/wip-51030
...
osd/ECBackend: Fix null pointer dereference when enabling jaeger tracing
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
2021-06-05 21:33:00 +08:00
Kefu Chai
4855e971ce
Merge pull request #41501 from aclamk/wip-bluefs-safer-flush
...
os/bluestore: Remove possibility of replay log and file inconsistency
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
2021-06-05 21:26:04 +08:00
Kefu Chai
b2823a457f
Merge pull request #41506 from ceph/wip-cv-batch-fixes
...
ceph-volume: fix batch report and respect ceph.conf config values
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
2021-06-05 21:23:13 +08:00
Kefu Chai
6ba7763f80
Merge pull request #41688 from tchaikov/wip-debian-rook
...
debian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-roo…
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-06-05 21:17:24 +08:00
Kefu Chai
9fbd60131b
crimson/os/seastore: open_collection() returns nullptr if DNE
...
we check for the existence of meta collection by trying to open it,
if it exists, we continue check for the superblock stored in it, if
the superblock does not exist or corrupted, we consider it as a failure.
before this change, open_collection() always return a valud Collection
even if the store does not have the collection with specified cid. this
behavior could be misleading in the use case above.
after this change, open_collection() looks up the collections stored in
root collection node for the specfied cid, and return nullptr if it does
not exist.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-05 18:02:45 +08:00
Kefu Chai
ca48d1cbdb
crimson/os/seastore: use structured binding
...
for better readability
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-05 18:02:45 +08:00
Kefu Chai
854df814d9
script/ceph-debug-docker: s/x86_64/$(arch)/
...
try to avoid hardwiring to a certain architecture if possible.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-05 12:22:00 +08:00
Kefu Chai
7804a3180f
pybind: add tox.ini
...
also add ceph_daemon to mypy.ini
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-05 12:10:37 +08:00
Kefu Chai
024012a943
pybind/ceph_daemon: add missing type annotations
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-05 12:08:40 +08:00
Kefu Chai
9121d5f711
pybind/ceph_daemon: correct type annotation of admin_socket()
...
we always pass a list of string to it, but since it does not assume the
container type of string, just specify Sequence[str].
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-05 11:53:08 +08:00
Kefu Chai
fb50de457c
pybind/ceph_daemon: fix the format string in Termsize.__repr__()
...
we intended to print the class name usign "%s".
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-05 11:40:26 +08:00
Kefu Chai
2d0d87dc9b
pybind/ceph_daemon: do not handle get_command_descriptions in admin_socket()
...
we never pass a single string to admin_socket() as its 2nd parameter.
instead, we always pass a list of string. so no need to handle it as a
special case.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-05 11:38:18 +08:00
Kefu Chai
9370ac9fa8
Merge pull request #41581 from tchaikov/wip-options-mgr-mon
...
common/options: extract mgr and mon options out
Reviewed-by: Neha Ojha <nojha@redhat.com>
2021-06-05 10:06:07 +08:00
Kefu Chai
e8f1477da1
Merge pull request #40073 from jmolmo/delete_service_causes_osd_removal
...
mgr/cephadm: Warn about OSDs to remove manually when deleting an OSD service
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-06-05 08:44:42 +08:00
Sage Weil
ffce51af8e
mgr/nfs: fix 'nfs export create' argument order
...
Put path before --readonly so that it can still be positional.
Signed-off-by: Sage Weil <sage@newdream.net>
2021-06-04 16:56:17 -04:00
Sage Weil
ec293f34b1
common/cmdparse: emit proper json
...
Instead of '"req": "false"', emit '"req": false'. Same for conditional.
Luckily, the clients don't really care about this change, as
ceph_argparse.py argdesc interpets the JSON like so:
self.req = req in (True, 'True', 'true')
self.positional = positional in (True, 'True', 'true')
Clean up command definitions to use lowercase 'false', but tolerate
both for backward compat during upgrade and to tolerate future errors.
Signed-off-by: Sage Weil <sage@newdream.net>
2021-06-04 16:56:17 -04:00
Sage Weil
b6b5ecc210
mon/MonCommands: add -- seperator to example
...
Signed-off-by: Sage Weil <sage@newdream.net>
2021-06-04 16:56:17 -04:00
Sage Weil
8683cccd06
qa/tasks/cephfs/test_nfs: fix export create test
...
Everything after --readonly is non-positional.
Signed-off-by: Sage Weil <sage@newdream.net>
2021-06-04 16:56:17 -04:00
Sage Weil
218f4cefea
mgr: make mgr commands compat with pre-quincy mon
...
If the mon is not yet quincy, do not share the quincy-ism of
'positional=false'.
Signed-off-by: Sage Weil <sage@newdream.net>
2021-06-04 16:56:17 -04:00
Sage Weil
295a5f2827
doc/_ext/ceph_commands: handle non-positional args in docs
...
Signed-off-by: Sage Weil <sage@newdream.net>
2021-06-04 16:56:17 -04:00
