RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-25 21:03:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,121 Commits 211 Branches 394 Tags 1.3 GiB
90393886fc
Commit Graph

291 Commits

Author SHA1 Message Date
Yuri Weinstein
581fcf192f Merge pull request #380 from ceph/wip-11204 
Make sure that ulimits are adjusted for ceph-objectstore-tool
 2015-03-27 12:23:37 -07:00
Dan Mick
58174f05e9 calamari_setup: der. Use dict.update() correctly 
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2015-03-26 17:54:36 -07:00
Andrew Schoen
85e7be5a48 Merge pull request #381 from dmick/master 
calamari_setup fixes
 2015-03-26 17:21:18 -07:00
Sage Weil
dcb5e8da9d Merge remote-tracking branch 'gh/hammer' 
Conflicts:
	.gitignore
 2015-03-26 17:09:33 -07:00
Dan Mick
e3ec2fc7c4 calamari_setup: Require test_image to be set 
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2015-03-26 17:01:48 -07:00
Dan Mick
dee010163b calamari_setup: centralize config defaults 
Make a DEFAULTS dict that is updated by any user parms, so that
defaults are documented centrally and so config.get(key, defval) is
no longer necessary everywhere.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2015-03-26 17:01:48 -07:00
Dan Mick
3a69c3f494 calamari_setup: remove "build test image" code; add 'test_image' cfgvar 
Stop trying to build test images inside this test; presume the test
image is available built externally (in a file path or an http URL).
Config vars ice_tool_dir, ice_version, iceball_location, and
ice_git_location go away in favor of 'test_image', the path to the
testable image (which can still be a tar.gz or an .iso).

Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2015-03-26 17:01:48 -07:00
Dan Mick
5644bb5a8d calamari_setup: mounting iso on older distros requires -o loop 
Ubuntu's mount/kernel support "mount <file> <mntpnt>" directly;
apparently Centos 6 (and presumably RHEL6) require specifying at
least '-o loop' (a /dev/loopN will be dynamically allocated and removed
on unmount).

Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2015-03-26 17:01:48 -07:00
Sage Weil
bafe87a8e5 tasks/watch_notify_same_primary: wait for watch before notify 
Make sure watch is done registering and ready before sending the
notifies.

Fixes: #10634
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-03-26 16:51:56 -07:00
David Zafman
e6ce90fdb1 Make sure that ulimits are adjusted for ceph-objectstore-tool 
Fixes: #11204

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-03-26 15:18:47 -07:00
Loic Dachary
fc39550933 ensure summary is looked for the user we need (part 2) 
Move the get_user_summary(out, user) logic to util.rgw so that it can be
shared between radosgw_admin_rest.py and radosgw_admin.py and modify
them accordingly.

http://tracker.ceph.com/issues/11180 Fixes: #11180

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 97e6d808f0)
 2015-03-24 13:37:41 -04:00
Loic Dachary
97e6d808f0 ensure summary is looked for the user we need (part 2) 
Move the get_user_summary(out, user) logic to util.rgw so that it can be
shared between radosgw_admin_rest.py and radosgw_admin.py and modify
them accordingly.

http://tracker.ceph.com/issues/11180 Fixes: #11180

Signed-off-by: Loic Dachary <loic@dachary.org>
 2015-03-22 21:07:51 +01:00
David Zafman
6c5300552d ceph_manager: Check for exit status 11 from ceph-objectstore-tool import 
Fixes: #11139

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-03-20 21:25:41 -07:00
Gregory Meno
798f31d836 Merge pull request #371 from ceph/wip-iso-style 
Add support for ISOs to tasks/calamari_setup
 2015-03-20 20:33:53 -04:00
Dan Mick
c571e65671 calamari_setup: oops: ice-tools is still where it was on github.com 
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2015-03-20 17:28:10 -07:00
Alfredo Deza
b6c2e978d6 ensure summary is looked for the user we need 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f7ea0a424a)
 2015-03-20 13:23:02 -04:00
Alfredo Deza
f7ea0a424a ensure summary is looked for the user we need 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2015-03-20 09:27:05 -04:00
Gregory Meno
81c493c99f calamari_setup: add -y to yum localinstall icesetup 
also fix a few flake8 things

Signed-off-by: Ubuntu <ubuntu@vpm047.front.sepia.ceph.com>
 2015-03-19 20:14:52 +00:00
Dan Mick
93c0b8a0bd calamari_setup: handle iso, preserving support for tar.gz 
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2015-03-18 18:03:21 -07:00
Dan Mick
da668abb92 calamari_setup: small comment/logmsg fixes, correct git user path 
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2015-03-18 18:03:18 -07:00
Dan Mick
9087b7da12 calamari_setup: make iceball fetch/creators return path to iceball 
Also, widen the concept of "iceball" to include both iso and tar.gz

Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2015-03-18 17:16:53 -07:00
Dan Mick
34e7544e12 calamari_setup: Refactor/simplify in preparation for iso support 
Signed-off-by: Gregory Meno <gmeno@redhat.com>
 2015-03-18 17:16:41 -07:00
