Commit Graph

40212 Commits

Author SHA1 Message Date
Sage Weil
1c2041752b osd: use (robust) helper for setting exists or clearing whiteout
The current blanket check in prepare_transaction() will trigger only when
there is a net obs.exists change from the commited obs to new_obs.
However, this misses the case where the first osd_op is a delete and then a
subsequent osd_op recreates the object.  Changing the whiteout check to
look only at new_obs does not work because it fails to understand when
_delete_oid sets the whiteout and will simply clear it again.

In order to support sequences of delete + create in general, we need to do
the whiteout flag clearing when the actual create happens (to match the
fact that we set it when we process the delete osd_op).  Use a helper to
do this and consolidate most other obs.exists = true code to use it.

Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-17 10:26:13 -07:00
Samuel Just
a6c685c805 Merge pull request #3994 from athanatos/wip-11069
PGLog: split divergent priors as well

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2015-03-17 10:15:46 -07:00
Samuel Just
f5a2aef3db PGLog::merge_log: in tail extend case, log.log might be empty
Even if the tail != last_update, the log might be empty due to split
moving all entries into other logs.

Fixes: 10718
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-17 10:07:03 -07:00
Thomas Johnson
87528c19a2 doc-rados-operations-crush-map: Swap Raid4 for Erasure
Signed-off-by: Thomas Johnson <NTmatter@gmail.com>
2015-03-17 17:32:24 +01:00
Yehuda Sadeh
b446fa11a3 Merge pull request #4001 from rzarzynski/wip-10650
rgw: send Last-Modified header in response for PUT on Swift's object.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-17 08:25:45 -07:00
Yehuda Sadeh
e35269e749 Merge pull request #3925 from rzarzynski/wip-11088
rgw: fix handling empty metadata items on Swift container.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-17 08:11:40 -07:00
Vu Pham
9f3f9efa1e xio: Add xio_transport_type
Add xio_transport_type to control and run xio messenger over
rdma or tcp

Signed-off-by: Vu Pham <vu@mellanox.com>
2015-03-17 05:17:01 -07:00
Vu Pham
8b8a6f167c xio: Update README.xio with dependencies
Signed-off-by: Vu Pham <vu@mellanox.com>
2015-03-17 05:13:57 -07:00
Loic Dachary
c87b655845 Merge pull request #4024 from ceph/wip-unused-var
mds: remove double-define on iterator

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-17 09:59:49 +01:00
John Spray
3fce475a82 mds: remove double-define on iterator
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-17 08:20:54 +00:00
Kefu Chai
34d7315658 Merge pull request #3976 from wonzhq/hit-set-check
osd/ReplicatePG: correctly checking if an object is in hit set

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-17 15:05:47 +08:00
Josh Durgin
015ed1b5b8 Merge pull request #4017 from ceph/wip-11125
rgw: update keystone cache with token info

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-16 18:27:12 -07:00
Loic Dachary
71a9571e22 Merge pull request #4019 from NTmatter/doc-typo-monap
doc/rados/operations/add-or-rm-mons: correcting minor typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-17 00:01:10 +01:00
Thomas Johnson
c60cd5bf35 doc/rados/operations/add-or-rm-mons: correcting minor typo
Signed-off-by: Thomas Johnson <NTmatter@gmail.com>
2015-03-16 23:54:29 +01:00
Samuel Just
bbe231a61f PGLog: split divergent priors as well
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-16 14:34:03 -07:00
Yehuda Sadeh
6616294aa1 rgw: update keystone cache with token info
Fixes: #11125
Backport: hammer, firefly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-16 13:43:10 -07:00
Josh Durgin
90a03937e9 PendingReleaseNotes: warn about lttng LD_PRELOAD for daemons
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-03-16 13:42:52 -07:00
Sage Weil
1bea682169 Merge pull request #3997 from ceph/wip-debian-mv-var-lib-ceph-mds
debian: move /var/lib/ceph/mds to ceph-mds package

Reviewed-by: James Page <james.page@ubuntu.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-16 13:00:52 -07:00
Sage Weil
e219918a4f Merge pull request #3945 from tchaikov/hammer-fix-xio-requeue
XIO: Handle requeue case of XIO messages
2015-03-16 12:50:49 -07:00
Sage Weil
ec2d8c9163 Merge pull request #3977 from tchaikov/fix-xio-loop-conn-cleanup
Fix XioLoopbackConnection Lifecycle.

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-16 12:48:35 -07:00
Sage Weil
53cc492bee ceph_test_rados_tier: add test case for delete+create compound ops
This triggers #11123, originally observed when rgw does a delete + create
sequence in a single op and the whiteout gets left behind.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-16 11:35:43 -07:00
Loic Dachary
0a76aa5e70 Merge pull request #3872 from dachary/wip-7334-partx-test
ceph-disk: test activate on the second journal

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2015-03-16 19:21:23 +01:00
Loic Dachary
332cf94632 Merge pull request #4014 from ceph/wip-mon-doc
doc/rados/operations/add-or-rm-mons: revise doc a bit to be less confusing

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-16 18:52:50 +01:00
John Spray
6417cf8b4e Merge pull request #3922 from ceph/wip-11053
mds: fix assertion caused by system clock backwards

