Commit Graph

130259 Commits

Author SHA1 Message Date
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
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
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
wangyunqing
07584628d6 doc/radosgw/sync-modules.rst: fix typos
Signed-off-by: wangyunqing <wangyunqing@inspur.com>
2022-03-30 11:53:57 +08:00
Samuel Just
32ee47a864
Merge pull request #45526 from xxhdx1985126/wip-coordinate-segment-seq
crimson/os/seastore: coordinate segment seq of journal and ool segments

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2022-03-29 20:53:30 -07:00
Chunmei Liu
7244b80956 crimson: return 0 in osd_op.rval when enodata
Signed-off-by: Chunmei Liu <chunmei.liu@intel.com>
2022-03-29 17:44:54 -07:00
Chunmei Liu
019c4128cb crimson: add OP_OMAP_CLEAR support
Signed-off-by: Chunmei Liu <chunmei.liu@intel.com>
2022-03-29 17:44:40 -07:00
Chunmei Liu
3414b28278 crimson:add OMAP_CMP support
Signed-off-by: Chunmei Liu <chunmei.liu@intel.com>
2022-03-29 17:38:17 -07:00
Ernesto Puerta
64c6bb394b
Merge pull request #45563 from rhcs-dashboard/fix-54991-master
mgr/dashboard:  don't log 3xx as errors

Reviewed-by: Sarthak0702 <NOT@FOUND>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2022-03-29 19:03:49 +02:00
Boris Ranto
f1d17b04e4
Merge pull request #45295 from lbausch/tweak_mgr_alerts_mail
mgr/alerts: Add Message-Id and Date header to sent emails

Reviewed-by: Boris Ranto <branto@redhat.com>
2022-03-29 13:55:14 +02:00
Ernesto Puerta
406e54d8c4
mgr/dashboard: don't log 3xx as errors
Let's avoid printing these ugly/misleading/redundant messages:

```
0 [dashboard DEBUG controllers.home] frontend language from headers: ['en-us']
0 [dashboard DEBUG controllers.home] found directory for language 'en-us'
0 [dashboard DEBUG controllers.home] serving static content: /home/jenkins-build/build/workspace/ceph-dashboard-pull-requests/build/src/pybind/mgr/dashboard/frontend/dist/en-US/styles.css
0 [dashboard ERROR exception] Internal Server Error
Traceback (most recent call last):
  File "/home/jenkins-build/build/workspace/ceph-dashboard-pull-requests/src/pybind/mgr/dashboard/services/exception.py", line 47, in dashboard_exception_handler
    return handler(*args, **kwargs)
  File "/usr/lib/python3/dist-packages/cherrypy/_cpdispatch.py", line 60, in __call__
    return self.callable(*self.args, **self.kwargs)
  File "/home/jenkins-build/build/workspace/ceph-dashboard-pull-requests/src/pybind/mgr/dashboard/controllers/home.py", line 134, in __call__
    return serve_file(full_path)
  File "/usr/lib/python3/dist-packages/cherrypy/lib/static.py", line 70, in serve_file
    cptools.validate_since()
  File "/usr/lib/python3/dist-packages/cherrypy/lib/cptools.py", line 117, in validate_since
    raise cherrypy.HTTPRedirect([], 304)
cherrypy._cperror.HTTPRedirect: ([], 304)
```

Fixes: https://tracker.ceph.com/issues/54991
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2022-03-29 11:52:18 +02:00
Kefu Chai
1651ce5b03
Merge pull request #45676 from rzarzynski/wip-crimson-toolset-10
ceph.spec.in: use gcc-toolset-10 for building crimson

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-03-29 17:03:14 +08:00
Ernesto Puerta
729e956855
Merge pull request #44014 from rhcs-dashboard/host-detail-service-column
mgr/dashboard: extend daemon actions to host details 

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
2022-03-29 10:49:31 +02:00
Yuval Lifshitz
cd96c07c6f
Merge pull request #45537 from yuvalif/wip-yuval-multisite-test-devices
multisite/test: running the multisite test script with custom devices
2022-03-29 10:35:57 +03:00
Tim Serong
01359f7905
Merge pull request #45666 from SUSE/wip-fix-55087
ceph.spec.in: Use libthrift-devel on SUSE distros

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-03-29 18:01:46 +11:00
Tim Serong
c454eeae35
Merge pull request #45664 from SUSE/wip-fix-55079
ceph.spec.in: remove build directory at end of %install

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-03-29 17:08:09 +11:00
Radosław Zarzyński
30f7514317 ceph.spec.in: use gcc-toolset-10 for building crimson
This commit bumps up the toolset version but only to build crimson.
That is, the classical OSD stays unaffected.

The reason behind the upgrade is the following FTBFS:

