Commit Graph

30707 Commits

Author SHA1 Message Date
Loic Dachary
76765503fa osd: ostream is enough for build_simple*
There is no need to specialize the argument into stringstream. It is
replaced by a ostream which is convenient to display errors directly to
cerr if appropriate.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-12 17:48:32 +01:00
Yan, Zheng
dae248f273 Merge pull request #998 from ceph/wip-omapdirfrag2
use OMAP to store dirfrags
2014-01-10 15:48:05 -08:00
Sage Weil
cec8d85853 mds: require CEPH_FEATURE_OSD_TMAP2OMAP
Require that all OSDs support TMAP2OMAP before starting the MDS.  This
avoids doing some work and then crashing with EOPNOTSUPP, and gives us
a more informative message in the logs.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-11 07:41:40 +08:00
Sage Weil
1d8429de57 osd/OSDMap: get_up_osd_features()
Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-11 07:40:37 +08:00
Yan, Zheng
b8dfcc1ed2 mds: use OMAP to store dirfrags
MDS can fetch dirfrags from both TMAP and OMAP. When committing a
dirfrags that is stored in TMAP, MDS first uses OSD_OP_TMAP2OMAP
to convert corresponding TMAP to OMAP, then updates the resulting
OMAP.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-01-11 07:40:37 +08:00
Yan, Zheng
0f0dd74cde osd: introduce TMAP->OMAP conversion operation
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-01-11 07:40:37 +08:00
athanatos
20f8bae920 Merge pull request #1074 from ceph/wip-7135
Fixes: #7135

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-10 14:28:01 -08:00
Samuel Just
90d6cec6d9 src/test/ObjectMap: test clear_keys_header() call
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-01-10 14:02:29 -08:00
Samuel Just
617a50c02a src/test/librados/misc.cc: verify that omap_clear doesn't blast xattr
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-01-10 14:02:29 -08:00
Samuel Just
0c81849c4f os/DBObjectMap, FileStore: omap_clear should not remove xattrs
Prevously, FileStore::_omap_clear() used ObjectMap::clear(), which
incorrectly also blasts any stored xattrs.  Instead, add
ObjectMap::clear_keys_header() to handle this case efficiently.

Fixes: #7065
Fixes: #7135
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-01-10 14:02:25 -08:00
Sage Weil
ecd503471e Merge pull request #1073 from dachary/wip-mailmap
mailmap updates

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-10 13:58:33 -08:00
Sage Weil
1ddf5893b4 Merge remote-tracking branch 'gh/next' 2014-01-10 13:57:04 -08:00
Loic Dachary
6225f2cc18 mailmap: fix typo in Alexandre Maragone
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 20:50:47 +01:00
Loic Dachary
fa43d9cee1 organizationmap: joe.buck@inktank.com is Inktank
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 19:07:50 +01:00
Sage Weil
744895326c Merge pull request #1062 from ceph/wip-7110
rgw: convert bucket info if needed

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-01-10 09:51:20 -08:00
Loic Dachary
a0e3f05dcb Merge pull request #1070 from dachary/wip-organizationmap
organizationmap: match authors with organizations

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-10 09:45:23 -08:00
Loic Dachary
8604e762b5 organizationmap: match authors with organizations
Using the same format as .mailmap, match author names with the
organization sponsoring them, if any. It can be used from the command
line to display git log statistics with results aggregated by company
names.

The git-check-mailmap command that was introduced in git 1.8.4 can be
used to use .mailmap first and then .organizationmap using the
normalized author names. For instance:

    git log --pretty='%aN <%aE>' | \
    git -c mailmap.file=.organizationmap check-mailmap --stdin

This file is also meant to be a source of information for the maintainers of
http://metrics.ceph.com/

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 18:44:18 +01:00
Sage Weil
ce95cef349 mongoose: fix warning
Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-10 09:26:30 -08:00
Sage Weil
8f01eeb5d9 Merge pull request #1069 from dachary/wip-mailmap
mailmap updates

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Roald J. van Loon <roald@roaldvanloon.nl>
Reviewed-by: David Moreau Simard <dmsimard@iweb.com>
2014-01-10 08:53:55 -08:00
Loic Dachary
af0269de8d mailmap: make roald@roaldvanloon.nl primary
It seems more appropriate than @gmail.com

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 10:51:13 +01:00
Loic Dachary
f18b310c44 mailmap: remove company name from Pascal de Bruijn name
It is in the email address anyway.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 10:46:16 +01:00
Loic Dachary
39db90f766 mailmap: add Andrew Leung, Carlos Maltzahn and Esteban Molina-Estolano
Although the commit aliases are cryptic, the timeframe and account names
seem to match.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 10:43:44 +01:00
Loic Dachary
176cec8230 mailmap: add David Moreau Simard alias
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 10:09:32 +01:00
Loic Dachary
440fbed207 Merge pull request #1060 from dachary/wip-mailmap
mailmap updates for reviewed-by

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: João Eduardo Luís <joao.luis@inktank.com>
Reviewed-by: Noah Watkins <noah.watkins@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-01-10 01:05:05 -08:00
Greg Farnum
29da2ec403 FileStore: detect XFS properly
We were only setting m_fs_type = FS_TYPE_XFS if
m_filestore_replica_fadvise was also set -- presumably
the bug fix accidentally blocked off too much of the code type. This
resulted in our xattr counts always being set too low: the store
is mounted (and thus does _detectfs) twice; once in as part of the
not-as-conditional-as-it-looks convertfs in ceph_osd.cc, and once
as part of OSD::init().

