]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Nathan Cutler [Fri, 27 Jan 2017 21:27:18 +0000 (22:27 +0100)]
tests: add require_jewel_osds before upgrading last hammer node
Note: this commit was inspired by
http://github.com/ceph/ceph-qa-suite/commit/
50758a4810794d265c5d36a71d1e16799251a00d
As of 10.2.4, when upgrading a cluster from hammer to jewel, after the last
node is upgraded the MON will put the cluster into HEALTH_WARN and say: "all
OSDs are running jewel or later but the 'require_jewel_osds' osdmap flag is not
set". The release notes say:
This is a signal for the admin to do "ceph osd set require_jewel_osds" – by
doing this, the upgrade path is complete and no more pre-Jewel OSDs may be
added to the cluster.
Fixes: http://tracker.ceph.com/issues/18719
Signed-off-by: Nathan Cutler <ncutler@suse.com>
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 )
John Spray [Tue, 20 Dec 2016 18:04:47 +0000 (18:04 +0000)]
mds: check for errors decoding backtraces
Fixes: http://tracker.ceph.com/issues/18311
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
6f489c74ac0040631fde0ceb0926cbab24d3ad55 )
Samuel Just [Mon, 12 Dec 2016 18:35:38 +0000 (10:35 -0800)]
PG: fix cached_removed_snaps bug in PGPool::update after map gap
5798fb3bf6d726d14a9c5cb99dc5902eba5b878a actually made 15943 worse
by always creating an out-of-date cached_removed_snaps value after
a map gap rather than only in the case where the the first map after
the gap did not remove any snapshots.
Introduced:
5798fb3bf6d726d14a9c5cb99dc5902eba5b878a
Fixes: http://tracker.ceph.com/issues/15943
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
5642e7e1b3bb6ffceddacd2f4030eb13a17fcccc )
Samuel Just [Wed, 14 Dec 2016 23:48:59 +0000 (15:48 -0800)]
qa/config/rados.yaml: enable osd_debug_verify_cached_snaps
Also, make map gaps more likely.
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
d4b6615a49e4635113f9ba900e9c57147b224357 )
Samuel Just [Mon, 12 Dec 2016 18:33:13 +0000 (10:33 -0800)]
PG::handle_advance_map: add debugging option to verify cached_removed_snaps
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
aeb8fef92469831d94f06db457a4ba15b5b0e3c5 )
Jeff Layton [Tue, 3 Jan 2017 17:56:51 +0000 (12:56 -0500)]
client: don't use special faked-up inode for /..
The CEPH_INO_DOTDOT thing is quite strange. Under most OS (Linux
included), the parent of the root is itself. IOW, at the root, '.' and
'..' refer to the same inode.
Change the ceph client to do the same, as this allows users to get
valid stat info for '..', as well as elimnating some special-casing.
Also in several places, we're checking dn_set.empty as an indicator
of being the root. While that is true for the root, it's also true
for unlinked directories.
This patch has treats them the same. An unlinked directory will
be reparented to itself, effectively acting as a root of its own.
Fixes: http://tracker.ceph.com/issues/18408
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
30d4ca01db0de9a1e12658793ba9bf9faf0331dd )
Mykola Golub [Tue, 13 Dec 2016 16:54:17 +0000 (18:54 +0200)]
rbd-nbd: invalid error code for "failed to read nbd request" messages
Fixes: http://tracker.ceph.com/issues/18242
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit
42c2514fe22d34e1bd5a5d2686e06f7e01b7c0c3 )
runsisi [Wed, 14 Dec 2016 07:18:18 +0000 (15:18 +0800)]
librbd: ignore error when object map is already locked by current client
otherwise when using rbd cli to rollback image with object-map feature
enabled, the following error message will be printed out on the screen,
which is confusing to users:
librbd::object_map::LockRequest: failed to lock object map: (17) File exists
Fixes: http://tracker.ceph.com/issues/16179
Signed-off-by: runsisi <runsisi@zte.com.cn>
(cherry picked from commit
711da4e2396a8967cd457133a847d40cb46b0a5a )
Nathan Cutler [Mon, 2 Jan 2017 21:49:13 +0000 (22:49 +0100)]
tests: rbd/test_lock_fence.sh: fix rbdrw.py relative path
This commit fixes a regression introduced by
cf294777ea92f0911813a7132068584d4f73a65a
Fixes: http://tracker.ceph.com/issues/18388
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
91231de16dbe4d0e493ec617165a2b38078d122b )
Orit Wasserman [Mon, 4 Jan 2016 09:03:08 +0000 (10:03 +0100)]
tests: use ceph-jewel branch for s3tests
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Mykola Golub [Fri, 16 Dec 2016 10:50:50 +0000 (12:50 +0200)]
rbd: fix json formatting for image and journal status output
Fixes: http://tracker.ceph.com/issues/18261
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit
4c2659a0f49ff5f709a8275d6adaa817daf8f76a )
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 [Mon, 19 Dec 2016 19:08:11 +0000 (14:08 -0500)]
qa/workunits: include extension for nose tests
When you have a relative path you have to include the extension.
Weird.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
5666fd61d6dbd40be1d79354227cabd562e829ea )
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Conflicts:
qa/workunits/rados/test_python.sh (nosetests instead of nose)
Sage Weil [Thu, 15 Dec 2016 20:10:28 +0000 (15:10 -0500)]
qa/workunits: use relative path instead of wget from git
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
cf294777ea92f0911813a7132068584d4f73a65a )
Conflicts:
qa/workunits/rados/test_python.sh (nosetests instead of nose)
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 )
Xiaoxi Chen [Thu, 8 Dec 2016 18:40:03 +0000 (02:40 +0800)]
librbd/diff_iterator: use proper snap to query parent overlap
If no snapshot has been made, we will use CEPH_NOSNAP instead of 0,
to query the parent overlap.
Fixes bug http://tracker.ceph.com/issues/18200
Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
(cherry picked from commit
a88ceff2767761483aee73590767c412116a7489 )
Loic Dachary [Wed, 21 Dec 2016 23:18:11 +0000 (00:18 +0100)]
Merge remote-tracking branch 'ceph/jewel-next' into jewel
jtlayton [Wed, 21 Dec 2016 14:18:18 +0000 (09:18 -0500)]
Merge pull request #12591 from jtlayton/wip-18308-jewel
Clear setuid bits on ownership changes
jtlayton [Tue, 20 Dec 2016 20:36:39 +0000 (15:36 -0500)]
Merge branch 'jewel' into wip-18308-jewel
jtlayton [Tue, 20 Dec 2016 20:35:54 +0000 (15:35 -0500)]
Merge pull request #12592 from jtlayton/wip-18307-jewel
Fix mount root for ceph_mount users and change tarball format
Jeff Layton [Tue, 20 Dec 2016 19:44:04 +0000 (14:44 -0500)]
ceph_disk: fix a jewel checkin test break
Silly python:
ceph_disk/main.py:173:1: E305 expected 2 blank lines after class or function definition, found 1
ceph_disk/main.py:5011:1: E305 expected 2 blank lines after class or function definition, found 1
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Jeff Layton [Tue, 20 Dec 2016 16:54:25 +0000 (11:54 -0500)]
automake: convert to tar-pax
We hit some recent build issues with the merge of ceph-qa-suite into
the main repo. The ustar format barfs on >100 character symlink
paths.
Convert to using "tar-pax" which should make it use the posix format.
Any build machine that we're reasonably targeting should support it.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Jeff Layton [Tue, 20 Dec 2016 13:17:21 +0000 (08:17 -0500)]
client: drop setuid/setgid bits on ownership change
When we hold exclusive auth caps, then the client is responsible for
handling changes to the mode. Make sure we remove any setuid/setgid
bits on an ownership change.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
18d2499d6c85a10b4b54f3b8c335cddf86c4588f )