]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoqa/cephfs: update tests for stale session handling
Yan, Zheng [Tue, 5 Mar 2019 09:40:08 +0000 (17:40 +0800)]
qa/cephfs: update tests for stale session handling

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 1c8be588e32f47ca712561711ad1ffdddc54b330)

 Conflicts:
qa/tasks/cephfs/test_client_recovery.py

5 years agomds: change how mds revoke stale caps
Yan, Zheng [Wed, 27 Feb 2019 12:51:38 +0000 (20:51 +0800)]
mds: change how mds revoke stale caps

- Only revokes conflicting caps from stale client.
- If stale client holds conflicting CEPH_CAP_ANY_WR,
  blacklist and kill it.

Fixes: https://tracker.ceph.com/issues/38326
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit dcae1ea2d30398f7b6493a74b482e964a21fcfeb)

 Conflicts:
src/mds/CInode.cc
src/mds/Capability.cc
src/mds/Locker.cc
src/mds/MDSRank.h
src/mds/Server.cc

5 years agomds: don't mark unresponsive sessions holding no caps stale
Yan, Zheng [Mon, 17 Jun 2019 04:58:58 +0000 (12:58 +0800)]
mds: don't mark unresponsive sessions holding no caps stale

When an unresponsive MDS session holds no caps, do not mark it stale
even after session_timeout; at session_autoclose, evict it directly.

Fixes: http://tracker.ceph.com/issues/17854
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 98af31d10f362c05ea8ed57495973b08599431e7)

 Conflicts:
src/mds/Server.cc

5 years agomds: optimize resuming stale caps
Yan, Zheng [Mon, 10 Dec 2018 03:37:32 +0000 (11:37 +0800)]
mds: optimize resuming stale caps

If client doesn't want any cap, there is no need to re-issue stale
caps.

A special case is that client wants some caps, but skipped updating
'wanted'. For this case, client needs to update 'wanted' when stale
session get renewed.

Fixes: http://tracker.ceph.com/issues/38043
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit e824b3d2024db36789fdf579f0af9bf3bbe55d51)

 Conflicts:
src/client/Client.cc
src/mds/cephfs_features.h

5 years agoclient: avoid unnecessary wakeup when handling RENEWCAPS
Yan, Zheng [Thu, 6 Dec 2018 09:22:25 +0000 (17:22 +0800)]
client: avoid unnecessary wakeup when handling RENEWCAPS

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit c744bc1673ca0b4e50f41516fdf49c8560db073a)

5 years agoclient: don't wakeup cap waiters twice when mds recovered
Yan, Zheng [Thu, 6 Dec 2018 09:16:49 +0000 (17:16 +0800)]
client: don't wakeup cap waiters twice when mds recovered

Both kick_maxsize_requests() and wake_inode_waiters() wake up cap
waiters

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 5993a93e606d23ef311831863444294d7c64cc04)

 Conflicts:
src/client/Client.cc
src/client/Client.h

5 years agoclient: set cap->wanted when adding new cap
Yan, Zheng [Thu, 6 Dec 2018 07:30:44 +0000 (15:30 +0800)]
client: set cap->wanted when adding new cap

This avoids unnecessary cap message if cap is added by open/create
request reply.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 314660a46a8a1af97f70b2bac05b2f6fa5d23bc4)

 Conflicts:
src/client/Client.h

5 years agomds: optimize revoking stale caps
Yan, Zheng [Fri, 23 Nov 2018 08:19:52 +0000 (16:19 +0800)]
mds: optimize revoking stale caps

For caps that are not being revoked and don't have writeable range
and don't want exclusive caps or file read/write. there is no need
to call Locker::revoke_stale_caps(Capability*). Because these caps
don't need recover and don't affect eval_gather()/try_eval().

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit cb62030f0468fc04735c1b4cff73da779cb11ad8)

 Conflicts:
src/mds/CInode.cc
src/mds/Capability.h
src/mds/Locker.cc
src/mds/Migrator.cc

5 years agomds: put notable caps at the front of session's caps list
Yan, Zheng [Thu, 22 Nov 2018 09:28:15 +0000 (17:28 +0800)]
mds: put notable caps at the front of session's caps list

Notable Capabilities are ones that are being revoked, ones that
have writeable ranges and ones that want exclusive caps or want
file read/write.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit cb6e7184458e64720ad83c266e5e393a80c32697)

