1 commit 56c4847ba82a92023700e2d4920b59cdaf23428d
2 Author: Gary Lowell <gary.lowell@inktank.com>
3 Date: Wed May 8 17:23:47 2013 -0700
7 commit 3b94f03ec58abe3d7a6d0359ff9b4d75826f3777
8 Author: Samuel Just <sam.just@inktank.com>
9 Date: Thu May 2 14:13:07 2013 -0700
11 mon: dump MonitorDBStore transactions to file
13 Signed-off-by: Samuel Just <sam.just@inktank.com>
14 (cherry picked from commit 797089ef082b99910eebfd9454c03d1f027c93bb)
16 commit 9143d6d0d0ebaaee81622587dc21a3d562b05c9c
17 Author: Sage Weil <sage@inktank.com>
18 Date: Mon May 6 14:21:28 2013 -0700
20 osd: optionally enable leveldb logging
22 Signed-off-by: Sage Weil <sage@inktank.com>
23 (cherry picked from commit 0b4c5c1a3349670d11cc3c4fb3c4b3c1a80b2502)
25 commit 8f456e89ec38f37ae4b444f5cabccd9fc0e415b8
26 Author: Sage Weil <sage@inktank.com>
27 Date: Mon May 6 14:13:50 2013 -0700
29 mon: allow leveldb logging
31 'mon leveldb log = filename'
33 Signed-off-by: Sage Weil <sage@inktank.com>
34 (cherry picked from commit c1d5f815546b731e10bfcb81cbcd48b7d432e9c4)
36 commit 306ebc6a9164feab084123f91a0fe928125f4b74
37 Author: Gary Lowell <glowell@inktank.com>
38 Date: Wed May 8 16:33:05 2013 -0700
40 debian/control: squeeze requres cryptsetup package
42 Squeeze requires the cryptsetup package which has been renamed
43 cryptsetup-bin in later versions. Allow either package to
44 satisfy the dependency.
46 Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
47 (cherry picked from commit 83bbae415de16f708ca1cb24861ddbb0bd514a7f)
49 commit e0c0a5c1a711263d234b70b454aca07c23e98243
50 Author: Yehuda Sadeh <yehuda@inktank.com>
51 Date: Wed May 8 12:18:49 2013 -0700
53 osd: don't assert if get_omap_iterator() returns NULL
56 This can happen if the object does not exist and it's
57 a write operation. Just return -ENOENT.
59 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
60 (cherry picked from commit 36ec6f9bce63641f4fc2e4ab04d03d3ec1638ea0)
62 commit 82b9299512537b8d921caa044107472adacbdabe
63 Author: Sage Weil <sage@inktank.com>
64 Date: Wed May 8 14:54:33 2013 -0700
66 ceph-create-keys: gracefully handle no data from admin socket
68 Old ceph-mon (prior to 393c9372f82ef37fc6497dd46fc453507a463d42) would
69 return an empty string and success if the command was not registered yet.
70 Gracefully handle that case by retrying.
72 If we still fail to parse, exit entirely with EINVAL.
75 Signed-off-by: Sage Weil <sage@inktank.com>
76 Reviewed-by: Dan Mick <dan.mick@intank.com>
77 (cherry picked from commit e2528ae42c455c522154c9f68b5032a3362fca8e)
79 commit ee3da880fbc0488467c30b1d0b635e3c50e23cc3
80 Author: Sage Weil <sage@inktank.com>
81 Date: Wed May 8 14:35:54 2013 -0700
83 init-ceph: fix osd_data location when checking df utilization
85 Do not assume default osd data location.
88 Backport: cuttlefish, bobtail
89 Signed-off-by: Sage Weil <sage@inktank.com>
90 Reviewed-by: Gary Lowelll <gary.lowell@inktank.com>
91 (cherry picked from commit f2a54cc9c98a9f31aef049c74ea932b2d9000d3c)
93 commit 4848fac24224879bcdc4fcf202d6ab689d8d990f
94 Author: Samuel Just <sam.just@inktank.com>
95 Date: Tue May 7 16:41:22 2013 -0700
97 OSD: handle stray snap collections from upgrade bug
99 Previously, we failed to clear snap_collections, which causes split to
100 spawn a bunch of snap collections. In load_pgs, we now clear any such
101 snap collections and then snap_collections field on the PG itself.
104 Signed-off-by: Samuel Just <sam.just@inktank.com>
105 Reviewed-by: Sage Weil <sage@inktank.com>
106 (cherry picked from commit 8e89db89cb36a217fd97cbc1f24fd643b62400dc)
108 commit dc6b9e6b2e8c1b41e982430795ff41a65a5813dc
109 Author: Samuel Just <sam.just@inktank.com>
110 Date: Tue May 7 16:35:57 2013 -0700
112 PG: clear snap_collections on upgrade
114 Signed-off-by: Samuel Just <sam.just@inktank.com>
115 Reviewed-by: Sage Weil <sage@inktank.com>
116 (cherry picked from commit 252d71a81ef4536830a74897c84a7015ae6ec9fe)
118 commit b514941ba5f49b6465082e4906b7f4022631bfb3
119 Author: Samuel Just <sam.just@inktank.com>
120 Date: Tue May 7 16:34:57 2013 -0700
122 OSD: snap collections can be ignored on split
124 Signed-off-by: Samuel Just <sam.just@inktank.com>
125 Reviewed-by: Sage Weil <sage@inktank.com>
126 (cherry picked from commit 438d9aa152e546b2008ec355b481df71aa1c51a5)
128 commit 30ffca77df006a244044604074779af538721f14
129 Author: Sage Weil <sage@inktank.com>
130 Date: Wed May 8 11:05:29 2013 -0700
132 ceph: return error code when failing to get result from admin socket
134 Make sure we return a non-zero result code when we fail to read something
135 from the admin socket.
137 Backport: cuttlefish, bobtail
138 Signed-off-by: Sage Weil <sage@inktank.com>
139 (cherry picked from commit 393c9372f82ef37fc6497dd46fc453507a463d42)