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
Haomai Wang
3d8c09c27f
AsyncMessenger: Use Thread's method to support set affinity
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-16 18:08:01 +08: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
Haomai Wang
b70bd6def7
Thread: Support set_affinity to bind core
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-16 00:12:44 +08: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
Samuel Just
3858d0bf76
ReplicatedPG: finish_ctx: do not assume that the oi is for the head object
...
If we are setting the oi on the clone object, we want to update the
mod_desc.
Fixes: 11027
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-13 15:29:50 -07:00
Ken Dreyer
338b44bc74
packaging: include ceph_perf_objectstore
...
The /usr/bin/ceph_perf_objectstore file is installed by default. Prior
to this commit it was missing from the packaging. This caused the RPM to
fail to build in mock.
Add ceph_perf_objectstore to the "ceph-test" RPM and Debian package.
If we end up developing further ceph_perf_* utilities, it would make
sense to glob them all with a wildcard, similar to what we are doing
with all the ceph_test_* utilities in ceph-test.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-03-13 16:14:51 -06:00
Pete Zaitcev
372297201f
Specify the actual struct used in protocol handshake
...
Maybe it was sockaddr_storage in an older version, but it is
definitely entity_addr_t in "ceph v027".
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
2015-03-13 14:18:11 -06:00
James Page
b2781fb563
Add support for PPC architecture, provide fallback
...
Add high precision cpu cycles support for powerpc and powerpc64.
Provide a fallback for other architectures and warn during
compilation.
Signed-off-by: James Page <james.page@ubuntu.com>
2015-03-13 19:47:00 +00:00
Kefu Chai
e3bbe4e02b
Merge pull request #3957 from xinxinsh/wip-cleanup
...
os/{Level,Rocks}DBStore: cleanup in_prefix function
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-14 00:28:08 +08:00
Kefu Chai
19d106f2dc
Merge pull request #3985 from fmarsylle/master
...
doc: s/that will called every time/that will be called every time/
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-13 23:33:26 +08:00
Haomai Wang
fd5df5c6ad
librbd: Make metadata_set support multi kv pairs
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:43 +08:00
Haomai Wang
978d7b4713
librbd: Fix typo and prefix ++
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:43 +08:00
Haomai Wang
ba112d599d
librbd: Make image metadata copied during image copy
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:43 +08:00
Haomai Wang
5cae66a950
cls_rbd: Fix incorrect assert for prefix metadata key
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
5178c09dff
test_cli: update rbd client help description
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
933702d20c
librbd: Add tests for metadata get operation
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
da9a057216
librbd: Add metadata_get method to support single metadata key retrieve
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
dfb3a01485
librbd: Make metadata support clone operation
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
7380632aba
rbd.cc: add metadata cli operations
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00