]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Fabian Niepelt [Wed, 11 Dec 2019 13:19:14 +0000 (14:19 +0100)]
ceph-volume: use correct extents when using db-devices and >1 osds_per_device
Actual data size depending on osds_per_device needs to be calculated here. Otherwise, if osds_per_device is greater than 1, ceph-volume will allocate 100% of the device to the first osd and then fail to create the LV for the second because the volume group is already full.
Fixes: https://tracker.ceph.com/issues/39442
Signed-off-by: Fabian Niepelt <f.niepelt@mittwald.de>
(cherry picked from commit
ecde6cd619605003706f545b0b5ad4e2e8932f28 )
Conflicts:
src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
I've removed `data_uuid` since it's not in nautilus already
Yuri Weinstein [Sat, 8 Feb 2020 00:27:15 +0000 (16:27 -0800)]
Merge pull request #30689 from smithfarm/wip-42120-nautilus
nautilus: core: osd/OSDMap: health alert for non-power-of-two pg_num
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 7 Feb 2020 22:31:36 +0000 (14:31 -0800)]
Merge pull request #32857 from smithfarm/wip-43471-nautilus
nautilus: osd/PeeringState.cc: don't let num_objects become negative
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 7 Feb 2020 22:31:01 +0000 (14:31 -0800)]
Merge pull request #32848 from smithfarm/wip-43346-nautilus
nautilus: qa/suites/rados/thrash: force normal pg log length with cache tiering
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Fri, 7 Feb 2020 22:30:26 +0000 (14:30 -0800)]
Merge pull request #32847 from smithfarm/wip-43319-nautilus
nautilus: osd/PeeringState.cc: skip peer_purged when discovering all missing
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 7 Feb 2020 22:29:48 +0000 (14:29 -0800)]
Merge pull request #32843 from smithfarm/wip-43099-nautilus
nautilus: osd/OSD: enhance osd numa affinity compatibility
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Fri, 7 Feb 2020 22:29:08 +0000 (14:29 -0800)]
Merge pull request #32773 from dzafman/wip-43246-nautilus
nautilus: osd: Use physical ratio for nearfull (doesn't include backfill resserve)
Reviewed-by: Neha Ojha <nojha@redhat.com>
David Zafman [Fri, 7 Feb 2020 22:27:18 +0000 (14:27 -0800)]
Merge branch 'nautilus' into wip-42120-nautilus
Yuri Weinstein [Fri, 7 Feb 2020 22:11:40 +0000 (14:11 -0800)]
Merge pull request #32716 from smithfarm/wip-43650-nautilus
nautilus: osd: Diagnostic logging for upmap cleaning
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Fri, 7 Feb 2020 22:09:27 +0000 (14:09 -0800)]
Merge pull request #32715 from smithfarm/wip-43620-nautilus
nautilus: kv: fix shutdown vs async compaction
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Fri, 7 Feb 2020 22:08:44 +0000 (14:08 -0800)]
Merge pull request #32259 from smithfarm/wip-43243-nautilus
nautilus: selinux: Allow ceph to read udev db
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 7 Feb 2020 22:03:28 +0000 (14:03 -0800)]
Merge pull request #32769 from liewegas/fix-42566-nautilus
nautilus: mgr/MgrClient: fix open condition
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Lenz Grimmer [Thu, 6 Feb 2020 10:33:33 +0000 (10:33 +0000)]
Merge pull request #32930 from rhcs-dashboard/wip-43845-nautilus
nautilus: mgr/dashboard: disable 'Add Capability' button in rgw user edit
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Lenz Grimmer [Thu, 6 Feb 2020 10:21:49 +0000 (10:21 +0000)]
Merge pull request #32827 from rhcs-dashboard/wip-43811-nautilus
nautilus: mgr/dashboard: check if user has config-opt permissions
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Lenz Grimmer [Thu, 6 Feb 2020 10:20:36 +0000 (10:20 +0000)]
Merge pull request #31808 from bk201/wip-42956-nautilus
nautilus: mgr/dashboard: check embedded Grafana dashboard references
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Lenz Grimmer [Thu, 6 Feb 2020 10:19:33 +0000 (10:19 +0000)]
Merge pull request #31792 from rhcs-dashboard/wip-42936-nautilus
nautilus: mgr/dashboard: Dashboard can't handle self-signed cert on Grafana API
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Thu, 6 Feb 2020 10:17:22 +0000 (10:17 +0000)]
Merge pull request #31190 from rhcs-dashboard/wip-42294-nautilus
nautilus: mgr/dashboard: add debug mode, and accept expected exception when SSL handshaking
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Lenz Grimmer [Thu, 6 Feb 2020 10:15:34 +0000 (10:15 +0000)]
Merge pull request #32304 from ricardoasmarques/wip-43333-nautilus
nautilus: mgr/dashboard: iSCSI targets not available if any gateway is down (and more...)
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Thu, 6 Feb 2020 10:13:27 +0000 (10:13 +0000)]
Merge pull request #32888 from shyukri/wip-42033-nautilus
nautilus: mgr/dashboard: Using wrong identifiers in RGW user/bucket datatables
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Alfonso Martínez [Wed, 22 Jan 2020 15:05:12 +0000 (16:05 +0100)]
mgr/dashboard: disable 'Add Capability' button when all the capabilities are added
Fixes: https://tracker.ceph.com/issues/43564
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
4ef0e2c1ba2c7c2b12556f5ee7a593ae4ba99144 )
Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
- Change applied manually in conflicting file.
Alfonso Martínez [Tue, 21 Jan 2020 12:49:02 +0000 (13:49 +0100)]
mgr/dashboard: check if user has config-opt permissions before retrieving settings.
Fixes: https://tracker.ceph.com/issues/43595
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
ea1c8c7ef7f494208aec1c59d12fec2da759784a )
Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts
Volker Theile [Fri, 20 Sep 2019 13:46:50 +0000 (15:46 +0200)]
mgr/dashboard: Using wrong identifiers in RGW user/bucket datatables
Fixes: https://tracker.ceph.com/issues/41940
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
1271bf73fb862b567739ea3f493c7f571794b4e4 )
Ricardo Marques [Thu, 30 Jan 2020 13:19:48 +0000 (13:19 +0000)]
mgr/dashboard: Unable to remove an iSCSI gateway that is already in use
Fixes: https://tracker.ceph.com/issues/43900
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
bcb05d0cae89deeb6c5e6a0cf282d84fed7811c3 )
Josh Durgin [Fri, 31 Jan 2020 22:40:34 +0000 (17:40 -0500)]
Merge branch 'nautilus-saved' into nautilus
Resetting branch after 14.2.7 hotfix release
Jenkins Build Slave User [Fri, 31 Jan 2020 17:07:52 +0000 (17:07 +0000)]
14.2.7
Abhishek Lekshmanan [Fri, 24 Jan 2020 14:41:51 +0000 (15:41 +0100)]
rgw: drop the partial message check while reading messages
Avoid leaking connections that had partially-consumed
client data on unexpected disconnect.
Signed-off-by: Or Friedmann <orfriedma@redhat.com>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
Sébastien Han [Thu, 30 Jan 2020 21:54:39 +0000 (22:54 +0100)]
Merge pull request #32979 from leseb/bkp-32828
nautilus: ceph-volume: add db and wal support to raw mode
Casey Bodley [Thu, 30 Jan 2020 21:29:44 +0000 (16:29 -0500)]
Merge pull request #32221 from smithfarm/wip-43168-nautilus
nautilus: rgw/pubsub: fix records/event json format to match documentation
Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
Sébastien Han [Fri, 24 Jan 2020 15:29:54 +0000 (16:29 +0100)]
ceph-volume: add db and wal support to raw mode
Using the raw mode, the OSD preparation can now be called with extra
arguments to specify a block device for either rocksdb db or wal.
The code expects the device to be available and no validation will be
performed. Also, the entire block device will be consumed.
The goal is run this on Kubernetes with Rook and OSD are running on PVC.
Users will request PVC from a certain size, the request will be
acknowledged and a block will be created, then attached to the machine.
Later on consumed by Rook's preparation job.
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
c8f23c7182e2681f2bc756776a890995aca1efd2 )
Sébastien Han [Fri, 24 Jan 2020 16:25:42 +0000 (17:25 +0100)]
ceph-volume: fix raw list
There is no json anymore, just plain output.
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
e99eb8cc95c5f50ec13170f202226c3581e3f5e2 )
Sébastien Han [Fri, 24 Jan 2020 15:28:17 +0000 (16:28 +0100)]
ceph-volume: remove unnecessary comment
This comment is not relevant since we will never bring systemd support
to the raw mode.
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
af3f5fded95e4dcc0dfa2a0b2eec5fb2c4252b6c )
Sébastien Han [Fri, 24 Jan 2020 15:27:10 +0000 (16:27 +0100)]
ceph-volume: remove osd-id and osd-fsid flag
These are not used since we only rely on the device path so removing
them to avid confusion.
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
525957be98a0a6ff742f6bae4450f291591f516f )
Sébastien Han [Fri, 24 Jan 2020 15:23:10 +0000 (16:23 +0100)]
ceph-volume: remove "create" call from raw mode
This mode is intented to work when the cluster is running on Kubernetes
and OSDs are running on PVC.
So we always have a "prepare" pod and an "activate" pod.
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
c7a2ecc59394a9eb323a19ff233a2e3dfe04a018 )
Yuri Weinstein [Wed, 29 Jan 2020 20:33:54 +0000 (12:33 -0800)]
Merge pull request #32835 from smithfarm/wip-43812-nautilus
nautilus: rgw: support radosgw-admin zone/zonegroup placement get command
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:33:30 +0000 (12:33 -0800)]
Merge pull request #32834 from smithfarm/wip-43789-nautilus
nautilus: rgw: fix opslog operation field as per Amazon s3
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:33:02 +0000 (12:33 -0800)]
Merge pull request #32833 from smithfarm/wip-43786-nautilus
nautilus: rgw: the http response code of delete bucket should not be 204-no-content
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:32:36 +0000 (12:32 -0800)]
Merge pull request #32832 from smithfarm/wip-43782-nautilus
nautilus: rgw: Incorrectly calling ceph::buffer::list::decode_base64 in bucket policy
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:31:07 +0000 (12:31 -0800)]
Merge pull request #32504 from smithfarm/wip-43477-nautilus
nautilus: rgw: Select the std::bitset to resolv ambiguity
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:30:14 +0000 (12:30 -0800)]
Merge pull request #32437 from pritha-srivastava/wip-42385-nautilus
nautilus: rgw: Adding 'iam' namespace for Role and User Policy related REST APIs.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:29:34 +0000 (12:29 -0800)]
Merge pull request #32239 from smithfarm/wip-43300-nautilus
nautilus: rgw: fix bugs in listobjectsv1
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:25:09 +0000 (12:25 -0800)]
Merge pull request #32825 from smithfarm/wip-43779-nautilus
nautilus: rgw: return error if lock log shard fails
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:24:27 +0000 (12:24 -0800)]
Merge pull request #32824 from smithfarm/wip-43728-nautilus
nautilus: rgw: move forward marker even in case of many rgw.none indexes
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:24:03 +0000 (12:24 -0800)]
Merge pull request #32822 from smithfarm/wip-43576-nautilus
nautilus: rgw: fix a bug that bucket instance obj can't be removed after resharding completed
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:23:36 +0000 (12:23 -0800)]
Merge pull request #32821 from smithfarm/wip-43574-nautilus
nautilus: rgw: fix data consistency error casued by rgw sent timeout
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:23:10 +0000 (12:23 -0800)]
Merge pull request #32820 from smithfarm/wip-43571-nautilus
nautilus: rgw: build_linked_oids_for_bucket and build_buckets_instance_index should return negative value if it fails
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:22:43 +0000 (12:22 -0800)]
Merge pull request #32819 from smithfarm/wip-43373-nautilus
nautilus: rgw: data sync markers include timestamp from datalog entry
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:22:15 +0000 (12:22 -0800)]
Merge pull request #32818 from smithfarm/wip-43372-nautilus
nautilus: rgw: radosgw-admin: sync status displays id of shard furthest behind
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:21:48 +0000 (12:21 -0800)]
Merge pull request #32759 from smithfarm/wip-43203-nautilus
nautilus: rgw: adding mfa code validation when bucket versioning status is changed
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:18:35 +0000 (12:18 -0800)]
Merge pull request #32489 from bzed/clang-build-fix
nautilus: rgw/rgw_rest_conn.h: fix build with clang
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 20:17:08 +0000 (12:17 -0800)]
Merge pull request #32057 from smithfarm/wip-43010-nautilus
nautilus: rgw multisite: fixes for concurrent version creation
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 19:55:44 +0000 (11:55 -0800)]
Merge pull request #32900 from smithfarm/wip-43830-nautilus
nautilus: rbd: librbd: don't call refresh from mirror::GetInfoRequest state machine
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Wed, 29 Jan 2020 19:55:09 +0000 (11:55 -0800)]
Merge pull request #32842 from smithfarm/wip-43735-nautilus
nautilus: librbd: support compression allocation hints to the OSD
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 19:54:21 +0000 (11:54 -0800)]
Merge pull request #32841 from smithfarm/wip-43511-nautilus
nautilus: librbd: skip stale child with non-existent pool for list descendants
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 19:53:55 +0000 (11:53 -0800)]
Merge pull request #32840 from smithfarm/wip-43508-nautilus
nautilus: rbd: creating thick-provision image progress percent info exceeds 100%
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 19:51:11 +0000 (11:51 -0800)]
Merge pull request #32839 from smithfarm/wip-43501-nautilus
nautilus: librbd: remove pool objects when removing a namespace
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Wed, 29 Jan 2020 19:50:27 +0000 (11:50 -0800)]
Merge pull request #32837 from smithfarm/wip-43237-nautilus
nautilus: librbd: fix rbd_open_by_id, rbd_open_by_id_read_only
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Mon, 27 Jan 2020 20:14:40 +0000 (12:14 -0800)]
Merge pull request #32815 from tchaikov/nautilus-pr-30284
nautilus: tests: add missing header cmath to test/mon/test_mon_memory_target.cc
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Mon, 27 Jan 2020 20:13:37 +0000 (12:13 -0800)]
Merge pull request #32441 from tchaikov/nautilus-boost-1.72
nautilus: switch to boost 1.72
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Mykola Golub [Mon, 20 Jan 2020 13:42:47 +0000 (13:42 +0000)]
librbd: don't call refresh from mirror::GetInfoRequest state machine
Fixes: https://tracker.ceph.com/issues/43589
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
da46798ab3f56a639cc7a0b885778e8f75505b53 )
Conflicts:
src/librbd/api/Mirror.cc
- C_ImageGetInfo ctor takes only two arguments in nautilus
- nautilus does not have LambdaContext as a class; use FunctionContext
instead
Lenz Grimmer [Mon, 27 Jan 2020 12:10:15 +0000 (12:10 +0000)]
nautilus: monitoring: add details to Prometheus' alerts (#32892)
nautilus: monitoring: add details to Prometheus' alerts
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Ilya Dryomov [Mon, 27 Jan 2020 10:21:31 +0000 (11:21 +0100)]
Merge pull request #32838 from smithfarm/wip-43241-nautilus
nautilus: qa: krbd_exclusive_option.sh: update for recent kernel changes
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Patrick Seidensal [Thu, 23 Jan 2020 11:52:24 +0000 (12:52 +0100)]
monitoring: add details to Prometheus' alerts
Fixes: https://tracker.ceph.com/issues/43764
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
fb51c589b5b5cd6a05cbfb08c41ca46a8941b269 )
Pritha Srivastava [Mon, 25 Mar 2019 07:07:23 +0000 (12:37 +0530)]
rgw: Adding 'iam' namespace for Role and User Policy related REST APIs.
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit
121a2695544bd56973459fad9b4f545b4ee412f8 )
Conflicts:
src/common/options.cc
src/rgw/CMakeLists.txt
src/rgw/rgw_main.cc
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h
Nathan Cutler [Sat, 25 Jan 2020 11:50:22 +0000 (12:50 +0100)]
Merge pull request #32781 from idryomov/wip-doc-fs-authorize-fix-nautilus
nautilus: doc/cephfs/client-auth: description and example are inconsistent
Reviewed-by: Jeff Layton <jlayton@redhat.com>
songweibin [Tue, 20 Aug 2019 12:25:25 +0000 (20:25 +0800)]
librbd: allow remove snapshot with child from non-existent pool
Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit
50f3cc199e5a4ace0ccf1d755ac682aeb489a454 )
Conflicts:
src/test/librbd/test_librbd.cc
- nautilus does not have test "DISABLED_TestSeqWriteAIOPP"
test/librbd/operation/test_mock_SnapshotRemoveRequest.cc
- nautilus uses "RWLock::RLocker", instead of "std::shared_lock", with
owner_locker
jiahuizeng [Thu, 24 Oct 2019 03:32:38 +0000 (11:32 +0800)]
rgw: fix radosgw-admin zone/zonegroup placement get command
Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit
9f0e461ce33808496e1df5c0706ed8b4403b7109 )
Conflicts:
src/rgw/rgw_admin.cc
- nautilus uses "store->svc.sysobj"
Neha [Sat, 14 Dec 2019 00:49:27 +0000 (00:49 +0000)]
osd/PeeringState.cc: don't let num_objects become negative
If num_objects become negative, we may end up incorrectly setting
the PG_STATE_DEGRADED flag. Instead reset num_objects to zero and set
the PG_STATE_INCONSISTENT flag when this happens expecting scrub to fix
the inconsistency.
Fixes: https://tracker.ceph.com/issues/43308
Co-authored-by: David Zafman <dzafman@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
54c5eca48ce94dc4a1416836a06203db880c3842 )
Conflicts:
src/osd/PeeringState.cc
- file is missing in nautilus; backported the code change manually
to src/osd/PG.cc
Yuri Weinstein [Fri, 24 Jan 2020 21:43:35 +0000 (13:43 -0800)]
Merge pull request #32208 from smithfarm/wip-43280-nautilus
nautilus: rpm: add rpm-build to SUSE-specific make check deps
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Wed, 19 Jun 2019 16:15:25 +0000 (11:15 -0500)]
qa/suites/rados/thrash: force normal pg log length with cache tiering
When we are doing cache tiering, we are more sensitive to short PG logs
because the dup op entries are not perfectly promoted from the base to
the cache.
See:
http://tracker.ceph.com/issues/38358
http://tracker.ceph.com/issues/24320
This works around the problem by not testing short pg logs in combination
with cache tiering. This works because the short_pg_log.yaml fragment
sets the short log in the [global] section but the cache workloads overload
it (back to a large/default value) in the [osd] section.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
afd0b508c2e0f3dc529ba3a28fd180a3e8925646 )
Neha [Wed, 11 Dec 2019 23:47:19 +0000 (23:47 +0000)]
osd/PeeringState.cc: skip peer_purged when discovering all missing
We hit a couple of bugs because in discover_all_missing() we send
pg_query to an OSD that was marked stray and already got purged. This results
in a state machine crash on the purged OSD. Fix this by skipping any
purged peers.
Fixes: https://tracker.ceph.com/issues/41317
Fixes: https://tracker.ceph.com/issues/40963
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
4960f579a234f9984d73767fde073c419e884c17 )
Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus; made the changes manually in
src/osd/PG.cc
Yuri Weinstein [Fri, 24 Jan 2020 16:39:07 +0000 (08:39 -0800)]
Merge pull request #32079 from smithfarm/wip-43143-nautilus
nautilus: mds: tolerate no snaprealm encoded in on-disk root inode
Reviewed-by: Ramana Raja <rraja@redhat.com>
Dai zhiwei [Thu, 31 Oct 2019 01:29:59 +0000 (09:29 +0800)]
osd/OSD: enhance osd numa affinity compatibility
add bond network numa affinity compatibility support
add subnet compatibility support
add public and cluster network numa nodes not matching log
Fixes: https://tracker.ceph.com/issues/42411
Signed-off-by: Dai zhiwei <daizhiwei3@huawei.com>
(cherry picked from commit
637fdea62b08c4d675a280e2218bcef1039ba25d )
luo rixin [Fri, 11 Oct 2019 13:27:38 +0000 (21:27 +0800)]
osd/osd: set_numa_affinty: add an err log when it unable to
identify cluster interface's numa node
Signed-off-by: luo rixin <luorixin@huawei.com>
(cherry picked from commit
e928f1a9bd568ffff751662ebf781dc17f40370f )
Jason Dillaman [Fri, 17 Jan 2020 13:38:14 +0000 (08:38 -0500)]
doc/rbd: documented 'rbd compression hint' config option
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
d611a9860a5cbbdb0bf8f8d958b86fef5ea74fb2 )
Jason Dillaman [Thu, 16 Jan 2020 19:53:37 +0000 (14:53 -0500)]
librbd: support compression allocation hints to the OSD
A new "rbd_compression_hint" configuration option can be applied
globally, at the pool level, or to individual images to send
the associated compression allocation hint to the OSD on write
operations.
Fixes: https://tracker.ceph.com/issues/42097
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
200fc5b2f24859109a79002e30927d457971b939 )
songweibin [Wed, 14 Aug 2019 05:46:29 +0000 (13:46 +0800)]
librbd: skip stale child with non-existent pool for list_descendants
Fixes: https://tracker.ceph.com/issues/41241
Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit
a485eb827009b629c4c7804ec1b7191cfe6b6dd7 )
songweibin [Thu, 15 Aug 2019 06:35:05 +0000 (14:35 +0800)]
librbd: fix error param of ioctx when passing to `list_descendants`
Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit
b7ac8a17ef0b0602301eebea0e2e3c8032889174 )
Xiangdong Mu [Wed, 16 Oct 2019 06:20:40 +0000 (14:20 +0800)]
rbd:the progress percent info exceeds 100%
Signed-off-by: Xiangdong Mu <muxiangdong@inspur.com>
(cherry picked from commit
4877c8a12181ec9cbc1c1e59bea3a615e0367588 )
Jason Dillaman [Mon, 23 Dec 2019 15:46:09 +0000 (10:46 -0500)]
librbd: remove pool objects when removing a namespace
Avoid leaving RBD pool objects within a pool namespace that is
being deleted.
Fixes: https://tracker.ceph.com/issues/43378
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9e29914a6a9581ea8b41f3d3efd61f254fafeeff )
Conflicts:
src/librbd/api/Namespace.cc
- "r = Mirror<I>::mode_set(ns_ctx, RBD_MIRROR_MODE_DISABLED)"
block is missing in nautilus
Ilya Dryomov [Wed, 4 Dec 2019 18:08:46 +0000 (19:08 +0100)]
qa: kernel.sh: unlock before rolling back
"rbd snap rollback" expects an unlocked image, but we may get there
locked if object map is enabled (or if lock_on_read is specified in
rbd_default_map_options).
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
3aae140353a4b27dfe6e2d2ac7a49cdcdbbe5ffe )
Ilya Dryomov [Wed, 4 Dec 2019 14:26:54 +0000 (15:26 +0100)]
qa: krbd_exclusive_option.sh: update for recent kernel changes
Since 5.3:
- a plain "rbd map" acquires the lock, so it's not different from
"rbd map -o exclusive" in this regard
- if the lock is held by the exclusive peer, I/O is failed right away
instead of blocking
- lock_timeout option is respected only by "rbd map" and not by I/O
Since 5.5:
- if the mapping is read-only, the lock isn't acquired
Added blacklisting test case, dropped lock_timeout test case.
Fixes: https://tracker.ceph.com/issues/43127
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
50933b863a1d239bbca0a25663c0dbe7ab8963ce )
yangjun [Sun, 8 Dec 2019 01:09:53 +0000 (09:09 +0800)]
librbd: fix rbd_open_by_id, rbd_open_by_id_read_only
These methods incorrectly delete ImageCtx on error, resulting
in double-free heap corruption.
Fixes: https://tracker.ceph.com/issues/43178
Signed-off-by: yangjun <yangjun@cmss.chinamobile.com>
(cherry picked from commit
3457192c24a66ba499a7c9b1747bc29c79b34636 )
Yuri Weinstein [Fri, 24 Jan 2020 16:06:55 +0000 (08:06 -0800)]
Merge pull request #32245 from smithfarm/wip-41106-nautilus
nautilus: mds: add command that config individual client session
Reviewed-by: Ramana Raja <rraja@redhat.com>
jiahuizeng [Sat, 12 Oct 2019 12:14:21 +0000 (20:14 +0800)]
rgw: support radosgw-admin zone/zonegroup placement get command
Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit
5601517c3b4ea0ad9e5debf758fedd75a00c5c7c )
Jiaying Ren [Tue, 24 Sep 2019 07:19:23 +0000 (15:19 +0800)]
rgw: fix opslog operation field as per Amazon s3
According to Amazon s3[1], current Operation field are using
http method, which should be operation name.
[1] http://docs.aws.amazon.com/AmazonS3/latest/dev/LogFormat.html
Fixes: http://tracker.ceph.com/issues/20978
Signed-off-by: Jiaying Ren <renjiaying@cmss.chinamobile.com>
(cherry picked from commit
7949f81b71b718e1c17ade5ca0393979b22260bc )
Chang Liu [Thu, 19 Sep 2019 06:56:02 +0000 (14:56 +0800)]
rgw: the http response code of delete bucket should not be 204-no-content
Fixes: https://tracker.ceph.com/issues/41925
Signed-off-by: Chang Liu <liuchang0812@gmail.com>
(cherry picked from commit
710d8d31d27af05de1f17f7a44f9f0b5862b00a2 )
xxcs [Mon, 4 Nov 2019 12:29:46 +0000 (20:29 +0800)]
rgw: Incorrectly calling ceph::buffer::list::decode_base64 in bucket policy
Fixes: https://tracker.ceph.com/issues/42616
Signed-off-by: GaryHyg <huygbj@inspur.com>
(cherry picked from commit
f56e9146f86f107bbf245700874ea849c57b5fef )
Nathan Cutler [Fri, 24 Jan 2020 15:51:07 +0000 (16:51 +0100)]
Merge pull request #32746 from jan--f/wip-43026-nautilus
nautilus: doc/ceph-volume: initial docs for zfs/inventory and zfs/api
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Willem Jan Withagen [Thu, 24 Oct 2019 15:09:56 +0000 (17:09 +0200)]
rgw: Select the std::bitset to resolv ambiguity
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
(cherry picked from commit
2853a48385ce07689eac476ce7b0ff0057b1c195 )
Boris Ranto [Tue, 16 Jul 2019 17:10:48 +0000 (19:10 +0200)]
selinux: Allow ceph to read udev db
We are using libudev and reading the udev db files because of that. We
need to allow ceph to access these files in the SELinux policy.
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit
ef191068d6c8147f52ac264097a62698d1f67be8 )
albIN7 [Wed, 3 Jul 2019 19:26:50 +0000 (00:56 +0530)]
rgw: fix bugs in listobjectsv1
Fixes: https://tracker.ceph.com/issues/40663
Signed-off-by: Albin Antony <aantony@redhat.com>
(cherry picked from commit
c9a8e3acb130fd0e7f355440f4802f4f065d213f )
Conflicts:
src/rgw/rgw_rest_s3.cc
- deleted "if (is_truncated && !next_marker.empty()) {" conditional
block is different in nautilus
- white space change not relevant to nautilus
- "s->formatter->close_section()" change not needed in nautilus
Yuval Lifshitz [Sun, 1 Dec 2019 18:08:12 +0000 (20:08 +0200)]
rgw/pubsub: support eventId in push mode
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
(cherry picked from commit
19832a0daeb7b23006d1c38059ad14f0c239d32a )
Conflicts:
PendingReleaseNotes
Yuval Lifshitz [Fri, 29 Nov 2019 05:31:07 +0000 (07:31 +0200)]
rgw/pubsub: fix recerds/event json format to match documentation
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
(cherry picked from commit
11e66bd16acdda0f2a097e94c66cc25f4550b99c )
Or Friedmann [Thu, 2 Jan 2020 09:51:00 +0000 (11:51 +0200)]
cls/rgw: when object is versioned and lc transition it, the object is becoming non-current
when object is versioned and lc transition it, the object is becoming non-current
Signed-off-by: Or Friedmann <ofriedma@redhat.com>
Fixes: https://tracker.ceph.com/issues/43444
(cherry picked from commit
5f37ca283141df76a6f698ae4d7a23772b8b9e1b )
zhangshaowen [Mon, 4 Nov 2019 01:57:34 +0000 (09:57 +0800)]
rgw: return error if lock log shard fails
Fixes: https://github.com/ceph/ceph/pull/31344
Signed-off-by: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit
0775c1b8754f488434ec72d262d1387627e6bf62 )
Ilsoo Byun [Tue, 7 Jan 2020 01:35:53 +0000 (10:35 +0900)]
rgw: move forward marker even in case of many non-existent indexes
Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
(cherry picked from commit
2eaac132d491ef3c6f8cb50c34fc67f56e006c07 )
Conflicts:
src/rgw/rgw_rados.cc
- comment is slightly different in nautilus
- nautilus does not have "if (*is_truncated && count < num_entries)"
conditional block
zhang Shaowen [Fri, 8 Nov 2019 09:50:23 +0000 (17:50 +0800)]
rgw: fix a bug that bucket instance obj can't be removed after resharding completed.
Fixes: https://tracker.ceph.com/issues/42691
Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit
03039d9630e65088b525e9637dfc6f8f2c0a2702 )
Conflicts:
src/rgw/rgw_reshard.cc
- in master, *store has type "rgw::sal::RGWRadosStore", while in nautilus
it has type "RGWRados", but this line appears to be merely incidental
to the patch
Gabe Lee [Fri, 8 Nov 2019 02:00:11 +0000 (10:00 +0800)]
rgw:[bug] civetweb mg_write with offset.
data consistency error casued by rgw sent timeout.
Incomplete data transmission and incorrect data re-transmission
Signed-off-by: 李纲彬82225 <82225@sangfor.com>
(cherry picked from commit
d9fccedda90ff889fbaaa35ebacf3f3b4574ea09 )
zhangshaowen [Mon, 4 Nov 2019 03:06:56 +0000 (11:06 +0800)]
rgw: build_linked_oids_for_bucket and build_buckets_instance_index
should return negative value if it fails
Fixes: https://tracker.ceph.com/issues/43452
Signed-off-by: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit
e9e6a3664efeda9abb4ad784b98975c272667844 )
Casey Bodley [Tue, 17 Dec 2019 19:26:56 +0000 (14:26 -0500)]
rgw: data sync markers include timestamp from datalog entry
this corrects the output of 'radosgw-admin data sync status' to show the
timestamp of the last datalog entry applied
Fixes: https://tracker.ceph.com/issues/43359
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
b403e011185a98a7ae2d3fb6246f0b1131a5f9a9 )