Commit Graph

33601 Commits

Author SHA1 Message Date
Sage Weil
7784ef178d Merge pull request #1849 from ceph/wip-mon-get-version
mon: set MMonGetVersionReply tid

Reviewed-by: Sage Weil <sage@inktank.com>
2014-05-21 08:40:16 -07:00
Ilya Dryomov
9235dcb1ef mon: set MMonGetVersionReply tid
Currently we don't set MMonGetVersionReply tid even if the original
MMonGetVersion message had a non-zero tid.  This is bad for the kernel
client, which has the infrastructure in place that relies on tids to
lookup message buffers and contexts.  To kick off transitioning away
from the workaround, set MMonGetVersionReply tid to the tid of the
original MMonGetVersion message.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-21 12:20:51 +04:00
Sage Weil
e5fb75fc84 Merge pull request #1723 from ctheune/patch-1
Fix formatting of header
2014-05-20 20:22:55 -07:00
John Wilkins
e9eb30c066 Merge pull request #1845 from wdneto/master
doc: Update manual-deployment.rst
2014-05-20 17:40:29 -07:00
John Wilkins
08f72d561b Merge pull request #1828 from nereocystis/faq-fix
doc: fix link to FAQ
2014-05-20 17:38:11 -07:00
John Wilkins
a147b46a75 Merge pull request #1829 from nereocystis/preflight-cleanup
doc: Clean up pre-flight documentation
2014-05-20 17:37:56 -07:00
John Wilkins
7564df85f8 Merge pull request #1833 from nereocystis/admin-node-doc
doc: mention admin-node in common documentation
2014-05-20 17:37:07 -07:00
John Wilkins
aca9b1edfd Merge pull request #1837 from nereocystis/quick-ceph-deploy-cleanup
doc: quick-ceph-deploy cleanup
2014-05-20 17:35:56 -07:00
Sage Weil
ec9a9dac1e Merge pull request #1841 from ceph/wip-8373
Fixes for crush ruleset selection during pool creation (Wip 8373)

Reviewed-by: Sage Weil <sage@inktank.com>
2014-05-20 17:10:39 -07:00
John Wilkins
4523e58120 Merge pull request #1836 from ceph/wip-doc-openstack
doc: Clarifications to Ceph Block Device and OpenStack documentation.
2014-05-20 17:06:43 -07:00
Sage Weil
f305b8a3bd Merge pull request #1842 from ceph/wip-buildroot
ceph.spec.in: remove BuildRoot
2014-05-20 15:27:26 -07:00
Sage Weil
7e695318ec Merge pull request #1844 from onlyjob/hppa
Define AO_REQUIRE_CAS (fixes FTBFS on 'hppa')

Backport: firefly
Reviewed-by: Sage Weil <sage@inktank.com>
2014-05-20 15:26:56 -07:00
Aristoteles Neto
c2644b29e8 Update manual-deployment.rst
- When creating the OSD data, specify osd-uuid so that it matches when the osd is first created.
- Modify caps when adding osd auth to match what ceph-deploy does.
2014-05-21 10:20:55 +12:00
Dmitry Smirnov
74218f3d6c Define AO_REQUIRE_CAS (fixes FTBFS on 'hppa')
to fix FTBFS due to undeclared atomic functions.

As reported

    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748571

by John David Anglin <dave.anglin@bell.net>

~~~~
./include/atomic.h: In member function 'size_t ceph::atomic_t::inc()':
./include/atomic.h:42:36: error: 'AO_fetch_and_add1' was not declared in this scope
       return AO_fetch_and_add1(&val) + 1;
                                    ^
./include/atomic.h: In member function 'size_t ceph::atomic_t::dec()':
./include/atomic.h:45:42: error: 'AO_fetch_and_sub1_write' was not declared in this scope
       return AO_fetch_and_sub1_write(&val) - 1;
                                          ^
./include/atomic.h: In member function 'void ceph::atomic_t::add(size_t)':
./include/atomic.h:48:36: error: 'AO_fetch_and_add' was not declared in this scope
       AO_fetch_and_add(&val, add_me);
                                    ^
./include/atomic.h: In member function 'void ceph::atomic_t::sub(int)':
./include/atomic.h:52:48: error: 'AO_fetch_and_add_write' was not declared in this scope
       AO_fetch_and_add_write(&val, (AO_t)negsub);
                                                ^
./include/atomic.h: In member function 'size_t ceph::atomic_t::dec()':
./include/atomic.h:46:5: warning: control reaches end of non-void function [-Wreturn-type]
     }
     ^
