Kefu Chai
7db35f2ec0
Merge pull request #5951 from guangyy/doc-pool
...
doc: update doc for with new pool settings
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-10-01 18:03:19 +08:00
Loic Dachary
b750a160f0
Merge pull request #5853 from branch-predictor/bp-rados-fix-noverify
...
common/obj_bencher.cc: fix verification crashing when there's no objects
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-30 21:14:32 +02:00
Samuel Just
a1760b49f6
Merge pull request #6117 from athanatos/wip-12990
...
Wip 12990
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-30 10:15:48 -07:00
Samuel Just
142cfc1ad2
Merge pull request #6120 from athanatos/wip-13185
...
Wip 13185
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-30 10:15:24 -07:00
Loic Dachary
3e487c3491
Merge pull request #6009 from theanalyst/scripts/orig-issue
...
scripts: release_notes can track original issue
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-30 17:38:26 +02:00
Sage Weil
756f809f0b
Merge pull request #5211 from 0003ydlom/smc3
...
MOSDOp/do_op/handle_op: Simple Messenger optimization
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Tested-by: Kefu Chai <kchai@redhat.com>
2015-09-30 11:09:08 -04:00
Sage Weil
960b16fc10
Merge pull request #6127 from wido/mirror-docs-fixes
...
docs: Fix styling of newly added mirror docs
2015-09-30 08:41:59 -04:00
Sage Weil
28c57e55fe
Merge pull request #6122 from athanatos/wip-13234
...
OSDMap: fill in known encode_features where possible
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-30 08:36:36 -04:00
Sage Weil
b947acbcaa
Merge pull request #6109 from liewegas/wip-13214
...
init-rbdmap: fix CMDPARAMS
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-09-30 08:31:48 -04:00
Sage Weil
02113ac449
init-rbdmap: fix CMDPARAMS
...
Fixes : #13214
Reported-by: Wyllys Ingersoll <wyllys.ingersoll@keepertech.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-30 08:29:05 -04:00
John Spray
04c09ac62f
mds: fix SnapServer crash on deleted pool
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-30 13:11:16 +01:00
Wido den Hollander
2bb3d4be2f
docs: Fix styling of newly added mirror docs
2015-09-30 13:45:28 +02:00
Ruifeng Yang
0ce749165a
bugfix: should call md_config_t::remove_observer on shutdown
...
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
2015-09-30 16:30:49 +08:00
Sage Weil
27d40fda45
Merge branch 'wip-12983' of git://github.com/dzafman/ceph into infernalis
2015-09-29 21:09:43 -04:00
Guang Yang
6b1e4a69c5
cleanup: make the pool setting GET decription point to SET description
...
Signed-off-by: Guang Yang yguang@yahoo-inc.com
2015-09-30 00:48:12 +00:00
Guang Yang
ef59f7c737
doc: update doc for with new pool settings
...
Signed-off-by: Guang Yang yguang@yahoo-inc.com
2015-09-30 00:48:01 +00:00
Sage Weil
bc627ba8c2
Merge pull request #6119 from athanatos/wip-13192
...
Wip 13192
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-29 20:32:47 -04:00
Sage Weil
b7d35d597c
Merge pull request #6121 from athanatos/wip-13199
...
OSDService::agent_entry: don't use PG::operator<< without pg lock
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-29 20:24:41 -04:00
Loic Dachary
7af863d3f8
Merge pull request #6113 from dachary/wip-13176-objectstore-tool
...
ceph-objectstore-tool: delete ObjectStore::Sequencer after umount
Reviewed-by: David Zafman <dzafman@redhat.com>
2015-09-30 02:21:58 +02:00
Samuel Just
bb55d6c0c3
Merge pull request #6036 from liewegas/wip-13116
...
osd: fix replay requeue when pg is activating
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-09-29 17:19:12 -07:00
Sage Weil
41d59fcc3b
Merge remote-tracking branch 'gh/infernalis'
2015-09-29 20:15:31 -04:00
Josh Durgin
a965378e3a
ReplicatedPG: clearing a whiteout should create the object
...
This was uncovered by 7532194372
. Since
rbd_create() does a stat, the obc is cached as a whiteout, and the
subsequent create(EXCL) would fall through to return false from
maybe_create_new_object(). This would then skip adding a touch() to
the transaction.
Fixes : #13281
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-09-29 17:04:59 -07:00
Loic Dachary
47f4a03939
ceph-objectstore-tool: delete ObjectStore::Sequencer after umount
...
An ObjectStore::Sequencer provided to an ObjectStore must not be
deallocated before umount. The ObjectStore::Sequencer may hold a pointer
to the instance with no reference counting. If a Context completes after
the ObjectStore::Sequencer is deleted, it could try to use it and fail.
http://tracker.ceph.com/issues/13176 Fixes : #13176
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-30 00:54:27 +02:00
Sage Weil
de29da4973
Merge pull request #6101 from liewegas/wip-fs
...
os/fs: fix do loop
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-29 17:42:08 -04:00
John Spray
f20f67e18c
pybind/cephfs: fix DirEntry helpers
...
These were referring to constants incorrectly, would
throw exception if called.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-29 22:40:59 +01:00
Nathan Cutler
7b1882f875
ceph.spec.in: correctly declare systemd dependency for SLE/openSUSE
...
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-09-29 23:28:00 +02:00
Yehuda Sadeh
3f000421c6
rgw: set default value for env->get() call
...
Fixes : #13239
This fixes a regression introduced at commit abe4ec293d
.
The host var is a string, env->get() returns a char pointer, shouldn't
pass in NULL.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-09-29 08:18:32 -07:00
Sage Weil
469d35f253
osd: init started to 0
...
Fixes : #13206
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-29 10:44:08 -04:00
Sage Weil
bba3ab367e
mon: combine _ms_dispatch and dispatch
...
_ms_dispatch() is the only caller, and it is confusing to have both
dispatch() and dispatch_op() that take the same argument type.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-29 09:52:58 -04:00
branto1
8322a5c2a6
Merge pull request #6103 from SUSE/wip-re-redrop-fdupes
...
ceph.spec.in: re-re-drop fdupes
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-09-29 12:57:32 +02:00
Piotr Dałek
612480b3b6
test/test_rados_tool.sh: implement regression test for bench verify crash
...
Truncate all objects after format test, then check whether rados bench rand/seq
still works, or just crashes.
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-09-29 09:12:03 +02:00
Piotr Dałek
0c8faf7c99
common/obj_bencher.cc: fix verification crashing when there's no objects
...
When specified pool is empty or doesn't contain valid bench objects, rados
can crash because it attempts to memcmp through NULL pointer. Added check
for valid object size (which also fixes the case when objects are there, but
they're truncated), and made object_size being size_t instead of int.
In seq_read_bench, there's a missing lock.Lock() which causes rados to trigger
assert when object reading fails. Moved lock.Lock() before completion_ret()
call.
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-09-29 09:11:12 +02:00
Nathan Cutler
e42c9aaec7
ceph.spec.in: re-re-drop fdupes
...
The %fdupes call was dropped by 53072b9019
Later, it got accidentally reinstated by ceb93e8e69
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-09-29 08:57:16 +02:00
Gregory Farnum
a467db1de5
Merge pull request #6025 from ukernel/wip-13167
...
journaler: detect unexpected holes in journal objects
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-28 22:21:34 -07:00
Gregory Farnum
119336fbf6
Merge pull request #5849 from ukernel/wip-32bits-ceph-fuse
...
Wip 32bits ceph fuse
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-28 22:19:11 -07:00
Gregory Farnum
e171984b9c
Merge pull request #4791 from ceph/wip-11783
...
cephfs: detect completed cap flushes
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-28 22:14:52 -07:00
Yan, Zheng
ae62a9cf1e
Merge pull request #6070 from jcsp/wip-reformat-subtreemaptest
...
Fix reformatting journals containing SUBTREEMAP_TEST events
2015-09-29 10:12:39 +08:00
Yan, Zheng
95cc1549be
Merge pull request #6082 from jcsp/wip-client-quota-roots
...
Fix quota enforcement on subdir mounts
2015-09-29 10:02:28 +08:00
Sage Weil
566c8728b6
os/fs: fix aio submit method
...
continue in a do while(false) will always eval false and break
out. To repeat, we need while (true) and an explicit break.
Reported-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-28 21:31:23 -04:00
Sage Weil
04f9ae5724
Merge pull request #6078 from H3C/wip-13208
...
Objecter: maybe access wild pointer(op) in _op_submit_with_budget.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-28 16:42:01 -04:00
Sage Weil
14a36a20ff
Merge pull request #6064 from H3C/wip-rbd-bugfix1
...
Objecter: misc fix for segmentation fault.
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-28 16:41:44 -04:00
Sage Weil
8d97771c3c
Merge pull request #6084 from liewegas/wip-revert-scrub
...
Revert "osd: new pool settings: scrub intervals"
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2015-09-28 16:40:31 -04:00
Ken Dreyer
d73ca4f597
Merge pull request #5832 from SUSE/wip-drop-dup-rcceph
...
ceph.spec.in: refrain from duplicating %{_sbindir}/rcceph
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-28 13:09:38 -06:00
Samuel Just
d7b620f9dc
ECBackend::handle_recovery_read_complete: do not expose the hash_info when getting the obc
...
Aside from expose an ECBackend internal detail, it causes ReplicatedPG
to cache the value causing trouble with WRITEFULL.
Partially fixes : #12983
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-09-28 11:33:11 -07:00
David Zafman
892800b4dc
ECBackend::handle_sub_read: restructure hash check and fix part of 12983
...
The previous code erroneously assumed that the reads on a single object
would always be in order, and not overlap.
Partially fixes : #12983
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-09-28 11:33:06 -07:00
Samuel Just
405eef2f56
Merge pull request #6098 from liewegas/wip-crash-replay-interval
...
don't assume crash_replay_itnerval == 45
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-09-28 10:17:41 -07:00
Sage Weil
80b7237e5e
qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45
...
e.g., it's 5 in teuthology's ceph.conf.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-28 13:13:40 -04:00
Sage Weil
4ef8a0e1f7
Merge pull request #6076 from liewegas/wip-scrub-fix
...
osd/PG: compensate for sloppy hobject scrub bounds from hammer
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-28 11:44:46 -04:00
Sage Weil
c5a9275c76
osd/ReplicatedPG: preserve (some) flags when proxying reads
...
In particular, proxy RWORDERED as clients in the real world set
that.
Fixes : #13260
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-28 10:28:48 -04:00
Yan, Zheng
994ec60eda
mds: respect max_entries/max_bytes of lssnap request
...
Fixes : #13256
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-09-28 21:26:20 +08:00