Commit Graph

30926 Commits

Author SHA1 Message Date
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
Sage Weil
d429ab5434 osd/OSDMonitor: fix 'osd tier add ...' pool mangling
Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-10 11:17:43 -08:00
Sage Weil
f49d9cdeb7 osd: fix propagation of removed snaps to other tiers
When we update removed_snaps we do not update snap_seq.  Drop this broken
optimization.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-10 11:17:39 -08:00
Sage Weil
3b3511c38c mon: debug propagate_snaps_to_tiers
Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-10 11:15:31 -08:00
Loic Dachary
631d0c719c erasure-code: erasure code decode interface helper
The decode_concat method is implemented, documented and tested. It is a
convenience method to concatenate chunks into a single bufferlist.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 19:44:09 +01:00
Loic Dachary
d2b2f5dea3 erasure-code: jerasure implementation of chunk size helpers
The encode methode uses the get_chunk_size method which is a translation
of the code it previously used for the same purpose. The chunk_count and
chunk_data_count methods return k+m and k respectively. But that will
no longer be the case after local parity is implemented.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 19:43:58 +01:00
Loic Dachary
eb2374ea21 erasure-code: refactor the example to use chunk size helpers
The get_chunk_size and get_chunk_count methods are implemented using the
code found in the encode() method. The encode method is modified to use
the chunk size helpers.

The unit tests are modified to use the helpers.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 19:24:55 +01:00
Loic Dachary
1f3c1bdd92 erasure-code: add chunk size calculation helpers
With the current erasure code interface, figuring out the size of a
chunk and the number of chunks for a given object can only be achieved
by calling the encode() method on an actual buffer.

The get_chunk_count, get_data_chunk_count and get_chunk_size helpers are
added and documented.

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-10 19:24:55 +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
Yehuda Sadeh
9395e0d778 rgw: fix temp url restful apis and support multiple keys
the set temp url api didn't do anything, fix that. Also add support for
multiple temp url keys.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-09 14:28:25 -08:00
Yehuda Sadeh
7ccb513c19 rgw: support multiple temp url keys
Apparently the swift api defines two temp url keys. Add internal support
for multiple keys, radosgw-admin can config two keys.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-09 14:28:25 -08:00
Yehuda Sadeh
56e4015cf4 rgw: handle temp url key authorization
Fixes: #3454
Implement auth handling code that checks temp url signature and
expiration. The key that is used for the signature is the bucket owner's
temp url key.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-09 14:28:25 -08:00
Yehuda Sadeh
0e43ac903d rgw: add optional tenant name for swift urls
In order to maintain compatibility with swift clients that expect the
url to also contain a reference to the tenant name, add an optional
param (empty by default) that would add it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-09 14:28:25 -08:00
Yehuda Sadeh
2626101f17 rgw: can set temp url key on user
Either through new through new rest api call, or via
radosgw-admin

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-09 14:28:24 -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
Sage Weil
995a3cc5a3 mds/MDSMap: include max_file_size in plaintext print output
Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-09 04:54:29 -08: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
Sage Weil
ca9acb9634 mon: implement 'mds set max_mds|max_file_size'
First, add the ability to modify max_file_size.  While we are at it, move
to a more sensible interface for adjusting max_mds too.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-09 04:31:41 -08:00