5 years agomds: track if client has writeable range in Capability
Yan, Zheng [Wed, 21 Nov 2018 12:22:25 +0000 (20:22 +0800)]
mds: track if client has writeable range in Capability

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 370ae1cb3e5dc07867d80e998082bc514e8fccfd)

 Conflicts:
src/mds/Locker.cc
src/mds/MDCache.h
src/mds/Server.cc

5 years agomds: add session pointer to Capability
Yan, Zheng [Mon, 26 Nov 2018 01:44:56 +0000 (09:44 +0800)]
mds: add session pointer to Capability

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 7c628472a86c6acebb20f0a2504744b10f250587)

 Conflicts:
src/mds/CInode.cc
src/mds/Capability.h
src/mds/Locker.cc

5 years agoclient: sync 'retain caps' logical from kernel client
Yan, Zheng [Thu, 22 Nov 2018 07:55:12 +0000 (15:55 +0800)]
client: sync 'retain caps' logical from kernel client

The main change is keeping CEPH_CAP_ANY_RD for unused file inodes

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 29034396398b1706db625e1abf2e6682be7130a5)

5 years agoclient: skip updating 'wanted' caps if caps are already issued
Yan, Zheng [Thu, 22 Nov 2018 07:02:36 +0000 (15:02 +0800)]
client: skip updating 'wanted' caps if caps are already issued

When reading cached inode that already has Fscr caps, this can avoid
two cap messages (one updats 'wanted' caps, one clears 'wanted' caps).

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit d20b260ecf3f323c87ad1e6865f87e2381444546)

5 years agoMerge pull request #30808 from jan--f/wip-42233-mimic
Jan Fajerski [Fri, 18 Oct 2019 12:02:01 +0000 (14:02 +0200)]
Merge pull request #30808 from jan--f/wip-42233-mimic

mimic: ceph-volume: VolumeGroups.filter shouldn't purge itself

5 years agoMerge pull request #30936 from smithfarm/wip-42130-mimic
Nathan Cutler [Fri, 18 Oct 2019 11:59:33 +0000 (13:59 +0200)]
Merge pull request #30936 from smithfarm/wip-42130-mimic

mimic: doc/ceph-fuse: mention -k option in ceph-fuse man page

Reviewed-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge pull request #30806 from jan--f/wip-42235-mimic
Jan Fajerski [Fri, 18 Oct 2019 11:58:51 +0000 (13:58 +0200)]
Merge pull request #30806 from jan--f/wip-42235-mimic

mimic: ceph-volume: PVolumes.filter shouldn't purge itself

5 years agoMerge pull request #29224 from smithfarm/wip-39223-mimic
Yuri Weinstein [Thu, 17 Oct 2019 16:45:12 +0000 (09:45 -0700)]
Merge pull request #29224 from smithfarm/wip-39223-mimic

mimic: mds: behind on trimming and [dentry] was purgeable but no longer is!

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29232 from smithfarm/wip-40439-mimic
Yuri Weinstein [Thu, 17 Oct 2019 16:44:39 +0000 (09:44 -0700)]
Merge pull request #29232 from smithfarm/wip-40439-mimic

mimic: mds: cannot switch mds state from standby-replay to active

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29479 from xiaoxichen/wip-41001
Yuri Weinstein [Thu, 17 Oct 2019 16:44:11 +0000 (09:44 -0700)]
Merge pull request #29479 from xiaoxichen/wip-41001

mimic: cephfs: client: unlink dentry for inode with llref=0

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29218 from smithfarm/wip-38709-mimic
Yuri Weinstein [Thu, 17 Oct 2019 16:04:52 +0000 (09:04 -0700)]
Merge pull request #29218 from smithfarm/wip-38709-mimic

mimic: tests: kclient unmount hangs after file system goes down

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29220 from smithfarm/wip-39210-mimic
Yuri Weinstein [Thu, 17 Oct 2019 16:04:29 +0000 (09:04 -0700)]
Merge pull request #29220 from smithfarm/wip-39210-mimic

mimic: mds: mds_cap_revoke_eviction_timeout is not used to initialize Server::cap_revoke_eviction_timeout

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29222 from smithfarm/wip-39212-mimic
Yuri Weinstein [Thu, 17 Oct 2019 16:03:59 +0000 (09:03 -0700)]
Merge pull request #29222 from smithfarm/wip-39212-mimic

