1 commit e23b817ad0cf1ea19c0a7b7c9999b30bed37d533
2 Author: Gary Lowell <gary.lowell@inktank.com>
3 Date: Fri Aug 16 19:39:41 2013 -0700
7 commit 1aa01910957e967e87e46b86f1e67844148703e3
8 Author: Dan Mick <dan.mick@inktank.com>
9 Date: Thu Aug 15 17:10:56 2013 -0700
11 ceph.in: --admin-daemon was not returning EINVAL on bad command
13 Fix by restructuring code to hoist common code and have only one
14 place where admin_socket is actually called.
16 Signed-off-by: Dan Mick <dan.mick@inktank.com>
17 (cherry picked from commit 266460e97ec9ef9711e9eaa4bd954f3188d8da69)
19 commit d290a91525c3ebc6941dae2bb55f0bfbf120cb60
20 Author: Sage Weil <sage@inktank.com>
21 Date: Thu Aug 15 14:37:07 2013 -0700
23 mon: use str_join instead of std::copy
25 The std::copy method leaves a trailing separator.
27 Signed-off-by: Sage Weil <sage@inktank.com>
28 Reviewed-by: Dan Mick <dan.mick@inktank.com>
29 (cherry picked from commit 35565ee64e41d7fddc7849c6006692c78227132c)
31 commit b99921746ef2e1e15777c748a15e929c72888db1
32 Author: Sage Weil <sage@inktank.com>
33 Date: Thu Aug 15 14:36:57 2013 -0700
35 config: fix stringification of config values
37 The std::copy construct leaves a trailing separator character, which breaks
38 parsing for booleans (among other things) and probably mangles everything
42 Signed-off-by: Sage Weil <sage@inktank.com>
43 Reviewed-by: Samuel Just <sam.just@inktank.com>
44 (cherry picked from commit fc23cfe3fe567b30413d8af0c614a32fec238939)
46 commit d212bba6bd0d7d234097122988e4d973064b5645
47 Author: Sage Weil <sage@inktank.com>
48 Date: Thu Aug 15 14:36:49 2013 -0700
50 common: add str_join helper
52 Signed-off-by: Sage Weil <sage@inktank.com>
53 Reviewed-by: Dan Mick <dan.mick@inktank.com>
54 (cherry picked from commit ce3a0944d9b47f7b178fe7775c9d105305b238e0)
56 commit a99fef9189086f5dd6ddacaecf967619dc5fe407
57 Author: Josh Durgin <josh.durgin@inktank.com>
58 Date: Wed Aug 14 15:50:59 2013 -0700
60 rados.py: fix Rados() unicode checking
62 Check new parameters and check that rados_id is not None again to
63 catch the empty string.
65 Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
66 Reviewed-by: Sage Weil <sage.weil@inktank.com>
67 (cherry picked from commit 4422f21a6586467a63ce6841552d0f60aa849cf1)
69 commit dd0df583e2661444287a36acc240a8ac0ec381e8
70 Author: Josh Durgin <josh.durgin@inktank.com>
71 Date: Wed Aug 14 15:28:19 2013 -0700
73 rados.py: fix Rados() backwards compatibility
75 Previously it had no name parameter, so the default will be used by
76 old clients. However, if an old client set rados_id, a new check that
77 both rados_id and name are set would result in an error. Fix this by
78 only applying the default names after the check, and add tests of this
81 This was introduced in 783b7ec847c7f987ac1814c9c41c91921cac4eba,
82 so it does not affect cuttlefish.
85 Reported-by: Michael Morgan <mmorgan@dca.net>
86 Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
87 Reviewed-by: Sage Weil <sage.weil@inktank.com>
88 (cherry picked from commit 34da9cbc33205623cf64aee1989f53dfb2c5bddd)
90 commit b9d1bf51610159a88ad257f29a81691e6b178e17
91 Author: Sage Weil <sage@inktank.com>
92 Date: Tue Aug 13 12:52:41 2013 -0700
94 librados: fix async aio completion wakeup
96 For aio flush, we register a wait on the most recent write. The write
97 completion code, however, was *only* waking the waiter if they were waiting
98 on that write, without regard to previous writes (completed or not).
99 For example, we might have 6 and 7 outstanding and wait on 7. If they
100 finish in order all is well, but if 7 finishes first we do the flush
101 completion early. Similarly, if we
111 Fix by doing any completions that are prior to the oldest pending write in
112 the aio write completion handler.
116 Signed-off-by: Sage Weil <sage@inktank.com>
117 Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
118 Tested-by: Oliver Francke <Oliver.Francke@filoo.de>
119 (cherry picked from commit 16ed0b9af8bc08c7dabead1c1a7c1a22b1fb02fb)
121 commit 29ae033b435581a64fc92a26106b4ea1c3dfc0b1
122 Author: Josh Durgin <josh.durgin@inktank.com>
123 Date: Mon Aug 12 19:17:09 2013 -0700
125 librados: fix locking for AioCompletionImpl refcounting
127 Add an already-locked helper so that C_Aio{Safe,Complete} can
128 increment the reference count when their caller holds the
129 lock. C_AioCompleteAndSafe's caller is not holding the lock, so call
130 regular get() to ensure no racing updates can occur.
132 This eliminates all direct manipulations of AioCompletionImpl->ref,
133 and makes the necessary locking clear.
135 The only place C_AioCompleteAndSafe is used is in handling
136 aio_flush_async(). This could cause a missing completion.
139 Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
140 Reviewed-by: Sage Weil <sage@inktank.com>
141 Tested-by: Oliver Francke <Oliver.Francke@filoo.de>
142 (cherry picked from commit 7a52e2ff5025754f3040eff3fc52d4893cafc389)