]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoosd: make coll_t structured instead of a string
Sage Weil [Tue, 6 Jan 2015 22:01:11 +0000 (14:01 -0800)]
osd: make coll_t structured instead of a string

coll_t now has a restricted set of representable values:

- meta
- pg
- pg temp
- forremoval

The forremoval is for legacy compatibility only; we will be able to remove
it soonish.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/MemStore: fix warnings
Sage Weil [Tue, 6 Jan 2015 22:44:16 +0000 (14:44 -0800)]
os/MemStore: fix warnings

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: simplify load_pgs
Sage Weil [Tue, 6 Jan 2015 19:31:56 +0000 (11:31 -0800)]
osd: simplify load_pgs

No more snap collections.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: change coll_t::is_pg() and is_temp() to take a pointer; drop snap
Sage Weil [Tue, 6 Jan 2015 19:20:24 +0000 (11:20 -0800)]
osd: change coll_t::is_pg() and is_temp() to take a pointer; drop snap

The snap arg isn't used anymore.  The spg_t should be a pointer (not ref)
since it is an output argument.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: drop old snap_colls arg from PG::upgrade()
Sage Weil [Tue, 6 Jan 2015 19:18:31 +0000 (11:18 -0800)]
osd: drop old snap_colls arg from PG::upgrade()

No longer used.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: simplify coll_t::is_removal(); fix removal (pass pgid)
Sage Weil [Tue, 6 Jan 2015 19:28:55 +0000 (11:28 -0800)]
osd: simplify coll_t::is_removal(); fix removal (pass pgid)

We just need a binary check, no metadata or output.

Fix the removal to take a pgid while we are here.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/PG: drop pre-snapmapper upgrade
Sage Weil [Tue, 6 Jan 2015 01:02:26 +0000 (17:02 -0800)]
osd/PG: drop pre-snapmapper upgrade

We dropped support for this back in 9d1466cb6e1f8e81b6a225279fe3aeb7878692b3.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/osd_types: drop coll_t string ctor
Sage Weil [Tue, 6 Jan 2015 00:31:50 +0000 (16:31 -0800)]
osd/osd_types: drop coll_t string ctor

No more users!

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/KeyValueStore: change collection master list strategy
Sage Weil [Tue, 6 Jan 2015 00:31:15 +0000 (16:31 -0800)]
os/KeyValueStore: change collection master list strategy

Don't use a pseudo-collection COLLECTIONS.  We aren't allowed to make
strangely-named coll_t's any more.  Instead, store the collection list in
a simple encoded buffer that's stored as a single key in the backend db.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/KeyValueStore: drop collection attr support
Sage Weil [Mon, 5 Jan 2015 23:44:17 +0000 (15:44 -0800)]
os/KeyValueStore: drop collection attr support

Deprecated!

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_smalliobenchfs: use valid collection names
Sage Weil [Mon, 5 Jan 2015 23:37:15 +0000 (15:37 -0800)]
ceph_smalliobenchfs: use valid collection names

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore: only recognized valid collection names
Sage Weil [Mon, 5 Jan 2015 23:26:17 +0000 (15:26 -0800)]
os/FileStore: only recognized valid collection names

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/osd_types: add coll_t::parse() method
Sage Weil [Mon, 5 Jan 2015 23:24:35 +0000 (15:24 -0800)]
osd/osd_types: add coll_t::parse() method

This will explicitly validate the form of the input string to make sure it
is a recognized collection.  (Eventually we can then store things
internally as something other than a string.)

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_objectstore: adjust tests to new sorting regime
Sage Weil [Tue, 23 Dec 2014 20:12:28 +0000 (12:12 -0800)]
ceph_test_objectstore: adjust tests to new sorting regime

A few things here:

 - try to use pg-based collections throughout
 - try to match object names to collection pool and shard

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_objectstore: be better about collections
Sage Weil [Mon, 22 Dec 2014 22:43:10 +0000 (14:43 -0800)]
ceph_test_objectstore: be better about collections

Use meta collection or pg collections.  Try to make ghobject's pools match
the pg collections.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/KeyValueStore: change naming scheme to work with new ghobject_t sorting
Sage Weil [Mon, 22 Dec 2014 22:40:42 +0000 (14:40 -0800)]
os/KeyValueStore: change naming scheme to work with new ghobject_t sorting