mimic: cephfs: MDSTableServer.cc: 83: FAILED assert(version == tid)

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
5 years agoMerge pull request #29223 from smithfarm/wip-39215-mimic
Yuri Weinstein [Thu, 17 Oct 2019 15:58:00 +0000 (08:58 -0700)]
Merge pull request #29223 from smithfarm/wip-39215-mimic

mimic: mds: there is an assertion when calling Beacon::shutdown()

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29228 from smithfarm/wip-40219-mimic
Yuri Weinstein [Thu, 17 Oct 2019 15:57:28 +0000 (08:57 -0700)]
Merge pull request #29228 from smithfarm/wip-40219-mimic

mimic: tests: cephfs: TestMisc.test_evict_client fails

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29230 from smithfarm/wip-40437-mimic
Yuri Weinstein [Thu, 17 Oct 2019 15:56:58 +0000 (08:56 -0700)]
Merge pull request #29230 from smithfarm/wip-40437-mimic

mimic: cephfs: getattr on snap inode stuck

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30796 from dillaman/wip-36122-mimic
Yuri Weinstein [Thu, 17 Oct 2019 15:50:42 +0000 (08:50 -0700)]
Merge pull request #30796 from dillaman/wip-36122-mimic

mimic: librbd: properly handle potential object map failures

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30828 from dillaman/wip-41882-mimic
Yuri Weinstein [Thu, 17 Oct 2019 15:49:58 +0000 (08:49 -0700)]
Merge pull request #30828 from dillaman/wip-41882-mimic

mimic: rbd-mirror: cannot restore deferred deletion mirrored images

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #30213 from smithfarm/wip-41449-mimic
Yuri Weinstein [Wed, 16 Oct 2019 23:26:47 +0000 (16:26 -0700)]
Merge pull request #30213 from smithfarm/wip-41449-mimic

mimic: core: mon: C_AckMarkedDown has not handled the Callback Arguments

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #30150 from neha-ojha/wip-40769-mimic
Yuri Weinstein [Wed, 16 Oct 2019 23:22:05 +0000 (16:22 -0700)]
Merge pull request #30150 from neha-ojha/wip-40769-mimic

mimic: bluestore: common/options: Set concurrent bluestore rocksdb compactions to 2

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #30069 from smithfarm/wip-40124-mimic
Yuri Weinstein [Tue, 15 Oct 2019 20:06:01 +0000 (13:06 -0700)]
Merge pull request #30069 from smithfarm/wip-40124-mimic

mimic: qa/rgw: don't use ceph-ansible in s3a-hadoop suite

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30133 from smithfarm/wip-40850-mimic
Yuri Weinstein [Tue, 15 Oct 2019 20:05:35 +0000 (13:05 -0700)]
Merge pull request #30133 from smithfarm/wip-40850-mimic

mimic: rgw/multisite: Don't allow certain radosgw-admin commands to run on non-master zone

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29203 from smithfarm/wip-40320-mimic
Yuri Weinstein [Tue, 15 Oct 2019 19:46:27 +0000 (12:46 -0700)]
Merge pull request #29203 from smithfarm/wip-40320-mimic

mimic: tests: make: *** [hello_world_cpp] Error 127 in rados

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30219 from vumrao/wip-vumrao-bluefs-shared-alloc-with-log-level...
Yuri Weinstein [Tue, 15 Oct 2019 19:45:57 +0000 (12:45 -0700)]
Merge pull request #30219 from vumrao/wip-vumrao-bluefs-shared-alloc-with-log-level-change-mimic

mimic: os/bluestore: apply shared_alloc_size to shared device with log level change

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #30260 from smithfarm/wip-41723-mimic
Yuri Weinstein [Tue, 15 Oct 2019 19:45:19 +0000 (12:45 -0700)]
Merge pull request #30260 from smithfarm/wip-41723-mimic

mimic: build/ops: fix build fail related to PYTHON_EXECUTABLE variable

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30355 from pdvian/wip-41765-mimic
Yuri Weinstein [Tue, 15 Oct 2019 19:44:51 +0000 (12:44 -0700)]
Merge pull request #30355 from pdvian/wip-41765-mimic

mimic: build/ops: ceph.spec.in: reserve 2500MB per build job

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #30672 from smithfarm/wip-37520-mimic
Yuri Weinstein [Tue, 15 Oct 2019 19:44:21 +0000 (12:44 -0700)]
Merge pull request #30672 from smithfarm/wip-37520-mimic

