Kefu Chai
c384b04ceb
Merge pull request #41703 from tchaikov/wip-options-mgr-mon
...
common/options: extract mgr and mon options out
Reviewed-by: Neha Ojha <nojha@redhat.com>
2021-06-08 23:33:38 +08:00
Kefu Chai
04fa416472
Merge pull request #41444 from Daniel-Pivonka/cephadm-monitoring-ip-bind
...
mgr/cephadm: allow monitoring stack ip binding and custom ports
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-06-08 23:32:24 +08:00
Kefu Chai
fb25fa722a
Merge pull request #41555 from mgfritch/cephadm-pytest-bootstrap
...
cephadm: add bootstrap unit tests
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-06-08 23:30:47 +08:00
Kefu Chai
7bb4628e76
Merge pull request #41567 from ybwang0211/listxattr
...
doc: Added the explanation of the 'listxattr <obj-name>' and 'getxattr <obj-name> attr' commands
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-08 23:30:13 +08:00
Kefu Chai
a879aadd51
Merge pull request #41724 from tchaikov/wip-cmdparse-cleanup
...
common/cmdparse: do not create temp string unless necessary
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-06-08 23:29:27 +08:00
Ernesto Puerta
756d4b18aa
.github/labeler: add api-change label
...
To flag PRs changing the Ceph REST API. It might also work for another
APIs.
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2021-06-08 17:12:36 +02:00
Ernesto Puerta
a9ea94f8f6
Merge pull request #41656 from rhcs-dashboard/49885-fix-bucket-object-lock-fields
...
mgr/dashboard: simplify object locking fields in 'Bucket Creation' form
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2021-06-08 16:53:10 +02:00
Kefu Chai
cf4587e654
Merge pull request #41743 from tchaikov/wip-rgw-lua-exception
...
rgw/rgw_lua_utils: return error using luaL_error()
Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
2021-06-08 21:33:50 +08:00
Kefu Chai
e2693727ac
Merge pull request #41689 from tchaikov/wip-vstart-restful
...
vstart.sh: disable restful by default
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2021-06-08 20:23:40 +08:00
Kefu Chai
873e3fc8dc
Merge pull request #41756 from rzarzynski/wip-crimson-monc-fix-races-in-on_session_opened
...
crimson/monc: fix races between on_session_opened() and the reset sequence
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-08 19:40:38 +08:00
Kefu Chai
52600606fa
Merge pull request #41747 from dengchl01/dengchl01-commit
...
mgr/mgr_module: update docstring of MgrModule.get()
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-06-08 19:11:35 +08:00
Radoslaw Zarzynski
b5f3dc4d9d
crimson/monc: fix races between on_session_opened() and the reset sequence.
...
The `active_con` can get invalidated every single time when there is
a preemption point. This includes even the middle connection open
sequence as it's spread across multiple continuations!
Unfortunately, we don't check for `active_con` in the lambdas inside
the `on_session_opened()` method. That was the reason of the following
crash at Sepia [1]:
```
INFO 2021-06-08 09:36:23,992 [shard 0] monc - do_auth_single: connection closed
/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-4967-g96cdf983/rpm/el8/BUILD/ceph-17.0.0-4967-g96cdf983/src/crimson/mon/MonClient.cc:399:10: runtime error: member access within null pointer of type 'struct Connection'
Segmentation fault on shard 0.
Backtrace:
0# 0x000055C3C1CA860F in ceph-osd
1# FatalSignal::signaled(int, siginfo_t const*) in ceph-osd
2# FatalSignal::install_oneshot_signal_handler<11>()::{lambda(int, siginfo_t*, void*)#1}::_FUN(int, siginfo_t*, void*) in ceph-osd
3# 0x00007FAAE1713B20 in /lib64/libpthread.so.0
4# crimson::mon::Connection::get_conn() in ceph-osd
5# 0x000055C3C2532DA8 in ceph-osd
6# 0x000055C3C2535CB5 in ceph-osd
7# 0x000055C3BBC9FC70 in ceph-osd
8# 0x000055C3C76FAE5F in ceph-osd
9# 0x000055C3C77003A0 in ceph-osd
10# 0x000055C3C78B240B in ceph-osd
11# 0x000055C3C740FE8A in ceph-osd
12# 0x000055C3C7419FAE in ceph-osd
13# main in ceph-osd
14# __libc_start_main in /lib64/libc.so.6
15# _start in ceph-osd
Fault at location: 0x98
```
[1]: http://pulpito.front.sepia.ceph.com/rzarzynski-2021-06-08_09:11:05-rados-master-distro-basic-smithi/6159602
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-06-08 10:57:03 +00:00
Sebastian Wagner
5f1aa05563
doc/dev/cephadm: cephadm bootstrap --shared_ceph_folder
...
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
2021-06-08 12:16:49 +02:00
Aaryan Porwal
4e53a139d9
mgr/dashboard: fix for right sidebar nav icon not clickable
...
fixed the responsive sidebar not opening on click event, and close sidebar on clicking tasks and notification list item because it'll be over shadowed by the sidebar
Signed-off-by: Aaryan Porwal <aaryanporwal2233@gmail.com>
2021-06-08 14:16:14 +05:30
dengchl01
ff15d24d4a
mgr/mgr_module: add docstring of MgrModule.get()-mgr_map,modified_config_options,service_map,mds_metadata,pg_status,osd_pool_stats,mgr_ips,have_local_config_map
...
Signed-off-by: dengchl01 <dengchl01@inspur.com>
2021-06-08 15:42:27 +08:00
Kefu Chai
a5fd875665
Merge pull request #41745 from tchaikov/wip-crimson-osd-cleanup
...
crimson/osd: do not capture unused variable
Reviewed-by: Samuel Just <sjust@redhat.com>
2021-06-08 13:57:03 +08:00
Kefu Chai
02f7a41f9c
crimson/osd: do not capture unused variable
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-08 13:12:41 +08:00
Kefu Chai
53de4a5713
cmake: vstart do not depend on cython_rbd if WIN32
...
6eacbdcac1
2021-06-08 13:07:08 +08:00
Kefu Chai
0182a11670
rgw/rgw_lua*: return unknown field error using luaL_error()
...
it's found on aarch64, the exception is not caught even if we do
catch exactly the same type of thrown exception, and the uncaught
exception ends up with a std::terminate() call. it could be the ABI
mismatch in aarch64, so the C++ runtime failed to find the catch block.
in this change, luaL_error() is used to populate the error to the
caller instead to workaround this issue.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-08 12:44:43 +08:00
Kefu Chai
9b2e0b6ac2
rgw/rgw_lua_utils: return error using luaL_error()
...
it's found on aarch64, the exception is not caught even if we do
catch exactly the same type of thrown exception, and the uncaught
exception ends up with a std::terminate() call. it could be the ABI
mismatch in aarch64, so the C++ runtime failed to find the catch block.
in this change, luaL_error() is used to populate the error to the
caller instead to workaround this issue.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-08 12:44:35 +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
Sage Weil
f58ffbe3bd
mgr/nfs: do not depend on cephadm.utils
...
The cephadm package may not be installed (it is a separate rpm/deb).
While we are here, adjust the exception to be an NFS-specific one.
Signed-off-by: Sage Weil <sage@newdream.net>
2021-06-07 18:24:18 -04: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
Kefu Chai
abca699b59
common/cmdparse: do not create temp string for writing ostream
...
ostream is able to handle std::string_view, so no need to create
temporary std::string instance for writing to a std::ostream
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-07 22:11:58 +08:00
Kefu Chai
0893d18b4d
common/cmdparse: do not create temp string for cmd_getval()
...
cmd_getval() consumes string_view, so no need to create a temporary
std::string instance for it.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-07 22:11:58 +08: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
Nizamudeen A
7c1df692f2
mgr/dashboard: Include Network address and labels on Host Creation form
...
The ability to create host by specifying network address and also create
labels.
https://tracker.ceph.com/issues/50318
Signed-off-by: Nizamudeen A <nia@redhat.com>
2021-06-07 14:47:09 +05:30
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
9b1d524839
debian: mark "crimson" specific deps with "pkg.ceph.crimson"
...
see also https://wiki.debian.org/BuildProfileSpec
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-07 12:36:19 +08:00
Kefu Chai
c0fad448e9
debian: mark "make check" deps with "pkg.ceph.check" build
...
instead of inventing our way for defining "make check" dependencies, use
build profile for adding "make check" specific dependencies. see
https://wiki.debian.org/BuildProfileSpec
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-06-07 12:35:00 +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
