Commit Graph

39802 Commits

Author SHA1 Message Date
Gregory Farnum
e7e0ea626e Merge pull request #4170 from ceph/hammer-11205
qa/workunits/fs/misc: fix filelock_interrupt.py

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-24 21:35:29 -07:00
Yan, Zheng
6f218b1603 qa/workunits/fs/misc: fix filelock_interrupt.py
Handle the case that kernel does not support fcntl.F_OFD_SETLK.
Also fix the code that checks if fnctl fails with errno == EINTR.

Fixes: 11205
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 4ececa3dc4a21b98f61a592da9e2be60a0d71625)
2015-03-25 11:10:56 +08:00
Sage Weil
4dbb9c872e Merge pull request #4162 from athanatos/wip-11156
ReplicatedPG::promote_object: check scrubber and block if necessary

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-24 12:15:21 -07:00
Samuel Just
836fdc512d Merge pull request #4163 from athanatos/wip-revert-degraded-writes
Wip revert degraded writes

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-24 09:31:13 -07:00
Sage Weil
ed5ee16747 Merge pull request #4152 from ceph/wip-11145
rgw: shut down timer before erroring out

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-23 18:11:08 -07:00
Yehuda Sadeh
924ace882e rgw: shut down timer before erroring out
Fixes: #11145
Backport: hammer

Clean up initialization timer, otherwise if we error out, we'll assert.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-23 16:21:14 -07:00
Samuel Just
65bb4df599 ReplicatedPG::promote_object: check scrubber and block if necessary
Otherwise, we might attempt to promote into an in-progress scrub
interval causing 11156.  I would have added a return value to
promote_object(), but could not find an existing user which
cared to distinguish the cases, even with a null op passed.
All existing users are in maybe_handle_cache.  The ones which
pass a null op are for promoting the object in parallel
with a proxy -- a case where not actually performing the promote
does not really matter.

Fixes: #11156
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-23 14:40:59 -07:00
Loic Dachary
3216a584e0 Merge pull request #4125 from dzafman/wip-11176-hammer
ceph-objectstore-tool: Output only unsupported features when incomatible

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-23 20:37:14 +01:00
Sage Weil
df35a91023 Merge pull request #4145 from ceph/wip-hammer-rgw
Wip hammer rgw

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-23 12:30:47 -07:00
Samuel Just
78c5de77a2 osd/: s/is_degraded_object/is_degraded_or_backfilling_object
Currently, this method also returns true if the object is backfilling.
This commit was reverted earlier in the branch in order to make the
other reverts clean.  It's actually a nice rename though, so I'm
re-cherry-picking it.

Signed-off-by: Samuel Just <sjust@redhat.com>

Conflicts:
	src/osd/ReplicatedPG.cc
2015-03-23 12:11:32 -07:00
Samuel Just
4a5bd0561a Revert "osd/: update peer_missing and local missing if we write a degraded object"
This reverts commit c632fecb87e292eb73161f36d4e6df6f077fae77.
2015-03-23 11:54:57 -07:00
Samuel Just
6ed86b4827 Revert "append_log: use remove_snap_mapped_object"
This reverts commit 964d17756f9e49002eb96c4f27a3f41da0880f71.
2015-03-23 11:54:44 -07:00
Samuel Just
b84943cb45 Revert "osd/: don't block writes on degraded objects"
This reverts commit f9abffbb2461b5988c0435ee2f7771eca028f29f.
2015-03-23 11:50:10 -07:00
Samuel Just
9cefc59118 Revert "ReplicatedPG: block writes on degraded objects for ec pools"
This reverts commit 1f165d2547.
2015-03-23 11:48:38 -07:00
Samuel Just
45bff593de Revert "Merge pull request #3641 from athanatos/wip-10731"
This reverts commit 54a22236a0, reversing
changes made to 7eca03e290.

Conflicts:
	src/include/ceph_features.h
2015-03-23 11:46:35 -07:00
Samuel Just
6f23d3420f Revert "osd/: s/is_degraded_object/is_degraded_or_backfilling_object"
This reverts commit 25f9363b90.
2015-03-23 11:43:52 -07:00
Yehuda Sadeh
fc3ce48daf rgw: update makefile to enable civetweb config
Fixes: #10965
Backport: hammer, firefly