mimic: msg/async: do not trigger RESETSESSION from connect fault during connection phase

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #30784 from smithfarm/wip-41918-mimic
Yuri Weinstein [Tue, 15 Oct 2019 19:43:52 +0000 (12:43 -0700)]
Merge pull request #30784 from smithfarm/wip-41918-mimic

mimic: core: osd: scrub error on big objects; make bluestore refuse to start on big objects

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agodoc/ceph-fuse: mention -k option in ceph-fuse man page 30936/head
Rishabh Dave [Wed, 25 Sep 2019 06:12:50 +0000 (11:42 +0530)]
doc/ceph-fuse: mention -k option in ceph-fuse man page

Fixes: https://tracker.ceph.com/issues/42044
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit a96a32bd2ef15e963bdb8c46e45edcb83e2361bb)

5 years agoMerge pull request #29258 from smithfarm/wip-39741-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:23:59 +0000 (13:23 -0700)]
Merge pull request #29258 from smithfarm/wip-39741-mimic

mimic: rgw: swift object expiry fails when a bucket reshards

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29483 from pdvian/wip-40761-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:23:12 +0000 (13:23 -0700)]
Merge pull request #29483 from pdvian/wip-40761-mimic

mimic: rgw: Save an unnecessary copy of RGWEnv

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29500 from pdvian/wip-40847-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:22:43 +0000 (13:22 -0700)]
Merge pull request #29500 from pdvian/wip-40847-mimic

mimic: rgw: Don't crash on copy when metadata directive not supplied

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30073 from smithfarm/wip-40517-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:22:21 +0000 (13:22 -0700)]
Merge pull request #30073 from smithfarm/wip-40517-mimic

mimic: rgw: perfcounters: add gc retire counter

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30077 from smithfarm/wip-40599-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:21:50 +0000 (13:21 -0700)]
Merge pull request #30077 from smithfarm/wip-40599-mimic

mimic: rgw_file: fix readdir eof() calc--caller stop implies !eof and introduce fast S3 Unix stats (immutable)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29276 from smithfarm/wip-40215-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:19:36 +0000 (13:19 -0700)]
Merge pull request #29276 from smithfarm/wip-40215-mimic

mimic: rgw_file:  fix invalidation of top-level directories

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
5 years agoMerge pull request #29984 from pdvian/wip-41110-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:18:44 +0000 (13:18 -0700)]
Merge pull request #29984 from pdvian/wip-41110-mimic

mimic: rgw: fix drain handles error when deleting bucket with bypass-gc option

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30074 from smithfarm/wip-40539-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:18:15 +0000 (13:18 -0700)]
Merge pull request #30074 from smithfarm/wip-40539-mimic

mimic: cls/rgw: keep issuing bilog trim ops after reset

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30105 from smithfarm/wip-41120-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:15:56 +0000 (13:15 -0700)]
Merge pull request #30105 from smithfarm/wip-41120-mimic

mimic: rgw: permit rgw-admin to populate user info by access-key

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30130 from smithfarm/wip-40629-mimic
Yuri Weinstein [Fri, 11 Oct 2019 20:15:29 +0000 (13:15 -0700)]
Merge pull request #30130 from smithfarm/wip-40629-mimic

mimic: rgw: data/bilogs are trimmed when no peers are reading them

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30233 from smithfarm/wip-41129-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:23:19 +0000 (13:23 -0700)]
Merge pull request #30233 from smithfarm/wip-41129-mimic

mimic: qa: use hard_reset to reboot kclient

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30234 from smithfarm/wip-40444-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:22:54 +0000 (13:22 -0700)]
Merge pull request #30234 from smithfarm/wip-40444-mimic

mimic: mds: cleanup unneeded client_snap_caps when splitting snap inode

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30235 from smithfarm/wip-40844-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:22:26 +0000 (13:22 -0700)]
Merge pull request #30235 from smithfarm/wip-40844-mimic

mimic: mon/MDSMonitor: use stringstream instead of dout for mds repaired

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30236 from smithfarm/wip-40853-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:22:01 +0000 (13:22 -0700)]
Merge pull request #30236 from smithfarm/wip-40853-mimic