Note that this is definitely not backward compatible!

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore: fix remove_collection return value
Sage Weil [Sat, 6 Jun 2015 04:04:21 +0000 (00:04 -0400)]
os/FileStore: fix remove_collection return value

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore: better debug output for destroy_collection
Sage Weil [Wed, 27 May 2015 23:44:54 +0000 (19:44 -0400)]
os/FileStore: better debug output for destroy_collection

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore: force temp objects into _TEMP temp collection
Sage Weil [Mon, 22 Dec 2014 22:44:49 +0000 (14:44 -0800)]
os/FileStore: force temp objects into _TEMP temp collection

We've removed the temp collection concept from the ObjectStore interface,
but the FileStore HashIndex will mix objects with different pools together
by hash id, which breaks the ordering.

Compensate by forcing objects with 'temp' pool ids (anything < -1) into
a parallel temp collection.  Hide this detail isnide FileStore, below the
ObjectStore interface and above the HashIndex backend.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoshard_id_t: change NO_SHARD to sort before 0 (min instead of max)
Sage Weil [Tue, 23 Dec 2014 00:39:38 +0000 (16:39 -0800)]
shard_id_t: change NO_SHARD to sort before 0 (min instead of max)

The min ghobject has shard NO_SHARD, and is the default constructed value.
That initial value is assumed in uncounted ways across the code base when
users do

  ghobject_t foo;
  foo.this = that;

such that changing it is dangerous.  It is safer to change the shard_id_t
sort order such that NO_SHARD is signed instead of unsigned.  The value
doesn't actually change (still 0xff), but the sorting does.  Note that
only a single comparison triggers a signed/unsigned warning from this
change, and it assumes that the shard is not NO_SHARD (ec pool) and we
case it to preserve the old behavior anyway.

In PGBackend we change the minimum value for the objects_list_partial()
method to start with NO_SHARD.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoghobject_t: is_min()
Sage Weil [Mon, 22 Dec 2014 23:42:09 +0000 (15:42 -0800)]
ghobject_t: is_min()

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoghobject_t: make operator<< put shard at front
Sage Weil [Mon, 22 Dec 2014 23:31:14 +0000 (15:31 -0800)]
ghobject_t: make operator<< put shard at front

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: some simple osd type sanity tests
Sage Weil [Tue, 23 Dec 2014 17:31:32 +0000 (09:31 -0800)]
osd: some simple osd type sanity tests

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: add coll_t is_temp() and is_meta()
Sage Weil [Mon, 22 Dec 2014 22:43:46 +0000 (14:43 -0800)]
osd: add coll_t is_temp() and is_meta()

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: use explicit coll_t::make_string_coll() ctor
Sage Weil [Mon, 22 Dec 2014 21:39:19 +0000 (13:39 -0800)]
osd: use explicit coll_t::make_string_coll() ctor

Call out those creating collections with strings.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: use non-string coll_t's
Sage Weil [Mon, 22 Dec 2014 21:38:10 +0000 (13:38 -0800)]
osd: use non-string coll_t's

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: use coll_t() for meta collection
Sage Weil [Mon, 22 Dec 2014 21:34:01 +0000 (13:34 -0800)]
osd: use coll_t() for meta collection

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: add coll_t::get_temp() helper
Sage Weil [Mon, 22 Dec 2014 20:12:35 +0000 (12:12 -0800)]
osd: add coll_t::get_temp() helper

Generate the temp collection for a pg collection.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore: remove unused legacy split/create collection methods
Sage Weil [Mon, 22 Dec 2014 17:54:00 +0000 (09:54 -0800)]
os/FileStore: remove unused legacy split/create collection methods

These are no longer needed or called.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoghobject_t: MIN for default
Sage Weil [Sat, 13 Dec 2014 00:16:11 +0000 (16:16 -0800)]
ghobject_t: MIN for default

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agohobject_t: MIN for default
Sage Weil [Sat, 13 Dec 2014 00:16:04 +0000 (16:16 -0800)]
hobject_t: MIN for default

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_objectstore_test: a few simple collection_list_partial tests
Sage Weil [Thu, 11 Dec 2014 23:55:55 +0000 (15:55 -0800)]
ceph_objectstore_test: a few simple collection_list_partial tests