Civetweb compilation now includes conf header to enable ipv6.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit caa90225ba)
2015-03-23 11:37:04 -07:00
Yehuda Sadeh
2f1342e965 civetweb: update submodule
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 0f8be6f086faaea4b20a36dfdd436d2300f56d08)
2015-03-23 11:36:47 -07:00
Yehuda Sadeh
e5f3282101 rgw: pass civetweb configurables to civetweb
Fixes: #10907
Backport: firefly

Pass any configurables in the rgw frontends config line to civetweb.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 986d7554426764a149621ba733c5c075b94e0431)
2015-03-23 11:34:57 -07:00
Yehuda Sadeh
a8ced2c6ce rgw: don't overwrite bucket / object owner when setting acls
Fixes: #10978
Backport: hammer, firefly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit eb13f2d4b60c031f16139f7cc4237c012644dd78)
2015-03-23 11:34:04 -07:00
Samuel Just
3edfa672fd Revert "ReplicatedPG: only allow a degraded write if we have at least min_size copies"
This reverts commit 48466f8d7ce2b6762077f3fc686ada5648021517.
2015-03-23 11:16:27 -07:00
Samuel Just
5e4b7b0df4 Revert "Merge pull request #3911 from athanatos/wip-11057"
This reverts commit 05bb9c9870781941b2e362e6cb9b5ec7fb72e97e, reversing
changes made to b780048c48784a59348d030b5be720d270649a36.
2015-03-23 11:16:06 -07:00
Loic Dachary
c60ba6af8c Merge pull request #4134 from dzafman/wip-dzman-hammer
Minor man page improvement

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-23 00:41:17 +01:00
David Zafman
0a0d8f691e doc: Regenerate man/ceph.8 based on ceph.rst changes
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-22 15:28:17 -07:00
David Zafman
eb890b1bdc doc: Break ceph osd pool get into sections based on pool type
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-22 15:28:17 -07:00
David Zafman
5b23f5b589 ceph-objectstore-tool: Output only unsupported features when incomatible
Fixes: #11176
Backport: firefly, giant

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-20 16:57:40 -07:00
Dan Mick
120300febe Merge pull request #4040 from dzafman/wip-11092-11093
Fix ceph pg dump_stuck with multiple options

Reviewed-by: Dan Mick <dmick@redhat.com>
2015-03-20 16:39:00 -07:00
Sage Weil
ef4d5d8bcf Merge pull request #4107 from ceph/wip-11102
osd: only complain about stored vs actual digest if all peers support it

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-19 17:16:45 -07:00
Sage Weil
477ac92984 osd: only complain about stored vs actual digest if all peers support it
If we have a mixed cluster of hammer and pre-hammer OSDs, we will fall back
to using 0 as the initial crc32c value.  However, if the primary has a
stored digest, it currently compares its value to the reported value (w/
the wrong initial value) and complains.

There are two possible fixes:
 - avoid storing a digest if all peers don't support it, or
 - avoid complaining on scrub if all peers don't support it.

The latter is easier, and this fix also has the benefit of fixing the bug
even for clusters where this has already happened.

Fixes: #11102
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-19 16:27:17 -07:00
Samuel Just
9a2ff34d75 PG::find_best_info: reject infos with old last_epoch_started
See doc/dev/osd_internals/last_epoch_started.rst

Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-19 15:30:41 -07:00
Sage Weil
cfecd125fe Merge pull request #3988 from ceph/wip-refine-build-configuration-hammer
Refine build configuration for hammer

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-19 11:31:31 -07:00
Samuel Just
91a5816702 Merge pull request #4105 from athanatos/wip-11110
Wip 11110

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-19 09:41:58 -07:00
Yehuda Sadeh
f96d58bd88 init-radosgw*: don't require rgw_socket_path to be defined
Fixes: #11159
Backport: hammer, firefly

Scripts required rgw_socket_path to exist in order to start radosgw.
This is not needed.

