Commit Graph

20 Commits

Author SHA1 Message Date
Sage Weil
12a391ea01 thrashosds: increase osd revive timeout (75s -> 150s)
This is needed when running valgrind.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-25 08:52:02 -07:00
Loic Dachary
e5c5bcf92d rgw: add erasure_code_profile configuration
If erasure_code_profile is present at the same leve as ec-data-pool, it
is used to override the default hard coded profile.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-08-22 01:27:17 +02:00
Zack Cerza
5765fde1aa Merge pull request #102 from ceph/9171
ignore errors on informational service status
2014-08-21 09:16:49 -06:00
Alfredo Deza
70a1f18adf use 'mon create-initial' always
But don't error if it fails, as this would mean that the monitors
are just taking longer to form quorum. Go and try the next block which will
wait up to 15 minutes for a successful gatherkeys to happen (that only works
if monitors have formed quorum).

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
2014-08-21 10:03:28 -04:00
Alfredo Deza
5b946e1a6d ignore errors on informational service status
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
2014-08-21 09:44:45 -04:00
Alfredo Deza
4b15d0118e use the right syntax for RHEL/CentOS distros to check for ceph status
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
2014-08-18 12:40:43 -04:00
Sage Weil
f7b32bcc31 rgw: httpd instead of httpd.worker
httpd exists on rhel 6.5 too ...

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-16 16:44:32 -07:00
Sage Weil
6392758f1b rgw: need alll of mod unixd, version, authz
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-16 16:44:32 -07:00
Sage Weil
27b7eceeae tasks/rgw: include mod_authz
As per http://www.webhostingtalk.com/showthread.php?t=1173594

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-16 13:56:15 -07:00
Sage Weil
2aae91929f tasks/rgw: get mpm_event frmo mods-available, not mods-enabled
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-16 13:37:39 -07:00
Dan Mick
9de5bd1d23 Add extra conf for Apache 2.4
Inside a conditional to affect only 2.4, set User, Group, and the
module config to load mpm_event.  This is normally done with the
default configuration files, but since this abbreviated conf bypasses
those, we must set them here.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2014-08-15 22:37:22 -07:00
Loic Dachary
821b2a4397 replace locally instantiated CephManager
Use the ctx.manager instance created by ceph.py instead

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-08-15 15:56:52 +02:00
Loic Dachary
9782465c87 initialize ctx.manager in ceph.py
instead of rados.py because ceph.py is only run once where rados.py
could be run multiple time, leading to race conditions

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-08-15 15:56:35 +02:00
Loic Dachary
f53ea258a4 move functions from ceph to ceph_manager
mount_osd_data and make_admin_daemon_dir are only used by
ceph_manager.py although they are defined in ceph.py

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-08-15 15:56:35 +02:00
Loic Dachary
da00662191 rgw: s/idle_timeout/default_idle_timeout/
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-08-15 12:34:37 +02:00
Zack Cerza
2fc76d6e7f Merge pull request #86 from dachary/wip-9027-create-unique-pool
rados.py: avoid CephManager creation race
2014-08-14 09:28:29 -06:00
Loic Dachary
54a7298cdd rgw: add default_idle_timeout to allow override
Globally overriding the rgw idle_timeout is not possible because it it
needs to be done on a per client.0, client.1, etc. basis. Add the
default_idle_timeout key to the rgw config : it defaults to the
previously hardcoded default (30) and can be changed via the override.

The existing tasks that were previously overriding the idle_timeout on a
per client basis are changed to use the default_idle_timeout instead for
consistency and to allow a global override.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-08-14 14:53:24 +02:00
Loic Dachary
6237acb316 rados.py: avoid CephManager creation race
gevent may hold the rados.py thread when it has an opportunity. The

   if not hasattr(ctx, 'manager'):

must therefore be immediately before the manager creation it is supposed
to protect. If any of the functions called as a side effect of

   first_mon = teuthology.get_first_mon(ctx, config)
   (mon,) = ctx.cluster.only(first_mon).remotes.iterkeys()

give gevent an opportunity to hold the thread, it creates a race
condition.

The other possibility would be use a ctx lock to protect the code, but
this solution seem simpler.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-08-14 10:57:35 +02:00
Zack Cerza
4e1e929f75 Update module references
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
2014-08-07 08:24:59 -06:00
Zack Cerza
0e1df3cc72 Import teuthology tasks (master branch)
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
2014-08-07 08:24:58 -06:00