mimic: cephfs: test_volume_client: fix test_put_object_versioned()

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30238 from smithfarm/wip-40896-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:21:26 +0000 (13:21 -0700)]
Merge pull request #30238 from smithfarm/wip-40896-mimic

mimic: cephfs: ceph_volume_client: convert string to bytes object

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30239 from smithfarm/wip-40899-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:20:55 +0000 (13:20 -0700)]
Merge pull request #30239 from smithfarm/wip-40899-mimic

mimic: mds: evict an unresponsive client only when another client wants its caps

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge pull request #30240 from smithfarm/wip-41466-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:19:16 +0000 (13:19 -0700)]
Merge pull request #30240 from smithfarm/wip-41466-mimic

mimic: cephfs: mount.ceph: properly handle -o strictatime

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30241 from smithfarm/wip-41487-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:18:29 +0000 (13:18 -0700)]
Merge pull request #30241 from smithfarm/wip-41487-mimic

mimic: cephfs: client: return -EIO when sync file which unsafe reqs have been dropped

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30417 from pdvian/wip-41852-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:18:06 +0000 (13:18 -0700)]
Merge pull request #30417 from pdvian/wip-41852-mimic

mimic: mds: make MDSIOContextBase delete itself when shutting down

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30443 from pdvian/wip-41856-mimic
Yuri Weinstein [Thu, 10 Oct 2019 20:17:41 +0000 (13:17 -0700)]
Merge pull request #30443 from pdvian/wip-41856-mimic

mimic: cephfs: client: nfs-ganesha with cephfs client, removing dir reports not empty

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agorbd-mirror: prevent restored trash images from being deleted after delay 30828/head
Jason Dillaman [Wed, 11 Sep 2019 20:30:16 +0000 (16:30 -0400)]
rbd-mirror: prevent restored trash images from being deleted after delay

The image deleter wasn't verifying whether or not an image was still in the trash
prior to deleting the image. This not only would incorrectly remove any restored
images but it will also leave the image id object and entry within the directory.

Fixes: https://tracker.ceph.com/issues/41780
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f091a31d5252bba76598fffdc997275ca531621d)

Conflicts:
src/test/rbd_mirror/image_deleter/test_mock_TrashRemoveRequest.cc: removed state test cases
src/tools/rbd_mirror/image_deleter/TrashRemoveRequest.h/cc: removed state validation

5 years agorbd-mirror: renamed RemoveRequest state machine to TrashRemoveRequest
Jason Dillaman [Wed, 11 Sep 2019 19:28:28 +0000 (15:28 -0400)]
rbd-mirror: renamed RemoveRequest state machine to TrashRemoveRequest

This better matches the current behavior where the images are only
removed from the trash.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 55daa8e1e28f457a897070adfabf1583093aadd3)

Conflicts:
src/test/rbd_mirror/CMakeLists.txt: trivial resolution
src/tools/rbd_mirror/ImageDeleter.cc: trivial resolution
src/tools/rbd_mirror/image_deleter/TrashRemoveRequest.cc: trivial resolution

5 years agorbd-mirror: set image as primary when moving to trash
Jason Dillaman [Wed, 11 Sep 2019 18:50:24 +0000 (14:50 -0400)]
rbd-mirror: set image as primary when moving to trash

This will allow the the image to be restored and re-mirrored if
desired.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 73d4577d1b9a9bff087b555c9de5005d1120a0ea)

Conflicts:
src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc: trivial resolution

5 years agolibrbd: reuse async trash remove state machine
Jason Dillaman [Thu, 10 Oct 2019 00:04:32 +0000 (20:04 -0400)]
librbd: reuse async trash remove state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: async trash remove state machine
Mykola Golub [Mon, 15 Apr 2019 10:32:15 +0000 (11:32 +0100)]
librbd: async trash remove state machine

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 8455d6611c48ae8a721d307d157b64d8a7041abe)

Conflicts:
src/librbd/trash/RemoveRequest.cc/h: removed set state calls
src/test/librbd/trash/test_mock_RemoveRequest.cc: removed set state test cases

5 years agoMerge pull request #29609 from jtlayton/wip-40162-mimic
Yuri Weinstein [Wed, 9 Oct 2019 19:12:11 +0000 (12:12 -0700)]
Merge pull request #29609 from jtlayton/wip-40162-mimic

