Ernesto Puerta
40befabbe6
Merge pull request #45763 from rhcs-dashboard/fix-55172-master
...
monitoring/grafana: fix version
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2022-04-04 15:21:39 +02:00
Venky Shankar
18c4af3faf
Merge pull request #45514 from tchaikov/wip-cxx20-fixes-cephfs
...
cephfs: C++20 related fixes
Reviewed-by: Venky Shankar <vshankar@redhat.com>
2022-04-04 18:48:52 +05:30
Ernesto Puerta
8721bd6c5d
monitoring/grafana: fix version
...
Fixes: https://tracker.ceph.com/issues/55172
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2022-04-04 13:52:43 +02:00
Ernesto Puerta
a98c2475c6
Merge pull request #45254 from travisn/prometheus-rules-typos
...
prometheus: Spell check the alert descriptions
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
Reviewed-by: Travis Nielsen <tnielsen@redhat.com>
2022-04-04 13:46:00 +02:00
Ilya Dryomov
86523c537c
Merge pull request #45746 from idryomov/wip-crush-rule-sizes-cleanup
...
doc,test: clean up crush rule min/max_size leftovers
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-04-04 13:31:05 +02:00
zdover23
7601206945
Merge pull request #45385 from zdover23/wip-doc-2022-03-14-os-recommendations
...
doc/start: update os-recommendations.rst
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2022-04-04 14:20:12 +10:00
Tim Serong
e92720665f
Merge pull request #45705 from SUSE/wip-really-fix-55079
...
ceph.spec.in: remove build directory in %clean, not %install
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-04-04 13:49:32 +10:00
Radoslaw Zarzynski
bd85f2c1c5
Merge pull request #44612 from rzarzynski/wip-bs-lazy4freebsd
...
bdev: fix FTBFS on FreeBSD, keep the huge paged read buffers.
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
2022-04-02 11:44:37 +02:00
Liu-Chunmei
3cd054d117
Merge pull request #45719 from liu-chunmei/crimson-setopflag
...
Crimson handle CEPH_OSD_OP_FLAG_FAILOK
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2022-04-01 21:01:29 -07:00
David Galloway
7e2ad53343
Merge pull request #45658 from ceph/wip-debug-install
...
build: Add some debugging messages
2022-04-01 15:25:41 -04:00
David Galloway
57edb76ea4
build: Add some debugging messages
...
Having a unique string like "CI_DEBUG" will help me know where we are in the build process in Jenkins logs.
Signed-off-by: David Galloway <dgallowa@redhat.com>
2022-04-01 13:33:36 -04:00
David Galloway
b4910a6627
Merge pull request #45739 from rhcs-dashboard/fix-55155-master
...
grafana/Makefile: don't push to docker
2022-04-01 13:30:05 -04:00
Zac Dover
9ba68fb1a0
doc/start: update os-recommendations.rst
...
This PR updates the extremely out-of-date
os-recommendations.rst file.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
2022-04-02 01:50:45 +10:00
Ilya Dryomov
5bdf197431
src/crush: remove sample.txt
...
It is hopelessly outdated -- the weights were moved from crushmap to
osdmap in 2008, etc.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2022-04-01 14:00:13 +02:00
Ilya Dryomov
1ab943cabb
doc,test: clean up crush rule min/max_size leftovers
...
These fields were removed in quincy in commit f95eb04411
("crush:
eliminate min_size and max_size").
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2022-04-01 14:00:13 +02:00
Ernesto Puerta
7e6309fac3
grafana/Makefile: don't push to docker
...
Fixes: https://tracker.ceph.com/issues/55155
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2022-04-01 11:44:43 +02:00
Ernesto Puerta
2d1c480f5a
Merge pull request #45583 from p-se/monitoring-alert-mtu-group-by-devices
...
mgr/dashboard: Compare values of MTU alert by device
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: p-se <NOT@FOUND>
2022-04-01 11:11:30 +02:00
Kefu Chai
553d2bfef8
Merge pull request #45742 from tchaikov/wip-python-debian
...
debian: install from site-packages to dist-packages
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
2022-04-01 14:57:41 +08:00
Kefu Chai
e6eee05222
debian: install from site-packages to dist-packages
...
this change addresses the regression introduced by
637dd7b404
dist-packages is a debian specific directory for holding 3rd party
python modules. so install the pure python packages into it.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-04-01 13:14:23 +08:00
Chunmei Liu
31b6340b87
crimson: set result = 0 when op.flags include CEPH_OSD_OP_FLAG_FAILOK
...
Signed-off-by: Chunmei Liu <chunmei.liu@intel.com>
2022-03-31 16:06:34 -07:00
chunmei-liu
9aa3defc1f
crimson: handle osd_op.op.flags include CEPH_OSD_OP_FLAG_FAILOK
...
If the osd_op failed, still continue to next op when it include
CEPH_OSD_OP_FLAG_FAILOK.
Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
2022-03-31 16:06:22 -07:00
Liu-Chunmei
4feeea0ebb
Merge pull request #45707 from rzarzynski/wip-crimson-errorator-2nd-arg-handle
...
crimson/common: let errorator's handlers to conditionally forward errors
Reviewed-by: Sam Just <sjust@redhat.com>
liu-chunmei <chunmei.liu@intel.com>
2022-03-31 15:15:12 -07:00
Ernesto Puerta
87f494eda0
Merge pull request #45578 from rhcs-dashboard/fix-grafana-build
...
mgr/dashboard: remove transition-through-oci image workaround in grafana build
Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2022-03-31 19:58:29 +02:00
Radoslaw Zarzynski
d04ea43cfd
bdev: fix FTBFS on FreeBSD, keep the huge paged read buffers.
...
Special thanks to Willem Jan Withagen!
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2022-03-31 13:27:43 +02:00
Ilya Dryomov
d191b08bb6
Merge pull request #45660 from CongMinYin/fix-pwl-status
...
librbd/cache/pwl: correct cache state
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2022-03-31 12:30:03 +02:00
Travis Nielsen
9cca95b16a
prometheus: spell check the alert descriptions
...
Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-03-30 17:38:43 -06:00
Radosław Zarzyński
fc3d1b2f01
crimson/common: let errorator's handlers to conditionally forward errors
...
The use case is like the following one:
```diff
diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index a96f1b8dd2b..055add2e407 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -516,10 +516,14 @@ ReplicatedRecoveryBackend::read_object_for_push_op(
recovered_to = push_op->data_included.range_end();
}
return seastar::make_ready_future<uint64_t>(recovered_to);
- }, PGBackend::read_errorator::all_same_way([](auto e) {
+ }, PGBackend::read_errorator::all_same_way([](auto e, auto&& e_raw) -> PGBackend::read_errorator::future<uint64_t> {
logger().debug("build_push_op: read exception");
- return seastar::make_exception_future<uint64_t>(e);
- }));
+ if (42) {
+ return std::move(e_raw);
+ } else {
+ return seastar::make_exception_future<uint64_t>(e);
+ }
+ })).handle_error_interruptible(PGBackend::read_errorator::discard_all{});
}
RecoveryBackend::interruptible_future<>
```
Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
2022-03-31 01:17:16 +02:00
Adam King
6e4dd0e082
Merge pull request #45361 from adk3798/mds-upgrade-test
...
qa/suites/fs: stop looping in mds upgrade test if upgrade failed
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
2022-03-30 18:56:45 -04:00
Adam King
7e41eb9f93
Merge pull request #45248 from adk3798/offline-thread
...
mgr/cephadm: offline host watcher
Reviewed-by: Michael Fritch <mfritch@suse.com>
2022-03-30 13:50:07 -04:00
Adam King
5a97bc15b7
Merge pull request #45344 from adk3798/raw-prepare-cmd
...
mgr/cephadm: generate one c-v raw prepare cmd per data device in raw mode
Reviewed-by: Michael Fritch <mfritch@suse.com>
2022-03-30 13:48:43 -04:00
Casey Bodley
7989a028c5
Merge pull request #45567 from cbodley/wip-55000
...
rgw multisite: data sync uses yield_spawn_window()
Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2022-03-30 12:24:56 -04:00
Casey Bodley
9ce4431f26
Merge pull request #45515 from tchaikov/wip-cxx20-fixes-rgw
...
rgw: C++20 related fixes
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2022-03-30 12:03:15 -04:00
Kefu Chai
fd5b4a5206
Merge pull request #45536 from tchaikov/wip-std-optional
...
compressor/QatAccel: s/boost::optional/std::optional/
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2022-03-30 23:16:15 +08:00
Kefu Chai
4875c65998
Merge pull request #45648 from tchaikov/wip-kill-distutils
...
cmake: avoid using distutils
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2022-03-30 22:56:32 +08:00
Yuri Weinstein
daea072720
Merge pull request #45694 from amathuria/amathuri-53923-fix
...
osd/osd_types: Increasing decode version of scrub_duration in pg stats
Reviewed-by: Neha Ojha <nojha@redhat.com>
2022-03-30 07:16:44 -07:00
Kefu Chai
35f56a1850
Merge pull request #45142 from SoftIron/ceph-mgr-cephadm-python3-cherrypyTHREE
...
debian/control: fix python3-cherrypy*3* dependency
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-03-30 21:57:19 +08:00
Yin Congmin
6593e31fff
librbd/cache/pwl: correct cache state
...
update cache state after dirty_entries or log_enties list updated.
Fixes: https://tracker.ceph.com/issues/50614
Signed-off-by: Yin Congmin <congmin.yin@intel.com>
2022-03-30 21:45:29 +08:00
Adam King
627a9df99d
Merge pull request #45217 from rkachach/fix_issue_47872
...
mgr/cephadm: check spec host when adding osd
Reviewed-by: Adam King <adking@redhat.com>
2022-03-30 09:01:40 -04:00
Adam King
5b49c10aaf
Merge pull request #45275 from rkachach/fix_issue_54342
...
mgr/cephadm: adding HostSpec validation
Reviewed-by: Adam King <adking@redhat.com>
2022-03-30 08:59:15 -04:00
Adam King
f1760bed61
Merge pull request #45534 from rkachach/fix_issue_50804
...
mgr/cephadm: Show warning when user provides --fsid option
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
2022-03-30 08:58:04 -04:00
Adam King
c985bd639c
Merge pull request #45692 from rkachach/fix_issue_55113
...
mgr/cephadm: fallback to normal sorted if cannot import natsorted
Reviewed-by: Adam King <adking@redhat,com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
2022-03-30 08:48:33 -04:00
Radosław Zarzyński
c976e67e3a
crimson/common: avoid unnecessary throwing in stateful_error_t
...
This is an optimization for the flexible-but-slow `stateful_error_t`
error family of errorator. It's used infrequently.
Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
2022-03-30 14:21:25 +02:00
Koen Kooi
b7b381fe91
debian/control: fix python3-cherrypy*3* dependency
...
The trailing '3' was missed in one instance, ceph-mgr-cephadm, leading to:
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:
The following packages have unmet dependencies:
ceph-mgr-cephadm : Depends: python3-cherrypy but it is not installable
Which makes the installation fail.
Fixes: 78983ad0d0
Signed-off-by: Koen Kooi <koen@softiron.com>
2022-03-30 05:18:51 -07:00
Ernesto Puerta
043f7953d8
Merge pull request #45335 from rhcs-dashboard/fix-54513-master
...
mgr/dashboard: Pool overall performance shows multiple entries of same pool in pool overview
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
2022-03-30 14:05:38 +02:00
Ernesto Puerta
751d3df47b
Merge pull request #45559 from rhcs-dashboard/existing-host-test-fix
...
mgr/dashboard: fix 01-hosts.e2e test error
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2022-03-30 13:00:36 +02:00
Anthony D'Atri
39e8ec9389
Merge pull request #45701 from inspur-wyq/wip-doc-typos
...
doc/radosgw/sync-modules.rst: fix typos
2022-03-29 23:54:42 -07:00
Anthony D'Atri
2df627751b
Merge pull request #45702 from inspur-wyq/wip-doc-my-typos
...
doc/cephadm/operations.rst: fix typos
2022-03-29 23:43:46 -07:00
Tim Serong
94ad178bdc
ceph.spec.in: remove build directory in %clean, not %install
...
Removing the build directory at the end of %install is too soon,
and means we get rid of a bunch of stuff needed to correctly
create debuginfo/debugsource packages, which happens automatically
right after %install. So, let's put it where it really belongs, in
the %clean section.
Fixes: aa18cb1200
Fixes: https://tracker.ceph.com/issues/55079
Signed-off-by: Tim Serong <tserong@suse.com>
2022-03-30 16:25:34 +11:00
Samuel Just
b73ed7bb39
Merge pull request #45630 from liu-chunmei/crimson-omap-cmp
...
crimson: add omap cmp
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2022-03-29 21:40:49 -07:00
wangyunqing
92eb799a95
doc/cephadm/operations.rst: fix typos
...
Signed-off-by: wangyunqing <wangyunqing@inspur.com>
2022-03-30 11:58:43 +08:00