John Spray
7ad8ac63fc tasks/cephfs: clean up core on deliberate crash 
To avoid internal.coredump task synthesizing a failure
during teardown from the core we left behind.

Fixes: #10949
Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-04 19:13:43 +00:00
Andrew Schoen
d2b52d977b Control the nfs service correctly on rpm-based systems 
This fixes issue #11020

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 2e4d884fda)
 2015-03-04 10:10:01 -06:00
Andrew Schoen
7402d5f1a9 Fixes #11013, use time.sleep instead of manager.sleep which isn't there. 
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 811c02e392)
 2015-03-04 10:09:21 -06:00
Andrew Schoen
2e4d884fda Control the nfs service correctly on rpm-based systems 
This fixes issue #11020

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
 2015-03-04 08:57:03 -06:00
Andrew Schoen
811c02e392 Fixes #11013, use time.sleep instead of manager.sleep which isn't there. 
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
 2015-03-03 16:42:59 -06:00
John Spray
1647453d66 Merge pull request #356 from ceph/wip-10948 
tasks/cephfs: don't run iptables in parallel

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-03 20:25:09 +00:00
John Spray
386b6feaaf Merge pull request #358 from ceph/wip-10712 
tasks: fix intermittent failure in TestFlush

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-03 11:42:09 +00:00
Andrew Schoen
cdaa11d427 Use an NFS mount instead of virtio-9p in the qemu task 
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 93f2bea353)
 2015-03-02 15:45:10 -08:00
Greg Farnum
0c9fb0f7be workunit: include /usr/sbin in the PATH for all commands 
Fixes: #10600

Backport: hammer, giant, firefly, dumpling

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 0e53f5f38b)
 2015-03-02 11:29:24 -08:00
Alfredo Deza
d25aa7bdc1 rename test to tests, follows best practices for tests dirs 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 7b2062602f)
 2015-03-02 11:20:35 -08:00
Alfredo Deza
b0ac3516e3 create a new get_acl helper to ensure proper xml is compared 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9b6ff63873)
 2015-03-02 11:20:23 -08:00
Alfredo Deza
20a1ae72ef tests for the new acl helper in radosgw_admin 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 3801ac9357)
 2015-03-02 11:20:11 -08:00
John Spray
d20d9238cd tasks: fix intermittent failure in TestFlush 
This was an overly strict success condition: the
flush operation doesn't promise to leave you an empty
journal, it promises that anything in the journal
before the flush will be flushed.

Fixes: #10712
Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-02 12:53:01 +00:00
John Spray
5b2fd3d614 tasks/cephfs: don't run iptables in parallel 
Where multiple MDSs were on the same node, trying
to concurrently update their firewall state was
causing an exception because the iptables command
errors out if another instance is already running.

Fixes: #10948
Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-02 12:41:13 +00:00
John Spray
fc4e90930b tasks/cephfs: fix/improve fuse force umount (again) 
teuthology helpfully escapes things for us so
the \; didn't need the backslash.  The logic
was still falling over in some cases too.

Additionally, make the FUSE /sys/ abort operation
more surgical by working out the connection name
of our own mount during mount().

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-02-26 23:08:33 +00:00
Alfredo Deza
a8a29760f0 remove unused import from repair_test 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2015-02-26 15:04:02 -05:00
Alfredo Deza
9157622ef7 remove unused variable assignment 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9df27f7a10)
 2015-02-26 15:02:07 -05:00
Alfredo Deza
3f3ce53fde remove unused import from fuse 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2015-02-26 14:55:02 -05:00
Alfredo Deza
35224e3dda remove uneeded variable assignment for call 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 0a65e90db2)
 2015-02-26 14:54:14 -05:00
Alfredo Deza
976773a5d0 remove unused import in calamari_setup 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d22cd6917b)
 2015-02-26 14:53:35 -05:00
Alfredo Deza
e8e1e7ee5e remove unused imports from populate_rbd 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 959c491462)
 2015-02-26 14:52:58 -05:00
Alfredo Deza
28d3075266 remove unused imports from peering_speed 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 6d45352782)
 2015-02-26 14:52:40 -05:00
Alfredo Deza
5018e91c1e remove redefined StringIO import 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 3a18cb29a8)
 2015-02-26 14:48:53 -05:00
Alfredo Deza
4ed442e44c stdin is no longer a kwarg 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 49a61dc2d2f66bd8dde34ba67dbd98d4c5148c9e)
 2015-02-26 14:48:40 -05:00
Alfredo Deza
33f7982480 add the log object to ceph_manager 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f7c1ca4a1e23b03ecf86d5e67d563f95b3a82f99)
 2015-02-26 14:48:30 -05:00
Alfredo Deza
9cdd278d08 add missing mon object to osd_failsafe 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 1673be45c0e3aeb1eadad7ecd5b87570e9bac5ca)
 2015-02-26 14:47:35 -05:00
Alfredo Deza
744bc3802e fix undefined var in divergent_priors 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 26c5a82af9cf4efd3601b6a32aa5444f61fa9f81)
 2015-02-26 14:47:08 -05:00
Alfredo Deza
0a65e90db2 remove uneeded variable assignment for call 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2015-02-26 11:35:31 -05:00