```
[ 32%] Building CXX object src/seastar/CMakeFiles/seastar.dir/src/core/reactor.cc.o
/home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/src/core/reactor.cc: In constructor ‘seastar::reactor::reactor(std::shared_ptr<seastar::smp>, seastar:👽:instance&, unsigned int, seastar::reactor_backend_selector, seastar::reactor_config)’:
/home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/src/core/reactor.cc:926:90: error: use of deleted function ‘seastar::condition_variable::condition_variable()’
  926 |     , _thread_pool(std::make_unique<thread_pool>(this, seastar::format("syscall-{}", id))) {
      |                                                                                          ^
In file included from /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/include/seastar/core/reactor.hh:74,
                 from /home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/src/core/reactor.cc:32:
/home/jenkins-build/build/workspace/ceph-dev-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-11345-ga3bb1485/rpm/el8/BUILD/ceph-17.0.0-11345-ga3bb1485/src/seastar/include/seastar/core/condition-variable.hh:157:5: note: ‘seastar::condition_variable::condition_variable() noexcept’ is implicitly deleted because its exception-specification does not match the implicit exception-specification ‘’
  157 |     condition_variable() noexcept = default;
```

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
2022-03-28 21:03:01 +02:00
Ernesto Puerta
2022a56646
Merge pull request #45647 from rhcs-dashboard/fix-55060-master
mgr/dashboard: fix api test issue with pip

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: zmc <NOT@FOUND>
2022-03-28 17:29:11 +02:00
Xuehan Xu
34e5ebfca7 crimson/os/seastore: coordinate segment seq of journal and ool segments
the segment seq in ool segments' headers also need to be set to the
current journal segment seq, because we rely on this to judge whether a
delta needs to be replayed

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
2022-03-28 17:48:33 +08:00
Tim Serong
19922e1875 ceph.spec.in: Use libthrift-devel on SUSE distros
Fixes: 80e82686eb
Fixes: https://tracker.ceph.com/issues/55087
Signed-off-by: Tim Serong <tserong@suse.com>
2022-03-28 20:46:26 +11:00
Ernesto Puerta
2289ad2bc3
mgr/dashboard: fix api test issue with pip
Fix
```
ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.
apache-libcloud 3.5.0 requires requests>=2.26.0, but you have requests 2.25.1 which is incompatible.
Successfully installed CherryPy-13.1.0 PyJWT-2.0.1 Routes-2.4.1 bcrypt-3.1.4 ceph-1.0.0 chardet-4.0.0 cheroot-8.6.0 idna-2.10 jaraco.functools-3.5.0 more-itertools-4.1.0 natsort-8.1.0 portend-3.1.0 pyopenssl-22.0.0 pytz-2022.1 repoze.lru-0.7 requests-2.25.1 tempora-5.0.1
```

Fixes: https://tracker.ceph.com/issues/55060
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2022-03-28 11:28:36 +02:00
Tim Serong
aa18cb1200 ceph.spec.in: remove build directory at end of %install
By the time we get to the end of the %install section, all the
built binaries have been installed in the build root, so we can
delete the build directory from the source tree.  This frees up
about 17GB of disk space on build hosts, which is helpful in
case other processes later in the RPM build need more disk space.

Fixes: https://tracker.ceph.com/issues/55079
Signed-off-by: Tim Serong <tserong@suse.com>
2022-03-28 19:23:18 +11:00
Kefu Chai
01b57c1f63
Merge pull request #45661 from tchaikov/doc-dpdk
doc/dpdk: reformat and reword

Reviewed-by: Chunsong Feng <fengchunsong@huawei.com>
2022-03-27 09:58:43 +08:00
Kefu Chai
352ab9b5f0 doc/dpdk: reword the root access part
the root access to system is not a must have for running a DPDK
application. so reword the "Configuring OSD DPDKStack" section.

also, manually editing /etc/passwd is not encouraged, so use
"usermod" instead. to add a directory after user's command
interpreter in /etc/passwd does not make sense. see PASSWD(5).
so drop the paragraph on editing /etc/passwd.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-03-27 01:00:21 +08:00
Ronen Friedman
a3bb148507
Merge pull request #45640 from ronen-fr/wip-rf-snaptrim
osd/scrub: restart snap trimming only after scrubbing is done

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2022-03-26 20:00:20 +03:00
Kefu Chai
3d2d6ffabb doc/dpdk: improve the formatting
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-03-27 00:46:17 +08:00
Kefu Chai
20b11d81df
Merge pull request #44292 from fengchunsong/dpdk-doc
doc/dev: add dpdkstack doc

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2022-03-26 23:48:00 +08:00
Adam King
56f20feb62
Merge pull request #44343 from adk3798/nfs-offline
mgr/cephadm: Reschedule nfs daemons from offline hosts

