Sage Weil
31a94922a9
Merge remote-tracking branch 'gh/next'
2013-10-22 10:45:27 -07:00
Loic Dachary
e7dfe416f8
Merge pull request #756 from hjwsm1989/master
...
test_ceph_argparse.py: No assert_not_in and assert_in in nose.tools
Reviewed-by: Loic Dachary <loic@dachary.org>
2013-10-22 10:43:03 -07:00
Sage Weil
89ea5f3bf9
Merge pull request #749 from ceph/wip-6599
...
client: fix invalid iterator dereference in Client::trim_caps()
Backport: emperor, dumpling, cuttlefish
Reviewed-by: Sage Weil <sage@inktank.com>
2013-10-22 10:39:54 -07:00
Josh Durgin
3445810f1f
Merge pull request #754 from ceph/wip-test-librbd
...
fix ceph_test_lirbd crash
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-10-22 10:04:25 -07:00
Sage Weil
dff41cd768
ceph_test_librbd: fix heap overrun
...
We are storing rbd_snap_info_t structs, not pointers to them. But we
can also avoid the heap entirely.
This crashed pretty reliably on arm.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-22 09:37:08 -07:00
huangjun
eb5dd55068
test_ceph_argparse.py: No assert_not_in and assert_in in nose.tools
...
Signed-off-by: huangjun <hjwsm1989@gmail.com>
2013-10-22 19:16:57 +08:00
Sage Weil
1f6b8b27b0
librbd: parse args to ceph_test_librbd
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-21 15:55:32 -07:00
Sage Weil
ad4553a4fd
librbd: fix build error
...
From a10703008f
.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-21 15:48:42 -07:00
Sage Weil
bd2eeb71bc
ceph-mon: add debug to ip selection
...
This will hopefully help us track down #5804 .
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-21 15:33:37 -07:00
Josh Durgin
ad455c8ebe
Merge pull request #753 from ceph/wip-5668-b
...
librbd: wire up flush counter
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-10-21 14:58:31 -07:00
Sage Weil
a10703008f
librbd: wire up flush counter
...
Fixes : #5668
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-21 14:40:03 -07:00
Loic Dachary
1376d2379a
Merge pull request #751 from ceph/wip-6603
...
a couple trivial leaks
2013-10-21 11:20:37 -07:00
Sage Weil
715d2ab318
common/BackTrace: fix memory leak
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-21 09:22:35 -07:00
Sage Weil
687ecd8bf9
common/cmdparse: fix memory leak
...
demangle is allocating with malloc() in this case.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-21 09:21:57 -07:00
Yan, Zheng
34d09417b7
client: fix invalid iterator dereference in Client::trim_caps()
...
trimming inode drops a reference to the inode's parent, it may cause
the inode's parent also be trimmed. If the cap iterator 'p' happens to
point to the inode's parent and the inode's parent is trimmed, the cap
iterator 'p' become invalid.
Fix the issue by delaying removing cap from the seesion cap list.
(similar to what the kclient does)
Fixes #6599
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2013-10-20 21:34:02 +08:00
Sage Weil
1f02d006b7
Merge pull request #747 from dachary/wip-commands
...
common: get_command_descriptions use cout instead of dout
Reviewed-by: Sage Weil <sage@inktank.com>
2013-10-19 21:12:38 -07:00
Sage Weil
d9d390caf6
Merge remote-tracking branch 'gh/next'
2013-10-19 21:01:28 -07:00
Loic Dachary
e70ceace52
Merge pull request #748 from dachary/master
...
autoconf: fix typo on AM_COMMON_CFLAGS
2013-10-19 19:33:57 -07:00
Loic Dachary
4f299cac44
autoconf: fix typo on AM_COMMON_CFLAGS
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2013-10-20 04:11:07 +02:00
Loic Dachary
94080de93a
common: get_command_descriptions use cout instead of dout
...
Using dout instead of cout creates noise and makes it more difficult for
people trying to debug a failure in test_ceph_argparse.py.
The output of get_command_descriptions is modified to only contain
parseable information and the code parsing its output
test_ceph_argparse.py is removed.
Signed-off-by: Loic Dachary <loic@dachary.org>
2013-10-19 18:57:47 +02:00
Sage Weil
ddfe67fe2a
Merge pull request #746 from ceph/wip-6582
...
Wip 6582
Reviewed-by: Sage Weil <sage@inktank.com>
2013-10-18 23:08:08 -07:00
Sage Weil
4d3502ba9b
Merge pull request #734 from kri5/master
...
ceph: Remove unavailable option with clang
Reviewed-by: Sage Weil <sage@inktank.com>
2013-10-18 18:41:13 -07:00
Greg Farnum
8586c755ff
ReplicatedPG: copy: conditionally requeue copy ops when cancelled
...
We may need to requeue copy ops which are cancelled as part of an acting
set change but don't change the primary. To support this, add a
"requeue" flag to cancel_copy_ops() and copy_ops(), as well as to
CopyResults. The CopyCallback is then responsible for requeuing (the
higher layers can't do so as they can't know which request actually
triggered the copy).
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-10-18 16:34:11 -07:00
Greg Farnum
6dff926151
PG: add a requeue_op() function to complement requeue_ops().
...
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-10-18 16:24:27 -07:00
Loic Dachary
1203a9a6e9
Merge pull request #741 from hjwsm1989/master
...
ceph.spec.in: Add erasure-code related files.
2013-10-18 13:44:56 -07:00
John Wilkins
f06647eb0f
Merge pull request #742 from atwardowski/patch-1
...
Update ceph-authtool.rst - Fix typo
2013-10-18 11:21:57 -07:00
John Wilkins
45d184602b
doc: Removed references to Chef.
...
fixes : #6464
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-10-18 11:12:43 -07:00
Sage Weil
89995efe54
doc/release-notes: missed mds snaps
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-18 10:35:31 -07:00
Sage Weil
5905227495
doc/release-notes: v0.71
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-18 10:33:23 -07:00
Adam Twardowski
5d2cf46c1d
Update ceph-authtool.rst
...
Fix typo
2013-10-18 13:14:25 -04:00
huangjun
7bcfe0967f
ceph.spec.in: Add erasure-code related files.
...
Signed-off-by: huangjun <hjwsm1989@gmail.com>
2013-10-18 18:21:22 +08:00
Sage Weil
ac533bf670
Merge pull request #722 from ceph/wip-6475
...
radosgw: create /var/log/radosgw in package, not init script
Reviewed-and-tested-by: Gary Lowell <gary.lowell@inktank.com>
2013-10-17 21:11:57 -07:00
Gary Lowell
09bd6bbe3b
Merge branch 'next'
2013-10-18 01:51:16 +00:00
Josh Durgin
9af9c50cf1
Merge pull request #737 from xarses/6127
...
Add Redhat init script option
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-10-17 17:27:34 -07:00
Andrew Woodward
533626c7e0
Add Redhat init script option
...
Resolves: 6127
Signed-off-by: Andrew Woodward <awoodward@mirantis.com>
2013-10-17 17:23:04 -07:00
Sage Weil
93f1befdd7
Merge pull request #738 from ceph/wip-cache-crc
...
fix cached crc, bug #6583
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-10-17 16:52:29 -07:00
Sage Weil
3cfe9f602b
common/buffer: invalidate crc on zero, copy_in
...
This does not capture users who
- calc a crc
- use c_str() to modify the buffer content
- (re)calc a crc
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-17 16:47:29 -07:00
Sage Weil
8ec3aed516
common/buffer: fix crc_map types
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-17 16:46:10 -07:00
Sage Weil
394ec17540
common/buffer: drop unused fields
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-17 16:36:20 -07:00
Gary Lowell
2edc04cde5
ceph.spec.in: Need to cread radosgw log directory.
...
Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
2013-10-17 15:40:12 -07:00
Sage Weil
1f291f5c89
qa/workunits/rest/test.py: fix mds {add,remove}_data_pool test
...
Arg name changed from poolid to pool in e2602c54
.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-17 14:38:37 -07:00
Sage Weil
11fc80df13
doc/release-notes: link ot the changelog
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-17 13:25:59 -07:00
Sage Weil
eb0a3b7e94
doc/release-notes: v0.61.9
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-17 13:15:23 -07:00
Sage Weil
d3f0c0b2a6
Makefile: fix /sbin vs /usr/sbin behavior
...
Instead of telling configure to put things in /sbin, explicitly put the
two important items (mkcephfs and mount.fuse.ceph) in /sbin via an
automake rule. This unbreaks FreeBSD 9.1 and probably others.
Based on patches originally from Alan Somers <asomers@gmail.com>, modified
for the current Makefile structure and applied to the specfile too.
Fixes : #6456
Signed-off-by: Sage Weil <sage@inktank.com>
Tested-by: Alan Somers <asomers@gmail.com>
2013-10-17 12:06:49 -07:00
Samuel Just
15ec5332ba
OSD: check for splitting when processing recover/backfill reservations
...
Fixes: 6565
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-10-17 09:58:42 -07:00
Christophe Courtaut
08177f24df
ceph: Remove unavailable option with clang
...
Some options are unavailable in clang. (-Wstrict-null-sentinel,
-rdynamic)
They were reintroduced by this commit
6949d221ad
This patch fixes it.
Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
2013-10-17 18:00:39 +02:00
Gregory Farnum
ff8e6a763a
Merge pull request #691 from ceph/wip-dirfrag
...
Reviewed-by: Greg Farnum <greg@inktank.com>
Partly-Reviewed-by: Sage Weil <sage@inktank.com>
2013-10-17 08:35:38 -07:00
Gary Lowell
e509cb1e69
v0.71
2013-10-17 09:19:36 +00:00
Sage Weil
e1e6408403
Merge remote-tracking branch 'gh/next'
2013-10-16 21:04:01 -07:00
Sage Weil
10b466e945
radosgw: create /var/log/radosgw in package, not init script
...
Fixes : #6475
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-16 16:16:16 -07:00