Add a simple list test, and a second one that mixes different pool ids
into the same collection.  The latter confirms that we can deal with
ghobject_t's in the temp pool space within a single collection.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoghobject_t: fix max to make embedded hobject_t also max
Sage Weil [Tue, 23 Dec 2014 19:01:09 +0000 (11:01 -0800)]
ghobject_t: fix max to make embedded hobject_t also max

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agohobject_t: fix get_boundary to work with new sorting regime
Sage Weil [Tue, 23 Dec 2014 19:03:17 +0000 (11:03 -0800)]
hobject_t: fix get_boundary to work with new sorting regime

The hash is no longer the most significant field; set everything that is
more significant, too.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoghobject_t: change sort order (max, shard, hobj, gen)
Sage Weil [Fri, 12 Dec 2014 00:28:48 +0000 (16:28 -0800)]
ghobject_t: change sort order (max, shard, hobj, gen)

Go from (hobj, shard, gen) -> (max, shard, hobj, gen)

This makes the ghobject_t's sort in a way that groups them by PG, which
will likely be useful in the future for ObjectStore implementations.
Notably, we get a ghobject_t MAX value that is distinct from the
hobject_t one.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years ago.gitignore: ignore store_test_temp_dir
Sage Weil [Tue, 23 Dec 2014 18:40:15 +0000 (10:40 -0800)]
.gitignore: ignore store_test_temp_dir

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agohobject_t: adjust comparator to check most-likely-different fields first
Sage Weil [Fri, 12 Dec 2014 00:28:17 +0000 (16:28 -0800)]
hobject_t: adjust comparator to check most-likely-different fields first

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agohobject_t: modify operator<<
Sage Weil [Fri, 12 Dec 2014 00:25:49 +0000 (16:25 -0800)]
hobject_t: modify operator<<

Put the most significant fields to the left so that it matches the sort
order.  Also use unambiguous separator when the nspace is present
(like we do with the key).

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agohobject_t: adjust sort order (pool position)
Sage Weil [Fri, 12 Dec 2014 00:28:32 +0000 (16:28 -0800)]
hobject_t: adjust sort order (pool position)

Make pool more significant than hash (and nspace, object, and everything
else).

This won't break anything because we only care about hobject_t sort order
within the context of a PG (or possibly split) where pool is always
fixed.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agohobject_t: change default pool id to INT64_MIN
Sage Weil [Fri, 12 Dec 2014 00:24:16 +0000 (16:24 -0800)]
hobject_t: change default pool id to INT64_MIN

We are including pool in a (more) significant part of the sort and using
negative pool IDs; the default must be the most negative (min) so that
it is a useful starting point for a search.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/HashIndex: use ghobject_t::get_max() instead of hobject_t one
Sage Weil [Thu, 11 Dec 2014 23:53:56 +0000 (15:53 -0800)]
os/HashIndex: use ghobject_t::get_max() instead of hobject_t one

We are working with ghobject_t's; use that max!

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: eliminate temp collections
Sage Weil [Wed, 10 Dec 2014 23:45:26 +0000 (15:45 -0800)]
osd: eliminate temp collections

The temp objects have distinct pool ids.  Old temp objects are already
blown away on OSD restart.  This patch removes all the futzing with
temp_coll and puts the temp objects in the same collection as everything
else.

Interesting, collection_move_rename is now always using the same source
and dest collection.  Hmm!

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/osd_types: remove ancient CEPH_*_NS cruft
Sage Weil [Wed, 10 Dec 2014 22:47:58 +0000 (14:47 -0800)]
osd/osd_types: remove ancient CEPH_*_NS cruft

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: use per-pool temp poolid for temp objects
Sage Weil [Wed, 10 Dec 2014 22:35:11 +0000 (14:35 -0800)]
osd: use per-pool temp poolid for temp objects

Previously, all temp objects had poolid == -1.  Instead, use -2 - poolid.
This, when combined with the PG hash, provides a unique temp namespace
per pg.

