]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Jason Dillaman [Mon, 30 Jan 2017 16:38:21 +0000 (11:38 -0500)]
librbd: ensure owner lock is held before purging cache
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 6 Jan 2017 16:17:10 +0000 (11:17 -0500)]
librados: blacklist_add should wait for latest OSD map
This ensures that future operations against the OSDs force
a OSD map update to notice the blacklisted client.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9242a2e4e1a5a9fcea48d8135b1589493fc28242 )
Jason Dillaman [Thu, 5 Jan 2017 18:31:57 +0000 (13:31 -0500)]
librbd: prevent assertion failure when journal IO is blacklisted
Fixes: http://tracker.ceph.com/issues/18429
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
c720f6e3704ed7e8cf41dffdb931dbb05d59a003 )
Jason Dillaman [Wed, 4 Jan 2017 17:12:27 +0000 (12:12 -0500)]
librbd: ignore blacklist error when releasing exclusive lock
This ensures the journal and object map are properly closed so that the
image can be properly closed w/o failing any assertions.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
418dcf29cb8c450049047e09a4dad2941af87018 )
Jason Dillaman [Tue, 3 Jan 2017 20:29:17 +0000 (15:29 -0500)]
librbd: fail immediately if the exclusive lock cannot be acquired
Fixes: http://tracker.ceph.com/issues/16988
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
47b89f4d48a0b99876462167389df28893a8d418 )
Jason Dillaman [Tue, 3 Jan 2017 19:51:14 +0000 (14:51 -0500)]
librbd: add new lock_get_owners / lock_break_lock API methods
If the client application supports failover, let the application
force break the current lock and blacklist the owner. This is
required in case the current lock owner is alive from the point-of-view
of librbd but failover was required due to a higher level reason.
Fixes: http://tracker.ceph.com/issues/18327
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9a5a8c75a025143cee6f92f3dbc3a12f2b6a9ad7 )
Conflicts:
src/pybind/rbd/rbd.pyx: trivial resolution
src/test/pybind/test_rbd.py: trivial resolution
Jason Dillaman [Thu, 22 Dec 2016 20:00:23 +0000 (15:00 -0500)]
librbd: separate break lock logic into standalone state machine
The current lockers are now queried before the lock is attempted to
prevent any possible race conditions when one or more clients attempt
to break the lock of a dead client.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
23f60fee86d1ff9b261fbb6411746a2a9479cf19 )
Jason Dillaman [Thu, 22 Dec 2016 22:24:47 +0000 (17:24 -0500)]
librbd: separate locker query into standalone state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
03533b912c59d5e433d0f006e1a063e014468ca5 )
Conflicts:
src/test/librbd/exclusive_lock/test_mock_AcquireRequest.cc: trivial resolution
Danny Al-Gaaf [Mon, 22 Feb 2016 14:17:20 +0000 (15:17 +0100)]
librbd/exclusive_lock/AcquireRequest.cc: init lock_type
Fixup for:
CID
1351687 (#1 of 1): Uninitialized scalar variable (UNINIT)
var_decl: Declaring variable lock_type without initializer
uninit_use: Using uninitialized value lock_type.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit
da9ede90cd257ff605ab3ebfcc1aa995f655f1cc )
Mykola Golub [Wed, 8 Jun 2016 12:11:02 +0000 (15:11 +0300)]
librbd: API methods to directly acquire and release the exclusive lock
Fixes: http://tracker.ceph.com/issues/15632
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit
8f1b47fd5da021ec320fd0b5fc0fd68ffff8a706 )
Conflicts:
src/common/config_opts.h: trivial resolution
src/include/rbd/librbd.h: trivial resolution
src/librbd/CMakeLists.txt: trivial resolution
src/librbd/Makefile.am: trivial resolution
src/test/librbd/test_librbd.cc: trivial resolution
Mykola Golub [Fri, 10 Jun 2016 11:04:04 +0000 (14:04 +0300)]
rbd-mirror: fix error messages formatting
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit
2af72480d94b2b90ed6eac7b3e131437864eada7 )
Conflicts:
src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc: trivial resolution
Jason Dillaman [Sun, 11 Sep 2016 13:08:41 +0000 (09:08 -0400)]
librbd: ignore partial refresh error when acquiring exclusive lock
Fixes: http://tracker.ceph.com/issues/17227
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
24396dcba77a97342d19916fdd285bae0c38fd19 )
Jason Dillaman [Fri, 9 Sep 2016 12:31:52 +0000 (08:31 -0400)]
librbd: potential seg fault when blacklisting an image client
Fixes: http://tracker.ceph.com/issues/17251
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
7025fe8976f8672a2fce05ea693c06a8e9faed19 )
Jason Dillaman [Sun, 4 Sep 2016 14:48:48 +0000 (10:48 -0400)]
librbd: potential double-unwatch of watch handle upon error
Fixes: http://tracker.ceph.com/issues/17210
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
1068ded0cba59831a0712f347946731689a68553 )
Jason Dillaman [Thu, 1 Sep 2016 01:33:54 +0000 (21:33 -0400)]
librbd: deadlock when replaying journal during image open
Fixes: http://tracker.ceph.com/issues/17188
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3dc13067f5f0d140ee76b0166eb4cec568610211 )
Jason Dillaman [Thu, 1 Sep 2016 00:56:54 +0000 (20:56 -0400)]
librbd: improve image state machine debug log messages
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
c71182a73146c65dfe7bf955ad67ebeebcf7b1fd )
Jason Dillaman [Wed, 17 Aug 2016 19:16:37 +0000 (15:16 -0400)]
librbd: remove unused refresh request logic
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
5156b438d5ad69803b4d4529083039db825d6c8c )
Jason Dillaman [Wed, 17 Aug 2016 18:58:22 +0000 (14:58 -0400)]
librbd: interlock image refresh and lock operations
Fixes: http://tracker.ceph.com/issues/16773
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
583ac91872859e81d68c9d346516522c6aa1614c )
Jason Dillaman [Wed, 17 Aug 2016 18:02:32 +0000 (14:02 -0400)]
librbd: image state machine now has hooks for lock requests
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a5b8c9c1d81ed609e71a5a8abe4d0e90194408cc )
Jason Dillaman [Tue, 16 Aug 2016 20:23:57 +0000 (16:23 -0400)]
librbd: integrate asynchronous image rewatch state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
d0d97fcca2cb427adbdf5c32f0e07830c38aaf4b )
Jason Dillaman [Mon, 15 Aug 2016 19:46:23 +0000 (15:46 -0400)]
librbd: helper state machine for asynchronous watch recovery
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
32180aaf42050a01981c33f84edd95eff931ee6c )
Conflicts:
src/librbd/CMakeLists.txt: trivial resolution
src/librbd/Makefile.am: trivial resolution
Jason Dillaman [Tue, 16 Aug 2016 18:20:20 +0000 (14:20 -0400)]
librbd: exclusive lock now supports reacquiring a lost lock
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
66c605573f840c0db8b3630315ea50e9fc987509 )
Jason Dillaman [Tue, 16 Aug 2016 17:11:19 +0000 (13:11 -0400)]
librbd: store exclusive lock cookie instead of recalculating
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
aa53f74ad261f453e971bf3cef0b96bba4932b7b )
Jason Dillaman [Tue, 16 Aug 2016 16:28:09 +0000 (12:28 -0400)]
librbd: helper state machine to update lock cookie
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
d523df8dafac472f95233805d3a82edb3b3b02ea )
Jason Dillaman [Mon, 15 Aug 2016 20:50:43 +0000 (16:50 -0400)]
cls_lock: support updating the lock cookie without releasing the lock
Fixes: http://tracker.ceph.com/issues/17015
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
377f57652f8ddae53f44c59f21e89c51b2bf0f7b )
Nathan Cutler [Mon, 30 Jan 2017 12:26:37 +0000 (13:26 +0100)]
Merge pull request #12323 from dachary/wip-18024-jewel
jewel: rbd: FAILED assert(m_processing == 0) while running test_lock_fence.sh
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Mon, 30 Jan 2017 12:25:48 +0000 (13:25 +0100)]
Merge pull request #12649 from xiaoxichen/wip-18278-jewel
jewel: rbd: librbd: use proper snapshot when computing diff parent overlap
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Mon, 30 Jan 2017 12:24:22 +0000 (13:24 +0100)]
Merge pull request #12741 from SUSE/wip-18320-jewel
jewel: rbd status: json format has duplicated/overwritten key
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Mon, 30 Jan 2017 12:23:44 +0000 (13:23 +0100)]
Merge pull request #12753 from Abhishekvrshny/wip-18288-jewel
jewel: rbd-mirror: image sync object map reload logs message
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Mon, 30 Jan 2017 12:23:09 +0000 (13:23 +0100)]
Merge pull request #12756 from Abhishekvrshny/wip-18276-jewel
jewel: rbd-nbd: invalid error code for "failed to read nbd request" messages
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Mon, 30 Jan 2017 12:22:37 +0000 (13:22 +0100)]
Merge pull request #12822 from SUSE/wip-18450-jewel
jewel: tests: update rbd/singleton/all/formatted-output.yaml to support ceph-ci
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Mon, 30 Jan 2017 12:21:25 +0000 (13:21 +0100)]
Merge pull request #12909 from dillaman/wip-18290-jewel
jewel: librbd: properly order concurrent updates to the object map
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Mon, 30 Jan 2017 12:20:07 +0000 (13:20 +0100)]
Merge pull request #12529 from SUSE/wip-18270-jewel
jewel: rbd: add image id block name prefix APIs
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Nathan Cutler [Mon, 30 Jan 2017 12:18:32 +0000 (13:18 +0100)]
Merge pull request #12322 from dachary/wip-18110-jewel
jewel: diff calculate can hide parent extents when examining first snapshot in clone
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Nathan Cutler [Sun, 29 Jan 2017 12:22:49 +0000 (13:22 +0100)]
Merge pull request #13043 from SUSE/wip-18570-jewel
jewel: Python Swift client commands in Quick Developer Guide don't match configuration in vstart.sh
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
vasukulkarni [Sun, 29 Jan 2017 01:58:45 +0000 (17:58 -0800)]
Merge pull request #13166 from smithfarm/wip-drop-ext4-test
tests: Remove ext4 option from rados:thrash tests
Nathan Cutler [Sat, 28 Jan 2017 11:11:08 +0000 (12:11 +0100)]
tests: Remove ext4 option from rados:thrash tests
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(manual cherry-pick from ceph-qa-suite
1fcc4457144278f77dd8462ecf34948a11dcb2a9 )
Yehuda Sadeh [Fri, 27 Jan 2017 20:57:32 +0000 (12:57 -0800)]
Merge pull request #13160 from ceph/revert-13068-jewel-rgw-multipart-upload-copy
Revert "jewel: rgw: multipart upload copy"
Reverting, will require further testing before merging. Some tests fail.
Matt Benjamin [Fri, 27 Jan 2017 20:53:47 +0000 (15:53 -0500)]
Revert "jewel: rgw: multipart upload copy"
Matt Benjamin [Fri, 27 Jan 2017 18:04:46 +0000 (13:04 -0500)]
Merge pull request #13068 from linuxbox2/jewel-rgw-multipart-upload-copy
DNM: jewel:rgw: multipart upload copy
Yehuda Sadeh [Fri, 30 Sep 2016 00:44:08 +0000 (17:44 -0700)]
rgw: minor optimization
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
4919dc9987c6376d3d4e143702c26417449524c5 )
Yehuda Sadeh [Fri, 30 Sep 2016 00:43:00 +0000 (17:43 -0700)]
rgw: rgw_obj_key use adjustment in multipart copy part
This fixes a case where objects start with double underscore.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
29fece3545cc1df404a25eec46706b16f893a5df )
Yehuda Sadeh [Fri, 30 Sep 2016 00:43:35 +0000 (17:43 -0700)]
rgw: multipart copy-part handle versionId
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
53521efffb1cb92e5f5ce992d4127bf9498d7c33 )
Yehuda Sadeh [Thu, 29 Sep 2016 21:24:13 +0000 (14:24 -0700)]
rgw: multipart copy part minor parsing cleanup
no need for range.size()
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
6e9b824d5d4017239d58b4752ebc43bfad8f698d )
Yehuda Sadeh [Thu, 29 Sep 2016 21:11:43 +0000 (14:11 -0700)]
rgw: multipart copy, check for empty bucket, improve logging
also reduce log level for non critical user errors.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
2bcb3d286b230ef917d5ba96c8276a942f544689 )
Yehuda Sadeh [Thu, 29 Sep 2016 21:07:14 +0000 (14:07 -0700)]
rgw: multipart copy part, chunked read
Don't read the entire range from source object, read it in parts.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
4049e47a0cfc1eef6efd502590b68ba7234589d3 )
Javier M. Mellid [Tue, 26 Jul 2016 12:56:50 +0000 (14:56 +0200)]
rgw: doc: add multipart uploads copy part feature as supported
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
(cherry picked from commit
8a7ebeee2ff3f10ceb23b7fa43e43c3c450efe22 )
Javier M. Mellid [Tue, 26 Jul 2016 12:53:44 +0000 (14:53 +0200)]
rgw: multipart uploads copy part support
Add multipart uploads copy part feature.
Fixes: http://tracker.ceph.com/issues/12790
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
(cherry picked from commit
949480c2e9760855ed6a0501d364d5e766c8207d )
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Nathan Cutler [Sat, 7 Jan 2017 12:48:51 +0000 (13:48 +0100)]
tests: subst repo and branch in qemu test urls
References: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
2484a5546160560a4050d35400a6edce37ae48ad )
Conflicts:
qa/suites/rbd/qemu/workloads/#qemu_xfstests.yaml#
(file does not exist in jewel)
Nathan Cutler [Sat, 7 Jan 2017 12:45:10 +0000 (13:45 +0100)]
tests: subst branch and repo in qa/tasks/qemu.py
References: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
74689df754561e11a3377998840efcea9e780755 )
Nathan Cutler [Fri, 6 Jan 2017 20:09:23 +0000 (21:09 +0100)]
tests: subst repo name in krbd/unmap/tasks/unmap.yaml
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
ed0e8be0b2c4d7a3e6e0716a0211d19e8b93f125 )
Nathan Cutler [Fri, 6 Jan 2017 20:06:11 +0000 (21:06 +0100)]
tests: subst repo name in qa/tasks/cram.py
Inspired by
bcbe45d948f1c4da02e27b3be5f29a8b52745e28
Fixes: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
56e37e41f4dddd289dd3c1886b192cd328ed311b )
Venky Shankar [Fri, 9 Dec 2016 09:41:49 +0000 (15:11 +0530)]
cram: support fetching from sha1 branch, tag, commit hash
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit
d2f0d745987a2e2eee4e1822146aad8da5d42708 )
Conflicts:
suites/rbd/singleton/all/formatted-output.yaml (has been moved
under qa/)
Jason Dillaman [Wed, 25 Jan 2017 15:40:25 +0000 (10:40 -0500)]
Merge pull request #13103 from dillaman/wip-18672
jewel: qa/workunits/rbd: use more recent qemu-iotests that support Xenial
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Mon, 5 Dec 2016 18:46:02 +0000 (13:46 -0500)]
qa/workunits/rbd: use more recent qemu-iotests that support Xenial
Fixes: http://tracker.ceph.com/issues/18149
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4314cb945a9c2296e2f7cd357b09015777f233c0 )
Jason Dillaman [Wed, 7 Dec 2016 14:59:39 +0000 (09:59 -0500)]
qa/workunits/rbd: removed qemu-iotest case 077
The test case is not stable due to racing console output. This
results in spurious failures.
Fixes: http://tracker.ceph.com/issues/10773
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
2c70df978d605a45ff81971b86f5afbefbdaabb6 )
John Spray [Wed, 25 Jan 2017 13:57:17 +0000 (14:57 +0100)]
Merge pull request #12137 from jcsp/wip-17974
jewel: client: fix stale entries in command table
John Spray [Wed, 25 Jan 2017 13:56:24 +0000 (14:56 +0100)]
Merge pull request #12686 from SUSE/wip-18272-jewel
jewel: tests: Workunits needlessly wget from git.ceph.com
John Spray [Wed, 25 Jan 2017 13:56:03 +0000 (14:56 +0100)]
Merge pull request #12836 from SUSE/wip-18462-jewel
jewel: Decode errors on backtrace will crash MDS
John Spray [Wed, 25 Jan 2017 13:55:46 +0000 (14:55 +0100)]
Merge pull request #13023 from SUSE/wip-18603-jewel
jewel: cephfs test failures (ceph.com/qa is broken, should be download.ceph.com/qa)
John Spray [Wed, 25 Jan 2017 13:55:28 +0000 (14:55 +0100)]
Merge pull request #12155 from dachary/wip-17956-jewel
jewel: Clients without pool-changing caps shouldn't be allowed to change pool_namespace
John Spray [Wed, 25 Jan 2017 13:55:11 +0000 (14:55 +0100)]
Merge pull request #12325 from dachary/wip-18026-jewel
jewel: ceph_volume_client.py : Error: Can't handle arrays of non-strings
John Spray [Wed, 25 Jan 2017 13:54:51 +0000 (14:54 +0100)]
Merge pull request #13060 from asheplyakov/jewel-bp-18615
jewel: mds: fix null pointer dereference in Locker::handle_client_caps
John Spray [Wed, 25 Jan 2017 13:54:35 +0000 (14:54 +0100)]
Merge pull request #11656 from ajarr/wip-17705-jewel
jewel: ceph_volume_client: fix recovery from partial auth update
John Spray [Wed, 25 Jan 2017 13:54:06 +0000 (14:54 +0100)]
Merge pull request #12154 from dachary/wip-18008-jewel
jewel: Cannot create deep directories when caps contain path=/somepath
John Spray [Wed, 25 Jan 2017 13:53:45 +0000 (14:53 +0100)]
Merge pull request #13085 from jcsp/wip-18361-jewel
jewel: client: populate metadata during mount
Nathan Cutler [Tue, 24 Jan 2017 14:49:24 +0000 (15:49 +0100)]
qa/tasks/cephfs/filesystem.py: backport _write_data_xattr() function
This is a partial manual backport of
5f77f09b019b607b84e6a8f89ce19065383ca108
It is needed by test_corrupt_backtrace() in qa/tasks/cephfs/test_damage.py
Signed-off-by: Nathan Cutler <ncutler@suse.com>
John Spray [Fri, 13 Jan 2017 00:30:28 +0000 (00:30 +0000)]
client: populate metadata during mount
This way we avoid having to over-write the "root"
metadata during mount, and any user-set overrides (such
as bad values injected by tests) will survive.
Because Client instances may also open sessions without
mounting to send commands, add a call into populate_metadata
from mds_command as well.
Fixes: http://tracker.ceph.com/issues/18361
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
1dbff09ad553f9ff07f4f4217ba7ece6c2cdc5d2 )
Yan, Zheng [Fri, 6 Jan 2017 07:42:52 +0000 (15:42 +0800)]
mds: fix null pointer dereference in Locker::handle_client_caps
Locker::handle_client_caps delays processing cap message if the
corresponding inode is freezing or frozen. When the message gets
processed, client can have already closed the session.
Fixes: http://tracker.ceph.com/issues/18306
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit
e281a0b9c1fdeaf09f1b01f34cecd62e4f49d02e )
Ronak Jain [Fri, 13 Jan 2017 11:27:45 +0000 (16:57 +0530)]
Doc: Fixes Python Swift client commands
Fixes: http://tracker.ceph.com/issues/17746
Signed-off-by: Ronak Jain <ronakjain@outlook.in>
(cherry picked from commit
8c79959557d60f619adf1a3ed1b5bd1112ceaabb )
John Spray [Tue, 17 Jan 2017 16:12:46 +0000 (17:12 +0100)]
qa: update remaining ceph.com to download.ceph.com
Fixes: http://tracker.ceph.com/issues/18574
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
549d993d3fd8ffffa280ed4a64aca41d1c6f2da1 )
Conflicts:
qa/tasks/cram.py (trivial resolution)
Nathan Cutler [Fri, 20 Jan 2017 14:50:16 +0000 (15:50 +0100)]
Merge pull request #12766 from jtlayton/wip-18408-jewel
client: Fix lookup of "/.." in jewel
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Loic Dachary [Fri, 20 Jan 2017 11:31:26 +0000 (12:31 +0100)]
Merge pull request #12147 from dachary/wip-18007-jewel
jewel: ceph-disk: ceph-disk@.service races with ceph-osd@.service
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
vasukulkarni [Wed, 18 Jan 2017 20:43:34 +0000 (12:43 -0800)]
Merge pull request #12983 from ceph/wip-cherry-pick-4vasu
qa: Wip cherry pick https://github.com/ceph/ceph/pull/12969
Vasu Kulkarni [Tue, 10 Jan 2017 00:45:01 +0000 (16:45 -0800)]
Add ceph-create-keys to explicitly create admin/bootstrap keys
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
68f9b7eb3c0548c88650f67fb72c6ff9bc0f3ead )
Vasu Kulkarni [Tue, 10 Jan 2017 01:59:20 +0000 (17:59 -0800)]
Remove debug overrides
the high level of debug for mon/osd is causing remoto to hang during get key
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
f7dcc74cd3f119a2f65584fdb544c08d115f8c39 )
Vasu Kulkarni [Tue, 10 Jan 2017 23:43:12 +0000 (15:43 -0800)]
use the create option during instantiation
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
be836bb30960000468c79e08fb416ceefd79d7db )
Loic Dachary [Wed, 18 Jan 2017 16:12:54 +0000 (17:12 +0100)]
Merge pull request #12210 from ddiss/tracker18049_ceph_disk_trigger_flock_timeout_jewel
jewel: systemd/ceph-disk: reduce ceph-disk flock contention
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Jason Dillaman [Tue, 17 Jan 2017 13:41:25 +0000 (08:41 -0500)]
Merge pull request #12959 from SUSE/wip-18545-jewel
jewel: [teuthology] update Ubuntu image url after ceph.com refactor
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 17 Jan 2017 03:12:51 +0000 (22:12 -0500)]
qa/tasks/qemu: update default image url after ceph.com redesign
Fixes: http://tracker.ceph.com/issues/18542
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
6d17befb3bbc3d83c9d23d763ad95e1e7b2e4be0 )
Ramana Raja [Tue, 11 Oct 2016 08:48:29 +0000 (14:18 +0530)]
test_volume_client: remove superfluous arguments
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
bb60e01904187db417e8c7d6e57401823a0072fd )
Ramana Raja [Tue, 11 Oct 2016 08:10:43 +0000 (13:40 +0530)]
test_volume_client: check volume size
Check that the total size shown by the df output of a mounted volume
is same as the volume size and the quota set on the volume.
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
91c74f4778ce5433968226345ffe26e876eb56a7 )
Ramana Raja [Tue, 6 Sep 2016 12:01:04 +0000 (17:31 +0530)]
tasks/cephfs: test recovery of partial auth update
... in ceph_volume_client.
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
f0134a3db576282ed05d4b94b969b9593297669d )
Ramana Raja [Tue, 4 Oct 2016 08:25:46 +0000 (13:55 +0530)]
ceph_volume_client: fix partial auth recovery
... for volumes whose group_id is None.
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
0ab8badcf3ffe685135af17dc28b238f6e686922 )
Ramana Raja [Wed, 28 Sep 2016 08:36:54 +0000 (14:06 +0530)]
ceph_volume_client: check if volume metadata is empty
... when recovering from partial auth updates.
Auth update happens in the following order:
auth metadata update, volume metadata update, and then Ceph auth
update.
A partial auth update can happen such that auth metadata is updated,
but the volume metadata isn't updated and is empty, and the auth
update did not propogate to Ceph. When recovering from such a
scenario, check if volume metadata is empty and if so remove the
partial auth update info in auth metadata.
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
a95de7882cdf70e04e3c918ff41fc690d0d9bda3 )
Ramana Raja [Tue, 4 Oct 2016 11:20:13 +0000 (16:50 +0530)]
ceph_volume_client: fix _recover_auth_meta() method
It needs to be an instance method.
Fixes: http://tracker.ceph.com/issues/17216
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
675cb91b68c1b54698708d604253ab9d1b2abdec )
Loic Dachary [Fri, 13 Jan 2017 10:10:39 +0000 (11:10 +0100)]
Merge pull request #12745 from SUSE/wip-18386-jewel
jewel: tests: use ceph-jewel branch for s3tests
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Jason Dillaman [Fri, 9 Dec 2016 14:39:39 +0000 (09:39 -0500)]
librbd: block concurrent in-flight object map updates for the same object
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
7d743bfce61c6ede0a34fc0982e52be1d367d772 )
Josh Durgin [Thu, 12 Jan 2017 21:58:42 +0000 (13:58 -0800)]
Merge pull request #12912 from liewegas/wip-workunits-jewel
qa/tasks/workunits: backport misc fixes to jewel
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 22 Dec 2016 18:05:22 +0000 (13:05 -0500)]
qa/tasks/workunit: clear clone dir before retrying checkout
If we checkout ceph-ci.git, and don't find a branch,
we'll try again from ceph.git. But the checkout will
already exist and the clone will fail, so we'll still
fail to find the branch.
The same can happen if a previous workunit task already
checked out the repo.
Fix by removing the repo before checkout (the first and
second times). Note that this may break if there are
multiple workunit tasks running in parallel on the same
role. That is already racy, so if it's happening, we'll
want to switch to using a truly unique clonedir for each
instantiation.
Fixes: http://tracker.ceph.com/issues/18336
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
2a7013cd5a033c5be43350505d75f088e831e201 )
Sage Weil [Fri, 16 Dec 2016 20:06:16 +0000 (15:06 -0500)]
qa/tasks/workunit: retry on ceph.git if checkout fails
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
72d73b8c8836ae35c518fa09f44805a74038f02a )
Sage Weil [Thu, 15 Dec 2016 18:26:14 +0000 (13:26 -0500)]
qa/tasks/workunit.py: add CEPH_BASE env var
Root of git checkout
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
27b8eac24922f8b4bd065e6e7f0bc8e2ba37b5d5 )
Sage Weil [Thu, 15 Dec 2016 18:25:23 +0000 (13:25 -0500)]
qa/tasks/workunit: leave workunits inside git checkout
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
4602884ab8f5a256d13091f7239d938990482d95 )
Jason Dillaman [Thu, 8 Dec 2016 03:38:47 +0000 (22:38 -0500)]
librbd: new block guard helper to prevent concurrent IO to blocks
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
b1d624b43ec159d4a07616e86557ea48f089b7a1 )
Conflicts:
src/librbd/BlockGuard.h: fixed compile issue
src/librbd/Makefile.am: added BlockGuard
src/test/Makefile-client.am: added BlockGuard test
src/test/librbd/CMakeLists.txt: trivial resolution
Jason Dillaman [Thu, 8 Dec 2016 23:27:33 +0000 (18:27 -0500)]
librbd: convert ObjectMap to template for unit testing
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
ea7b30a4fb105e052603c55ac2dc2aca11e66545 )
Conflicts:
src/librbd/image/CreateRequest.cc: not in jewel
src/librbd/internal.cc: trivial resolution
src/librbd/object_map/CreateRequest.cc: not in jewel
src/librbd/object_map/RemoveRequest.cc: not in jewel
src/test/librbd/test_ObjectMap.cc: trivial resolution
Jason Dillaman [Thu, 8 Dec 2016 03:41:56 +0000 (22:41 -0500)]
librbd: clean up object map update interface
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
477ae54a568bd1081fd2c77b570b04dd1b983cd9 )
Conflicts:
src/librbd/AioObjectRequest.cc: trivial resolution
src/librbd/ObjectMap.cc: trivial resolution
src/librbd/operation/TrimRequest.cc: removed optimizations
src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc: trivial resolution
Jason Dillaman [Wed, 7 Dec 2016 21:28:22 +0000 (16:28 -0500)]
librbd: update in-memory object map after on-disk update committed
Concurrent IO to the same object would previously result in the first
IO pausing to update the object map while the other IO would proceed
to directly update the object before the object map state was properly
updated.
Fixes: http://tracker.ceph.com/issues/16176
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
378b810cbaadb1a12a7f0d21ed9a33e2a9640f55 )
Conflicts:
test/librbd/object_map/test_mock_UpdateRequest.cc: resize op signature
Loic Dachary [Thu, 12 Jan 2017 06:29:34 +0000 (07:29 +0100)]
Merge pull request #12791 from athanatos/wip-15943-jewel
jewel: crash adding snap to purged_snaps in ReplicatedPG::WaitingOnReplicas (part 2)
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Samuel Just [Wed, 11 Jan 2017 00:25:18 +0000 (16:25 -0800)]
Merge pull request #12868 from athanatos/wip-17899-jewel
OSDMonitor: only reject MOSDBoot based on up_from if inst matches
Reviewed-by: Sage Weil <sage@redhat.com>
John Spray [Thu, 5 Jan 2017 13:40:41 +0000 (13:40 +0000)]
qa/tasks: add test_corrupt_backtrace
Validate that we get EIO and a damage table entry
when seeing a decode error on a backtrace.
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
5f6cdab80f6e2f09af5783c8f616d8ddd6d9f428 )