Reported-by: Dan Mick <dmick@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 6823bcdcd0ce72cd223e809291f46d82da76115c)
2015-03-19 09:18:25 -07:00
Samuel Just
b8fa08c692 Merge pull request #4064 from dachary/wip-10488-jerasure-idempotent
mon: informative message when erasure-code-profile set fails

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-19 08:52:53 -07:00
Samuel Just
3d22b88e49 Merge pull request #4066 from dachary/wip-11144-erasure-code-profile-rm
osd: erasure-code-profile incremental rm before set

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-19 08:52:45 -07:00
Samuel Just
0712d8d90b PG: ensure that info.last_epoch_started only increases
See doc/dev/osd_internals/last_epoch_started.rst

Fixes: #11110
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-19 08:41:40 -07:00
Samuel Just
2956ae278d doc: add last_epoch_started.rst
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-19 08:41:38 -07:00
Sage Weil
78790b304b Merge pull request #3898 from jdurgin/wip-rbd-merge-diff
qa: make rbd-fuse exit cleanly with lttng

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-18 13:18:18 -07:00
Sage Weil
e096593a02 Merge pull request #4071 from athanatos/wip-10718
Wip 10718

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-18 13:16:53 -07:00
Samuel Just
cce74c7858 Merge pull request #4016 from ceph/wip-11123
osd: fix whiteout handling for delete+create compound ops

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-18 12:18:16 -07:00
Samuel Just
2da958464d PG: make sure to update history.last_epoch_started with first write
Otherwise, we might remember the write, but not that the activation
interval was history.last_epoch_started.

Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-18 11:19:49 -07:00
Loic Dachary
0d52aca0d0 osd: erasure-code-profile incremental rm before set
It is possible for an incremental change to have both a rm and a set for
a given erasure code profile. It only happens when a rm is followed by a
set. When a set is followed by a rm, the rm will remove the pending set
in the incremental change.

The logic is the same for pool create and pool delete.

We must apply the incremental erasure-code-profile removal before the
creation otherwise rm and set in the same proposal will ignore the set.

This fix is minimal. A better change would be that erasure-code-profile
set checks if there is a pending removal and wait_for_finished_proposal
before creating.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-18 14:17:00 +01:00
Loic Dachary
b92f9cf73e mon: informative message when erasure-code-profile set fails
When erasure-code-profile set refuses to override an existing profile,
it may be non trivial to figure out why. For instance:

   ceph osd set default ruleset-failure-domain=host

fails with:

   Error EPERM: will not override erasure code profile default

although ruleset-failure-domain=host is documented to be the
default. The error message now includes the two profiles that have been
compared to not be equal so that the user can verify the difference.

   Error EPERM: will not override erasure code profile default
   because the existing profile
   {directory=.libs,k=2,m=1,plugin=jerasure,technique=reed_sol_van}
   is different from the proposed profile
   {directory=.libs,k=2,m=1,plugin=jerasure,ruleset-failure-domain=host,technique=reed_sol_van}

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-18 11:53:20 +01:00
Sage Weil
c93ab8668f Merge pull request #4057 from ceph/wip-rgw-bootstrap
mon: add bootstrap-rgw profile

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-17 16:34:25 -07:00
Sage Weil
f5fa25d50f ceph-create-keys: create bootstrap-rgw key
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-17 16:16:01 -07:00
Sage Weil
679e266f73 mon: add 'bootstrap-rgw' profile
This profile is allowed to create client.rgw.* librados users.  They have
access to any pool, which is pretty coarse.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-17 16:16:01 -07:00
Boris Ranto
01379bd359 Compile test_build_librgw only if WITH_BUILD_TESTS 2015-03-17 12:48:22 -07:00
Samuel Just
ec3a6d74a5 Merge pull request #3910 from athanatos/wip-11027
Wip 11027

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-17 10:28:56 -07:00
Samuel Just
773039d313 Merge pull request #3918 from tchaikov/hammer-fix-leaks-in-C_TwoContexts
osdc: fix a memory leak in C_TwoContexts

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-03-17 10:28:19 -07:00
Samuel Just
ad167fef54 Merge pull request #3972 from tchaikov/hammer-fix-msg-leak
osd: fix a msg leak

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-17 10:27:06 -07:00