This has no impact on upgrade, since we delete all temp objects on startup
by collection (coll_t::is_temp()).

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_rados: add --balance-reads option
Sage Weil [Tue, 27 Jan 2015 19:19:06 +0000 (11:19 -0800)]
ceph_test_rados: add --balance-reads option

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/ReplicatedPG: avoid spurious omap_setkeys, setattrs during recovery
Sage Weil [Thu, 22 Jan 2015 18:00:35 +0000 (10:00 -0800)]
osd/ReplicatedPG: avoid spurious omap_setkeys, setattrs during recovery

Only call these if we have values to set on this iteration.  This is
rarely true for omap.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: deprecated collection_move
Sage Weil [Wed, 10 Dec 2014 21:40:32 +0000 (13:40 -0800)]
os/ObjectStore: deprecated collection_move

You will not be missed!

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: use a temporary object for recovery
Sage Weil [Tue, 30 Dec 2014 18:16:10 +0000 (10:16 -0800)]
osd: use a temporary object for recovery

Currently we recover objects directly into position by deleting and then
overwriting the target object.  This means that we lose the object if we
are recovering in multiple steps and we fail partway through.

This is also the last user of collection_move(), which we would like to
deprecate.

Instead, generate a unique temp object name (pgid, object version, snap
is unique), and recover to that.  Use the existing temp object cleanup
machinery to throw out a partial recovery result.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5002 from SUSE/wip_fixes_to_rcceph
Sage Weil [Thu, 18 Jun 2015 23:45:35 +0000 (16:45 -0700)]
Merge pull request #5002 from SUSE/wip_fixes_to_rcceph

Fixes to rcceph script

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4983 from yuyuyu101/wip-setallochint-option
Josh Durgin [Thu, 18 Jun 2015 22:00:28 +0000 (15:00 -0700)]
Merge pull request #4983 from yuyuyu101/wip-setallochint-option

librbd: Add option to allow disabling issuing alloc hint

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4993 from ceph/wip-12064
David Zafman [Thu, 18 Jun 2015 21:33:42 +0000 (14:33 -0700)]
Merge pull request #4993 from ceph/wip-12064

mon: only send MMonMetadata to peer mons that support it

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
10 years agoMerge pull request #5005 from maxime1992/master
Loic Dachary [Thu, 18 Jun 2015 18:09:34 +0000 (20:09 +0200)]
Merge pull request #5005 from maxime1992/master

doc: Document include/str_list.h

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Document include/str_list.h 5005/head
Maxime ROBERT [Thu, 18 Jun 2015 13:35:34 +0000 (15:35 +0200)]
doc: Document include/str_list.h
Fixes: #12050.
Signed-off-by: Claire MASSOT <claire.massot93@gmail.com>
Signed-off-by: Jordan DORNE <jordan.dorne@gmail.com>
Signed-off-by: Kévin CARADANT <kevin.caradant@gmail.com>
Signed-off-by: Gabriel SENTUCQ <perso@kazhord.fr>
Signed-off-by: Maxime ROBERT <maxime.robert1992@gmail.com>
10 years agoMerge pull request #5017 from JordanDorne/master
Loic Dachary [Thu, 18 Jun 2015 16:09:29 +0000 (18:09 +0200)]
Merge pull request #5017 from JordanDorne/master

doc: Replace requries with requires in python API doc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Replace requries with requires in python API doc 5017/head
JordanDorne [Thu, 18 Jun 2015 15:12:27 +0000 (17:12 +0200)]
doc: Replace requries with requires in python API doc
Fixes: #12076
Signed-off-by: Jordan DORNE <jordan.dorne@gmail.com>
10 years agoMerge pull request #4989 from ltoto2/master
Loic Dachary [Thu, 18 Jun 2015 15:36:33 +0000 (17:36 +0200)]
Merge pull request #4989 from ltoto2/master

 doc: Adding a link to documentation on admin socket

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Adding a link to documentation on admin socket 4989/head
Thomas Laumondais [Wed, 17 Jun 2015 15:52:00 +0000 (17:52 +0200)]
doc: Adding a link to documentation on admin socket