Reviewed-by: John Spray <john.spray@redhat.com>
2015-03-16 13:32:29 -04:00
John Spray
38cc0fc2de Merge pull request #3752 from ceph/wip-10744
mds: give up replicas of a stopping mds's stuff

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2015-03-16 13:06:49 -04:00
John Spray
c0e6227519 mds: give up replicas of a stopping mds's stuff
In order for an MDS to make it through stopping when
it had some strays, the other ranks that serviced
the migrate_stray renames must ensure that they
give up any cache objects that belonged to
the stopping MDS, so that the stopping MDS
can finish emptying its cache.

Fixes: #10744
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-16 17:05:46 +00:00
Sage Weil
d47e6228ee doc/rados/operations/add-or-rm-mons: revise doc a bit to be less confusing
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-16 09:32:22 -07:00
Ken Dreyer
8a05092880 debian: move /var/lib/ceph/mds to ceph-mds package
On Debian, ceph-mds was split out into its own package in
9d6013e0db, but the /var/lib/ceph/mds
directory was not moved along with the rest of the mds pieces.

The /var/lib/ceph/mds directory is only necessary if a user has
installed ceph-mds. Move it to the ceph-mds subpackage.

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-03-16 10:11:43 -06:00
Jason Dillaman
703ba377e3 librbd: acquire cache_lock before refreshing parent
cache_lock needs to be acquired before snap_lock to avoid
the potential for deadlock.

Fixes: #5488
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-16 11:11:21 -04:00
Samuel Just
93ef911bbf PG: add config to ignore history les in find_best_info
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-16 07:44:43 -07:00
Jason Dillaman
b38c96f2c1 librados_test_stub: AIO operation callbacks should be via Finisher
librados will execute all AIO callbacks via a single finisher to
prevent blocking the Objecter.  Reproduce this behavior to avoid
deadlocks that only exist when using the test stub.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-16 10:10:30 -04:00
branto1
049cb29b59 Merge pull request #4004 from rohanmars/wip-refine-build-configuration-hammer
fixes to compile librados on rhel 5.9
2015-03-16 13:24:11 +01:00
Loic Dachary
1eb6f6df2f Merge pull request #4002 from zhicheng/master
fix doc/dev/network-protocol.rst typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-16 09:03:00 +01:00
Kefu Chai
241a9d51c9 Merge pull request #4007 from dachary/wip-warnings
fix a few minor compilation warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-16 15:33:53 +08:00
Loic Dachary
489bca16fb fix a few minor compilation warnings
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-16 08:13:44 +01:00
Zhicheng Wei
5ba8764d2a fix doc/dev/network-protocol.rst typo
Signed-off-by: Zhicheng Wei <zhicheng@opensourceforge.net>
2015-03-16 10:26:55 +08:00
Sage Weil
a620705f66 Merge pull request #3989 from javacruft/wip/fixup-cycles-crossarch
Add support for PPC architecture, provide fallback

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-15 18:12:34 -07:00
Loic Dachary
d9af510c71 Merge pull request #4006 from dachary/wip-documentation
doc: mark the ascii schema as a literal block

Reviewed-by: Yann Dupont <yann@objoo.org>
2015-03-15 23:31:40 +01:00
Loic Dachary
d17e2e8b1d doc: mark the ascii schema as a literal block
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-15 22:47:59 +01:00
Loic Dachary
c1d644b0e9 Merge pull request #4005 from dachary/wip-releases
doc: release timeline

Reviewed-by: Yann Dupont <yann@objoo.org>
2015-03-15 22:39:39 +01:00
Loic Dachary
81dda4cca8 Merge pull request #3990 from zaitcev/first_contrib
Specify the actual struct used in protocol handshake

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-15 22:13:50 +01:00
Loic Dachary
cd1e5e184b Merge pull request #3992 from ceph/wip-package-perf-objectstore
packaging: include ceph_perf_objectstore

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
2015-03-15 22:12:05 +01:00
Loic Dachary
14c02d8fae doc: release timeline
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-15 22:02:59 +01:00
Rohan Mars
d06c1d7097 rhel 5.9 port fixes to compile librados only
Signed-off-by: Rohan Mars <code@rohanmars.com>
2015-03-15 12:28:06 -07:00
Radoslaw Zarzynski
9a22acc576 rgw: send Last-Modified header in response for PUT on Swift object.
Fixes: #10650
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2015-03-14 22:00:40 +01:00
David Zafman
a69055f7d5 Merge pull request #3982 from dzafman/wip-10678-2
Update ceph.8 man page to match ceph -h output

Reviewed-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2015-03-13 17:58:56 -07:00
David Zafman
f4bc48d954 doc: Fix ceph command manpage to match ceph -h (hammer)
Include rebuilt man/ceph.8

Fixes: #10678

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-13 17:00:10 -07:00
David Zafman
9495de4726 doc: Fix ceph command manpage to match ceph -h (firefly)
Improve synopsis section
Fixes: #10676

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9ac488c1eb)

Conflicts:

	doc/man/8/ceph.rst
	man/ceph.8
2015-03-13 16:59:39 -07:00
Samuel Just
5680456e35 PGBackend: do not rewrite ec object oi checksums
Deep scrub does not actually give us the whole-object checksum for an ec
object, only the checksum for the first shard.  We ignore it in scrub
for ec pools anyway in be_select_auth_object.

Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-13 15:29:53 -07:00
Samuel Just
e0bf13264f PGBackend: add debug option to rewrite digest even if present
Related: #11027
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-13 15:29:53 -07:00