Sage Weil
ccd54c6574
Merge pull request #4662 from dachary/wip-11359-tier-tests
...
tests: more robust tiering agent tests
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-15 13:36:31 -07:00
Nathan Cutler
584ed2e28b
ceph.spec.in: SUSE/openSUSE builds need libbz2-devel
...
http://tracker.ceph.com/issues/11629 Fixes : #11629
Signed-off-by: Nathan Cutler <ncutler@suse.cz>
2015-05-15 22:35:01 +02:00
Ken Dreyer
c728a185d9
Merge pull request #4686 from SUSE/wip-11638-next
...
ceph.spec.in: consolidate rhel+centos macros
2015-05-15 14:16:20 -06:00
Nathan Cutler
363d957d8f
ceph.spec.in: tweak ceph-common for SUSE/openSUSE
...
ceph-common needs python-argparse in SUSE/openSUSE and
needs redhat-lsb-core only in RHEL/CentOS/Fedora.
http://tracker.ceph.com/issues/11638 Fixes : #11638
Signed-off-by: Nathan Cutler <ncutler@suse.cz>
2015-05-15 21:43:34 +02:00
Nathan Cutler
46404dd381
ceph.spec.in: consolidate centos/rhel macros
...
0%{?rhel} || 0%{?centos} can be simplified to just 0%{?rhel}, since
CentOS defines that macro for compatibility with RHEL.
Signed-off-by: Nathan Cutler <ncutler@suse.cz>
2015-05-15 21:39:39 +02:00
Haomai Wang
361f766c3b
Merge pull request #4684 from xinxinsh/wip-fiemap-fix
...
do not return non-exist extents when doing sparse read
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-16 03:19:24 +08:00
Sage Weil
b688c58f6a
Merge pull request #4698 from ceph/wip-wn2-comment
...
watch/notify: Clarify comment where notifies are completed
2015-05-15 11:40:46 -07:00
Douglas Fuller
47277c51db
watch/notify: Clarify comment where notifies are completed
...
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
2015-05-15 11:37:35 -07:00
Yehuda Sadeh
0e6d525b68
Merge pull request #4675 from ceph/wip-11622
...
rgw: merge manifests correctly when there's prefix override
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-15 11:29:53 -07:00
Gregory Farnum
435e91624f
Merge pull request #4653 from ceph/wip-client-misc
...
Wip client misc
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-05-15 10:33:31 -07:00
Loic Dachary
02afcb2741
Merge pull request #4651 from dachary/wip-erasure-code-benchmark
...
erasure-code: add --erased option to ceph_erasure_code_benchmark
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-15 19:13:13 +02:00
Loic Dachary
ea2736380a
Merge pull request #4654 from dachary/wip-erasure-code-bench
...
erasure-code: bench.sh compares isa & jerasure, vandermonde & cauchy
Reviewed-by: Andreas Peters <Andreas.Joachim.Peters@cern.ch>
2015-05-15 18:59:22 +02:00
Kefu Chai
0a6b5ab9e8
Merge pull request #4694 from ceph/wip-workflow-doc
...
doc: s/relase/release/
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-16 00:56:48 +08:00
John Spray
f11de858a9
mds: fix handle_mds_map in standby_replay
...
Broken by "mds: validate the state+rank in MDS map"
Signed-off-by: John Spray <john.spray@redhat.com>
2015-05-15 15:53:13 +01:00
Loic Dachary
3bd1cc48a2
doc: s/relase/release/
...
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-15 16:44:04 +02:00
Varada Kari
9eb760d1d5
KeyValueStore: Fix the prefix comparion to avoid object leaks.
...
Iterator becomes invalid due to a partial prefix comparision in
rmkeys_by_prefix, resulting in not deleting the objects from backend.
Modified the comparision to the given prefix.
Signed-off-by: Varada Kari <varada.kari@sandisk.com>
2015-05-15 19:46:26 +05:30
Varada Kari
c199b7b887
KeyValueStore: Initialize the iterator
...
Initialize the iterator in get_keys and get_keys_with_header.
This fixes the issues with ceph_test_rados_api_aio.
Signed-off-by: Varada Kari <varada.kari@sandisk.com>
2015-05-15 19:37:30 +05:30
Varada Kari
ab30ff20d6
KeyValueStore: optimize the object header writes
...
Don't write the object header when any strip is overwritten.
write header when new strip is added or any header fields are modified.
Signed-off-by: Varada Kari <varada.kari@sandisk.com>
2015-05-15 19:27:05 +05:30
Gregory Farnum
e63c44b253
Merge pull request #4226 from ceph/wip-11276
...
#11276 : make ceph-fuse well behaved with pool quotas
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-05-14 16:37:07 -07:00
Sage Weil
0373e4941b
Merge pull request #4622 from xiaoxichen/wip-rocksdb-conf
...
Wip rocksdb conf
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-14 16:22:31 -07:00
xinxin shu
a46b333854
do not return non-exist extents when doing sparse read
...
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2015-05-15 03:39:10 +08:00
Yehuda Sadeh
389ae6739d
rgw: merge manifests correctly when there's prefix override
...
Fixes : #11622
Backport: hammer, firefly
Prefix override happens in a manifest when a rados object does not
conform to the generic prefix set on the manifest. When merging
manifests (specifically being used in multipart objects upload), we need
to check if the rule that we try to merge has a prefix that is the same
as the previous rule. Beforehand we checked if both had the same
override_prefix setting, but that might not apply as both manifests
might have different prefixes.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-05-14 15:32:41 -04:00
Travis Rhoden
3368a9b79c
Merge pull request #4606 from ceph/wip-rgw-init
...
init-radosgw: check in /var/lib/ceph/radosgw ; unify w/ sysv version
Reviewed-by: Travis Rhoden <trhoden@redhat.com>
2015-05-14 13:03:42 -04:00
Sage Weil
9d8c115b0a
init-radosgw.sysv: remove
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-05-14 09:51:14 -07:00
Sage Weil
1c45f512a9
init-radosgw: unify init-radosgw[.sysv]
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-05-14 09:50:09 -07:00
Sage Weil
a4bb992426
init-radosgw: look in /var/lib/ceph/radosgw
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-05-14 09:50:09 -07:00
Sage Weil
22984ee777
Merge remote-tracking branch 'gh/wip-11613' into next
...
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-14 09:15:45 -07:00
Loic Dachary
31a82f8374
Merge pull request #4680 from ceph/wip-fix-group-in-doxygen
...
doc: fix group in doxygen
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-14 15:31:17 +02:00
John Spray
0c5b9a2bab
mds: validate the state+rank in MDS map
...
Especially:
* once I have been assigned a rank, it
can't be taken away without restarting
the daemon.
* once I have entered standby, I can
only go upwards through the states.
Fixes : #11481
Signed-off-by: John Spray <john.spray@redhat.com>
2015-05-14 13:58:31 +01:00
John Spray
46a8e0864d
mds: respawn instead of suicide on blacklist
...
This was already the case in general, but the case
in RecoveryQueue slipped through.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-05-14 13:58:31 +01:00
John Spray
7fe435ccee
mon: handle DNE beacon from MDS
...
...by calling fail_mds_gid for that MDS.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-05-14 13:58:31 +01:00
John Spray
c565d8721b
mds: on suicide(), send a DNE beacon to MDSMonitor
...
...using the same timeout beacon send routine that
was created for damaged().
Signed-off-by: John Spray <john.spray@redhat.com>
2015-05-14 13:58:13 +01:00
Kefu Chai
fdffcc4593
doc: customize css for the group title
...
Fixes : #9442
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-14 19:33:31 +08:00
Kefu Chai
f59d6e1269
doc: use @name to define a group, not @group
...
we are able to output a specified group using the directive
of `doxygengroup` in breathe. this directive prints out the
description of the group. but it's not realistic to enumerate
all groups defined in source code in the rst files. but the
doxygen command @name also helps to group functions together.
the downside of this approach is that we can not add more
items to a group later on. but it should be fine with us,
since in our case, all the grouped items are living in a single
header file.
Fixes : #9442
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-14 19:09:18 +08:00
Loic Dachary
ed93541c35
Merge pull request #4671 from dachary/wip-contributing
...
doc: recommendations related to performances / cleanup
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-14 09:04:36 +02:00
Sage Weil
e399914600
Merge pull request #4661 from ceph/wip-11604
...
rgw: restore buffer of multipart upload after EEXIST
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-13 22:33:55 -07:00
Sage Weil
7e7974b149
Merge pull request #4678 from SUSE/wip-submitting-patches-typo
...
SubmittingPatches: fix typo
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-13 22:28:56 -07:00
Nathan Cutler
362d3b7198
SubmittingPatches: fix typo
...
Signed-off-by: Nathan Cutler <ncutler@suse.cz>
2015-05-14 06:55:22 +02:00
Loic Dachary
fbad3df41b
Merge pull request #4674 from flaf/master
...
Doc: add a note about a CRUSH corner case with `ceph osd out`
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-14 02:08:49 +02:00
Sage Weil
700a1643e1
Merge pull request #4673 from dachary/wip-bencher
...
tools: remove obsolete aio_bench argument placeholder
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-13 17:06:46 -07:00
lafont
dcf8c597c5
Doc: add a note about a CRUSH corner case with ceph osd out
...
Signed-off-by: François Lafont <francois.lafont@ac-versailles.fr>
2015-05-14 02:02:33 +02:00
Loic Dachary
1bcea5ac10
tools: remove obsolete aio_bench argument placeholder
...
It was a noop and has been removed by
1ac7279822
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-14 01:59:38 +02:00
Loic Dachary
18a03f5f8f
Merge pull request #4672 from dachary/wip-bencher
...
common: fix ObjBencher::aio_bench signature
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-14 01:03:32 +02:00
Loic Dachary
fe79babc98
common: fix ObjBencher::aio_bench signature
...
It was broken by 1ac7279822
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-14 00:54:07 +02:00
Josh Durgin
3242a89ba0
Merge pull request #4592 from ceph/wip-7746
...
rbd: add disk usage tool
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-05-13 17:38:58 -04:00
Loic Dachary
d10631722d
Merge pull request #4308 from dachary/wip-bencher
...
common: clarify some obj_bencher code
Reviewed-by: Dmitry Yatsushkevich <dmitry.yatsushkevich@gmail.com>
2015-05-13 23:00:05 +02:00
Loic Dachary
7865d1dde9
Merge pull request #4650 from stiopaa1/bufferIterator
...
buffer.h: Removed unnecessary copy constructor, assignment operator a…
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-13 22:52:09 +02:00
Loic Dachary
42228d024f
doc: recommendations related to performances / cleanup
...
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-13 22:39:31 +02:00
Loic Dachary
d82681e6c7
Merge pull request #4668 from ceph/wip-rados-binary-omapsetval
...
rados cli: setomapval can now read from stdin
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-13 22:34:22 +02:00
David Zafman
00c4fc8907
Merge pull request #4473 from ceph/wip-10809-11135-10290
...
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-05-13 13:10:39 -07:00