]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Zack Cerza [Tue, 11 Apr 2017 15:25:50 +0000 (09:25 -0600)]
suites/upgrade-hammer-jewel-x: Add volumes
Signed-off-by: Zack Cerza <zack@redhat.com>
Loic Dachary [Sun, 9 Apr 2017 20:40:21 +0000 (22:40 +0200)]
Merge pull request #13497 from shinobu-x/wip-17821-kraken
kraken: ceph-disk: does not support cluster names different than 'ceph'
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Jason Dillaman [Wed, 29 Mar 2017 01:00:31 +0000 (21:00 -0400)]
Merge pull request #14163 from trociny/wip-19368
kraken: librbd: possible race in ExclusiveLock handle_peer_notification
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
David Zafman [Tue, 28 Mar 2017 22:25:39 +0000 (15:25 -0700)]
Merge pull request #14200 from dzafman/wip-18533-again
Fixes: http://tracker.ceph.com/issues/19391
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
David Zafman [Tue, 21 Mar 2017 00:28:45 +0000 (17:28 -0700)]
filestore, tools: Fix logging of DBObjectMap check() repairs
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
1704f62c0831e6b07138f7dd14a89fef3c9ed2c1 )
David Zafman [Fri, 3 Mar 2017 23:04:02 +0000 (15:04 -0800)]
osd: Simplify DBObjectMap by no longer creating complete tables
Bump the version for new maps to 3
Make clone less efficient but simpler
Add rename operation (use instead of clone/unlink)
For now keep code that understands version 2 maps
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
738156a99ed1caf61e5a8230eb8048360056c08e )
No ghobject_t::operator>() so use Kraken cmp_bitwise() instead
Need to use MIN_GHOBJ/MAX_GHOBJ instead of std::min/std::max
David Zafman [Thu, 16 Feb 2017 00:17:32 +0000 (16:17 -0800)]
ceph-osdomap-tool: Fix seg fault with large amount of check error output
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
1dda0411f4fbb14ce1e0062da9f14ec3af505d39 )
David Zafman [Wed, 15 Feb 2017 23:02:33 +0000 (15:02 -0800)]
osd: Add automatic repair for DBObjectMap bug
Add repair command to ceph-osdomap-tool too
Under some situations the previous rm_keys() code would
generated a corrupt complete table. There is no way to
figure out what the table should look like now. By removing
the entries we fix the corruption and aren't much worse off
because the corruption caused some deleted keys to re-appear.
This doesn't breaking the parent/child relationship during
repair because some of the keys may still be contained
in the parent.
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
4cd3c74c928a32e065ed9543d6c91d8718a6ae3d )
Conflicts:
src/os/filestore/DBObjectMap.h (trivial)
David Zafman [Wed, 15 Feb 2017 22:59:40 +0000 (14:59 -0800)]
ceph-osdomap-tool: Fix tool exit status
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
666f14ed90655a2d1bedde8561949625db7a9e6c )
Samuel Just [Fri, 10 Feb 2017 23:51:42 +0000 (15:51 -0800)]
DBObjectMap: rewrite rm_keys and merge_new_complete
Leverage the updated in_complete_region and needs_parent to simplify
these methods.
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
c4dffb68eaafe724f7fdae93a4285a7f8003ea29 )
Samuel Just [Fri, 10 Feb 2017 23:50:57 +0000 (15:50 -0800)]
DBObjectMap: strengthen in_complete_region post condition
Previously, in_complete_region didn't guarantee anything about
where it left complete_iter pointing. It will be handy for
complete_iter to be pointing at the lowest interval which ends
after to_test. Make it so.
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
97b35f4d7d4862da4b6f50ecaef0d292a671fd04 )
Samuel Just [Fri, 10 Feb 2017 23:48:57 +0000 (15:48 -0800)]
DBObjectMap: fix next_parent()
The previous implementation assumed that
lower_bound(parent_iter->key()) always leaves the iterator
on_parent(). There isn't any guarantee, however, that that
key isn't present on the child as well.
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
74a7631d0938d7b44894f022224eab10a90d5cec )
Samuel Just [Thu, 9 Feb 2017 18:47:59 +0000 (10:47 -0800)]
test_object_map: add tests to trigger some bugs related to 18533
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
f131dbcf5bb17107c029f942a57e9bf4432a26ee )
David Zafman [Tue, 14 Feb 2017 20:40:33 +0000 (12:40 -0800)]
test: Add ceph_test_object_map to make check tests
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
0e97a01bd7291458881ee53cece2d887f6333669 )
David Zafman [Thu, 9 Feb 2017 02:56:27 +0000 (18:56 -0800)]
ceph-osdomap-tool: Add --debug and only show internal logging if enabled
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
5fb2b2d13953979e5da9f571ab8c4b0b510b8368 )
David Zafman [Thu, 9 Feb 2017 02:55:48 +0000 (18:55 -0800)]
osd: DBOjectMap::check: Dump complete mapping when inconsistency found
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
fcf1e17c645e8fad5216c3e59627c817e5c858c7 )
David Zafman [Wed, 8 Feb 2017 23:38:51 +0000 (15:38 -0800)]
test_object_map: Use ASSERT_EQ() for check() so failure doesn't stop testing
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
053a273cbc02d6902a4bb1f11db1ea946498df3a )
David Zafman [Wed, 8 Feb 2017 18:02:40 +0000 (10:02 -0800)]
tools: Check for overlaps in internal "complete" table for DBObjectMap
Changed check to return an error count and fix tool error message
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
e5e8eb962db6187ea19b96ba29ac83469c90b4ea )
Conflicts:
src/os/filestore/DBObjectMap.h (trivial)
David Zafman [Wed, 8 Feb 2017 17:40:49 +0000 (09:40 -0800)]
tools: Add dump-headers command to ceph-osdomap-tool
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
f4101591ad701a62fe027c4744ca8ea505f44bdc )
Conflicts:
src/os/filestore/DBObjectMap.h (trivial)
David Zafman [Tue, 7 Feb 2017 05:09:42 +0000 (21:09 -0800)]
tools: Add --oid option to ceph-osdomap-tool
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
2d94889e9ee3359017b1efd560f3557ce03ccee6 )
David Zafman [Tue, 7 Feb 2017 05:31:18 +0000 (21:31 -0800)]
osd: Remove unnecessary assert and assignment in DBObjectMap
Fix and add comment(s)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
937e6a03ea4692cc44d53faa0615f8e808c9eb03 )
Mykola Golub [Tue, 28 Mar 2017 13:55:11 +0000 (15:55 +0200)]
kraken: librbd: possible race in ExclusiveLock handle_peer_notification
This is a direct commit to kraken -- the master diverged after
ManagedLock refactoring and is not affected.
Fix: http://tracker.ceph.com/issues/19368
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
Sage Weil [Sat, 4 Mar 2017 17:22:44 +0000 (11:22 -0600)]
Merge pull request #13501 from shinobu-x/wip-18371-kraken
kraken: ceph-disk: error on _bytes2str
Kefu Chai [Fri, 3 Mar 2017 03:14:48 +0000 (11:14 +0800)]
Merge pull request #13757 from liewegas/wip-pgp-kraken
qa/tasks: set pgp = pg num on thrashing finish
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 19 Feb 2017 05:10:44 +0000 (13:10 +0800)]
test: Thrasher: do not update pools_to_fix_pgp_num if nothing happens
we should not update pools_to_fix_pgp_num if the pool is not expanded or
the pg_num is not increased due to pgs being created. this prevent us
from fixing the pgp_num after done with thrashing if we actually did
nothing when fixing the pgp_num when thrashing, but we removed the pool
from pools_to_fix_pgp_num after set_pool_pgpnum() returns.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
c0f0cde399a80cea617c115417e5390a63ec674e )
Kefu Chai [Sun, 12 Feb 2017 05:16:57 +0000 (13:16 +0800)]
test: Thrasher: update pgp_num of all expanded pools if not yet
otherwise wait_until_healthy will fail after timeout as seeing warning
like:
HEALTH_WARN pool cephfs_data pg_num 182 > pgp_num 172
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
136483a8f940710cbe40804afa7af2eac6728d50 )
Zack Cerza [Wed, 1 Mar 2017 22:16:17 +0000 (15:16 -0700)]
Merge pull request #13707 from zmc/wip-openstack-volumes-kraken
qa/suites/ceph-deploy: Drop OpenStack volume count
Zack Cerza [Tue, 28 Feb 2017 20:07:15 +0000 (13:07 -0700)]
qa/suites/ceph-deploy: Drop OpenStack volume count
Looks like we only need two per node, since there is only one OSD per
node, and ceph-deploy wants two disks per OSD to account for the
journal.
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
87072e277c9ef259c9ee2ae1f761e252aa216713 )
Zack Cerza [Mon, 27 Feb 2017 19:23:10 +0000 (12:23 -0700)]
Merge pull request #13673 from zmc/wip-openstack-volumes-kraken
qa/suites/{ceph-ansible,rest}: OpenStack volumes
Zack Cerza [Mon, 27 Feb 2017 16:14:41 +0000 (09:14 -0700)]
qa/suites/rest: Openstack volumes
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
99d942145f4206c00aca30c0bb74f0edc4bac798 )
Zack Cerza [Mon, 27 Feb 2017 16:06:26 +0000 (09:06 -0700)]
qa/suites/ceph-ansible: Openstack volumes
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
964b983bdbd412311bce56184d12d1b6d43c7f28 )
Brad Hubbard [Sat, 25 Feb 2017 23:23:43 +0000 (09:23 +1000)]
Merge pull request #13485 from shinobu-x/wip-18644-kraken
kraken: osd: condition object_info_t encoding on required (not up) features
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Zack Cerza [Sat, 25 Feb 2017 00:22:11 +0000 (17:22 -0700)]
Merge pull request #13641 from zmc/wip-fs-openstack-kraken
qa/suites/fs: Add openstack volume configuration
Zack Cerza [Fri, 24 Feb 2017 22:25:19 +0000 (15:25 -0700)]
qa/suites/fs: Add openstack volume configuration
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
b076d89a3f1fbad7d477913812b2e17529abeacf )
Zack Cerza [Fri, 24 Feb 2017 21:44:04 +0000 (14:44 -0700)]
Merge pull request #13638 from zmc/wip-openstack-volumes-kraken
qa/suites/{knfs,hadoop,samba}: OpenStack volume configuration
Zack Cerza [Fri, 24 Feb 2017 21:43:34 +0000 (14:43 -0700)]
Merge pull request #13635 from zmc/wip-kcephfs-openstack-kraken
qa/suites/kcephfs: Openstack volume configuration
Loic Dachary [Wed, 22 Feb 2017 00:49:12 +0000 (01:49 +0100)]
ceph-disk: dmcrypt activate must use the same cluster as prepare
When dmcrypt is used, the fsid cannot be retrieved from the data
partition because it is encrypted. Store the fsid in the lockbox to
enable dmcrypt activation using the same logic as regular activation.
The fsid is used to retrive the cluster name that was used during
prepare, reason why activation does not and must not have a --cluster
argument.
Fixes: http://tracker.ceph.com/issues/17821
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit
7f66672b675abbc0262769d32a38112c781fefac )
Conflicts:
src/ceph-disk/ceph_disk/main.py
Zack Cerza [Fri, 24 Feb 2017 20:46:54 +0000 (13:46 -0700)]
qa/suites/samba: Openstack volume configuration
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
e0296d706422ea4dc01d84f8786f6f7104c3d996 )
Zack Cerza [Fri, 24 Feb 2017 20:45:18 +0000 (13:45 -0700)]
qa/suites/hadoop: Openstack volume configuration
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
3fef0a49da2ccfdceba7b98e9096be8305da1111 )
Zack Cerza [Fri, 24 Feb 2017 20:44:33 +0000 (13:44 -0700)]
qa/suites/knfs: Add openstack volume configuration
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
62c6fd3371adf0f420c12d9c7e2b3a2a0c69256b )
Zack Cerza [Fri, 24 Feb 2017 20:37:23 +0000 (13:37 -0700)]
qa/suites/kcephfs: Openstack volume configuration
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
ec6fb28eaf8e2db327e4afc115879a40c7664e07 )
Zack Cerza [Fri, 24 Feb 2017 19:16:02 +0000 (12:16 -0700)]
Merge pull request #13633 from zmc/wip-krbd-openstack-kraken
qa/suites/krbd: Add openstack volume configuration
Zack Cerza [Fri, 24 Feb 2017 19:15:29 +0000 (12:15 -0700)]
Merge pull request #13613 from ceph/wip-rgw-openstack-kraken
qa/suites/rgw: Add openstack volume configuration
Yuri Weinstein [Fri, 24 Feb 2017 18:37:12 +0000 (10:37 -0800)]
Merge pull request #13618 from tmuthamizhan/wip-rm-trusty-kraken
qa: drop ubuntu trusty support
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Zack Cerza [Fri, 24 Feb 2017 18:17:45 +0000 (11:17 -0700)]
qa/suites/krbd: Add openstack volume configuration
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
201b4d0d1e92bf95ac6a8f2951b664763030f12d )
Zack Cerza [Thu, 23 Feb 2017 17:14:05 +0000 (10:14 -0700)]
qa/suites/rgw: Add openstack volume configuration
Without this, OSDs will fail to create on instances whose root fs isn't
xfs.
(cherry picked from commit
8af4c35f9577ef5a88307ea5cbbe2561a473926c )
Signed-off-by: Zack Cerza <zack@redhat.com>
Ilya Dryomov [Mon, 6 Feb 2017 11:51:05 +0000 (12:51 +0100)]
osd/OSDMap: require OSD features only of OSDs
Fix up commit
1a5cc32f0a3b ("osd/OSDMap: reflect REQUIRE_*_OSDS flag in
required features") -- require_*_osds shouldn't affect older clients.
Fixes: http://tracker.ceph.com/issues/18831
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
ab558bbf2956157cbde59c155a5180a62ae73d07 )
Conflicts:
src/osd/OSDMap.cc
Tamil Muthamizhan [Fri, 17 Feb 2017 21:06:43 +0000 (21:06 +0000)]
qa: drop ubuntu trusty support
ceph-ansible dropped support for OS that doesnt support systemd
Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
(cherry picked from commit
4d4b38eca81f7b57e3d3b31e1c13e7ab0ba5b30f )
Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
Yuri Weinstein [Thu, 23 Feb 2017 22:55:56 +0000 (14:55 -0800)]
Merge pull request #13283 from zmc/wip-smoke-openstack-kraken
qa/suites/smoke: add openstack requirements
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Mykola Golub [Tue, 21 Feb 2017 14:16:26 +0000 (16:16 +0200)]
Merge pull request #13201 from dillaman/wip-18703-kraken
kraken: librbd: prevent self-blacklisting during break lock
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Mykola Golub [Tue, 21 Feb 2017 14:15:35 +0000 (16:15 +0200)]
Merge pull request #13102 from dillaman/wip-18668
kraken: test: use librados API to retrieve config params
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Kefu Chai [Tue, 3 Jan 2017 12:40:00 +0000 (20:40 +0800)]
ceph-disk: convert none str to str before printing it
Error('somethings goes wrong', e) is thrown if exception `e` is caught
in ceph-disk, where e is not a string. so we can not just concat it in
Error's __str__(). so cast it to str before doing so.
introduced by
d0e29c7
Fixes: http://tracker.ceph.com/issues/18371
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
5e0dd1e7df43a3be589d17878714756a22052d8e )
Loic Dachary [Mon, 13 Feb 2017 07:19:36 +0000 (08:19 +0100)]
Merge pull request #13330 from smithfarm/wip-18870-kraken
kraken: tests: SUSE yaml facets in qa/distros/all are out of date
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Yuri Weinstein [Fri, 10 Feb 2017 23:41:06 +0000 (15:41 -0800)]
Merge pull request #12984 from ceph/wip-cherry-pick-4tamil
qa: Wip cherry pick 4tamil ceph-ansible
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Kefu Chai [Thu, 9 Feb 2017 14:48:01 +0000 (22:48 +0800)]
Merge pull request #13239 from smithfarm/wip-18805-kraken
kraken: tests: ignore bogus ceph-objectstore-tool error in ceph_manager
Reviewed-by: Kefu Chai <kefu@redhat.com>
Nathan Cutler [Wed, 8 Feb 2017 20:23:54 +0000 (21:23 +0100)]
tests: drop buildpackages.py
The buildpackages suite has been moved to teuthology. This cleans up a file
that was left behind by https://github.com/ceph/ceph/pull/13297
Fixes: http://tracker.ceph.com/issues/18846
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
6b7443fb50c117ee7f20d53bbc7530bb0eb7ebd5 )
Nathan Cutler [Wed, 8 Feb 2017 14:27:00 +0000 (15:27 +0100)]
tests: update SUSE yaml facets in qa/distros/all
Fixes: http://tracker.ceph.com/issues/18856
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
0bd56e871a8549d4b0b1211f09dad2d1120fb606 )
Loic Dachary [Wed, 8 Feb 2017 17:50:52 +0000 (18:50 +0100)]
Merge pull request #13298 from dachary/wip-18849-kraken
kraken: tests: remove qa/suites/buildpackages
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Loic Dachary [Tue, 7 Feb 2017 17:33:29 +0000 (18:33 +0100)]
buildpackages: remove because it does not belong
It should live in teuthology, not in Ceph. And it is currently broken:
there is no need to keep it around.
Fixes: http://tracker.ceph.com/issues/18846
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit
5a43f8d57925da227c95480501ceec10a29395d8 )
Nathan Cutler [Mon, 6 Feb 2017 17:43:49 +0000 (18:43 +0100)]
tests: fix regression in qa/tasks/ceph_master.py
https://github.com/ceph/ceph/pull/13194 introduced a regression:
2017-02-06T16:14:23.162 INFO:tasks.thrashosds.thrasher:Traceback (most recent call last):
File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 722, in wrapper
return func(self)
File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 839, in do_thrash
self.choose_action()()
File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 305, in kill_osd
output = proc.stderr.getvalue()
AttributeError: 'NoneType' object has no attribute 'getvalue'
This is because the original patch failed to pass "stderr=StringIO()" to run().
Fixes: http://tracker.ceph.com/issues/16263
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
db2582e25e390fcaf75952eb59a73dcff643f49c )
Zack Cerza [Thu, 12 Jan 2017 21:55:26 +0000 (14:55 -0700)]
Add openstack requirements to smoke suite
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
fe9b7552d116b150f178c4cc778fa27cd8d956d1 )
Nathan Cutler [Mon, 30 Jan 2017 23:46:22 +0000 (00:46 +0100)]
tests: ignore bogus ceph-objectstore-tool error in ceph_manager
Fixes: http://tracker.ceph.com/issues/16263
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
046e873026c59e733f1844b28ffdc030cbe57b36 )
Jason Dillaman [Wed, 25 Jan 2017 19:45:56 +0000 (14:45 -0500)]
librbd: prevent self-blacklisting during break lock
Fixes: http://tracker.ceph.com/issues/18666
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
5c590acaec4dd66a9a8c3aa0ec8ab904dd350216 )
Conflicts:
src/librbd/exclusive_lock/BreakRequest.cc: managed lock refactor
src/test/librbd/exclusive_lock/test_mock_BreakRequest.cc: managed lock refactor
John Spray [Wed, 25 Jan 2017 23:33:46 +0000 (00:33 +0100)]
Merge pull request #13024 from SUSE/wip-18604-kraken
kraken: cephfs test failures (ceph.com/qa is broken, should be download.ceph.com/qa)
John Spray [Wed, 25 Jan 2017 23:31:53 +0000 (00:31 +0100)]
Merge pull request #12813 from SUSE/wip-18439-kraken
kraken: fuse: TestVolumeClient.test_evict_client failure creating pidfile
John Spray [Wed, 25 Jan 2017 23:29:55 +0000 (00:29 +0100)]
Merge pull request #12951 from jcsp/wip-18361-kraken
kraken: client: populate metadata during mount
John Spray [Wed, 25 Jan 2017 23:29:00 +0000 (00:29 +0100)]
Merge pull request #13030 from SUSE/wip-18612-kraken
kraken: client: segfault on ceph_rmdir path /
John Spray [Wed, 25 Jan 2017 23:27:57 +0000 (00:27 +0100)]
Merge pull request #13028 from SUSE/wip-18531-kraken
kraken: speed up readdir by skipping unwanted dn
John Spray [Wed, 25 Jan 2017 23:25:34 +0000 (00:25 +0100)]
Merge pull request #12835 from SUSE/wip-18463-kraken
kraken: Decode errors on backtrace will crash MDS
Jason Dillaman [Tue, 24 Jan 2017 14:24:52 +0000 (09:24 -0500)]
librbd: improve debug logging for lock / watch state machines
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 24 Jan 2017 02:24:41 +0000 (21:24 -0500)]
test: use librados API to retrieve config params
The CephContext object is not ABI-stable, so it is necessary to
use the "conf_get" librados methods to safely retrieve a setting.
Fixes: http://tracker.ceph.com/issues/18617
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
8ad40645ac3948f8341e9a80ce8aff8ac5b9ad11 )
Conflicts:
src/test/librbd/test_librbd.cc: trivial resolution
Radoslaw Zarzynski [Mon, 23 Jan 2017 19:46:55 +0000 (20:46 +0100)]
Merge pull request #13006 from rzarzynski/wip-rgw-18476-kraken
kraken: rgw: fix handling RGWUserInfo::system in RGWHandler_REST_SWIFT.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Radoslaw Zarzynski [Tue, 10 Jan 2017 11:09:50 +0000 (12:09 +0100)]
rgw: fix handling RGWUserInfo::system in RGWHandler_REST_SWIFT.
Before this patch the flag was wrongly handled in the Swift API
implementation. In rare conditions this might result in setting
req_state::system_request.
This may happen only if both of those conditions are fulfilled:
* RadosGW is running in a multi-site configuration (at least
one user with the system flag turned on is present),
* the "rgw_swift_account_in_url" configurable has been switched
to true. The value is false by default and our documentation
doesn't actually mention about the option.
The issue doesn't affect Jewel nor any previous release.
Fixes: http://tracker.ceph.com/issues/18476
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
8dac93392b6679c3ad9bb28ea66f6bb8c7be511d )
Nathan Cutler [Mon, 23 Jan 2017 18:29:57 +0000 (19:29 +0100)]
Merge pull request #13044 from SUSE/wip-18571-kraken
kraken: Python Swift client commands in Quick Developer Guide don't match configuration in vstart.sh
Reviewed-by: Casey Bodley <cbodley@redhat.com>
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 )
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 )
Michal Jarzabek [Thu, 12 Jan 2017 21:22:20 +0000 (21:22 +0000)]
client/Client.cc: prevent segfaulting
The segfaulting in the rmdir function is caused by calling
filepath::last_dentry() function.
last_dentry() function assumes that the bits vector has always at
least one element, which is not the case for the the filepath object
created with "/" input.
This commit also fixes other functions affected by this bug:
link, unlink, rename, mkdir, mknod and symlink.
Fixes: http://tracker.ceph.com/issues/9935
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
(cherry picked from commit
6ed7f2364ae5507bab14c60b582929aa7b0ba400 )
Sage Weil [Fri, 20 Jan 2017 17:14:24 +0000 (11:14 -0600)]
Merge pull request #13011 from liewegas/wip-18595-kraken
os/bluestore: fix Allocator::allocate() int truncation
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Xiaoxi Chen [Wed, 11 Jan 2017 02:11:08 +0000 (19:11 -0700)]
mds/server: skip unwanted dn in handle_client_readdir
We can skip unwanted dn which < (offset_key, snap) via map.lower_bound, rather than
iterate across them.
Previously we iterate and skip dn which < (offset_key, dn->last), as dn->last >= snap
means (offset_key, dn->last) >= (offset_key, snap), and such iterate_and_skip logic
still keep, so this commit doesnt change code logic but an optimization.
Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
(cherry picked from commit
52fe52baf920c672ac7f63a3087dcd31137891b6 )
Sage Weil [Fri, 20 Jan 2017 01:51:45 +0000 (19:51 -0600)]
os/bluestore: fix Allocator::allocate() int truncation
An allocation of size 0x80000000 gets truncated to 0. Larger values can
break things in similar ways.
Introduced in
5ab034345d7320fbc86a2133c0c29ec1aca4b71a .
Fixes: http://tracker.ceph.com/issues/18595
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
e19aa8484632ac7d83aa5dc868a1fe4dc167d9b9 )
Jenkins Build Slave User [Thu, 19 Jan 2017 13:08:38 +0000 (13:08 +0000)]
11.2.0
Sage Weil [Thu, 19 Jan 2017 12:29:48 +0000 (06:29 -0600)]
Merge pull request #13000 from liewegas/wip-bluestore-extents-kraken
os/bluestore: fix reclaim_blocks (kraken)
Tamil Muthamizhan [Fri, 13 Jan 2017 23:25:32 +0000 (15:25 -0800)]
removing fs workunit
removing fs workunit for now until tracker issue 18528 is resolved.
Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
(cherry picked from commit
728411f5aee053c8258e7e642816c5d5605da8ef )
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Sage Weil [Wed, 18 Jan 2017 22:47:29 +0000 (16:47 -0600)]
Merge pull request #12989 from yuriw/wip-fix-distro-kraken
qa: Switched to centos 7.3 and as runs on smithi and vps are supported now
Yuri Weinstein [Wed, 18 Jan 2017 22:44:02 +0000 (22:44 +0000)]
Switched to centos 7.3 and as runs on smithi and vps are supported now
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Tamil Muthamizhan [Thu, 12 Jan 2017 23:29:56 +0000 (15:29 -0800)]
qa: specify client for fs workunit
s/all/client.0
Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
(cherry picked from commit
8f6fd3a76695904f8e8674372866867bca44b464 )
Tamil Muthamizhan [Thu, 22 Dec 2016 00:03:31 +0000 (16:03 -0800)]
Added a smoke suite for ceph-ansible
Smoke suite with basic tests for ceph ansible deployment
Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
(cherry picked from commit
ad9b75f8d0ccca1aa2dfc8679196643433634687 )
Sage Weil [Wed, 18 Jan 2017 12:35:59 +0000 (07:35 -0500)]
os/bluestore/BlueFS: dump allocator freelist on failure in reclaim_blocks
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
15ff48518a65e0a3add97c5b7f650d329abf1dd1 )
Sage Weil [Wed, 18 Jan 2017 12:24:06 +0000 (06:24 -0600)]
os/bluestore/BlueFS: handle failure to reclaim blocks without crashing
We shouldn't fail to reclaim space in general, but if we do, do not treat
it as a fatal error. Log loudly.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
6dc1bcd9e72b01c3fbf09c7eb91cd7cf4e01f94a )
Yuri Weinstein [Tue, 17 Jan 2017 22:50:28 +0000 (14:50 -0800)]
Merge pull request #12969 from ceph/wip-cd-bp
qa/task/ceph-deploy backports for kraken
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
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>
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>
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>
Sage Weil [Tue, 17 Jan 2017 21:23:07 +0000 (16:23 -0500)]
unitest_bit_alloc, unittest_alloc: fixes
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
7492aef0f717f1fb5c09d55c99ded2adce7997d6 )
Sage Weil [Tue, 17 Jan 2017 16:17:38 +0000 (11:17 -0500)]
os/bluestore: prealloc/reserve extent vector for common alloc path
No need to worry about the gift/reclaim path--those are very rare.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
b0c243875fe963e2958828bef62f3ba55e123434 )
Sage Weil [Tue, 17 Jan 2017 15:26:50 +0000 (10:26 -0500)]
os/bluestore/Allocator: drop unused and goofy release_extents
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
14676ac8cd69a1b4c06c728b0c00b00dd6a71a7a )
Sage Weil [Tue, 17 Jan 2017 15:25:34 +0000 (10:25 -0500)]
os/bluestore: drop useless count arg to allocate
The vector<> has a size.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
0aa402fba19f5c83806304b2ecef6902c481eff4 )
Sage Weil [Tue, 17 Jan 2017 15:20:07 +0000 (10:20 -0500)]
os/bluestore: return blocks allocated from allocate()
Instead of having a separate output argument with the number of
blocks allocated, just return it via the return value. Simplifies
the calling convention.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
95c78706317f2fe61b8f48de5e8539ed49221d64 )
Sage Weil [Tue, 17 Jan 2017 15:56:13 +0000 (10:56 -0500)]
os/bluestore: manage vector from ExtentList
ExtentList was previous relying the caller to preallocate/size the
vector to be large enough for the worst case allocation of extents,
and keeping it's own manual count of the extent list size. Instead,
manage that from ExtentList, and remove the preallocation from the
callers.
Fixes: http://tracker.ceph.com/issues/18573
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
65502891dd66569c8d99384e63b68decdab1c8e2 )
Sage Weil [Tue, 17 Jan 2017 20:32:47 +0000 (15:32 -0500)]
Merge tag 'v11.1.1' into kraken
v11.1.1