make[5]: *** [cls/user/cls_user_client.o] Error 1
~~~~

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2014-05-21 08:18:12 +10:00
John Spray
fb504baed9 mon: Fix check of ruleset id on pool update
This code was using CrushWrapper::rule_exists, which
checks for a *rule* existing, whereas the value being
set is a *ruleset*.

Signed-off-by: John Spray <john.spray@inktank.com>
2014-05-20 23:16:54 +01:00
John Spray
1d9e4ac2e2 mon: Fix default replicated pool ruleset choice
Specifically, in the case where the configured
default ruleset is CEPH_DEFAULT_CRUSH_REPLICATED_RULESET,
instead of assuming ruleset 0 exists, choose the lowest
numbered ruleset.

In the case where an explicit ruleset is passed to
OSDMonitor::prepare_pool_crush_ruleset, verify
that it really exists.

The idea is to eliminate cases where a pool could
exist with its crush ruleset set to something
other than a value ruleset ID.

Fixes: #8373

Signed-off-by: John Spray <john.spray@inktank.com>
2014-05-20 23:16:54 +01:00
Sage Weil
401319a152 ceph.spec.in: remove BuildRoot
Deprecated

Fixes: #8143
Signed-off-by: Sage Weil <sage@inktank.com>
2014-05-20 13:41:35 -07:00
Christian Theune
107821fe9b Fix formatting of header
The header was displaying the newline as a simple "n" due to quoting in the doc.

Signed-off-by: Christian Theune <ct@gocept.com>
2014-05-20 10:38:01 +02:00
Gregory Farnum
1383b649d7 Merge pull request #1839 from ceph/wip-8338
OSD: verify that client ops are targeted correctly in the current epoch

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-05-19 16:53:55 -07:00
Josh Durgin
de3564bc55 Merge pull request #1830 from salehe/docfix-1
rados.py: clarify documentation of recent change on write return value

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-05-19 15:31:43 -07:00
Josh Durgin
d71839a6cf doc: clarify openstack cow sentence
Missing subject, and now applies to disks in general.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2014-05-19 15:25:37 -07:00
Josh Durgin
0f7f1e842b doc: note cinder multi-backend restriction
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2014-05-19 15:24:53 -07:00
Josh Durgin
e92f2d9fe0 doc: link to ephemeral rbd patches
These are necessary for using ephemeral rbd with Havana and Icehouse.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2014-05-19 15:14:29 -07:00
Kevin Dalley
13d6c3cf30 doc: quick-ceph-deploy cleanup
Improve documentation in quick-ceph-deploy.rst
Use admin-node consistently.
ceph should be installed on admin-node for the following reasons:
 "ceph-deploy admin admin-node" assumes that /etc/ceph exists.
 "ceph health" requires the use of ceph

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
2014-05-19 15:03:35 -07:00
Samuel Just
50f6641ade Merge pull request #1804 from ceph/wip-8104
Wip 8104

Reviewed-by: Sage Weil <sage@inktank.com>
2014-05-19 14:41:17 -07:00
Kevin Dalley
d40ba05313 doc: mention admin-node in common documentation
This change uses admin-node in the quick-common.rst file, including
the graph. This name is already used in
quick-ceph-deploy.rst.

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
2014-05-19 14:36:56 -07:00
Mohammad Salehe
bc897b8442 rados.py: clarify recent change on write return value
Signed-off-by: Mohammad Salehe <salehe+dev@gmail.com>
2014-05-20 01:48:33 +04:30
Kevin Dalley
637211854d doc: Clean up pre-flight documentation
Mention recent Ceph releases.
Move important message about sudo and ceph-deploy closer to the use of
ceph-deploy.
Mention files created by ceph-deploy comment
Separate apt-get from yum command

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
2014-05-19 13:38:31 -07:00
Kevin Dalley
06d05fd694 doc: fix link to FAQ
The location of the ceph wiki FAQ has changed.
Now, the link from ceph documentation matches the current FAQ location

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
2014-05-19 11:59:46 -07:00
Gregory Farnum
f3925b2094 Merge pull request #1820 from ceph/wip-osd-refs
osd: fix a session ref leak, and an unlikely race

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-05-19 11:24:05 -07:00
John Wilkins
03e3ccdd05 doc: Restored glance_api_version=2 setting.
Fixes: #8347

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-05-19 11:18:44 -07:00
Sage Weil
9e80c29c2c Merge remote-tracking branch 'gh/next' 2014-05-19 09:49:28 -07:00
Loic Dachary
d3488202a2 Merge pull request #1823 from dachary/wip-mailmap
mailmap: Sahid Orentino Ferdjaoui affiliation

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
2014-05-19 14:58:49 +02:00
Loic Dachary
23787ba094 mailmap: Sahid Orentino Ferdjaoui affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-05-19 14:49:01 +02:00
Loic Dachary
9bdc3f2ab4 Merge pull request #1822 from sahid/master
Ensure autogen.sh to be executed at the top-level

