1
0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Commit Graph

572 Commits

Author SHA1 Message Date
Sage Weil
176a3408c9 testrados -> ceph_test_rados
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:20 -08:00
Sage Weil
2a344c1079 rgw: sudo
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:06 -08:00
Sage Weil
ed82d87566 fix a few archive/log stragglers
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:06 -08:00
Sage Weil
38b30c646f ceph: make gitbuilder host configurable
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:06 -08:00
Sage Weil
b1c9864a7a ceph: install -dbg packages, too
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:06 -08:00
Sage Weil
d8b6bf94ec ceph: create /var/run/ceph
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
969a6def3b ceph-fuse: sudo
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
4eb047b4ea sudo for admin socket commands
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
0ad55b3604 cfuse -> ceph-fuse 2013-02-18 13:39:05 -08:00
Sage Weil
88ebc27f16 ceph: store logs in normal location
We need to switch around how these are compressed and pulled, since they
aren't in the regular archive dir anymore.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
d1d36241b7 ceph: use default data, keyring locations
This required reordering the cluster setup so that we do the ceph-osd
--mkfs --mkkey prior to gathering keys and initializing the monitors.

Also, run daemons as root.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
7a61b237d6 ceph: don't uninstall librados, librbd
This forces uninstall of kvm too, which is expensive.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
bc9ecf7813 ceph: pass package version to apt-get install
This avoids problems when a different or newer version of the package is
already installed.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
c9d3dea320 avoid secretfile, except for kclient
Only mount.ceph needs the secret in a standalone file.  Remove other users,
and simplify that one.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
45ddbe636e rgw: specify keyring location
Otherwise we look at the default /var/lib/ceph/radosgw/ceph-$id/keyring.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
4dc6c8b275 install radosgw
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
333c7260bc rbd: remove merge cruft
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:05 -08:00
Sage Weil
8b971611f2 ceph: simplify apt-key management
Run apt-key as root. No need to initialize ubuntu user's gpg.  Fix
whitespace.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:04 -08:00
Sage Weil
eadefec8ff ceph: put client keyrings in /etc/ceph/ceph.$name.keyring
And make it world readable, for ubuntu's sake.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:04 -08:00
Sage Weil
27fec2377f ceph: simpilfy package removal
apt-get doesn't have a nice way to tell if the package is not install and
we don't need to purge it.  Well, not one I found in 5 minutes.  Just
do a big purge and assume it works, or failed because there was nothing to
be done.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:04 -08:00
Sage Weil
a529bb725f ceph: install ceph-mds, ceph-common
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:04 -08:00
Sage Weil
5235fc18a0 ceph: fix purge
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 13:39:03 -08:00
Sander Pool
c525e1061b Install ceph debs and use installed debs
The ceph task installs ceph using the debian
packages now, and all invocations of binaries installed
in {tmpdir}/binary/usr/local/bin/ are replace with
the use of the binaries installed in standard locations
by the debs.

Author:    Sander Pool <sander.pool@inktank.com>
Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-18 13:39:03 -08:00
Sage Weil
9513f2f206 rbd_fsx: binary name now has ceph_ prefix
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-15 09:12:25 -08:00
Sage Weil
5d6d6884fe rados: testrados -> ceph_test_rados
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-13 14:10:33 -08:00
Sage Weil
6e3c2d93fb peer: add recovery delay to make test behave
Otherwise it was (very) racy!
2013-02-11 06:59:17 -08:00
Sandon Van Ness
a56eb88c16 Merge to include --machine-type and changes to --summary
Added the ability to support multiple types of machines with
--machine-type added to teuthology-lock when used with --lock-many
or --machine-type with teuthology --lock (automated tests). It
defaults to 'plana' and the 'vps' type is currently unused but
should be in the future.

Also updated teutholoy-lock --summary to be machine type aware
and sort things in a nice output.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-07 16:34:14 -08:00
Sandon Van Ness
030bc7c23d Added support for multiple types of machines.
Added the ability to support multiple types of machines with
--machine-type added to teuthology-lock when used with --lock-many
or --machine-type with teuthology --lock (automated tests). It
defaults to 'plana' and the 'vps' type is currently unused but
should be in the future.

Signed-off-by: Sandon Van Ness <sandon@van-ness.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-07 13:26:37 -08:00
Sage Weil
ed9103aad5 rgw: parse testdir into apache.conf
Also fix up the template to use {{field}} for stuff we don't want to parse.
There is probably a better way...

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-06 22:02:10 -08:00
Sage Weil
67bbb9c77b osd_recovery: add missing testdir arg 2013-02-06 21:44:10 -08:00
Sage Weil
561ea14c6e ceph_manager: take int or string to osd_admin_socket
This fixes a failure on dump_stuck.
2013-02-06 17:14:24 -08:00
Sage Weil
3fbb552240 radosbench: fix missing format value
tdir is substituted in at the end.  There is probably a better way to do
this.
2013-02-06 09:06:35 -08:00
Sage Weil
936f314a63 rgw: fix testdir format on f
Format the path, not filehandle
2013-02-06 09:04:37 -08:00
Sage Weil
82273e951b rbd: fix rbd image unmount
The testdir param was missing.  Avoid this class of errors by unmounting
exactly what we mounted.
2013-02-05 23:19:23 -08:00
Sage Weil
6099045990 rbd: set env before running sudo
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-05 23:01:25 -08:00
Sam Lang
da10b58d65 task/ceph_manager: Fix NoneType config issue
kill_mon is getting a config set to None, which blows
up now due to the check for powercycle.  Initialize
the config to an empty dict if we don't get anything
on init.  This is the error showing up in teuthology:

2013-02-04T15:04:16.595 ERROR:teuthology.run_tasks:Manager failed: <contextlib.GeneratorContextManager object at 0x1fcafd0>
Traceback (most recent call last):
  File "/var/lib/teuthworker/teuthology-master/teuthology/run_tasks.py", line 45, in run_tasks
    suppress = manager.__exit__(*exc_info)
  File "/usr/lib/python2.7/contextlib.py", line 24, in __exit__
    self.gen.next()
  File "/var/lib/teuthworker/teuthology-master/teuthology/task/mon_thrash.py", line 142, in task
    thrash_proc.do_join()
  File "/var/lib/teuthworker/teuthology-master/teuthology/task/mon_thrash.py", line 69, in do_join
    self.thread.get()
  File "/var/lib/teuthworker/teuthology-master/virtualenv/local/lib/python2.7/site-packages/gevent/greenlet.py", line 308, in get
    raise self._exception
AttributeError: 'NoneType' object has no attribute 'get'

Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-05 10:38:48 -06:00
Sam Lang
55c1bcf6b0 Add testdir param to get_valgrind_args() calls
Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-03 22:09:15 -06:00
Sam Lang
a5ba4f6a94 Merge branch 'wip-misc-fixes'
Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-03 11:38:29 -06:00
Sage Weil
ada803db0f rbd: fix .format() call with {1} syntax
IndexError: tuple index out of range
2013-02-03 08:18:52 -08:00
Sage Weil
fe9fb49e27 ceph_manager: use get() for self.config powercycle checks
I think this is what is going on...

Traceback (most recent call last):
  File "/var/lib/teuthworker/teuthology-master/teuthology/contextutil.py", line 27, in nested
    yield vars
  File "/var/lib/teuthworker/teuthology-master/teuthology/task/ceph.py", line 1158, in task
    yield
  File "/var/lib/teuthworker/teuthology-master/teuthology/run_tasks.py", line 25, in run_tasks
    manager = _run_one_task(taskname, ctx=ctx, config=config)
  File "/var/lib/teuthworker/teuthology-master/teuthology/run_tasks.py", line 14, in _run_one_task
    return fn(**kwargs)
  File "/var/lib/teuthworker/teuthology-master/teuthology/task/dump_stuck.py", line 93, in task
    manager.kill_osd(id_)
  File "/var/lib/teuthworker/teuthology-master/teuthology/task/ceph_manager.py", line 665, in kill_osd
    if 'powercycle' in self.config and self.config['powercycle']:
TypeError: argument of type 'NoneType' is not iterable
2013-02-02 21:01:08 -08:00
Sam Lang
7280980f34 Fixup latest commits that use /tmp/cephtest.
Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-02 11:00:17 -06:00
Sam Lang
d9fff40f6b task/chdir-coredump: Use readlink -e
realpath isn't available everywhere, use readlink -e instead.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-01 16:07:29 -06:00
Sam Lang
9a9fe73ec3 task/ceph: Fix typo in previous commit
Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-01 14:07:10 -06:00
Sam Lang
4ebd90eb81 task/ceph: Initialize disk_config maps
The mount_options and fstype maps need to be
initialized properly for later.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-01 11:37:13 -06:00
Sam Lang
3806dc5e72 task/ceph: Fix device list
dict.items() returns a tuple, whereas we want
the values().

Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-01 10:16:44 -06:00
Samuel Just
fadc22c0b9 ceph_manager: wait for admin socket on restart, use for set_config
Fixes: 
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-01-31 12:59:00 -08:00
Josh Durgin
8f9267cf0e thrashosds: note assumption for powercycling 2013-01-31 09:14:06 -08:00
Sam Lang
77e8d801b1 Remove console.py
Handling of ipmi via the console is now done through the
Console class in teuthology/orchestra/remote.py.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-31 08:23:41 -06:00
Sam Lang
8f720454cb Assign devices to osds using the device wwn
Linux doesn't guarantee device names (/dev/sdb, etc.)
are always mapped to the same disk.  Instead of assigning
nominal devices to osds, we map devices by their wwn
(/dev/disk/by-id/wwn-*) to an osd (both data and journal).

Signed-off-by: Sam Lang <sam.lang@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-31 08:23:39 -06:00
Sam Lang
58111595d4 Support power cycling osds/nodes through ipmi
This patch defines a RemoteConsole class associated
with each Remote class instance, allowing
power cycling a target through ipmi.

Fixes/Implements .
Signed-off-by: Sam Lang <sam.lang@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-31 08:23:37 -06:00