Jenkins Build Slave User [Fri, 6 Dec 2019 16:42:34 +0000 (16:42 +0000)]
14.2.5
Sage Weil [Fri, 6 Dec 2019 15:55:00 +0000 (09:55 -0600)]
Merge pull request #32082 from liewegas/workaround-py2-strptime-nautilus
nautilus: mgr/devicehealth: import _strptime directly
Sage Weil [Fri, 6 Dec 2019 14:30:53 +0000 (08:30 -0600)]
mgr/devicehealth: import _strptime directly
On some machines (in my case, ubuntu 18.04 with 2.7.15+), I see
MGR_MODULE_ERROR Module 'devicehealth' has failed: Failed to import _strptime because the import lockis held by another thread.
Module 'devicehealth' has failed: Failed to import _strptime because the import lockis held by another thread.
This is apparently an issue with datetime on py2, see
https://www.raspberrypi.org/forums/viewtopic.php?t=166912
Doing the import explicitly is a simple workaround (and resolves the
warning in my test case).
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 5 Dec 2019 22:16:07 +0000 (16:16 -0600)]
Merge pull request #32045 from liewegas/fix-mon-autotune-leveldb-nautilus
nautilus: mon/OSDMonitor: make memory autotune disable itself if no rocksdb
Sage Weil [Thu, 5 Dec 2019 19:34:19 +0000 (13:34 -0600)]
mon/OSDMonitor: make memory autotune disable itself if no rocksdb
Currently, we crash (failed assertion). Instead, just disable autotuning.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
68eea44c118f862c752781bb20f75e6f51749329)
Neha Ojha [Thu, 5 Dec 2019 18:07:09 +0000 (10:07 -0800)]
Merge pull request #32018 from dzafman/wip-revert-verify-upmap-nautilus
nautilus: Revert "crush: remove invalid upmap items"
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
David Zafman [Thu, 5 Dec 2019 00:13:42 +0000 (16:13 -0800)]
Revert "crush: remove invalid upmap items"
This reverts commit
d6b3025a279c3876df035b02c7b8ec13e0590d7f.
Signed-off-by: David Zafman <dzafman@redhat.com>
Sage Weil [Tue, 3 Dec 2019 22:12:02 +0000 (16:12 -0600)]
Merge pull request #31985 from liewegas/wip-fix-telemetry-log-typo-nautilus
nautilus: mgr/telemetry: fix typo
Sage Weil [Tue, 3 Dec 2019 19:38:50 +0000 (13:38 -0600)]
mgr/telemetry: fix log typo
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
462aa8ff951ad746d096deef17b201c86b41741f)
Sage Weil [Tue, 3 Dec 2019 19:33:48 +0000 (13:33 -0600)]
Merge pull request #31974 from liewegas/wip-fix-crash-sorting-nautilus
nautilus: mgr/crash: fix 'crash ls[-new]' sorting
Nathan Cutler [Tue, 3 Dec 2019 18:13:55 +0000 (19:13 +0100)]
Merge pull request #31894 from smithfarm/wip-43030-nautilus
nautilus: doc: mention --namespace option in rados manpage
Reviewed-by: Neha Ojha <nojha@redhat.com>
Sage Weil [Tue, 3 Dec 2019 13:12:26 +0000 (07:12 -0600)]
mgr/crash: fix 'crash ls[-new]' sorting
Broken by
c691f2f8763a9db081a0b61294c5eedf4e9c2cee
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
6e2d917acabee8f0bad09c7aa0d4a9e8e02754b5)
Nathan Cutler [Tue, 26 Nov 2019 07:04:17 +0000 (08:04 +0100)]
doc: mention --namespace option in rados manpage
Fixes: https://tracker.ceph.com/issues/43021
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
4353b5548e0a2a46a0f429afd1b82f4989e665ae)
Yuri Weinstein [Mon, 25 Nov 2019 16:01:36 +0000 (08:01 -0800)]
Merge pull request #31833 from dillaman/wip-42891-nautilus
nautilus: cls/rbd: sanitize the mirror image status peer address after reading from disk
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Sun, 24 Nov 2019 02:33:20 +0000 (20:33 -0600)]
Merge pull request #31822 from neha-ojha/wip-31657-nautilus
nautilus: osd: release backoffs during merge
Jason Dillaman [Sat, 23 Nov 2019 15:36:31 +0000 (10:36 -0500)]
cls/rbd: sanitize the mirror image status peer address after reading from disk
RADOS upgrade tests were failing when OSDs were partially upgraded since the
entity_addr_t::type overload wasn't being recovered when re-read. Now we will
always sanitize the on-disk entity address after reading it to avoid such
issues of on-disk encoding/decoding.
Fixes: https://tracker.ceph.com/issues/42891
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
1542d12e1b893166a5bc7b7a4c9a4474078a98be)
Conflicts:
src/cls/rbd/cls_rbd(_types).[h|cc]: the MirrorImageStatusOnDisk struct has moved
Alfredo Deza [Fri, 22 Nov 2019 20:04:50 +0000 (15:04 -0500)]
Merge pull request #31812 from jan--f/wip-42965-nautilus
nautilus: ceph-volume: check if we run in an selinux environment
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Sage Weil [Thu, 14 Nov 2019 14:49:32 +0000 (08:49 -0600)]
osd: release backoffs during merge
When we merge PGs, ensure that backoffs release messages are sent to
the client before the victim PG is destroyed. This is /almost/ handled
by on_shutdown(), except that the shutdown code is aggressive about
tearing down backoff state in order to manage the PGRef lifecycle
carefully--and because in the shutdown (or normal PG/pool deletion) case
it doesn't matter what (if anything) we tell the client.
Fix this by simply queuing the backoff release prior to shutting down the
merge source PG.
An alternative appraoch would be to rejigger the PGRef release timing, but
that code is very fragile and this is a more targetted fix for this issue.
We might consider a more careful look in the future... or not!
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
f75d8327277012db70c2ca00991decacf29b1b6a)
Jan Fajerski [Fri, 22 Nov 2019 16:45:31 +0000 (17:45 +0100)]
ceph-volume: add mock dependency to tox.ini
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
Jan Fajerski [Fri, 22 Nov 2019 14:51:00 +0000 (15:51 +0100)]
ceph-volume: python2 raises OSError on Popen with missing binary.
For compatibility alias FileNotFoundError to OSError.
Fixes: 72b79f71fa84fe0d56b2fd1745f5bb130380cc38
Fixes: https://tracker.ceph.com/issues/42967
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
12c5f89ddb51a1db9399e03591e1db6c429b9c9e)
Jan Fajerski [Fri, 22 Nov 2019 14:49:41 +0000 (15:49 +0100)]
ceph-volume: py2 compatibility for selinux test
Fixes: af30c7f956380beb3bc4021d60b9229a82bda4e2
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
114aa57df28107c2d14caacdfb3f0423b244075d)
Jan Fajerski [Fri, 22 Nov 2019 09:46:05 +0000 (10:46 +0100)]
ceph-volume: don't assume SELinux
Expect selinux related binaries to not be present.
Fixes: 33c8a64a54d9ea8962091caf8564cea3f603c5f5
Fixes: https://tracker.ceph.com/issues/42957
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
72b79f71fa84fe0d56b2fd1745f5bb130380cc38)
Jan Fajerski [Fri, 22 Nov 2019 10:09:22 +0000 (11:09 +0100)]
ceph-volume: fix test test_selinuxenabled_doesnt_exist
Popen does not open a shell by default, so A FileNotFoundError is
raised instead of returning a 127 return code.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
af30c7f956380beb3bc4021d60b9229a82bda4e2)
Patrick Donnelly [Thu, 21 Nov 2019 01:34:26 +0000 (17:34 -0800)]
Merge PR #30521 into nautilus
* refs/pull/30521/head:
qa: have kclient tests use new mount.ceph functionality
doc: document that the kcephfs mount helper will search keyring files for secrets
mount.ceph: fork a child to get info from local configuration
mount.ceph: track mon string and path inside ceph_mount_info
mount.ceph: add name and secret to ceph_mount_info
mount.ceph: add ceph_mount_info structure
mount.ceph: clean up debugging output and error messages
mount.ceph: clean up return codes
mount.ceph: add comment explaining why we need to modprobe
mount.ceph: use bools for flags
common: have read_secret_from_file return negative error codes
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Wed, 20 Nov 2019 21:14:15 +0000 (13:14 -0800)]
Merge pull request #31733 from epuertat/wip-42677-nautilus
nautilus: mgr/dashboard: Fix grafana dashboards
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 20 Nov 2019 20:06:54 +0000 (12:06 -0800)]
Merge pull request #30229 from vumrao/wip-vumrao-bluefs-shared-alloc-with-log-level-change-nautilus
nautilus: os/bluestore: apply shared_alloc_size to shared device with log level change
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Wed, 20 Nov 2019 20:05:12 +0000 (12:05 -0800)]
Merge pull request #31704 from smithfarm/wip-42858-nautilus
nautilus: mon/PGMap: fix incorrect pg_pool_sum when delete pool
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 20 Nov 2019 20:04:50 +0000 (12:04 -0800)]
Merge pull request #31676 from tchaikov/nautilus-42832
nautilus: ceph.in: do not preload ASan unless necessary
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Yuri Weinstein [Wed, 20 Nov 2019 20:03:42 +0000 (12:03 -0800)]
Merge pull request #31526 from ricardoasmarques/wip-42730-nautilus
nautilus: mgr/dashboard: tasks: only unblock controller thread after TaskManager thread
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Wed, 20 Nov 2019 20:03:02 +0000 (12:03 -0800)]
Merge pull request #30910 from rjfd/wip-42283-nautilus
nautilus: mgr/dashboard: internationalization support with AOT enabled
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Yuri Weinstein [Wed, 20 Nov 2019 20:01:28 +0000 (12:01 -0800)]
Merge pull request #30685 from ifed01/wip-ifed-fast-fsck-nau
nautilus: os/bluestore: shallow fsck mode and legacy statfs auto repair.
Reviewed-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Tue, 19 Nov 2019 16:51:20 +0000 (17:51 +0100)]
Merge pull request #31742 from smithfarm/wip-42836-nautilus
nautilus: rgw: Silence warning: control reaches end of non-void function
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Jos Collin [Wed, 3 Jul 2019 04:44:21 +0000 (10:14 +0530)]
rgw: drop getting list-type when get_data is false
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit
ae56a918174cc6899bf7384004560ea57036b009)
Jos Collin [Mon, 1 Jul 2019 09:02:33 +0000 (14:32 +0530)]
rgw: Silence warning: control reaches end of non-void function
Build shows:
[ 53%] Building CXX object src/mds/CMakeFiles/mds.dir/JournalPointer.cc.o
ceph/src/rgw/rgw_rest_s3.cc: In member function ‘RGWOp* RGWHandler_REST_Bucket_S3::get_obj_op(bool)’:
ceph/src/rgw/rgw_rest_s3.cc:3588:5: warning: control reaches end of non-void function [-Wreturn-type]
} }
^
Fixes: 4ffc765c4c5debc665ade7769c4647c3a7278fd2
Fixes: http://tracker.ceph.com/issues/40747
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit
abb2451dd5164e6b610589207b900a6464e21282)
Laura Paduano [Tue, 19 Nov 2019 15:57:17 +0000 (16:57 +0100)]
Merge pull request #31522 from ricardoasmarques/wip-42729-nautilus
nautilus: mgr/dashboard: RBD tests must use pools with power-of-two pg_n…
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Laura Paduano [Tue, 19 Nov 2019 15:56:34 +0000 (16:56 +0100)]
Merge pull request #31516 from rhcs-dashboard/42694-filter-non-pool-fields
nautilus: mgr/dashboard: do not show non-pool data in pool details
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Laura Paduano [Tue, 19 Nov 2019 15:55:55 +0000 (16:55 +0100)]
Merge pull request #31413 from smithfarm/wip-41980-nautilus
nautilus: mgr/dashboard: do not log tokens
Laura Paduano [Tue, 19 Nov 2019 15:55:14 +0000 (16:55 +0100)]
Merge pull request #31375 from tspmelo/wip-42150-nautilus
nautilus: mgr/dashboard: Configuring an URL prefix does not work as expected
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Laura Paduano [Tue, 19 Nov 2019 15:29:26 +0000 (16:29 +0100)]
Merge pull request #31349 from rhcs-dashboard/42589-edit-image-after-data-received
nautilus: mgr/dashboard: edit/clone/copy rbd image after its data is received
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Laura Paduano [Tue, 19 Nov 2019 15:02:32 +0000 (16:02 +0100)]
Merge pull request #31263 from ricardoasmarques/wip-42295-nautilus
nautilus: mgr/dashboard: Provide the name of the object being deleted
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Laura Paduano [Tue, 19 Nov 2019 15:00:42 +0000 (16:00 +0100)]
Merge pull request #31160 from Exotelis/wip-42482-nautilus
nautilus: mgr/dashboard: Add transifex-i18ntool
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Vikhyat Umrao [Thu, 22 Aug 2019 16:45:40 +0000 (09:45 -0700)]
os/bluestore/BlueFS: Move bluefs alloc size initialization log message to log level 1
Fixes: https://tracker.ceph.com/issues/41399
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit
96d48af3252f0ec2c1864383ad5eee993ecfeb4f)
Sage Weil [Wed, 7 Aug 2019 17:41:33 +0000 (12:41 -0500)]
os/bluestore/BlueFS: apply shared_alloc_size to shared device
Keep an alloc_size vector so that we have this value handy at all times.
Allow bluestore to fetch this value directly instead of looking at the
bluefs_* config options since this encapsulates things a bit better, and
also isn't vulnerable to the config setting changing at runtime.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
e8b5a458c306dfe166b09239fc9f57c04fa47ead)
Sage Weil [Thu, 8 Aug 2019 18:30:59 +0000 (13:30 -0500)]
os/bluestore/BlueFS: fix device_migrate_to_* to handle varying alloc sizes
The previous implementation moved extents individually. This caused
problems when moving an extent with a small alloc_size that wasn't
a multiple of the target device's alloc_size.
Instead, identify files with extents that need to be moved, and then read
the file in its entirety and rewrite it in its entirety.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
94269741959a4280225b6330dfb015f1799fd1f2)
Sage Weil [Wed, 7 Aug 2019 15:54:42 +0000 (10:54 -0500)]
os/bluestore: whitespace
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
99c56559d17fac4fde65ef38a82ac6cab090dafb)
Igor Fedotov [Tue, 16 Jul 2019 14:16:16 +0000 (17:16 +0300)]
os/bluestore: cleanup around allocator calls
Both stupid and bitmap allocator returs -ENOSPC if they're
unable to allocate any space. Existing callers aren't always
respect this - hence doing some cleanup.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
a1246da5705e2a699656c2561cebc5ed29628c90)
Sage Weil [Wed, 7 Aug 2019 15:44:38 +0000 (10:44 -0500)]
os/bluestore/BlueFS: add bluefs_shared_alloc_size
Add a separate config option that controls the alloc_size for the shared
device (BDEV_SLOW).
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
c69c9539f628c61a1cf4cae6aadd39cb48a8b022)
Neha [Fri, 2 Aug 2019 18:26:52 +0000 (18:26 +0000)]
os/bluestore/BlueStore.cc: start should be >= _get_ondisk_reserved()
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
27aa0db8e57bffd61225f2c4e73f596c7399d2b1)
Radu Toader [Wed, 30 Oct 2019 08:42:41 +0000 (10:42 +0200)]
mgr/dashboard: fix grafana dashboards
Fixes: https://tracker.ceph.com/issues/42542
Sort order was wrong for some dashboards,
fixed empty / buggy Top 3 clients IOPS by pool / Throughput - in Pools
Overall performance
fixed Avg utilization Multiple series found - in Host Overall
performance
Fixed invalid dimensions for plot - in OSD Overall performance
Signed-off-by: Radu Toader <radu.m.toader@gmail.com>
(cherry picked from commit
3beaf63761590fd35a72777fc56c0d5f4a6cad3b)
Lenz Grimmer [Tue, 19 Nov 2019 10:27:58 +0000 (10:27 +0000)]
nautilus: mgr/dashboard: Fix data point alignment in MDS count… (#31535)
nautilus: mgr/dashboard: Fix data point alignment in MDS counters chart
Reviewed-by: Stephan Müller <smueller@suse.com>
Yuri Weinstein [Mon, 18 Nov 2019 20:15:00 +0000 (12:15 -0800)]
Merge pull request #31658 from smithfarm/wip-42731-nautilus
nautilus: mon/MonMap: encode (more) valid compat monmap when we have v2-only addrs
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Mon, 18 Nov 2019 20:14:10 +0000 (12:14 -0800)]
Merge pull request #31604 from smithfarm/wip-42782-nautilus
nautilus: tests: test_librados_build.sh: grab from nautilus branch in nautilus
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 20:13:42 +0000 (12:13 -0800)]
Merge pull request #31444 from dzafman/wip-41785
nautilus: core: Make dumping of reservation info congruent between scrub and recovery
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 20:13:08 +0000 (12:13 -0800)]
Merge pull request #31261 from ceph/wip-nautilus-restful-node-items
nautilus: restful: Query nodes_by_id for items
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 20:12:18 +0000 (12:12 -0800)]
Merge pull request #31125 from smithfarm/wip-42439-nautilus
nautilus: build/ops: rpm: make librados2, libcephfs2 own (create) /etc/ceph
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 20:11:44 +0000 (12:11 -0800)]
Merge pull request #31011 from smithfarm/wip-42401-nautilus
nautilus: cmake: Allow cephfs and ceph-mds to be build when building on FreeBSD
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 20:10:35 +0000 (12:10 -0800)]
Merge pull request #30740 from smithfarm/wip-41463-nautilus
nautilus: ceph-objectstore-tool: update-mon-db: do not fail if incmap is missing
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 20:09:15 +0000 (12:09 -0800)]
Merge pull request #31682 from dzafman/wip-42432-nautilus
nautilus: mgr: Release GIL before calling OSDMap::calc_pg_upmaps()
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 20:08:31 +0000 (12:08 -0800)]
Merge pull request #31077 from smithfarm/wip-42141-nautilus
nautilus: core: osd/PGLog: persist num_objects_missing for replicas when peering is done
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Mon, 18 Nov 2019 20:05:28 +0000 (12:05 -0800)]
Merge pull request #30900 from smithfarm/wip-42136-nautilus
nautilus: osd: Remove unused osdmap flags full, nearfull from output
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 16:53:11 +0000 (08:53 -0800)]
Merge pull request #31136 from wjwithagen/wip-fixup-cephfs-nautilus
nautilus: test/{fs,cephfs}: Get libcephfs and cephfs to compile with FreeBSD
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 16:52:33 +0000 (08:52 -0800)]
Merge pull request #30951 from sidharthanup/mds-evict-duplicate-nautilus
nautilus: cephfs: mds: Fix duplicate client entries in eviction list
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 16:51:58 +0000 (08:51 -0800)]
Merge pull request #30043 from smithfarm/wip-41488-nautilus
nautilus: cephfs: client: return -eio when sync file which unsafe reqs have been dropped
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 16:50:59 +0000 (08:50 -0800)]
Merge pull request #29832 from pdvian/wip-41095-nautilus
nautilus: cephfs: qa: wait for MDS to come back after removing it
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 16:50:29 +0000 (08:50 -0800)]
Merge pull request #29811 from pdvian/wip-41093-nautilus
nautilus: cephfs: qa: ignore expected MDS_CLIENT_LATE_RELEASE warning
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 16:49:58 +0000 (08:49 -0800)]
Merge pull request #29750 from pdvian/wip-41087-nautilus
nautilus: qa: sleep briefly after resetting kclient
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 18 Nov 2019 15:57:05 +0000 (07:57 -0800)]
Merge pull request #31650 from uweigand/nautilus-backport-28013
nautilus: rgw: use explicit to_string() overload for boost::string_ref
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Mon, 18 Nov 2019 14:54:18 +0000 (06:54 -0800)]
Merge pull request #31079 from smithfarm/wip-42155-nautilus
nautilus: cephfs: mds: fix infinite loop in Locker::file_update_finish
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Kefu Chai [Tue, 26 Mar 2019 17:26:59 +0000 (01:26 +0800)]
ceph.in: normalize BOOL values found by get_cmake_variables()
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
44cb44425ce19ee293a0e0f012229cf2389ac271)
Sage Weil [Wed, 11 Sep 2019 21:43:11 +0000 (16:43 -0500)]
os/bluestore: test conversion from global statfs
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
923becc88257a70604b313a3ea0419a1024c62d2)
Sage Weil [Wed, 11 Sep 2019 17:52:57 +0000 (12:52 -0500)]
os/bluestore: simplify per-pool-stat config options
The previous bluestore_no_per_pool_stats_tolerance had a lot of possible
values, not all of which make sense to users. Replace with a single new
option, bluestore_fsck_error_on_no_per_pool_stats, which controls whether
the lack of per-pool stats is an error or a warning. On repair, we will
unconditionally convert to per-pool stats.
This brings us in sync with the newer
bluestore_fsck_error_on_no_per_pool_omap.
Note that one part of the ceph_test_objectstore test is dropped since it
is no longer possible to create a store with legacy stats.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
7e96024254d98591a5431623fb355a20f322b554)
Conflicts:
PendingReleaseNotes
- trivial
src/os/bluestore/BlueStore.cc
- lacking of int_repaired method
Igor Fedotov [Fri, 27 Sep 2019 10:51:54 +0000 (13:51 +0300)]
os/bluestore: fix invalid stray shared blob detection in fsck.
This is a regression, caused by https://github.com/ceph/ceph/pull/30264
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
3f79b1976885880a188ed0a7f5e7d40dd554dc15)
Igor Fedotov [Mon, 9 Sep 2019 13:46:31 +0000 (16:46 +0300)]
os/bluestore: fix warning counting in fsck
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
d3308d2cc17b0a12480e5dce850d2bda84985add)
Igor Fedotov [Tue, 10 Sep 2019 11:24:14 +0000 (14:24 +0300)]
os/bluestore: remove duplicate logging
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
f1346a0ce1e9c35d44d016380c6a962d23288de4)
Igor Fedotov [Mon, 9 Sep 2019 13:08:40 +0000 (16:08 +0300)]
os/bluestore: introduce 'fix_on_mount' mode for no per pool tolerance.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
52af6cda58409d4e90363d1bd741485683f54395)
Conflicts:
src/os/bluestore/BlueStore.cc
- trivial
Igor Fedotov [Sun, 8 Sep 2019 22:37:13 +0000 (01:37 +0300)]
os/bluestore: parallelize quick-fix running.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
c432f2268db60eb701fd9b17618537513f5d4eea)
Conflicts:
src/os/bluestore/BlueStore.cc
- trivial
Igor Fedotov [Sun, 8 Sep 2019 22:15:50 +0000 (01:15 +0300)]
common/work_queue: make ThreadPool/WorkQueue more reusable.
Some tricks to be able to derive from ThreadPool.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
e72801074c9d464044be3e981728c99618797984)
Igor Fedotov [Fri, 6 Sep 2019 12:49:13 +0000 (15:49 +0300)]
os/bluestore: pass containers by ptr in FSCK_ObjectCtx
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
799d54125584c2f7cb42d110b53b1e33e7b9bacb)
Conflicts:
src/os/bluestore/BlueStore.cc
- lacking per-pool omap
Igor Fedotov [Fri, 6 Sep 2019 11:56:50 +0000 (14:56 +0300)]
os/bluestore: another split out for fsck logic blocks.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
c6ab317fff7e28a938de40644d714a51bdb73bf3)
Igor Fedotov [Fri, 6 Sep 2019 10:26:45 +0000 (13:26 +0300)]
os/bluestore: reorder blocks within fsck_check_objects.
The rationale is to to have better locality for shallow checks which can
later run in a multithreaded manner.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
d63fc8f86e0609ad03c9679a42b7dd3021e3111d)
Conflicts:
src/os/bluestore/BlueStore.cc
- lacking per-pool omap
Igor Fedotov [Fri, 6 Sep 2019 09:09:45 +0000 (12:09 +0300)]
os/bluestore: split out object checking from _fsck.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
d713d4b6eedb50a0923c21bd173509b3f011caed)
Conflicts:
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
- lacking warnings and per-pool omap support
Sage Weil [Thu, 8 Aug 2019 21:31:01 +0000 (16:31 -0500)]
os/bluestore: fsck: int64_t for error count
Just to be on the safe side.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
dee8f8cb7e906596693f8c6e22ff74f815169c87)
Conflicts:
src/os/bluestore/BlueStore.cc
- trivial
Igor Fedotov [Thu, 5 Sep 2019 14:43:40 +0000 (17:43 +0300)]
os/bluestore: introduce shallow (quick-fix) mode for bluestore fsck/repair.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
ca2c4e5d6956a32a7ce83f28a01c825dde1ee117)
Conflicts:
src/os/bluestore/BlueStore.cc
- caused by lack of perpool omap support
src/os/bluestore/bluestore_tool.cc
- lacking allocator fragmentation analysis commands
Igor Fedotov [Thu, 5 Sep 2019 12:18:53 +0000 (15:18 +0300)]
os/bluestore: do not collect onodes when doing fsck.
This both saves RAM and cpu cycles making fsck process faster.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
4b23bae6a2412ad752543d2aa5e0f7bf053306d2)
Conflicts:
src/os/bluestore/BlueStore.cc
std::shared_lock vs. RWLock::RLocker mismatch
luo rixin [Tue, 12 Nov 2019 08:36:53 +0000 (16:36 +0800)]
mon/PGMap: fix incorrect pg_pool_sum when delete pool
We found the pools num diplayed by "ceph -s" is not the same with
"ceph osd lspools" after deleting a pool sometime. The result is
Mgr ClusterState::ingest_pgstats get the old pg_stat which pg is
not deleted in some osd before the pool deleted and add to
pending_inc.pool_statfs_updates. The deleted pool will be added to
pg_pool_sum unconsciously by PGMap::apply_incremental and which has
been deleted in OSDMap. This will also casue MON's Segmentation
fault.
Fixes: https://tracker.ceph.com/issues/42689
Fixes: https://tracker.ceph.com/issues/42592
Fixes: https://tracker.ceph.com/issues/41228
Fixes: https://tracker.ceph.com/issues/40011
Signed-off-by: luo rixin <luorixin@huawei.com>
(cherry picked from commit
446eca8defddda44fea7c789065afdb1a9d38dae)
Yuri Weinstein [Sat, 16 Nov 2019 16:07:30 +0000 (08:07 -0800)]
Merge pull request #30144 from ifed01/wip-ifed-gc-blobs-nau
nautilus: os/bluestore: apply garbage collection against excessive blob count growth
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Sat, 16 Nov 2019 16:06:12 +0000 (08:06 -0800)]
Merge pull request #31397 from jan--f/wip-41460-nautilus
nautilus: os/bluestore/KernelDevice: fix RW_IO_MAX constant
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Sat, 16 Nov 2019 16:04:29 +0000 (08:04 -0800)]
Merge pull request #30774 from smithfarm/wip-42144-nautilus
nautilus: mgr/prometheus: Fix KeyError in get_mgr_status
Yuri Weinstein [Sat, 16 Nov 2019 16:03:33 +0000 (08:03 -0800)]
Merge pull request #30624 from tchaikov/wip-nautilus-41983
nautilus: mgr: set hostname in DeviceState::set_metadata()
Yuri Weinstein [Sat, 16 Nov 2019 16:02:53 +0000 (08:02 -0800)]
Merge pull request #30622 from smithfarm/wip-42083-nautilus
nautilus: pybind/rados: fix set_omap() crash on py3
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Sat, 16 Nov 2019 16:01:49 +0000 (08:01 -0800)]
Merge pull request #30390 from pdvian/wip-41804-nautilus
nautilus: mgr: do not reset reported if a new metric is not collected
Yuri Weinstein [Sat, 16 Nov 2019 16:01:15 +0000 (08:01 -0800)]
Merge pull request #30370 from pdvian/wip-41766-nautilus
nautilus: ceph.spec.in: reserve 2500MB per build job
Yuri Weinstein [Sat, 16 Nov 2019 16:00:37 +0000 (08:00 -0800)]
Merge pull request #30360 from yuvalif/allow_gcc9_compilation
nautilus: build/ops: cmake/BuildDPDK: ignore gcc8/9 warnings
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Sat, 16 Nov 2019 15:59:33 +0000 (07:59 -0800)]
Merge pull request #30261 from smithfarm/wip-41724-nautilus
nautilus: build/ops: fix build fail related to PYTHON_EXECUTABLE variable
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Sat, 16 Nov 2019 15:58:39 +0000 (07:58 -0800)]
Merge pull request #30215 from sebastian-philipp/nautilus-k8sevents
nautilus: mgr/k8sevents: Initial ceph -> k8s events integration
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Yuri Weinstein [Sat, 16 Nov 2019 15:56:17 +0000 (07:56 -0800)]
Merge pull request #30016 from smithfarm/wip-41509-nautilus
nautilus: mgr/zabbix: encode string for Python 3 compatibility
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Sat, 16 Nov 2019 15:54:43 +0000 (07:54 -0800)]
Merge pull request #30006 from smithfarm/wip-40043-nautilus
nautilus: mgr/zabbix: Fix typo in key name for PGs in backfill_wait state
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Sat, 16 Nov 2019 15:52:47 +0000 (07:52 -0800)]
Merge pull request #29949 from smithfarm/wip-41282-nautilus
nautilus: bluestore: tool to check fragmentation
Yuri Weinstein [Sat, 16 Nov 2019 15:51:46 +0000 (07:51 -0800)]
Merge pull request #30046 from smithfarm/wip-40270-nautilus
nautilus: build/ops: make patch build dependency explicit
Yuri Weinstein [Sat, 16 Nov 2019 15:50:55 +0000 (07:50 -0800)]
Merge pull request #30089 from tchaikov/wip-nautilus-gcc-8
nautilus: build/ops: use gcc-8
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>