Fixes: #11845
Signed-off-by: Thomas Laumondais <thomas.laumondais@gmail.com>
10 years agoBug fix to ceph systemV compatability script. 5002/head
Owen Synge [Thu, 7 May 2015 10:02:41 +0000 (12:02 +0200)]
Bug fix to ceph systemV compatability script.

Was failing with more than one OSD / MON deamon on a single node.
Fixes suse bugzilla #927862

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoMerge pull request #5011 from robin974/master
Loic Dachary [Thu, 18 Jun 2015 15:14:41 +0000 (17:14 +0200)]
Merge pull request #5011 from robin974/master

doc: Fixes a missing dot

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5006 from Claire1293/master
Loic Dachary [Thu, 18 Jun 2015 15:12:08 +0000 (17:12 +0200)]
Merge pull request #5006 from Claire1293/master

doc: dev/differences-from-posix

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4987 from Aeryax/master
Loic Dachary [Thu, 18 Jun 2015 15:10:18 +0000 (17:10 +0200)]
Merge pull request #4987 from Aeryax/master

doc: Replaced "disk or drive" by "disk" in ceph-disk.rs

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Fixes a missing dot 5011/head
robin974 [Thu, 18 Jun 2015 14:43:45 +0000 (16:43 +0200)]
doc: Fixes a missing dot

Fixes: #12072
Signed-off-by: Robin Tang <robintang974@gmail.com>
10 years agoMerge pull request #5008 from jr31/master
Loic Dachary [Thu, 18 Jun 2015 14:39:03 +0000 (16:39 +0200)]
Merge pull request #5008 from jr31/master

doc: Unify ID format

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5007 from Cleminou/master
Loic Dachary [Thu, 18 Jun 2015 14:38:11 +0000 (16:38 +0200)]
Merge pull request #5007 from Cleminou/master

doc: Fixes a missing word in a printed string

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: dev/differences-from-posix 5006/head
unknown [Thu, 18 Jun 2015 13:56:06 +0000 (15:56 +0200)]
doc: dev/differences-from-posix
Fixes: #11108
Signed-off-by: Claire MASSOT <claire.massot93@gmail.com>
10 years agodoc: Unify ID format 5008/head
Jean-Rémi Deveaux [Thu, 18 Jun 2015 14:26:08 +0000 (16:26 +0200)]
doc: Unify ID format

Fixes: #12071
Signed-off-by: Jean-Rémi Deveaux <jeanremi.deveaux@gmail.com>
10 years agodoc: Fixes a missing word in a printed string 5007/head
Cleminou [Thu, 18 Jun 2015 14:05:43 +0000 (16:05 +0200)]
doc: Fixes a missing word in a printed string

Fixes: #11106
Signed-off-by: Clement Lebrun <clement.lebrun.31@gmail.com>
10 years agoMerge pull request #5004 from arthurgorjux/master
Loic Dachary [Thu, 18 Jun 2015 13:48:18 +0000 (15:48 +0200)]
Merge pull request #5004 from arthurgorjux/master

doc: Remove `` before and after 'ceph -s' in titles

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Replaced "disk or drive" by "disk" in ceph-disk.rs 4987/head
Kazhord [Wed, 17 Jun 2015 15:46:01 +0000 (17:46 +0200)]
doc: Replaced "disk or drive" by "disk" in ceph-disk.rs
Fixes: #12062
Signed-off-by: Gabriel SENTUCQ <perso@kazhord.fr>
10 years agoMerge pull request #5003 from Oxygen31/master
Loic Dachary [Thu, 18 Jun 2015 13:47:21 +0000 (15:47 +0200)]
Merge pull request #5003 from Oxygen31/master

doc : Change of "create" in "add"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4954 from JevonQ/add-iov-support-in-libcephfs
John Spray [Thu, 18 Jun 2015 13:26:58 +0000 (14:26 +0100)]
Merge pull request #4954 from JevonQ/add-iov-support-in-libcephfs

