]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sébastien Han [Wed, 19 Feb 2020 15:03:02 +0000 (16:03 +0100)]
ceph-volume: silence 'ceph-bluestore-tool' failures
If 'ceph-bluestore-tool' fails on a device, the json output of the list
command will be messed up. Ignoring stderr of that command fixes this.
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
e8828fe76a0c78786e53a1bd63c3fc574e36a6f0 )
Jan Fajerski [Fri, 28 Feb 2020 12:35:18 +0000 (13:35 +0100)]
Merge pull request #33580 from jan--f/wip-notracker-c-v-raw-mimic
mimic: ceph-volume: add raw mode
Jan Fajerski [Fri, 28 Feb 2020 10:24:21 +0000 (11:24 +0100)]
Merge pull request #33578 from jan--f/wip-43850-mimic
mimic: ceph-volume: add sizing arguments to prepare
Jan Fajerski [Fri, 28 Feb 2020 10:24:04 +0000 (11:24 +0100)]
Merge pull request #33579 from jan--f/wip-43872-mimic
mimic: ceph-volume: batch bluestore fix create_lvs call
Jan Fajerski [Wed, 15 Jan 2020 14:55:45 +0000 (15:55 +0100)]
ceph-volume: fix device unittest, mock has_bluestore_label, lint
This also adds a test case for has_bluestore_label.
Fixes: https://tracker.ceph.com/issues/43611
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
91c7f5189d163ca517c643b8548a2e16176392cc )
Guillaume Abrioux [Wed, 5 Feb 2020 01:15:17 +0000 (02:15 +0100)]
ceph-volume: remove stderr in has_bluestore_label()
We don't want to generate this log when a call to
`has_bluestore_label()` fails.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
7f8371c32b3f613b0d094f6f26ffbeb19ea0d25b )
Guillaume Abrioux [Tue, 4 Feb 2020 21:02:26 +0000 (22:02 +0100)]
ceph-volume: fix has_bluestore_label() function
When using vg/lv, this function throws an error like following:
```
stderr: unable to read label for test_group/data-lv2: (2) No such file or directory
stderr: 2020-02-04T21:03:32.153+0000
7fe091af4200 -1 bluestore(test_group/data-lv2) _read_bdev_label failed to open test_group/data-lv2: (2) No such file or directory
```
using `self.abspath` fixes this error.
Fixes: https://tracker.ceph.com/issues/43970
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
148069a20fef79ef8fe510f06879a0de02987eac )
Sage Weil [Mon, 13 Jan 2020 23:51:19 +0000 (17:51 -0600)]
ceph-volume: raw: activate: drop --all, --osd-id and --osd-fsid args
We don't need these currently.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
e7b8b5c46550ee707b09e35015fabea8c6a0c918 )
Sage Weil [Wed, 18 Dec 2019 14:27:47 +0000 (08:27 -0600)]
raw: fix activate args
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
5e9d9179b15808a26e6421d2a1772bbbadc3d408 )
Sage Weil [Wed, 18 Dec 2019 14:13:55 +0000 (08:13 -0600)]
raw: --osd-fsid throughout
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
4e7e694fa53c29ff1552656c892bee592d5db871 )
Sage Weil [Fri, 6 Dec 2019 20:08:12 +0000 (14:08 -0600)]
ceph-volume: add raw mode
list, prepare, activate, create (prepare+activate) basic bluestore OSDs
on a single device.
No support (or plans to ever support) dmcrypt.
I think support for db/wal could be added later without much trouble.
For now, we require --no-systemd and --bluestore flags because we haven't
implemented support for anything else but suspect we will in the future,
and would like to ensure users are being explicit about what they're
asking for.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
1e9de77add67fa94204c450c52d22fc3a33d7b22 )
Sage Weil [Mon, 9 Dec 2019 13:38:13 +0000 (07:38 -0600)]
ceph-volume: show devices with bluestore labels and unavailable
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
4b81bc8b358390f37eb5bcc3e2764ee6ede0ceda )
Jan Fajerski [Thu, 27 Feb 2020 14:01:36 +0000 (15:01 +0100)]
Merge pull request #32862 from shyukri/wip-43340-mimic
mimic: lvm/deactivate: add unit tests, remove --all
Jan Fajerski [Tue, 28 Jan 2020 08:25:39 +0000 (09:25 +0100)]
ceph-volume: batch bluestore fix create_lvs call
Fixes: https://tracker.ceph.com/issues/43844
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
df18497bc9eaf1922e5c885e8cc124e439c59364 )
Jan Fajerski [Tue, 7 Jan 2020 14:29:24 +0000 (15:29 +0100)]
ceph-volume: remove redefinition of [LV,PV,VG]_FIELDS
This was introduced in https://github.com/ceph/ceph/pull/32242
erroneously.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
6f107f7de9afc4fb200063410ec347b437d5b60a )
Jan Fajerski [Thu, 12 Dec 2019 12:45:44 +0000 (13:45 +0100)]
tests: fix tests after batch sizing was fixed
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
405112970ec62fca345d10040c1648b7e629d11a )
Jan Fajerski [Thu, 12 Dec 2019 12:44:07 +0000 (13:44 +0100)]
lvm/batch: adjust devices for byte based size calculation
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
9e61b80d2ce1d9ff5139dace00807f5a0cceb125 )
Jan Fajerski [Tue, 10 Dec 2019 13:56:37 +0000 (14:56 +0100)]
lvm: add sizing arguments to prepare and create.
This adds options to size to-be-created LVs in the prepare and create
subcommands. Sizing can be done explicitly by passing a sizes or
implicitly by specifying the number of slots per [data|journal|wal|db]
device. The former will try to create a LV of the specified size and use
that to create OSDs if it succeeds. The latter will carve up the device
size into $n slots and use one of those slots for the to-be-created OSD.
If partitions or LVs are passed these options are ignored.
This also creates the foundation to move to byte-based sizing, by moving
VolumeGroup lvm querying and size calculation to bytes as the base unit.
Fixes: https://tracker.ceph.com/issues/43299
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
8b8913ad3c0b8ceae9f458fd8d3ec292c5ff5eb1 )
Jan Fajerski [Tue, 10 Dec 2019 13:57:02 +0000 (14:57 +0100)]
util/disk: extend Size class
The Size class can now parse strings and has support for arithmetic
operations and comparisons with numbers.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
dd89f467a0b89a436371c314bc69cf71a6e9ce72 )
Jan Fajerski [Thu, 27 Feb 2020 12:53:23 +0000 (13:53 +0100)]
Merge pull request #33201 from jan--f/wip-43854-mimic
mimic: ceph-volume/batch: fail on filtered devices when non-interactive
Jan Fajerski [Thu, 27 Feb 2020 12:52:38 +0000 (13:52 +0100)]
Merge pull request #33215 from jan--f/wip-32242-notrack-mimic
mimic: ceph-volume: add methods to pass filters to pvs, vgs and lvs commands
Rishabh Dave [Thu, 21 Nov 2019 14:33:32 +0000 (20:03 +0530)]
ceph-volume: add methods to pass filters to pvs, vgs and lvs commands
Filters can be passed to these commands by using option '-S'.
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
a4f2fcefb80df524c472782e8c1d18b3c2d1c1fc )
Jan Fajerski [Mon, 16 Dec 2019 15:57:58 +0000 (16:57 +0100)]
lvm/deactivate: add unit tests, remove --all
Remove the --all flag until its actually implemented.
Fixes: https://tracker.ceph.com/issues/43330
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
c13901f963d515fd34bd0ff9df67bcf214507b70 )
Conflicts:
src/ceph-volume/ceph_volume/devices/lvm/deactivate.py
Jan Fajerski [Thu, 27 Feb 2020 09:57:50 +0000 (10:57 +0100)]
Merge pull request #32876 from shyukri/wip-43569-mimic
mimic: ceph-volume: Dereference symlink in lvm list
Jan Fajerski [Thu, 27 Feb 2020 09:56:37 +0000 (10:56 +0100)]
Merge pull request #33208 from jan--f/wip-deactivate-mimic
mimic: ceph-volume: lvm deactivate command
Jan Fajerski [Wed, 11 Dec 2019 13:54:16 +0000 (14:54 +0100)]
lvm: add deactivate subcommand
This new subcommand unmounts and OSDs tmpfs mount and closes crypt
devices if there are any.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
9797f6b83d727933b1a0daab239f3034675a1d0e )
Jan Fajerski [Thu, 12 Dec 2019 08:28:27 +0000 (09:28 +0100)]
util/system: add unmount_tmpfs helper
Thsi unmounts a path if and only if it's a tmpfs mount.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
705ed1110138b1e7c77768f97d5acda4a76d868f )
Jan Fajerski [Wed, 11 Dec 2019 12:17:19 +0000 (13:17 +0100)]
api/lvm: add get_lv_by_osd_id method
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
2558b55b0ecbcc83acccbf8412c19f01e8dafb3e )
Jan Fajerski [Wed, 11 Dec 2019 12:17:02 +0000 (13:17 +0100)]
api/lvm: add deactivate method to Volume class
Simply calls lvchange -an to deactivate a logical volume.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
8087600d4853554794b709291a08d97befd07ed1 )
Jan Fajerski [Thu, 27 Feb 2020 08:39:40 +0000 (09:39 +0100)]
Merge pull request #32869 from shyukri/wip-42946-mimic
mimic: ceph-volume: allow raw block devices everywhere
Jan Fajerski [Thu, 27 Feb 2020 08:38:24 +0000 (09:38 +0100)]
Merge pull request #32872 from shyukri/wip-43200-mimic
mimic: ceph-volume: fix the integer overflow
Yuri Weinstein [Wed, 26 Feb 2020 23:56:58 +0000 (15:56 -0800)]
Merge pull request #33331 from smithfarm/wip-43472-mimic
mimic: osd/PeeringState.cc: don't let num_objects become negative
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:56:27 +0000 (15:56 -0800)]
Merge pull request #33329 from smithfarm/wip-43320-mimic
mimic: osd/PeeringState.cc: skip peer_purged when discovering all missing
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:55:52 +0000 (15:55 -0800)]
Merge pull request #33324 from smithfarm/wip-42998-mimic
mimic: osd/PeeringState: do not exclude up from acting_recovery_backfill
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:55:21 +0000 (15:55 -0800)]
Merge pull request #33322 from smithfarm/wip-42852-mimic
mimic: mon/OSDMonitor: fix format error ceph osd stat --format json
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:52:06 +0000 (15:52 -0800)]
Merge pull request #33154 from shyukri/wip-43881-mimic
mimic: mon: Don't put session during feature change
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:51:34 +0000 (15:51 -0800)]
Merge pull request #33145 from shyukri/wip-43987-mimic
mimic: osd: Allow 64-char hostname to be added as the "host" in CRUSH
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:50:53 +0000 (15:50 -0800)]
Merge pull request #32717 from smithfarm/wip-43652-mimic
mimic: osd: Diagnostic logging for upmap cleaning
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:50:11 +0000 (15:50 -0800)]
Merge pull request #32258 from smithfarm/wip-43244-mimic
mimic: selinux: Allow ceph to read udev db
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:48:59 +0000 (15:48 -0800)]
Merge pull request #32125 from dvanders/dvanders_40890
mimic: osd: set collection pool opts on collection create, pg load
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:47:15 +0000 (15:47 -0800)]
Merge pull request #33323 from smithfarm/wip-42879-mimic
mimic: common/admin_socket: Increase socket timeouts
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:46:43 +0000 (15:46 -0800)]
Merge pull request #33158 from shyukri/wip-43925-mimic
mimic: mgr/prometheus: report per-pool pg states
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:45:55 +0000 (15:45 -0800)]
Merge pull request #33096 from k0ste/wip-43978-mimic
mimic: mgr/telemetry: check get_metadata return val
Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:44:17 +0000 (15:44 -0800)]
Merge pull request #32902 from smithfarm/wip-43630-mimic
mimic: common/util: use ifstream to read from /proc files
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:42:59 +0000 (15:42 -0800)]
Merge pull request #31673 from smithfarm/wip-42833-mimic
mimic: os/bluestore: fix improper setting of STATE_KV_SUBMITTED.
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:28:58 +0000 (15:28 -0800)]
Merge pull request #31805 from smithfarm/wip-42851-mimic
mimic: pybind/mgr: Cancel output color control
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Yuri Weinstein [Wed, 26 Feb 2020 23:27:55 +0000 (15:27 -0800)]
Merge pull request #31305 from smithfarm/wip-42544-mimic
mimic: qa/tasks/cbt: run stop-all.sh while shutting down
Reviewed-by: Kefu Chai <kchai@redhat.com>
Brad Hubbard [Tue, 25 Feb 2020 23:57:43 +0000 (09:57 +1000)]
Merge pull request #33377 from badone/wip-mimic-upgrade-ceph_ansible
mimic: qa/ceph-ansible: Upgrade to stable-3.2.30 branch
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:45:09 +0000 (11:45 -0800)]
Merge pull request #31861 from smithfarm/wip-43014-mimic
mimic: rgw: crypt: permit RGW-AUTO/default with SSE-S3 headers
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:44:46 +0000 (11:44 -0800)]
Merge pull request #31754 from smithfarm/wip-42896-mimic
mimic: rgw: add list user admin OP API
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:44:18 +0000 (11:44 -0800)]
Merge pull request #31377 from smithfarm/wip-41635-mimic
mimic: rgw: add bucket permission verify when copy obj
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:43:51 +0000 (11:43 -0800)]
Merge pull request #31299 from smithfarm/wip-42554-mimic
mimic: rgw: prevent bucket reshard scheduling if bucket is resharding
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:43:25 +0000 (11:43 -0800)]
Merge pull request #31183 from croit/mimic-rgw-bucket-stats-num-shards
mimic: rgw: add num_shards to radosgw-admin bucket stats
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:42:59 +0000 (11:42 -0800)]
Merge pull request #30804 from smithfarm/wip-41975-mimic
mimic: rgw: add missing admin property when sync user info
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:41:37 +0000 (11:41 -0800)]
Merge pull request #33304 from smithfarm/wip-43206-mimic
mimic: rgw: fix bad user stats on versioned bucket after reshard
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:41:10 +0000 (11:41 -0800)]
Merge pull request #33303 from smithfarm/wip-43202-mimic
mimic: rgw: adding mfa code validation when bucket versioning status is changed
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:40:41 +0000 (11:40 -0800)]
Merge pull request #33302 from smithfarm/wip-42734-mimic
mimic: rgw: allow reshard log entries for non-existent buckets to be cancelled
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:38:08 +0000 (11:38 -0800)]
Merge pull request #33341 from tpsilva/wip-44130-mimic
mimic: rgw: make max_connections configurable in beast
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:36:34 +0000 (11:36 -0800)]
Merge pull request #33313 from smithfarm/wip-43876-mimic
mimic: rgw: maybe coredump when reload operator happened
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 19:36:09 +0000 (11:36 -0800)]
Merge pull request #33309 from smithfarm/wip-43633-mimic
mimic: rgw: find oldest period and update RGWMetadataLogHistory()
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:58:21 +0000 (08:58 -0800)]
Merge pull request #33312 from smithfarm/wip-43847-mimic
mimic: rgw: update the hash source for multipart entries during resharding
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:57:51 +0000 (08:57 -0800)]
Merge pull request #33311 from smithfarm/wip-43658-mimic
mimic: rgw: move forward marker even in case of many rgw.none indexes
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:57:10 +0000 (08:57 -0800)]
Merge pull request #31378 from smithfarm/wip-41859-mimic
mimic: rgw: fix memory growth while deleting objects with
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:56:01 +0000 (08:56 -0800)]
Merge pull request #33306 from smithfarm/wip-43575-mimic
mimic: rgw: fix a bug that bucket instance obj can't be removed after resharding completed
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:55:31 +0000 (08:55 -0800)]
Merge pull request #33305 from smithfarm/wip-43480-mimic
mimic: rgw: change the "rgw admin status" 'num_shards' output to signed int
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:54:42 +0000 (08:54 -0800)]
Merge pull request #33300 from smithfarm/wip-42732-mimic
mimic: rgw: auto-clean reshard queue entries for non-existent buckets
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:12:49 +0000 (08:12 -0800)]
Merge pull request #33314 from smithfarm/wip-42992-mimic
mimic: qa: update krbd_blkroset.t and add krbd_get_features.t
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:12:17 +0000 (08:12 -0800)]
Merge pull request #33316 from smithfarm/wip-43242-mimic
mimic: qa: krbd_exclusive_option.sh: update for recent kernel changes
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:53:38 +0000 (11:53 -0800)]
Merge pull request #33318 from smithfarm/wip-43507-mimic
mimic: rbd: creating thick-provision image progress percent info exceeds 100%
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:53:10 +0000 (11:53 -0800)]
Merge pull request #33315 from smithfarm/wip-43238-mimic
mimic: librbd: fix rbd_open_by_id, rbd_open_by_id_read_only
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:52:35 +0000 (11:52 -0800)]
Merge pull request #32952 from shyukri/wip-43829-mimic
mimic: librbd: don't call refresh from mirror::GetInfoRequest state machine
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:52:03 +0000 (11:52 -0800)]
Merge pull request #32714 from smithfarm/wip-43625-mimic
mimic: nautilus: rbd-mirror: fix 'rbd mirror status' asok command output
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:51:28 +0000 (11:51 -0800)]
Merge pull request #32470 from zhengchengyao/diff_mimic
mimic: rbd: librbd: diff iterate with fast-diff now correctly includes parent
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:50:28 +0000 (11:50 -0800)]
Merge pull request #31520 from trociny/wip-42727-mimic
mimic: rbd-mirror: clone v2 mirroring improvements
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Brad Hubbard [Tue, 4 Feb 2020 01:33:05 +0000 (11:33 +1000)]
mimic: qa/ceph-ansible: Upgrade to stable-3.2.30 branch
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Tiago Pasqualini [Fri, 31 Jan 2020 18:22:19 +0000 (15:22 -0300)]
rgw: make max_connections configurable in beast
Beast frontend currently accepts a hardcoded number of connections
that is defined by boost::asio::socket_base::max_connections. This
commit makes it configurable via a 'max_connections' config option
on rgw frontend.
Fixes: https://tracker.ceph.com/issues/43952
Signed-off-by: Tiago Pasqualini <tiago.pasqualini@canonical.com>
(cherry picked from commit
d6dada5bcb356abaef8d9237ceca8f42d4fcfb74 )
Conflicts:
src/rgw/rgw_asio_frontend.cc
- trivial resolution
Jan Fajerski [Tue, 5 Nov 2019 12:39:27 +0000 (13:39 +0100)]
doc: update ceph-volume lvm prepare
Add option to pass raw physical devices everywhere, restructure a little
(bluestore section before filestore) and reword a few things.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
f2018d76eb8936aed8643328f0d5f111c87514e4 )
Jan Fajerski [Tue, 5 Nov 2019 07:31:44 +0000 (08:31 +0100)]
ceph-volume: make lvm report fields into constants
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
01a603f6e952d2c5931b89699a86503e281fb376 )
Jan Fajerski [Tue, 22 Oct 2019 12:32:11 +0000 (14:32 +0200)]
ceph-volume: api/lvm create or reuse a vg
This changes create_lv so one can pass the desired device and either a
VG with a name starting with ceph is re-used or a new one is created.
This commit also adds two new lvm primitives, making use of lvm's select
feature. The goal is to eventually avoid keeping a full list of lv's (or
vg's) around and query the lvm system as needed.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
bb4de1a3fc238eaf9f717dc59c6bdf338ef6d657 )
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
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 mimic; made the changes manually in
src/osd/PG.cc
Nathan Cutler [Fri, 14 Feb 2020 12:42:25 +0000 (13:42 +0100)]
Revert "osd/PG: avoid choose_acting picking want with > pool size items"
This reverts commit
a0d49cf83ae3b845f2724aec28234d8796c66747 .
c3e2990c39952a1fc4593076c5b2f0dea6cdcdd3 was backported to mimic by
a0d49cf83ae3b845f2724aec28234d8796c66747 .
In master,
c3e2990c39952a1fc4593076c5b2f0dea6cdcdd3 was reverted by
82bb83f0ba930d7f83bea5a5397629b3e334bae2 .
The revert is not cherry-picked from master because it's better to
revert the mimic backport directly.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
xie xingguo [Wed, 20 Nov 2019 00:31:54 +0000 (08:31 +0800)]
osd/PeeringState: do not exclude up from acting_recovery_backfill
If we choose a primary that does not belong to the current up set,
and all up peers are still recoverable, then we might end up excluding
some up peer from the acting_recovery_backfill set too due to the
"want size <= pool size" constraint (since https://github.com/ceph/ceph/pull/24035),
as a result of which all up peers might not get recovered in one go.
Fix by falling through any oversized want set to async recovery, which
should be able to handle it nicely.
Fixes: https://tracker.ceph.com/issues/42577
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
22c8cdad8ee1d7376c7d200bdb6ec94ed6d3b5e6 )
Conflicts:
src/osd/PeeringState.cc
- file does not exist in mimic; made the change manually to
src/osd/PG.cc
songshuangyang [Wed, 21 Nov 2018 12:39:37 +0000 (20:39 +0800)]
rgw: add list user admin OP API unit tests
Signed-off-by: Oshyn Song <dualyangsong@gmail.com>
(cherry picked from commit
b7580932c07e1c8048d016aa63981e00b0175698 )
songshuangyang [Tue, 13 Nov 2018 09:32:41 +0000 (17:32 +0800)]
rgw: add list user admin OP API
The radosgw-admin tool support the `user list` subcommand to list radosgw users, but there is no user listing function for the admin OP API. It needs to support this API.
Signed-off-by: Oshyn Song <dualyangsong@gmail.com>
(cherry picked from commit
97e1ff50e57a51744a6d864cef15f9afe0e84b66 )
Conflicts:
src/rgw/rgw_user.h
- needed to adapt the list_user RGWOp name() override
Brad Hubbard [Thu, 14 Nov 2019 05:07:32 +0000 (15:07 +1000)]
common/admin_socket: Increase socket timeouts
With the move of the 'bench' command to the admin socket the recv
timeout is being exceeded in testing due to the duration of the command.
Fixes: https://tracker.ceph.com/issues/42387
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
4dd67b9e3cb1a4168f6804b144e4178f2b821108 )
Nathan Cutler [Fri, 14 Feb 2020 12:26:59 +0000 (13:26 +0100)]
Merge pull request #32782 from idryomov/wip-doc-fs-authorize-fix-mimic
mimic: doc/cephfs/client-auth: description and example are inconsistent
Reviewed-by: Nathan Cutler <ncutler@suse.com>
zhengyin [Tue, 5 Nov 2019 07:29:34 +0000 (15:29 +0800)]
osd/OSDMap: fix format error ceph osd stat --format json
Fixes: https://tracker.ceph.com/issues/42501
Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
(cherry picked from commit
a85499ca57dd22e61bcad614897dc5fd57196353 )
Shilpa Jagannath [Tue, 26 Nov 2019 08:03:52 +0000 (13:33 +0530)]
rgw: when a period lookup for oldest_realm_epoch returns an ENOENT,
find the oldest one and update RGWMetadataLogHistory. This is to avoid an
empty cursor being passed in to ceph_assert() in PurgePeriodLogsCR::operate()
in case of incomplete period history.
Fixes: https://tracker.ceph.com/issues/40341
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit
0ea65d81d4d5431ca22340149dbd714e395ecdc3 )
Conflicts:
src/rgw/services/svc_mdlog.cc
- file does not exist in mimic; made the changes manually to
src/rgw/rgw_metadata.cc
- in mimic, find_oldest_period takes an argument: store
- in mimic, write_history takes an additional argument: store
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
- manual cherry-pick
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 )
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 )
Conflicts:
src/librbd/librbd.cc
Ilya Dryomov [Tue, 19 Nov 2019 15:31:35 +0000 (16:31 +0100)]
qa: add krbd_get_features.t test
Run it together with krbd_blkroset.t.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
80528fcb6cf808fbf1ae9744911cb0ef46075a68 )
Ilya Dryomov [Tue, 19 Nov 2019 15:05:37 +0000 (16:05 +0100)]
qa: krbd_blkroset.t: update for read-only changes
If an image is mapped read-only, setting its partition(s) to read-write
via BLKROSET is no longer allowed.
Add read-only OSD caps test cases.
Fixes: https://tracker.ceph.com/issues/42915
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
366a369c8d2dedf356d6848ccdc25a7693502f20 )
Richard Bai(白学余) [Mon, 19 Aug 2019 08:54:52 +0000 (16:54 +0800)]
rgw: maybe coredump when reload operator happened
Fixes: https://tracker.ceph.com/issues/42119
Signed-off-by: Richard Bai(白学余) <baixueyu@inspur.com>
(cherry picked from commit
78125a8dba6b59b012c642c6b756a2c4f34912b1 )
Conflicts:
src/rgw/rgw_rados.cc
- manual cherry-pick
taodd [Mon, 13 Jan 2020 14:18:45 +0000 (22:18 +0800)]
rgw: update the hash source for multipart entries during resharding
Fixes: https://tracker.ceph.com/issues/43583
Signed-off-by: dongdong tao <dongdong.tao@canonical.com>
(cherry picked from commit
fb6f78a3a54a39fb2f43fa7846cb847e4917860d )
Conflicts:
src/rgw/rgw_reshard.cc
- mimic does not have
7e613fdc55bd3db200cce912b0e27a99a128aa27
- in mimic, RGWMPObj is defined in rgw_rados.h
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
Mark Kogan [Thu, 13 Dec 2018 14:29:31 +0000 (09:29 -0500)]
rgw: change the 'rgw admin status" nun_shards output to signed int
Fixes: http://tracker.ceph.com/issues/37645
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit
9bdc324cb6667244bd32ee09760f91819383b30d )