Commit Graph

39648 Commits

Author SHA1 Message Date
Sage Weil
ec922a692f osd: use op (not connection) features for copy-get encoding
Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-16 09:21:41 -08:00
Sage Weil
70eab06549 osd: pass features through to proxied read op
If we proxy a read, pass the original client's features through.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-16 09:21:41 -08:00
Sage Weil
248be164c8 osd: set features explicitly in MOSDOp
Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-16 09:21:41 -08:00
Sage Weil
98dd78996e Merge pull request #3739 from athanatos/wip-10840
PG,ReplicatedPG: make missing_digests local to scrub_compare_maps

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-16 09:08:11 -08:00
Sage Weil
6a1bd776f0 Merge pull request #3738 from athanatos/wip-10830
osd/: include version_t in extra_reqids with promote

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-16 09:00:20 -08:00
Sage Weil
37a3a1dec8 Merge pull request #3737 from athanatos/wip-10768
ReplicatedPG::on_change: requeue in_progress_async_reads close to last

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-16 08:55:32 -08:00
Samuel Just
080fb0183d Merge pull request #3694 from ceph/wip-10784
Fix 10784: librbd: image has watchers - not removing

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-16 07:47:15 -08:00
Kefu Chai
8cba02eec5 Merge pull request #3735 from ceph/wip-da-fix-xio-configure
fix configure to reflect the missing libs for xio

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-02-16 20:14:43 +08:00
Loic Dachary
49e6cf7fd7 Merge pull request #3716 from t-miyamae/wip-mshec-fix10839
erasure-code: remove tests for when init() is not called in shec

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-16 09:44:25 +01:00
t-miyamae
e95d4cc5b6 tests: remove tests for when init() is not called in shec (#10839)
init2_1, init2_2, init2_3 are equivalent to init_1 and also removed.
encode_6, decode_6, create_ruleset_3 are null argument tests,
but the arguments are references of C++, so also removed.

Signed-off-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
2015-02-16 16:28:33 +09:00
Loic Dachary
d1a393ffc0 Merge pull request #3732 from Abioy/patch-1
rm some useless codes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-15 16:09:11 +01:00
Yongyue Sun
3e37c1375b rm some useless codes
tls is not used here

Signed-off-by: Yongyue Sun <abioy.sun@gmail.com>
2015-02-15 10:38:08 +08:00
Guang Yang
e7735d31ef osd: number of degraded objects in EC pool is wrong when there is OSD down(in)
With EC pool (crush rule choose indep), when there is an OSD down, the size of the 'acting' list does not change (CRUSH_ITEM_NONE is used to replace the down OSD), in this case, 'actingset' should be used to calculate the degraded objects.

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
2015-02-13 23:10:15 +00:00
Yehuda Sadeh
e0fbe5c596 cmake: add librbd/test_fixture.cc
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-02-13 11:57:44 -08:00
Yehuda Sadeh
caf2e1d9db cmake: add os/XfsFileStoreBackend.cc to rules
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-02-13 10:51:23 -08:00
Loic Dachary
7da93518fd Merge pull request #3720 from dachary/wip-10800-shec-experimental
erasure-code: mark the shec plugin as experimental

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-13 18:35:48 +01:00
Loic Dachary
62dd0c2060 erasure-code: mark the shec plugin as experimental
Reject the creation of an erasure code profile including plugin=shec
unless --enable-experimental-unrecoverable-data-corrupting-features=shec
is set.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-02-13 17:09:37 +01:00
Loic Dachary
f9c90e7a51 tests: fix unused variable warning
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-02-13 17:09:37 +01:00
Loic Dachary
3a3bb6de3c common: capture check_experimental_feature_enabled message
Implement check_experimental_feature_enabled so that it returns the
message instead of unconditionally displaying it via derr. It allows the
caller to display it in another context.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-02-13 17:09:33 +01:00
Sage Weil
d8f0215a13 mon/OSDMonitor: note osd map epoch in one other place
Also add a note about why we don't do it in another.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-13 05:48:25 -08:00
Sage Weil
d9b0cd3133 mon/OSDMonitor: move osd epoch cache update into helper, add fixme
There is no semantic change here, just a helper to make things more
clear.

Add warning about a potential bug so we don't lose track.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-13 05:48:25 -08:00
Kefu Chai
3a1520ba35 Merge pull request #3727 from POPSuL/patch-2
README.md: fix the indent of a command line usage

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-02-13 20:25:54 +08:00
Viktor Suprun
b80e6aecf9 README.md: fix the indent of a command line usage
Spaces replaced with tab

Signed-off-by: Viktor Suprun <popsul1993@gmail.com>
2015-02-13 21:10:51 +10:00
Haomai Wang
5870476626 Merge pull request #3725 from XinzeChi/wip-kvstore-op
cleanup: delete useless member variable

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-02-13 15:29:51 +08:00
Xinze Chi
4038d21062 cleanup: delete useless member variable
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-02-13 09:05:06 +00:00
Gregory Farnum
f62fb72f78 Merge pull request #3717 from ceph/wip-decoding-oldest-snap
mds: fix decoding of InodeStore::oldest_snap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-02-12 22:25:31 -08:00
Samuel Just
280a19817d PG,ReplicatedPG: make missing_digests local to scrub_compare_maps
We don't want/need to carry this state between scrub stages, so lets
remove the tempation by simply making it a local to scrub_compare_maps.

This caused a bug where we would attempt to write out the
missing_digests from the previous chunk during all future chunks, which
caused trouble.

Fixes: 10840
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-02-12 15:58:49 -08:00
Josh Durgin
161d3982a9 Merge remote-tracking branch 'origin/wip-10785' into hammer
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	src/librbd/ImageWatcher.cc
2015-02-12 15:57:12 -08:00
Sage Weil
b28c555105 Merge pull request #3723 from concubidated/master
Docs: OSD name, not id, needs to be given to remove an item from crush map

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-12 14:44:19 -08:00
Tyler Brekke
8e806bce89 Docs: OSD name, not id, needs to be given to remove an item from the CRUSH map.
Include command for deleteing bucket from the CRUSH map.

Signed-off-by: Tyler Brekke <tbrekke@redhat.com>
2015-02-12 14:37:17 -08:00
Sage Weil
a5759e9b97 mon/OSDMonitor: do not trust small values in osd epoch cache
If the epoch cache says the osd has epoch 100 and the osd is asking for
epoch 200+, do not send it 100+.

Fixes: #10787
Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-12 13:49:50 -08:00
Joao Eduardo Luis
87544f68b8 mon: MonCap: take EntityName instead when expanding profiles
entity_name_t is tightly coupled to the messenger, while EntityName is
tied to auth.  When expanding profiles we want to tie the profile
expansion to the entity that was authenticated.  Otherwise we may incur
in weird behavior such as having caps validation failing because a given
client messenger inst does not match the auth entity it used.

e.g., running

ceph --name osd.0 config-key exists foo daemon-private/osd.X/foo

has entity_name_t 'client.12345' and EntityName 'osd.0'.  Using
entity_name_t during profile expansion would not allow the client access
to daemon-private/osd.X/foo (client.12345 != osd.X).

Fixes: #10844
Backport: firefly,giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2015-02-12 14:33:19 +00:00
Yan, Zheng
fd830205bd mds: fix decoding of InodeStore::oldest_snap
There is no ENCODE_START/FINISH block when encoding inode that
embedded in dentry. So we can't use encoding version to check
if the buffer contains InodeStore::oldest_snap. Instead, we check
if the buffer iterator reaches end of buffer.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-02-12 20:43:26 +08:00
Loic Dachary
c7f3691384 Merge pull request #3698 from dachary/wip-10836-erasure-code-corpus
tests: clone ceph-erasure-code-corpus from ceph

Reviewed-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
2015-02-12 13:40:56 +01:00
Loic Dachary
3a598f3546 Merge pull request #3696 from dachary/wip-10755-centos-docker
tests: add support for centos 6

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-02-12 13:32:09 +01:00
Loic Dachary
12b04458ab Merge pull request #3714 from tchaikov/fix-osdcap-parser-10757
osd: fix OSDCap parser on old boost/spirit

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-12 13:30:59 +01:00
Loic Dachary
6918a98af1 tests: Dockerfile COPY with two arguments
Avoid using COPY with multiple files because it will not behave as
intended with older (1.2) versions of docker.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-02-12 11:22:12 +01:00
Loic Dachary
98297e0809 tests: update docker helper documentation
The tags for the centos repository changed from centos6, centos7 to 6
and 7 which is consistent with the other distribution
repositories. Update the documentation accordingly.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-02-12 11:22:12 +01:00
Loic Dachary
1023aa973b tests: add Dockerfile for centos-6
http://tracker.ceph.com/issues/10755 Fixes: #10755

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-02-12 11:22:04 +01:00
Loic Dachary
b3771ebfaf tests: one Dockerfile per repository:tag
There cannot be a common Dockerfile for all repository:tag combination
of a given operating system. The only way to customize a Dockerfile is
via variable substitution and it cannot conveniently address all
differences between versions.

Create one Dockerfile per operating system version instead. I.e. one
dockerfile for centos:7, one for centos:6 etc.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-02-12 11:18:17 +01:00
Kefu Chai
b9b586831c osd: fix OSDCap parser on old boost/spirit
* on boost 1.41, the ascii::space skipper fails to skip the spaces at the
  beginning of the parsed string, so as a workaround we replace the `lit(' ')`
  in grammar spec with `ascii::blank`. this also simplifies the grammar
  a little bit.

Fixes: #10757
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-12 18:08:02 +08:00
Loic Dachary
f53daa1c06 Merge pull request #3707 from dachary/wip-erasure-code-uninitialized
erasure-code: initialize all data members

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2015-02-12 11:06:41 +01:00
Loic Dachary
b7bdb2fa15 Merge pull request #3713 from tchaikov/pass-string-by-ref
Pass string by ref

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-12 11:05:19 +01:00
Kefu Chai
4ced591a34 osd/OpRequest: pass string by const&
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-12 13:10:28 +08:00
Gregory Farnum
bac1846828 Merge pull request #3711 from ceph/hadoop
qa: hadoop plays nice with new teuthology task
2015-02-11 21:04:03 -08:00
Sage Weil
26dfad798d Merge remote-tracking branch 'gh/master' into hammer 2015-02-11 18:31:39 -08:00
Sage Weil
ee3e466fc4 Merge pull request #3522 from ceph/wip-8600
mon: OSDMonitor: tolerate catastrophically bad crush maps

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-11 18:31:42 -08:00
Sage Weil
25d197f052 Merge pull request #3703 from vuhuong/wip-xio-hammer
Wip xio hammer

Reviewed-by: Matt Benjamin <matt@cohortfs.com>
2015-02-11 18:21:24 -08:00
Samuel Just
74d5ccf1b5 osd/: include version_t in extra_reqids with promote
Otherwise, we can't return the correct user version on a dup request.

Note: This patch does not handle compatilibity with the variant which
does not include the version_t field.  Since it's been less than 2 weeks
and we haven't had a release, I think that's ok since handling
compatilibity would require some overhead in the encode/decode
methods.

Fixes: 10830
Introduced (merge): b79c349067
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-02-11 17:44:49 -08:00
Samuel Just
584f535132 Merge pull request #3664 from liewegas/wip-10695
mon: fix 'nan' from osd df output

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2015-02-11 17:35:22 -08:00