mimic: cephfs: client: fix bad error handling in _lookup_parent

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
5 years agoMerge pull request #29751 from pdvian/wip-41088-mimic
Yuri Weinstein [Wed, 9 Oct 2019 19:11:38 +0000 (12:11 -0700)]
Merge pull request #29751 from pdvian/wip-41088-mimic

mimic: qa: sleep briefly after resetting kclient

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29812 from pdvian/wip-41094-mimic
Yuri Weinstein [Wed, 9 Oct 2019 19:11:01 +0000 (12:11 -0700)]
Merge pull request #29812 from pdvian/wip-41094-mimic

mimic: qa: ignore expected MDS_CLIENT_LATE_RELEASE warning

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29833 from pdvian/wip-41097-mimic
Yuri Weinstein [Wed, 9 Oct 2019 19:10:40 +0000 (12:10 -0700)]
Merge pull request #29833 from pdvian/wip-41097-mimic

mimic: cephfs: avoid map been inserted by mistake

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29915 from pdvian/wip-41100-mimic
Yuri Weinstein [Wed, 9 Oct 2019 19:10:18 +0000 (12:10 -0700)]
Merge pull request #29915 from pdvian/wip-41100-mimic

mimic: cephfs: fix a memory leak

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29940 from pdvian/wip-41108-mimic
Yuri Weinstein [Wed, 9 Oct 2019 19:09:57 +0000 (12:09 -0700)]
Merge pull request #29940 from pdvian/wip-41108-mimic

mimic: mds: delay exporting directory whose pin value exceeds max rank id

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30108 from smithfarm/wip-40442-mimic
Yuri Weinstein [Wed, 9 Oct 2019 19:09:32 +0000 (12:09 -0700)]
Merge pull request #30108 from smithfarm/wip-40442-mimic

mimic: cephfs: client: set snapdir's link count to 1

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #30228 from smithfarm/wip-40841-mimic
Yuri Weinstein [Wed, 9 Oct 2019 19:08:47 +0000 (12:08 -0700)]
Merge pull request #30228 from smithfarm/wip-40841-mimic

mimic: cephfs: client: support the fallocate() when fuse version >= 2.9

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoceph-volume: update tests since VolumeGroups.filter returns a list 30808/head
Rishabh Dave [Thu, 3 Oct 2019 12:14:37 +0000 (17:44 +0530)]
ceph-volume: update tests since VolumeGroups.filter returns a list

VolumeGroups.filter returns VolumeGroups object that contains VGs
matching the filter. Update the tests to hold the list returned by the
Volumes.filter() call.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit da58d239a0e067cd3ea5fd26aac24a2551b871c1)

5 years agoceph-volume: VolumeGroups.filter shouldn't purge itself
Rishabh Dave [Thu, 3 Oct 2019 12:09:37 +0000 (17:39 +0530)]
ceph-volume: VolumeGroups.filter shouldn't purge itself

VolumeGroups.filter remove VGs from the list that do no match filter.
Instead of doing that, return a new list that contains VGs that match
the fiter so that VolumeGroups object held by code calling it is not
modified.

Fixes: https://tracker.ceph.com/issues/42171
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 028757813282f764ebcce05572f9e4b76ea4e552)

5 years agoceph-volume: allow creating empty VolumeGroup objects
Rishabh Dave [Thu, 3 Oct 2019 12:10:37 +0000 (17:40 +0530)]
ceph-volume: allow creating empty VolumeGroup objects

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 2dc4f7de96e51c8117b719640ec4c09388a1412e)

5 years agoceph-volume: update tests since PVolumes.filter returns a list 30806/head
Rishabh Dave [Thu, 3 Oct 2019 11:30:38 +0000 (17:00 +0530)]
ceph-volume: update tests since PVolumes.filter returns a list

...returns a list of filtered PVs instead of removing the items that do
not match the filters from itself.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 38ccfe089a86f86b6e48b9a60286f26bb2444596)

5 years agoceph-volume: PVolumes.filter shouldn't purge itself
Rishabh Dave [Thu, 3 Oct 2019 11:18:46 +0000 (16:48 +0530)]
ceph-volume: PVolumes.filter shouldn't purge itself

PVolumes.filter removes the PVs that do not match the filters from its
list. This approach is problematic since the code calling this method
has to create a copy beforehand. Therefore, it's better to return a new
object that contains PVs that matches the filters.

Fixes: https://tracker.ceph.com/issues/42170
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit fcec33ee50457d43add844aef3b81bbf9dd2ad58)