Reviewed-by: Michael Fritch <mfritch@suse.com>
2022-03-25 19:45:39 -04:00
David Galloway
dcd4b20462
Merge pull request #45649 from tchaikov/wip-crimson-cleanup
crimson/os: use fmt::format() instead of sstream
2022-03-25 15:07:39 -04:00
David Galloway
01b730d349
Merge pull request #45539 from rhcs-dashboard/css-fix-highlight-search
mgr/dashboard: Remove padding in search highlighted text
2022-03-25 14:44:46 -04:00
Neha Ojha
55f87377e5
Merge pull request #45651 from sseshasa/wip-qa-fix-activate-osd-test
qa/standalone: Fix test_activate_osd() test in ceph-helpers.sh

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
2022-03-25 11:24:52 -07:00
Neha Ojha
88cad13a08
Merge pull request #45553 from wxypro/doc-update
doc/mgr/prometheus.rst: fix spelling error

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2022-03-25 11:06:14 -07:00
Neha Ojha
8d73d8aa1a
Merge pull request #45575 from wxypro/options-fix
common/options: fix typos: smarctl -> smartctl

Reviewed-by: Neha Ojha <nojha@redhat.com>
2022-03-25 11:00:19 -07:00
J. Eric Ivancich
323c4fffdd
Merge pull request #44699 from ivancich/wip-bucket-index-timeout-config
core,rgw: allow configuration of bi tx timeout; add instrumentation

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2022-03-25 13:16:39 -04:00
Neha Ojha
506361eb45
Merge pull request #45522 from sseshasa/wip-improve-mclock-docs
Doc: Improve mclock config reference documentation & update PendingReleaseNotes.

Reviewed-by: Neha Ojha <nojha@redhat.com>
2022-03-25 09:46:41 -07:00
Sridhar Seshasayee
3aa2df2e0f qa/standalone: Fix test_activate_osd() test in ceph-helpers.sh
Modify test_activate_osd() to get the type of scheduler in use and then
verify the value of osd_max_backfills. This is because mclock scheduler
overrides this option to 1000 upon OSD initialization.

The test earlier used to pass because the OSD daemon was killed but not
marked down and upon being brought up, the wait for OSD up check was
passing quickly. But the OSD still didn't have the latest config values.

But now upon killing the OSD, the osd_fast_shutdown sequence notifies the
mon (see PR: https://github.com/ceph/ceph/pull/44807) and is marked down
and dead. Upon bringing it up, the wait for OSD up check takes a longer
time and this is sufficient for the config values to be updated. This
results in the correct values being read from the config 'Values' map.

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
2022-03-25 22:10:31 +05:30
Yuri Weinstein
ea1727e7d5
Merge pull request #44807 from NitzanMordhai/wip-nitzan-fast-shutdown-notify-mon
osd/OSD: osd_fast_shutdown_notify_mon not quite right

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2022-03-25 08:59:05 -07:00
Kefu Chai
ac114ad172 crimson/os: use fmt::format() instead of sstream
for better readability.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2022-03-25 23:49:45 +08:00
J. Eric Ivancich
17692c14ad
Merge pull request #45309 from caisan/modify_without_source_segfault
radosgw-admin: fix segfault on pipe modify without source/dest zone specified

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2022-03-25 11:46:09 -04:00
Venky Shankar
d6516fa649
Merge pull request #45573 from wxypro/cephfs-shell-typos
tools/cephfs-shell: fix typos in comments

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2022-03-25 18:14:33 +05:30
Adam King
b511c9534d
Merge pull request #44895 from rkachach/fix_issue_54026
mgr/cephadm: Adding support for natural sorting

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2022-03-25 08:35:47 -04:00
Adam King
0bdf0eff49
Merge pull request #45241 from rkachach/fix_issue_51072
mgr/cephadm: fixing prometheus port handling

Reviewed-by: Adam King <adking@redhat.com>
2022-03-25 08:33:54 -04:00
Adam King
8cc6cbc5b1
Merge pull request #45314 from rkachach/fix_issue_54503
mgr/cephadm: checking service name before removal

Reviewed-by: Adam King <adking@redhat.com>
2022-03-25 08:32:01 -04:00
Ronen Friedman
948d3266c6 osd/scrub: restart snap trimming only after scrubbing is done
Snap trimming that was postponed as the target PG was scrubbing
must be restarted at scrub completion.
PR #38111 moved trimming restart to just before the scrub fully
terminated. The current PR fixes that.

Trimming is also restarted in those cases where scrub was
queued but aborted immediately.

Fixes: https://tracker.ceph.com/issues/52026

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
2022-03-25 11:49:51 +00:00
Ilya Dryomov
b89b099893
Merge pull request #45601 from idryomov/wip-diff-iterate-striping-fix
librbd: make diff-iterate in fast-diff mode sort and merge reported extents

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
2022-03-25 09:45:26 +01:00
Kefu Chai
75ee0e2184
Merge pull request #45513 from tchaikov/wip-cxx20-fixes-mon
mgr,mon,test: C++20 fixes

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Radosław Zarzyński <rzarzyns@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2022-03-25 12:24:24 +08:00
Samuel Just
0af6bc8778
Merge pull request #45386 from cyx1231st/wip-crimson-epm-split-hot-cold
crimson/os/seastore: reuse RecordSubmitter for SegmentedJournal and EPM::Writer

Reviewed-by: Samuel Just <sjust@redhat.com>
2022-03-24 20:46:02 -07:00