libcephfs: add ceph_p{read,write}v

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agodoc: Remove `` before and after 'ceph -s' in titles 5004/head
Arthur Gorjux [Thu, 18 Jun 2015 13:25:48 +0000 (15:25 +0200)]
doc: Remove `` before and after 'ceph -s' in titles
Fixes: #12059
Signed-off-by: Arthur Gorjux <arthurgorjux@gmail.com>
10 years agodoc : Change of "ceph-deploy mon create {ceph-node}" with "ceph-deploy mon add {ceph... 5003/head
Germain [Thu, 18 Jun 2015 13:24:43 +0000 (15:24 +0200)]
doc : Change of "ceph-deploy mon create {ceph-node}" with "ceph-deploy mon add {ceph-node}" in "Quick-ceph-deploy.rst"

Fixes : #10293

Signed-off-by : Germain CHIPAUX <germain.chipaux@gmail.com>

10 years agoMerge pull request #4986 from nicolasyong/master
Loic Dachary [Thu, 18 Jun 2015 13:22:00 +0000 (15:22 +0200)]
Merge pull request #4986 from nicolasyong/master

doc: Modification of a sentence

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Modification of a sentence. 4986/head
nicolasyong [Wed, 17 Jun 2015 15:12:43 +0000 (17:12 +0200)]
doc: Modification of a sentence.

Fixes : #12057

Signed-off-by: Nicolas Yong <nicolas.yong93@gmail.com>
10 years agoMerge pull request #4988 from kevincaradant/master
Loic Dachary [Thu, 18 Jun 2015 13:01:25 +0000 (15:01 +0200)]
Merge pull request #4988 from kevincaradant/master

doc: ceph-deploy man page: typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoFixes to rcceph script
Owen Synge [Thu, 18 Jun 2015 12:16:03 +0000 (14:16 +0200)]
Fixes to rcceph script

 - only start OSDs if mon daemons are also present
 - adds support for mask and unmask
 - removes support for cluster with non default cluster name,
   as this was very limited and inconsistent
 - Reapplied from a patch as could not cherry-pick
   66cb46c411d874be009c225450eea5021cf1219b from Mon Jan 12
   as this produced issues with src/gmock

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoMerge pull request #4931 from yuyuyu101/wip-perf-msgr
Gregory Farnum [Thu, 18 Jun 2015 10:09:56 +0000 (11:09 +0100)]
Merge pull request #4931 from yuyuyu101/wip-perf-msgr

PerfMsgr: A tool to benchmark messenger module

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4994 from liewegas/wip-mon-fixes
Kefu Chai [Thu, 18 Jun 2015 06:59:23 +0000 (14:59 +0800)]
Merge pull request #4994 from liewegas/wip-mon-fixes

mon: fix warning, and get_bucket_utilization

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3566 from majianpeng/librbd-cache-iohint
Josh Durgin [Thu, 18 Jun 2015 03:52:49 +0000 (20:52 -0700)]
Merge pull request #3566 from majianpeng/librbd-cache-iohint

Librbd cache iohint

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge branch 'next'
Josh Durgin [Thu, 18 Jun 2015 03:16:06 +0000 (20:16 -0700)]
Merge branch 'next'

10 years agoMerge remote-tracking branch 'origin/wip-11579' into next
Josh Durgin [Thu, 18 Jun 2015 03:15:25 +0000 (20:15 -0700)]
Merge remote-tracking branch 'origin/wip-11579' into next

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge branch 'next'
Josh Durgin [Thu, 18 Jun 2015 01:23:11 +0000 (18:23 -0700)]
Merge branch 'next'

10 years agolibrbd: flush operations need to acquire owner lock
Jason Dillaman [Tue, 9 Jun 2015 17:20:54 +0000 (13:20 -0400)]
librbd: flush operations need to acquire owner lock

Cache writeback operations will expect the owner lock to be held.

Fixes: #11938
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4990 from ilc/f22-build
Sage Weil [Thu, 18 Jun 2015 01:15:14 +0000 (18:15 -0700)]
Merge pull request #4990 from ilc/f22-build

Fix the build on Fedora 22.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge branch 'next'
Josh Durgin [Thu, 18 Jun 2015 01:02:31 +0000 (18:02 -0700)]
Merge branch 'next'