Reported-by: Sushma Gurram <Sushma.Gurram@sandisk.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-09 19:15:36 -08:00
Sage Weil
8c5c55c8b4 mon: set next commit in mon command replies
The mon command acks include a version that is used by the client to
determine which version of the map they need to get or wait for in order
to see the effects of their command.  Current we are returning
get_last_committed() everywhere, but we are about to commit something (and
waiting for it), which will increase that value by one.  As a result,
clients are always getting epoch/version-1 instead of epoch.

This manifested by a LibRadosTier.Promote test that failed becaues the
OSD had the OSDMap updates adding the tier and overlay but not the final
map change that set the cache-mode to writeback.  I suspect this is also
the cause of of spurious errors in the past where we've seen misdirected
request errors that made no sense.

Backport: emperor, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao@inktank.com>
2014-01-09 14:44:49 -08:00
Sage Weil
5ce1e2e917 Merge pull request #1061 from kdreyer-inktank/rm-execute-bit-src
remove spurious executable permissions on source code files

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-09 12:31:12 -08:00
John Wilkins
efb4cf6480 doc: Removed extraneous comment from snapshot text.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-01-09 10:26:28 -08:00
John Wilkins
70cf8d6c97 Merge branch 'master' of https://github.com/ceph/ceph 2014-01-09 10:15:41 -08:00
Loic Dachary
3a4111a141 Merge pull request #1063 from ceph/install-erasure-headers
osd: add missing header to install list

Reviewed-by: Loic Dachary <loic@dachary.org>
2014-01-09 09:31:35 -08:00
Noah Watkins
5070597421 osd: add missing header to install list
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2014-01-09 09:15:47 -08:00
Yehuda Sadeh
a5f8cc7ec9 rgw: convert bucket info if needed
Fixes: #7110
In dumpling, the bucket info was separated into bucket entry point and
bucket instance objects. When setting bucket attrs we only ended up
updating the bucket instance object. However, pre-dumpling buckets still
keep everything at the entry-point object, so acl changes didn't affect
anything (because we never updated the entry point). This change just
converts the bucket info into the new format.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-09 09:00:05 -08:00
Ken Dreyer
029b9ef541 remove spurious executable permissions on files
Fedora's rpmlint complains that some of the source code files in the
tree happen to be executable. Remove the execute bits from these files
to resolve the rpmlint warning.

Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>
2014-01-09 08:57:00 -07:00
Loic Dachary
2de21486f9 mailmap: add Yan Zheng fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:15 +01:00
Loic Dachary
62fbcacd28 mailmap: add Loic Dachary fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:15 +01:00
Loic Dachary
3fe5f11773 mailmap: add Gary Lowell fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:15 +01:00
Loic Dachary
17e0a5eb2e mailmap: add Noah Watkins fixes for Reviewed-by:
Also acknowledge noah.watkins@inktank.com as the primary email.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:15 +01:00
Loic Dachary
43fa0555f4 mailmap: add João Eduardo Luís fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:15 +01:00
Loic Dachary
96d9b9936f mailmap: add Dan Mick fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:15 +01:00
Loic Dachary
7aac3504cd mailmap: add Samuel Just fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:15 +01:00
Loic Dachary
6d0ba4d9a4 mailmap: add Greg Farnum fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:15 +01:00
Loic Dachary
a3eb935fa5 mailmap: add Yehuda Sadeh fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:15 +01:00
Loic Dachary
f6b52fd41f mailmap: add Sage Weil fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-09 13:49:12 +01:00
Loic Dachary
45418e9762 Merge pull request #1056 from apeters1971/wip-jerasure-vectorop
EC-JERASURE: rewrite region-xor function using vector operations 

Reviewed-by: Loic Dachary <loic@dachary.org>
2014-01-09 01:08:30 -08:00
Loic Dachary
5893469b98 Merge pull request #1057 from dachary/wip-buffer-aligned
erasure-code: ensure that coding chunks are page aligned

Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>
2014-01-09 01:06:32 -08:00
Sage Weil
7a89c678a2 Merge pull request #1045 from ceph/wip-7093
fix for #7093

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-01-08 17:05:46 -08:00
John Wilkins
09d021b4e8 doc: Updated for hostname -s and resolving to non-loopback IP address.
fixes: #6234

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-01-08 14:38:13 -08:00
John Wilkins
ed605f0dfb doc: Fixed hyperlink.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-01-08 14:37:20 -08:00
Loic Dachary
294cdfb93b erasure-code: relax zero copy requirements in tests
The input buffer is copied when padding is required. Remove the tests
that ensured the input buffer was not copied entirely when padding was
added.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-08 20:14:52 +01:00
Loic Dachary
656de1b668 erasure-code: ensure that coding chunks are page aligned
When coding chunks are allocated for jerasure, their address must be
aligned to page boundaries. The requirement is actually to be aligned on
a long long boundary but bufferlist do not allow for fine tuning of the
alignment.

If padding is necessary because the total size of the data to be encoded
is not a multiple of the alignment requirements as returned by
get_alignment(), the buffer is not only padded but also rebuilt using
rebuild_page_aligned() to preserve the page alignment that is expected
of the input buffer.

The overhead of rebuilding the whole input buffer when padding is
necessary could be reduced by only reallocating one buffer for the last
data chunk, therefore reducing the amount of data being copied. However,
this optimization is not going to be used if the caller takes care of
the padding, which is likely to be the case most of the time.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-08 20:13:37 +01:00