Reviewed-by: Loic Dachary <loic@dachary.org>
2014-05-19 14:40:00 +02:00
Sahid Orentino Ferdjaoui
30ae96a737 Ensure autogen.sh to be executed at the top-level
The commit adds a test to ensure that user executes
'autogen.sh' at the top-level of the directory.

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
2014-05-19 14:33:48 +02:00
Yan, Zheng
991f7f15a6 Merge pull request #1821 from ceph/mds-optracker-fixes
mds: fix Server::submit_mdlog_entry()
2014-05-18 13:42:51 +08:00
Yan, Zheng
57c89bf814 mds: fix Server::submit_mdlog_entry()
mdr can be NULL when rolling back slave update

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-05-18 13:38:32 +08:00
Sage Weil
c18da04828 osd: fix narrow session refcount race
The set_priv() call consumes a ref.  Technically the local 's' is not
actually owned by use by the time we get to the con_front set_priv().

Signed-off-by: Sage Weil <sage@inktank.com>
2014-05-17 18:33:36 -07:00
Sage Weil
2c4391b289 osd: fix session leak in ms_handle_fast_connect
Signed-off-by: Sage Weil <sage@inktank.com>
2014-05-17 18:32:20 -07:00
Gregory Farnum
5ace4d1af7 Merge pull request #1809 from ceph/wip-4354-mds-optracker
MDS OpTracker

Reviewed-by: Sage Weil <sage@inktank.com>
2014-05-16 15:17:00 -07:00
Greg Farnum
ee92a39bce MDS: add admin socket cleanup on shutdown
Signed-off-by: Greg Farnum <greg@inktank.com>
2014-05-16 15:15:55 -07:00
Ilya Dryomov
7a1538187f Merge pull request #1817 from ceph/wip-osdmon-pa-wait
OSDMonitor: set next commit in mon primary-affinity reply

Reviewed-by: Sage Weil <sage@inktank.com>
2014-05-16 20:37:05 +04:00
Ilya Dryomov
a78b14ec17 OSDMonitor: set next commit in mon primary-affinity reply
Commit 8c5c55c8b4 ("mon: set next commit in mon command replies")
fixed MMonCommand replies to include the right version, but the
primary-affinity handler was authored before that.  Fix it.

Backport: firefly
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-05-16 20:25:36 +04:00
Gregory Farnum
a877d12f0e Merge pull request #1816 from onlyjob/docs
sample.ceph.conf: minor update

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-05-16 07:08:53 -07:00
Dmitry Smirnov
6dfc544e5a sample.ceph.conf: minor update
* Moved filestore settings above [osd.*] declarations otherwise
   (if uncommented) those settings might be applied only to last
   OSD which is not very obvious.
 * Few options added.
2014-05-16 20:30:29 +10:00
Greg Farnum
290ac81869 OSD: fix an osdmap_subscribe interface misuse
When calling osdmap_subscribe, you have to pass an epoch newer than the
current map's. _maybe_boot() was not doing this correctly -- we would
fail a check for being *in* the monitor's existing map range, and then
pass along the map prior to the monitor's range. But if we were exactly
one behind, that value would be our current epoch, and the request would
get dropped. So instead, make sure we are not *in contact* with the monitor's
existing map range.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-05-15 16:54:39 -07:00
Greg Farnum
405063b16e workunits: provide some output in the dirfrag.sh test
Signed-off-by: Greg Farnum <greg@inktank.com>
2014-05-14 14:20:19 -07:00
Gregory Farnum
fe19a1dba6 Merge pull request #1803 from onlyjob/java-gcj
Java GCJ fixes

Reviewed-by: Greg Farnum <greg@inktank.com>
Acked-by: Noah Watkins <noahwatkins@gmail.com>
2014-05-14 13:24:20 -07:00
Samuel Just
aec5634e5e osd_types: remove the pool_id argument from (is|check)_new_interval
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-05-14 13:17:12 -07:00