10 years agoMerge remote-tracking branch 'origin/wip-11537' into next
Josh Durgin [Thu, 18 Jun 2015 01:01:20 +0000 (18:01 -0700)]
Merge remote-tracking branch 'origin/wip-11537' into next

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4992 from maxime1992/master
Loic Dachary [Wed, 17 Jun 2015 22:04:09 +0000 (00:04 +0200)]
Merge pull request #4992 from maxime1992/master

doc: Change the type of list in doc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomon/OSDMonitor: fix get_bucket_utilization return value 4994/head
Sage Weil [Wed, 17 Jun 2015 18:57:19 +0000 (11:57 -0700)]
mon/OSDMonitor: fix get_bucket_utilization return value

Broken in cc5f144a51d10f30e71b96c888a8d2a125e7c9b1.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomon: only send MMonMetadata to peer mons that support it 4993/head
Sage Weil [Wed, 17 Jun 2015 18:31:32 +0000 (11:31 -0700)]
mon: only send MMonMetadata to peer mons that support it

Avoid sending this to mons that don't support the feature or else they
will reset the connection and we'll go into a busy reconnect loop.

Fixes: #12064
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoconfigure.ac: Fix JUnit 4 detection on Fedora 22. 4990/head
Ira Cooper [Wed, 17 Jun 2015 16:45:29 +0000 (12:45 -0400)]
configure.ac: Fix JUnit 4 detection on Fedora 22.

This allows the build to detect JUnit 4 on Fedora 22, by adding
junit.jar as a valid jar name for JUnit 4.

Signed-off-by: Ira Cooper <ira@samba.org>
10 years agodoc: Change the type of list in doc 4992/head
Maxime ROBERT [Wed, 17 Jun 2015 16:12:08 +0000 (18:12 +0200)]
doc: Change the type of list in doc
Fixes: #12061.
Signed-off-by: Maxime ROBERT <maxime.robert1992@gmail.com>
10 years agoMerge pull request #4975 from mikulely/master
Loic Dachary [Wed, 17 Jun 2015 16:25:30 +0000 (18:25 +0200)]
Merge pull request #4975 from mikulely/master

Fix typos in librados example code

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: ceph-deploy man page: typo #12063 4988/head
Kévin CARADANT [Wed, 17 Jun 2015 15:46:50 +0000 (17:46 +0200)]
doc: ceph-deploy man page: typo #12063
Replace is initial monitor hostname with is the initial monitor hostname
Fixes : #12063
Signed-off-by: CARADANT Kevin <kevin.caradant@gmail.com>
10 years agoFix typos in librados example code 4975/head
Jiaying Ren [Wed, 17 Jun 2015 02:49:10 +0000 (10:49 +0800)]
Fix typos in librados example code

Signed-off-by: Jiaying Ren <mikulely@gmail.com>
10 years agoMerge pull request #4985 from yannick-ad/master
Loic Dachary [Wed, 17 Jun 2015 15:40:59 +0000 (17:40 +0200)]
Merge pull request #4985 from yannick-ad/master

doc: replace a sentence by another

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4979 from GaelFG/patch-1
Loic Dachary [Wed, 17 Jun 2015 15:38:06 +0000 (17:38 +0200)]
Merge pull request #4979 from GaelFG/patch-1

doc: Fixes the description of the purpose of a cache pool

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4984 from LucasFantinel/master
Loic Dachary [Wed, 17 Jun 2015 15:36:42 +0000 (17:36 +0200)]
Merge pull request #4984 from LucasFantinel/master

doc: Wrong restriction for a daemon's ID

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: replace a sentence by another 4985/head
yannick-ad [Wed, 17 Jun 2015 12:36:01 +0000 (14:36 +0200)]
doc: replace a sentence by another
Fixes: #12060
Signed-off-by: Yannick Atchy-Dalama <yannick.atchy.dalama@gmail.com>
10 years agodoc: Purpose of a cache pool 4979/head
Gaël Fenet-Garde [Wed, 17 Jun 2015 10:03:24 +0000 (12:03 +0200)]
doc: Purpose of a cache pool

Completing the description of the cache purpose.
Fixes : #11096
Signed-off-by: Gael Fenet-Garde <gael.fenet.garde@gmail.com>