]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Dan Mick [Wed, 29 Mar 2017 03:08:13 +0000 (20:08 -0700)]
tasks/workunit.py: when cloning, use --depth=1
Help avoid killing git.ceph.com. A depth 1 clone takes about
7 seconds, whereas a full one takes about 3:40 (much of it
waiting for the server to create a huge compressed pack)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit
c1309fbef300a062138ac40eb5d3e5081b833072 )
Kefu Chai [Mon, 27 Feb 2017 08:29:40 +0000 (16:29 +0800)]
qa/tasks/workunit: use ceph.git as an alternative of ceph-ci.git for workunit repo
if we run upgrade test, where, for example, "jewel" is not in
ceph-ci.git repo, we should check ceph.git to clone the workunits.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
edceabbd47697cb4e7d21798e57a58969a92ce79 )
Kefu Chai [Fri, 24 Feb 2017 08:43:07 +0000 (16:43 +0800)]
qa/tasks/workunit: use the suite repo for cloning workunit
as "workunits" reside in ceph/qa/workunits, it's more intuitive to
respect suite-repo option when cloning workunits.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
4cf28de4c9a60a4618d101f555f5a2e59b7ab109 )
Nathan Cutler [Wed, 12 Apr 2017 14:42:37 +0000 (16:42 +0200)]
Merge pull request #14098 from shinobu-x/wip-19192-kraken
kraken: tools: ceph-brag fails to count "in" mds
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 14:11:30 +0000 (16:11 +0200)]
Merge pull request #14155 from smithfarm/wip-18947-kraken
kraken: rbd-mirror: additional test stability improvements
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 14:10:47 +0000 (16:10 +0200)]
Merge pull request #14153 from smithfarm/wip-18892-kraken
kraken: librbd: Incomplete declaration for ContextWQ in librbd/Journal.h
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 14:09:55 +0000 (16:09 +0200)]
Merge pull request #14151 from smithfarm/wip-18822-kraken
kraken: tests: run-rbd-unit-tests.sh assert in lockdep_will_lock, TestLibRBD.ObjectMapConsistentSnap
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 14:06:58 +0000 (16:06 +0200)]
Merge pull request #14149 from smithfarm/wip-18777-kraken
kraken: rbd: rbd --pool=x rename y z does not work
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 13:50:51 +0000 (15:50 +0200)]
Merge pull request #14315 from smithfarm/wip-19460-kraken
kraken: build/ops: spec file mentions non-existent ceph-create-keys systemd unit file, causing ceph-mon units to not be enabled via preset
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 13:42:27 +0000 (15:42 +0200)]
Merge pull request #13875 from smithfarm/wip-19172-kraken
kraken: rgw: S3 create bucket should not do response in json
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Nathan Cutler [Wed, 12 Apr 2017 13:34:55 +0000 (15:34 +0200)]
Merge pull request #13873 from smithfarm/wip-19164-kraken
kraken: rgw: radosgw-admin: add the 'object stat' command to usage
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 13:32:54 +0000 (15:32 +0200)]
Merge pull request #13245 from smithfarm/wip-18776-kraken
kraken: rbd: qemu crash triggered by network issues
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 13:32:17 +0000 (15:32 +0200)]
Merge pull request #13247 from smithfarm/wip-18456-kraken
kraken: rbd: attempting to remove an image with incompatible features results in partial removal
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 13:31:24 +0000 (15:31 +0200)]
Merge pull request #13132 from rjfd/wip-18609-kraken
kraken: librbd: allow to open an image without opening parent image
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 13:17:09 +0000 (15:17 +0200)]
Merge pull request #13185 from smithfarm/wip-18721-kraken
kraken: build/ops: systemd restarts Ceph Mon to quickly after failing to start
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Wido den Hollander <wido@42on.com>
Nathan Cutler [Wed, 12 Apr 2017 11:55:16 +0000 (13:55 +0200)]
Merge pull request #13845 from smithfarm/wip-19147-kraken
kraken: rgw: DUMPABLE flag is cleared by setuid preventing coredumps
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 11:43:09 +0000 (13:43 +0200)]
Merge pull request #13555 from smithfarm/wip-18707-kraken
kraken: mds: failed filelock.can_read(-1) assertion in Server::_dir_is_nonempty
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 11:37:49 +0000 (13:37 +0200)]
Merge pull request #13488 from shinobu-x/wip-18955-kraken
kraken: ceph-disk: Fix getting wrong group name when --setgroup in bluestore
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 10:46:00 +0000 (12:46 +0200)]
Merge pull request #13112 from jcsp/wip-18678
kraken: mds: finish clientreplay requests before requesting active state
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 08:52:42 +0000 (10:52 +0200)]
Merge pull request #14048 from asheplyakov/reindex-on-pg-split-kraken
kraken: osd: pg log split does not rebuild index for parent or child
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 08:47:12 +0000 (10:47 +0200)]
Merge pull request #13116 from smithfarm/wip-18403-kraken
kraken: mon: cache tiering: base pool last_force_resend not respected (racing read got wrong version)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 08:41:21 +0000 (10:41 +0200)]
Merge pull request #13487 from shinobu-x/wip-18819-kraken
kraken: common: possible lockdep false alarm for ThreadPool lock
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Wed, 12 Apr 2017 08:36:12 +0000 (10:36 +0200)]
Merge pull request #14147 from smithfarm/wip-18769-kraken
kraken: rbd: [ FAILED ] TestJournalTrimmer.RemoveObjectsWithOtherClient
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Wed, 12 Apr 2017 00:53:06 +0000 (02:53 +0200)]
Merge pull request #13026 from SUSE/wip-18606-kraken
kraken: tools: ceph-disk prepare writes osd log 0 with root owner
Reviewed-by: Loic Dachary <ldachary@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>
Sébastien Han [Thu, 30 Mar 2017 07:32:31 +0000 (09:32 +0200)]
systemd: remove all occurence of ceph-create-keys
ceph-create-keys unit file does not exist anymore so there is no need to
call it.
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
205cff12b3fe577a02db119ed3084d5c46ba76ce )
Sébastien Han [Wed, 29 Mar 2017 13:47:56 +0000 (15:47 +0200)]
systemd: remove ceph-create-keys from presets
ceph-create-keys unit file was removed here:
* https://github.com/ceph/ceph/commit/
8bcb4646b6b9846bb965cdec3ca2a21eb3b26bab
* https://github.com/ceph/ceph/commit/
dc5fe8d415858358bd0baf5d8dce0a753f5e0cea
As a consequence the systemctl preset command now fails to run since the
unit does not exist anymore. Due to the redirection in /dev/null we
don't know what's happening.
Ultimately the mon unit doesn't get enabled and the mon service won't
start after reboot.
Removing the old/non-existent unit makes the command succeed now.
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
151c0ce213186b2196531ce74478ed7671eb9819 )
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>
Jason Dillaman [Mon, 21 Nov 2016 20:31:43 +0000 (15:31 -0500)]
qa/workunits/rbd: resolve potential rbd-mirror race conditions
Fixes: http://tracker.ceph.com/issues/18935
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
63eae97afc1a92412525468263fb8696a243ebac )
Boris Ranto [Wed, 8 Feb 2017 22:47:57 +0000 (23:47 +0100)]
librbd: Include WorkQueue.h since we use it
We use m_work_queue of type ContextWQ in handle_update function but we
do not include common/WorkQueue.h that defines ContextWQ. This results
in dereference of an incomplete type and causes build error in latest
Fedora rawhide (future 26).
Fixes: http://tracker.ceph.com/issues/18862
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit
480f82847ad1fc7959f1fe5a90761a5a24550993 )
Jason Dillaman [Thu, 19 Jan 2017 01:54:22 +0000 (20:54 -0500)]
librbd: avoid possible recursive lock when racing acquire lock
Fixes: http://tracker.ceph.com/issues/17447
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
5e46e8eb664f573bd70ae7c96a6d9a98b0deb09e )
Gaurav Kumar Garg [Mon, 30 Jan 2017 12:03:20 +0000 (13:03 +0100)]
rbd: destination pool should be source pool if it is not specified
Currently if user perform image rename operation and user give pool
name as a optional parameter (--pool=<pool_name>) then currently
its taking this optional pool name for source pool and making
destination pool name default pool name.
With this fix if user provide pool name as a optional pool name
parameter then it will consider both soruce and destination pool
name as optional parameter pool name.
Fixes: http://tracker.ceph.com/issues/18326
Reported-by: МАРК КОРЕНБЕРГ <socketpair@gmail.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
(cherry picked from commit
01f23aa99fb694da326ab408e75b33c640ce660b )
Jason Dillaman [Mon, 30 Jan 2017 22:41:51 +0000 (17:41 -0500)]
journal: stop processing removal after error
Fixed: http://tracker.ceph.com/issues/18738
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
040004f53f7d334fc9452e3f5fd80169cad5f65e )
Kefu Chai [Mon, 6 Mar 2017 03:33:27 +0000 (11:33 +0800)]
brag: count the number of mds in fsmap not in mdsmap
this change was introduced in
4e9b953
Fixes: http://tracker.ceph.com/issues/19192
Signed-off-by: Peng Zhang <zphj1987@gmail.com>
(cherry picked from commit
2d25a9c0c760664d3de33ecca0e0272c1031cd46 )
Sage Weil [Fri, 17 Feb 2017 17:46:38 +0000 (12:46 -0500)]
osd/PGLog: avoid return by value on ginormous log
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
a6ead998771753d95382abd082f451e6f67744e4 )
Sage Weil [Fri, 17 Feb 2017 19:50:38 +0000 (14:50 -0500)]
osd/PGLog: reindex properly on pg log split
When pg_log_t::split_out_child() runs it builds the list, which means the
old indexes are wrong (the point to bad memory), but index() will not
rebuild them because ever since
b858e869e78927dccebaa350d246bd74af7f1de9
we won't rebuild them if they are already built.
Fix that by calling unindex() before the split.
Further, the new child log also needs to be indexed. Fix that too.
Fixes: http://tracker.ceph.com/issues/18975
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
643ae42cf27f16dd6ed4e1402acc0483bb9fca74 )
Abhishek Lekshmanan [Thu, 16 Feb 2017 16:40:50 +0000 (17:40 +0100)]
doc: rgw: make a note abt system users vs normal users
Mention that system users don't behave like normal users in context of
normal rest operations
Fixes: http://tracker.ceph.com/issues/18889
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
a47bcf70c9f51a6601b809cba219f5615b204d34 )
root [Tue, 7 Feb 2017 09:07:36 +0000 (14:37 +0530)]
rgw: Let the object stat command be shown in the usage
Fixes: http://tracker.ceph.com/issues/19013
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
(cherry picked from commit
0fe76f83d19be098ef54fb0492a376fef3aa9e23 )
Brad Hubbard [Mon, 27 Feb 2017 03:06:59 +0000 (13:06 +1000)]
rgw: set dumpable flag after setuid post
ff0e521
ff0e521 resolved the issue for the other daemons but not for rgw since
it calls setuid (via civetweb) after the new code sets PR_SET_DUMPABLE.
Add another prctl call before wait_shutdown.
Fixes: http://tracker.ceph.com/issues/19089
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
bc458d39630b599e0e1ca9fe25ad7455fcffdd10 )
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>
Yan, Zheng [Wed, 18 Jan 2017 08:23:49 +0000 (16:23 +0800)]
mds: fix incorrect assertion in Server::_dir_is_nonempty()
when filelock is in XLOCKDONE state. client of xlocker can rdlock
the filelock. In that case, only client of xlocker can read the lock.
Fixes: http://tracker.ceph.com/issues/18578
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit
fe4ab52b30079a785be053a9fd0197d6990737fe )
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 )
craigchi [Thu, 16 Feb 2017 11:21:48 +0000 (19:21 +0800)]
ceph-disk: Fix getting wrong group name when --setgroup in bluestore
ceph-disk prepare --setgroup <GROUP NAME> will be wrong when using with
bluestore
Signed-off-by: craigchi <craig10624@gmail.com>
(cherry picked from commit
a8c0870e7370a0948e8e7fd53d3376b85bf9c649 )
Mykola Golub [Sat, 4 Feb 2017 14:27:11 +0000 (15:27 +0100)]
common: possible lockdep false alarm for ThreadPool lock
Fixes: http://tracker.ceph.com/issues/18819
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit
8677dea4cd462d2141da28623a82b208cbc926f6 )
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 )