5 years agoceph-volume: allow creating empty PVolumes objects
Rishabh Dave [Thu, 3 Oct 2019 11:14:35 +0000 (16:44 +0530)]
ceph-volume: allow creating empty PVolumes objects

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 384aaee8fd2b0de7120e58efc3ebbd2a520d709f)

5 years agoMerge pull request #30678 from sobelek/wip-42048-mimic
Jan Fajerski [Wed, 9 Oct 2019 11:13:56 +0000 (13:13 +0200)]
Merge pull request #30678 from sobelek/wip-42048-mimic

mimic: ceph-volume: fix warnings raised by pytest

5 years agoqa/rgw: update default port in perl workunits 30069/head
Casey Bodley [Tue, 18 Jun 2019 16:44:19 +0000 (12:44 -0400)]
qa/rgw: update default port in perl workunits

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 1643879218638915073d5310b859a94d10ffeac6)

5 years agoqa/rgw: extra s3tests tasks use rgw endpoint configuration
Casey Bodley [Tue, 18 Jun 2019 13:07:33 +0000 (09:07 -0400)]
qa/rgw: extra s3tests tasks use rgw endpoint configuration

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 09e992ff01b4ce286540e1230a30df67103f5968)

5 years agoqa/rgw: add dnsmasq back to s3a-hadoop
Casey Bodley [Tue, 14 May 2019 12:30:59 +0000 (08:30 -0400)]
qa/rgw: add dnsmasq back to s3a-hadoop

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 8c8a706b6f4cb3b2a5b89aa1eb06b7e47909852d)

5 years agoqa/rgw: remove ceph-ansible from s3a-hadoop suite
Casey Bodley [Fri, 10 May 2019 18:40:17 +0000 (14:40 -0400)]
qa/rgw: remove ceph-ansible from s3a-hadoop suite

Fixes: http://tracker.ceph.com/issues/39706
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 0fc2c8ecee2b6233292b9fd1325347fd0fdf9171)

Conflicts:
qa/tasks/s3a_hadoop.py
- trivial context difference

5 years agoqa/rgw: use default ports (80 or 443) unless overridden
Casey Bodley [Tue, 5 Mar 2019 15:50:23 +0000 (10:50 -0500)]
qa/rgw: use default ports (80 or 443) unless overridden

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3ff5f0c2406e40d1024d8152e0ac9400302a757a)

5 years agoqa/rgw: rgw task can override --rgw-dns-name on the command line
Casey Bodley [Tue, 20 Feb 2018 17:28:24 +0000 (12:28 -0500)]
qa/rgw: rgw task can override --rgw-dns-name on the command line

the value for rgw_dns_name isn't known until a machine is assigned, so
it can't be set via 'override: conf:'. add a per-client config option
to the rgw task so it can add the endpoint's hostname and/or s3website
hostname on the radosgw command line

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 658e5932fb79e2d33b73363b6ce76ff299809e16)

5 years agoqa/rgw: allow rgw client config to override port
Casey Bodley [Tue, 20 Feb 2018 16:23:00 +0000 (11:23 -0500)]
qa/rgw: allow rgw client config to override port

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 921faebb723c11686bf790ca424c952a786f358a)

5 years agolibrbd: do not unblock IO prior to growing object map during resize 30796/head
Jason Dillaman [Wed, 29 May 2019 13:37:34 +0000 (09:37 -0400)]
librbd: do not unblock IO prior to growing object map during resize

This could result in a small race condition where IO is able to write
beyond the current extent of the object map, resulting in an assertion
failure.

Fixes: http://tracker.ceph.com/issues/39952
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c8ce520870ef46ac00dfea8acfbff46f8b869913)

5 years agotest/librbd: fix 'Uninteresting mock function call' warning
Mykola Golub [Thu, 7 Feb 2019 15:35:20 +0000 (15:35 +0000)]
test/librbd: fix 'Uninteresting mock function call' warning

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 5a4526cc9f7a2434f1bb196d6031abda0c8db221)

5 years agolibrbd: properly handle potential object map failures
Jason Dillaman [Tue, 18 Sep 2018 18:37:12 +0000 (14:37 -0400)]
librbd: properly handle potential object map failures

Remove the "ceph_assert" statements and instead bubble any potential
error code up to the caller. The object map state machines should
attempt to return a 0 upon failure unless it was unable to flag the
object map as invalid.

