Merge remote-tracking branch 'upstream/next' into wip-sam-testing

Conflicts:
	src/osd/OSD.cc
test/ceph-disk.sh: mkdir -p

Signed-off-by: Sage Weil <sage@redhat.com>
Merge pull request #2208 from lpabon/osd_dev_doc

Developer quick start guide

Reviewed-by: Sage Weil <sage@redhat.com>
Add handles for the ceph-mon starting with upstart
test/osd/osd-test-helpers: mkdir -p for ceph-disk

Signed-off-by: Sage Weil <sage@redhat.com>
erasure-code: ErasureCode base class

Add the ErasureCode base class for ErasureCodeJerasure and
ErasureCodeIsa, for methods that can be shared among all plugins.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
erasure-code: move to ErasureCode::{encode,decode}{,chunk}

The bulk of ErasureCode{Jerasure,Isa}::encode and
ErasureCode{Jerasure,Isa}::decode is dealing with alignment and buffer
allocation. This is moved to ErasureCode::encode and ErasureCode::decode
respectively.

The jerasure/isa specific code is isolated in the new
ErasureCode{Jerasure,Isa}::encode_chunks and
ErasureCode{Jerasure,Isa}::decode_chunks virtual functions.

http://tracker.ceph.com/issues/8496 Refs: #8496

Signed-off-by: Loic Dachary <loic@dachary.org>
erasure-code: move to ErasureCode::minimum_to_decode*

The ErasureCode{Jerasure,Isa}::minimum_to_decode and
ErasureCode{Jerasure,Isa}::minimum_to_decode_with_cost methods are moved
verbatim to the ErasureCode base class.

http://tracker.ceph.com/issues/8496 Refs: #8496

Signed-off-by: Loic Dachary <loic@dachary.org>
erasure-code: move to ErasureCode::to_{int,bool}

The parameter parser helpers to_int and to_bool are moved from
ErasureCode{Jerasure,Isa} to ErasureCode.

The prototype is modified to return a status instead of the value. An
error ostream is provided as the last argument because ErasureCode
cannot use dout() or derr().

http://tracker.ceph.com/issues/8496 Refs: #8496

Signed-off-by: Loic Dachary <loic@dachary.org>
erasure-code: move to ErasureCode::decode_concat

It does not belong to ErasureCodeInterface which is supposed to not have
any implementation.

Signed-off-by: Loic Dachary <loic@dachary.org>
erasure-code: rework ErasureCode*::parse methods

The ErasureCode::parse virtual function is derived in
ErasureCode{Jerasure,Isa}. It is reworked to share parsing arguments the
various techniques have in common. The logic is otherwise unmodified.

http://tracker.ceph.com/issues/8496 Refs: #8496

Signed-off-by: Loic Dachary <loic@dachary.org>
Merge pull request #2202 from xinxinsh/enable-rocksdb-log-level

Enable rocksdb log level

Reviewed-by: Sage Weil <sage@redhat.com>
README: symlink from README.md

It looks better as markdown than rendered as text via the markdown tool,
so just symlink it.

Signed-off-by: Sage Weil <sage@redhat.com>
README.md: word wrap

Signed-off-by: Sage Weil <sage@redhat.com>
Merge pull request #2165 from dachary/wip-mailmap

mailmap updates
mon/PGMonitor: add _bytes fields for all usage dumps

Leave the _kb ones in place for now.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
mon/PGMonitor: add _bytes perf counters

Leave the _kb ones in place for now.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
mon: remove *_kb perf counters

This is an incompatible change.

Signed-off-by: Sage Weil <sage@redhat.com>
mon/PGMonitor: remove {rd,wr}_kb from pool stat dumps

These fields are replaced with corresponding *_bytes fields.

Signed-off-by: Sage Weil <sage@redhat.com>
Merge pull request #2215 from ceph/wip-kb

mon: clean up _kb fields in json and perf counter output

Reviewed-by: John Spray <john.spray@redhat.com>