Fixes: http://tracker.ceph.com/issues/36074
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 765f8ce2536b315a046d0aceff234e9e3c66271f)

Conflicts:
src/librbd/DeepCopyRequest.cc: trivial resolution
src/librbd/deep_copy/ObjectCopyRequest.cc: trivial resolution
src/librbd/deep_copy/SnapshotCopyRequest.cc: trivial resolution
src/librbd/exclusive_lock/PostAcquireRequest.cc: trivial resolution
src/librbd/exclusive_lock/PreReleaseRequest.cc: trivial resolution
src/librbd/image/RefreshRequest.cc: trivial resolution
src/librbd/io/CopyupRequest.cc: trivial resolution
src/librbd/io/ObjectRequest.cc: trivial resolution
src/librbd/object_map/InvalidateRequest.cc: trivial resolution
src/librbd/object_map/RefreshRequest.cc: trivial resolution
src/librbd/object_map/SnapshotRemoveRequest.cc: trivial resolution
src/librbd/operation/ResizeRequest.cc: trivial resolution
src/librbd/operation/SnapshotCreateRequest.cc: trivial resolution
src/librbd/operation/SnapshotRollbackRequest.cc: trivial resolution

5 years agoMerge pull request #30135 from smithfarm/wip-41126-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:09:49 +0000 (13:09 -0700)]
Merge pull request #30135 from smithfarm/wip-41126-mimic

mimic: rgw: swift: refrain from corrupting static large objects when using nginx as a GET cache

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30134 from smithfarm/wip-41103-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:05:57 +0000 (13:05 -0700)]
Merge pull request #30134 from smithfarm/wip-41103-mimic

mimic: rgw: mitigate bucket list with max-entries excessively high

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #30140 from smithfarm/wip-41131-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:04:54 +0000 (13:04 -0700)]
Merge pull request #30140 from smithfarm/wip-41131-mimic

mimic: rgw: Fix bucket versioning vs. swift metadata bug.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30141 from smithfarm/wip-41625-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:04:29 +0000 (13:04 -0700)]
Merge pull request #30141 from smithfarm/wip-41625-mimic

mimic: rgw/rgw_op: Remove get_val from hotpath via legacy options

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
5 years agoMerge pull request #30154 from smithfarm/wip-41265-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:03:59 +0000 (13:03 -0700)]
Merge pull request #30154 from smithfarm/wip-41265-mimic

mimic: rgw: don't throw when accept errors are happening on frontend

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30156 from smithfarm/wip-41270-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:03:32 +0000 (13:03 -0700)]
Merge pull request #30156 from smithfarm/wip-41270-mimic

mimic: rgw: Fix rgw decompression log-print

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30157 from smithfarm/wip-41342-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:03:06 +0000 (13:03 -0700)]
Merge pull request #30157 from smithfarm/wip-41342-mimic

mimic: rgw_file: readdir: do not construct markers w/leading '/'

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
5 years agoMerge pull request #30159 from pdvian/wip-41628-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:02:38 +0000 (13:02 -0700)]
Merge pull request #30159 from pdvian/wip-41628-mimic

mimic: rgw: RGWCoroutine::call(nullptr) sets retcode=0

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30165 from smithfarm/wip-41381-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:01:56 +0000 (13:01 -0700)]
Merge pull request #30165 from smithfarm/wip-41381-mimic

mimic: rgw: housekeeping of reset stats operation in radosgw-admin and cls back-end

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #30166 from smithfarm/wip-41478-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:01:22 +0000 (13:01 -0700)]
Merge pull request #30166 from smithfarm/wip-41478-mimic

mimic: rgw: make dns hostnames matching case insensitive

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30167 from smithfarm/wip-41483-mimic
Yuri Weinstein [Tue, 8 Oct 2019 20:00:53 +0000 (13:00 -0700)]
Merge pull request #30167 from smithfarm/wip-41483-mimic

mimic: rgw: fix potential realm watch lost

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30168 from smithfarm/wip-41484-mimic
Yuri Weinstein [Tue, 8 Oct 2019 19:59:11 +0000 (12:59 -0700)]
Merge pull request #30168 from smithfarm/wip-41484-mimic

mimic: rgw: fix list bucket with delimiter wrongly skip some special keys

Reviewed-by: Casey Bodley <cbodley@redhat.com>