1 commit 6eb7e15a4783b122e9b0c85ea9ba064145958aa5
2 Author: Gary Lowell <gary.lowell@inktank.com>
3 Date: Wed Feb 13 10:10:20 2013 -0800
7 commit f5eb845a0f7a2c28d3a88a37479bcb34f882f40c
8 Author: Yehuda Sadeh <yehuda@inktank.com>
9 Date: Fri Feb 8 13:14:49 2013 -0800
11 rgw: change json formatting for swift list container
14 There is some difference in the way swift formats the
15 xml output and the json output for list container. In
16 xml the entity is named 'name' and in json it is named
19 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
20 (cherry picked from commit 3e4d79fe42dfc3ca70dc4d5d2aff5223f62eb34b)
22 commit f21543f0d88f7bacb69cef3712b0ce087f386e93
23 Author: Josh Durgin <josh.durgin@inktank.com>
24 Date: Mon Feb 11 17:08:55 2013 -0800
26 librbd: unprotect any non-unprotected snapshot
28 Include snapshots in the UNPROTECTING state as well, which can occur
29 after an unprotect is interrupted.
33 Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
34 Reviewed-by: Dan Mick <dan.mick@inktank.com>
35 (cherry picked from commit fe283813b44a7c45def6768ea0788a3a0635957e)
37 commit 65969f8fbef02ee39f6c2365fffbcd3f633f4b37
38 Author: Sage Weil <sage@inktank.com>
39 Date: Fri Feb 8 21:36:13 2013 -0800
41 java: make CephMountTest use user.* xattr names
43 Changes to the xattr code in Ceph require
44 a few tweaks to existing test cases.
45 Specifically, there is now a ceph.file.layout
46 xattr by default and user defined xattrs
47 are prepended with "user."
49 Signed-off-by: Sage Weil <sage@inktank.com>
50 Reviewed-by: Joe Buck <jbbuck@gmail.com>
51 Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
53 commit 14fddc3ce85d3695aad9d3597f8f50dba5960a86
54 Author: Sage Weil <sage@inktank.com>
55 Date: Fri Feb 8 09:59:25 2013 -0800
57 mon: fix typo in C_Stats
59 Broken by previous commit.
61 Signed-off-by: Sage Weil <sage@inktank.com>
62 (cherry picked from commit 3cf3710be0b4cccc8de152a97be50d983c35116d)
64 commit 0453140d187016a61950a8836da57f54d2c34602
65 Author: Sage Weil <sage@inktank.com>
66 Date: Thu Feb 7 23:13:11 2013 -0800
68 mon: retry PGStats message on EAGAIN
70 If we get EAGAIN from a paxos restart/election/whatever, we should
71 restart the message instead of just blindly acking it.
73 Signed-off-by: Sage Weil <sage@inktank.com>
74 Reviewed-by: Joao Luis <joao.luis@inktank.com>
75 (cherry picked from commit 4837063d447afb45554f55bb6fde1c97559acd4b)
77 commit e68fcec78286363935cf731015108b9ea36b50a6
78 Author: Sage Weil <sage@inktank.com>
79 Date: Thu Feb 7 22:06:14 2013 -0800
81 mon: handle -EAGAIN in completion contexts
83 We can get ECANCELED, EAGAIN, or success out of the completion contexts,
84 but in the EAGAIN case (meaning there was an election) we were sending
85 a success to the client. This resulted in client hangs and all-around
86 confusion when the monitor cluster was thrashing.
89 Signed-off-by: Sage Weil <sage@inktank.com>
90 Reviewed-by: Joao Luis <joao.luis@inktank.com>
91 (cherry picked from commit 17827769f1fe6d7c4838253fcec3b3a4ad288f41)
93 commit 20ec490555728251444833520a40b20dc8015216
94 Author: Sage Weil <sage@inktank.com>
95 Date: Tue Feb 12 14:11:09 2013 -0800
97 osd: only share maps on hb connection of OSD_HBMSGS feature is set
99 Back in 1bc419a7affb056540ba8f9b332b6ff9380b37af we started sharing maps
100 with dead osds via the heartbeat connection, but old code will crash on an
101 unexpected message. Only do this if the OSD_HBMSGS feature is present.
103 Signed-off-by: Sage Weil <sage@inktank.com>
104 Reviewed-by: Samuel Just <sam.just@inktank.com>
105 (cherry picked from commit 302b26ff70ee5539da3dcb2e5614e2b7e83b9dcd)
107 commit cbf63b633e7a59456f503af487fd4ad2607bbd76
108 Author: Sage Weil <sage@inktank.com>
109 Date: Tue Feb 12 14:10:51 2013 -0800
111 osd: tolerate unexpected messages on the heartbeat interface
113 We should note but not crash on unexpected messages. Announce this awesome
114 new "capability" via a feature bit.
116 Signed-off-by: Sage Weil <sage@inktank.com>
117 Reviewed-by: Samuel Just <sam.just@inktank.com>
118 (cherry picked from commit afda30aeaae0a65f83c6886658354ad2b57c4c43)
122 src/include/ceph_features.h
124 commit 102a519632f1b7a0fede9a3fbd4a5c1df0e732a5
125 Merge: 2c6afa0 2ebf4d0
126 Author: Sage Weil <sage@inktank.com>
127 Date: Tue Feb 12 13:39:52 2013 -0800
129 Merge remote-tracking branch 'gh/wip-bobtail-osd-msgr' into bobtail
131 commit 2c6afa058e8b1738c1400392320482945834de86
132 Author: Sage Weil <sage@inktank.com>
133 Date: Wed Jan 30 11:32:23 2013 -0800
135 test_libcephfs: fix xattr test
137 Ignore the ceph.*.layout xattrs.
139 Signed-off-by: Sage Weil <sage@inktank.com>
140 (cherry picked from commit b0d4dd21c7be86eb47728a4702a3c67ca44424ac)
142 commit f11beb954976f66bfae75e847937f84958ebeaf3
143 Author: Sage Weil <sage@inktank.com>
144 Date: Thu Feb 7 22:51:29 2013 -0800
146 radosgw-admin: fix cli test
148 Signed-off-by: Sage Weil <sage@inktank.com>
149 (cherry picked from commit 1b05b0edbac09d1d7cf0da2e536829df05e48573)
151 commit ec1085e534eb39d999775bebdcdb997f893a04ae
152 Merge: 66d7758 62ed62f
153 Author: Sage Weil <sage@inktank.com>
154 Date: Thu Feb 7 23:25:30 2013 -0800
156 Merge remote-tracking branch 'gh/wip-bobtail-vxattrs' into bobtail
158 commit 66d775858004d1d4e8a138b8d33a3799e03ce26e
159 Author: Sage Weil <sage@inktank.com>
160 Date: Mon Feb 4 09:14:39 2013 -0800
162 mon: enforce reweight be between 0..1
164 Signed-off-by: Sage Weil <sage@inktank.com>
165 Reviewed-by: Joao Luis <joao.luis@inktank.com>
166 (cherry picked from commit 4e29c95d6f61daa838888840cef0cceedc0fcfdd)
168 commit 8bab3a1c3d0d2f619ddf885bb9050ad9a1c43517
169 Author: Samuel Just <sam.just@inktank.com>
170 Date: Thu Feb 7 10:38:00 2013 -0800
172 PG: dirty_info on handle_activate_map
174 We need to make sure the pg epoch is persisted during
178 Reviewed-by: Sage Weil <sage@inktank.com>
179 Signed-off-by: Samuel Just <sam.just@inktank.com>
180 (cherry picked from commit dbce1d0dc919e221523bd44e1d0834711da1577d)
182 commit dffa386bc13370c0ef56acf740b5200b2054980f
183 Author: Sage Weil <sage@inktank.com>
184 Date: Thu Feb 7 10:21:49 2013 -0800
186 osd: flush peering queue (consume maps) prior to boot
188 If the osd itself is behind on many maps during boot, it will get more and
189 (as part of that) flush the peering wq to ensure the pgs consume them.
190 However, it is possible for OSD to have latest/recnet maps, but pgs to be
191 behind, and to jump directly to boot and join. The OSD is then laggy and
192 unresponsive because the peering wq is way behind.
194 To avoid this, call consume_map() (kick the peering wq) at the end of
195 init and flush it to ensure we are *internally* all caught up before we
196 consider joining the cluster.
198 I'm pretty sure this is the root cause of #3905 and possibly #3995.
200 Signed-off-by: Sage Weil <sage@inktank.com>
201 Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
202 Reviewed-by: Samuel Just <sam.just@inktank.com>
203 (cherry picked from commit af95d934b039d65d3667fc022e2ecaebba107b01)
205 commit 47c9f46aac4afac37fb6ec72f0482e61f5e0d798
206 Author: Yehuda Sadeh <yehuda@inktank.com>
207 Date: Wed Feb 6 17:10:00 2013 -0800
209 rgw: a tool to fix clobbered bucket info in user's bucket list
211 This fixes bad entries in user's bucket list that may have occured
212 due to issue #4039. Syntax:
214 $ radosgw-admin user check --uid=<uid> [--fix]
216 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
217 Reviewed-by: Greg Farnum <greg@inktank.com>
218 (cherry picked from commit 9cb6c33f0e2281b66cc690a28e08459f2e62ca13)
223 commit 6c8d63819fde1b6854f8fc03351465b420ff1bdc
224 Author: Yehuda Sadeh <yehuda@inktank.com>
225 Date: Wed Feb 6 16:43:48 2013 -0800
227 rgw: bucket recreation should not clobber bucket info
230 User's list of buckets is getting modified even if bucket already
231 exists. This fix removes the newly created directory object, and
232 makes sure that user info's data points at the correct bucket.
234 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
235 Reviewed-by: Greg Farnum <greg@inktank.com>
236 (cherry picked from commit 9d006ec40ced9d97b590ee07ca9171f0c9bec6e9)
242 commit cc167914ac9603f87083c63f2cbc8dac9441329f
243 Author: Yehuda Sadeh <yehuda@inktank.com>
244 Date: Tue Feb 5 14:50:54 2013 -0800
246 rgw: a tool to fix buckets with leaked multipart references
248 Checks specified bucket for the #4011 symptoms, optionally fix
252 radosgw-admin bucket check --bucket=<bucket> [--fix]
254 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
255 (cherry picked from commit 2d8faf8e5f15e833e6b556b0f3c4ac92e4a4151e)
261 commit 4d6964fc7ddd23806e225c95bcb90ef93e4d23a1
262 Author: Yehuda Sadeh <yehuda@inktank.com>
263 Date: Tue Feb 5 13:54:11 2013 -0800
265 rgw: radosgw-admin object unlink
267 Add a radosgw-admin option to remove object from bucket index
269 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
270 (cherry picked from commit 16235a7acb9543d60470170bb2a09956364626cd)
275 src/test/cli/radosgw-admin/help.t
277 commit 2ebf4d065af3dc2e581a25b921071af3efb57f8a
278 Author: Sage Weil <sage@inktank.com>
279 Date: Fri Jan 25 09:30:00 2013 -0800
281 osd: kill unused addr-based send_map()
283 Not used, old API, bad.
285 Signed-off-by: Sage Weil <sage@inktank.com>
286 (cherry picked from commit e359a862199c8a94cb238f7271ba1b0edcc0863c)
288 commit bac5b144b27f32da306161ae7018ccc337704121
289 Author: Sage Weil <sage@inktank.com>
290 Date: Fri Jan 25 09:29:37 2013 -0800
292 osd: share incoming maps via Connection*, not addrs
294 Kill a set of parallel methods that are using the old addr/inst-based
295 msgr APIs, and instead use Connection handles. This is much safer and gets
296 us closer to killing the old msgr API.
298 Signed-off-by: Sage Weil <sage@inktank.com>
299 (cherry picked from commit 5e2fab54a4fdf2f59e2b635cbddef8a5909acb7c)
301 commit 9ca3a165ded62313ba153d7bab89dadf3f73999f
302 Author: Sage Weil <sage@inktank.com>
303 Date: Fri Jan 25 09:27:00 2013 -0800
305 osd: pass new maps to dead osds via existing Connection
307 Previously we were sending these maps to dead osds via their old addrs
308 using a new outgoing connection and setting the flags so that the msgr
309 would clean up. That mechanism is possibly buggy and fragile, and we can
310 avoid it entirely if we just reuse the existing heartbeat Connection.
312 Signed-off-by: Sage Weil <sage@inktank.com>
313 (cherry picked from commit 1bc419a7affb056540ba8f9b332b6ff9380b37af)
315 commit 4cb28b6ed5a702fdac99b8ec71233ef7f877a7a2
316 Author: Sage Weil <sage@inktank.com>
317 Date: Fri Jan 25 09:25:28 2013 -0800
319 osd: requeue osdmaps on heartbeat connections for cluster connection
321 If we receive an OSDMap on the cluster connection, requeue it for the
322 cluster messenger, and process it there where we normally do. This avoids
323 any concerns about locking and ordering rules.
325 Signed-off-by: Sage Weil <sage@inktank.com>
326 (cherry picked from commit 76705ace2e9767939aa9acf5d9257c800f838854)
328 commit e4f7ff8c288eac8a8b57382f11a4b6f93682315a
329 Author: Sage Weil <sage@inktank.com>
330 Date: Fri Jan 25 09:23:23 2013 -0800
332 msgr: add get_loopback_connection() method
334 Return the Connection* for ourselves, so we can queue messages for
337 Signed-off-by: Sage Weil <sage@inktank.com>
338 (cherry picked from commit a7059eb3f3922cf08c1e5bb5958acc2d45952482)
340 commit 62ed62f5e2fb068cee38612d7974526aa1b3c759
341 Author: Sage Weil <sage@inktank.com>
342 Date: Sat Jan 19 11:33:04 2013 -0800
344 qa: add layout_vxattrs.sh test script
346 Test virtual xattrs for file and directory layouts.
348 TODO: create a data pool, add it to the fs, and make sure we can use it.
350 Signed-off-by: Sage Weil <sage@inktank.com>
351 (cherry picked from commit 61fbe27a52d12ecd98ddeb5fc0965c4f8ee7841a)
353 commit d386622c3961a3b57eea42fdb82611cd2e904f4d
354 Author: Sage Weil <sage@inktank.com>
355 Date: Sat Jan 19 10:11:18 2013 -0800
357 mds: allow dir layout/policy to be removed via removexattr on ceph.dir.layout
359 This lets a user remove a policy that was previously set on a dir.
361 Signed-off-by: Sage Weil <sage@inktank.com>
362 (cherry picked from commit db31a1f9f27416e4d531fda716e32d42a275e84f)
364 commit 6af5da7ae2c4ef95c16c6460770b6244d1aa1a6e
365 Author: Sage Weil <sage@inktank.com>
366 Date: Sat Jan 19 10:09:39 2013 -0800
368 mds: handle ceph.*.layout.* setxattr
370 Allow individual fields of file or dir layouts to be set via setxattr.
372 Signed-off-by: Sage Weil <sage@inktank.com>
373 (cherry picked from commit ebebf72f0993d028e795c78a986e1aee542ca5e0)
375 commit c0af056eb9bdb62cfd8a6f9054a3a3c78c8e7447
376 Author: Sage Weil <sage@inktank.com>
377 Date: Mon Feb 4 22:03:32 2013 -0800
379 mdsmap: backported is_data_pool()
381 This roughly corresponds to mainline commit 99d9e1d.
383 Signed-off-by: Sage Weil <sage@inktank.com>
385 commit 0407af4641ea19697f8feb0f48a92cde8dd4fbe4
386 Author: Sage Weil <sage@inktank.com>
387 Date: Sat Jan 19 10:04:05 2013 -0800
389 mds: fix client view of dir layout when layout is removed
391 We weren't handling the case where the projected node has NULL for the
392 layout properly. Fixes the client's view when we remove the dir layout.
394 Signed-off-by: Sage Weil <sage@inktank.com>
395 (cherry picked from commit 09f28541e374ffac198e4d48082b064aae93cb2c)
397 commit 8ce834d3f50b00fdd59cd237f3fb5fef1d57e1dd
398 Author: Sage Weil <sage@inktank.com>
399 Date: Sat Jan 19 10:04:39 2013 -0800
401 client: note presence of dir layout in inode operator<<
403 Signed-off-by: Sage Weil <sage@inktank.com>
404 (cherry picked from commit 84751489ca208964e617516e04556722008ddf67)
406 commit 99824b93cec93daaa0d536f031eb3b6180f94e3b
407 Author: Sage Weil <sage@inktank.com>
408 Date: Sat Jan 19 09:05:59 2013 -0800
410 client: list only aggregate xattr, but allow setting subfield xattrs
412 Signed-off-by: Sage Weil <sage@inktank.com>
413 (cherry picked from commit ba32ea9454d36072ec5ea3e6483dc3daf9199903)
415 commit 809cff488ea1ffa299edd678ba6260993771bde3
416 Author: Sage Weil <sage@inktank.com>
417 Date: Fri Jan 18 22:26:00 2013 -0800
419 client: implement ceph.file.* and ceph.dir.* vxattrs
421 Display ceph.file.* vxattrs on any regular file, and ceph.dir.* vxattrs
422 on any directory that has a policy set.
424 Signed-off-by: Sage Weil <sage@inktank.com>
425 (cherry picked from commit 3f82912a891536dd7e930f98e28d9a8c18fab756)
427 commit 13babca354d9fbe255de8bae9608a0c158bf6c40
428 Author: Sage Weil <sage@inktank.com>
429 Date: Fri Jan 18 17:21:37 2013 -0800
431 client: move xattr namespace enforcement into internal method
433 This captures libcephfs users now too.
435 Signed-off-by: Sage Weil <sage@inktank.com>
436 (cherry picked from commit febb96509559084357bfaabf7e4d28e494c274aa)
438 commit 65ab51740175254ba3ee050f0fd97332dffe2eb7
439 Author: Sage Weil <sage@inktank.com>
440 Date: Fri Jan 18 17:20:22 2013 -0800
442 client: allow ceph.* xattrs
444 Signed-off-by: Sage Weil <sage@inktank.com>
445 (cherry picked from commit ad7ebad70bf810fde45067f78f316f130a243b9c)
447 commit 6f3c1cd2cc07d951dfc23e523b9c6400b7c77c72
448 Author: caleb miles <caselim@gmail.com>
449 Date: Mon Jan 14 12:16:12 2013 -0500
451 rgw_rest: Make fallback uri configurable.
453 Some HTTP servers, notabily lighttp, do not set SCRIPT_URI, make the fallback
456 Signed-off-by: caleb miles <caleb.miles@inktank.com>
457 Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
458 (cherry picked from commit b3a2e7e955547a863d29566aab62bcc480e27a65)
463 commit f57d1b4c8cc4d08c6147423d7881be55ed2e88d9
464 Author: Yehuda Sadeh <yehuda@inktank.com>
465 Date: Fri Feb 1 10:56:11 2013 -0800
467 rgw: fix setting of NULL to string
470 s->env->get() returns char * and not string and can return NULL.
471 Also, remove some old unused code.
473 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
474 Reviewed-by: Greg Farnum <greg@inktank.com>
475 (cherry picked from commit 9019fbbe8f84f530b6a8700dfe99dfeb03e0ed3d)
477 commit 55687240b2de20185524de07e67f42c3b1ae6592
478 Author: Samuel Just <sam.just@inktank.com>
479 Date: Fri Jan 11 10:44:04 2013 -0800
481 OSD: check for empty command in do_command
484 Signed-off-by: Samuel Just <sam.just@inktank.com>
485 Reviewed-by: David Zafman <david.zafman@inktank.com>
486 (cherry picked from commit 8cf79f252a1bcea5713065390180a36f31d66dfd)
488 commit c3468f76a5e68a6426f03e508d8ecf26950fca2a
489 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
490 Date: Wed Jan 30 18:52:24 2013 +0100
492 PGMap: fix -Wsign-compare warning
494 Fix -Wsign-compare compiler warning:
496 mon/PGMap.cc: In member function 'void PGMap::apply_incremental
497 (CephContext*, const PGMap::Incremental&)':
498 mon/PGMap.cc:247:30: warning: comparison between signed and
499 unsigned integer expressions [-Wsign-compare]
501 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
502 (cherry picked from commit b571f8ee2d22a3894120204bc5f119ff37e1de53)
504 commit 5a6b9af90f00d08ef97b34ee0b5abc7b0b63e72b
505 Author: Sage Weil <sage@inktank.com>
506 Date: Mon Jan 28 19:46:33 2013 -0800
508 mon: smooth pg stat rates over last N pgmaps
510 This smooths the recovery and throughput stats over the last N pgmaps,
513 Signed-off-by: Sage Weil <sage@inktank.com>
514 (cherry picked from commit a7d15afb529615db56bae038b18b66e60d827a96)
516 commit 7fd7a5eed19d5ab508d5fe11ff8734bc2bc8c565
517 Author: Sage Weil <sage@inktank.com>
518 Date: Fri Jan 25 19:51:40 2013 -0800
520 mon/PGMap: report IO rates
522 This does not appear to be very accurate; probably the stat values we're
523 displaying are not being calculated correctly.
525 Signed-off-by: Sage Weil <sage@inktank.com>
526 (cherry picked from commit 3f6837e022176ec4b530219043cf12e009d1ed6e)
528 commit 7f149cf6730280f0e633d9f5ef3f0f95c5a5e430
529 Author: Sage Weil <sage@inktank.com>
530 Date: Fri Jan 25 19:51:14 2013 -0800
532 mon/PGMap: report recovery rates
534 Signed-off-by: Sage Weil <sage@inktank.com>
535 (cherry picked from commit 208b02a748d97378f312beaa5110d8630c853ced)
537 commit 8d2d396c6d02bff72aca53920e9ac93fe91428d3
538 Author: Sage Weil <sage@inktank.com>
539 Date: Fri Jan 25 19:50:45 2013 -0800
541 mon/PGMap: include timestamp
543 Signed-off-by: Sage Weil <sage@inktank.com>
544 (cherry picked from commit 76e9fe5f06411eb0e96753dcd708dd6e43ab2c02)
546 commit 8ab77bd4b510149f4df6b3134de0ef59272cec71
547 Author: Sage Weil <sage@inktank.com>
548 Date: Fri Jan 25 19:49:16 2013 -0800
550 osd: track recovery ops in stats
552 Signed-off-by: Sage Weil <sage@inktank.com>
553 (cherry picked from commit a2495f658c6d17f56ea0a2ab1043299a59a7115b)
555 commit 8fd8534b4b808292a4b7c6b9f2f866c431cf9645
556 Author: Sage Weil <sage@inktank.com>
557 Date: Fri Jan 25 19:06:52 2013 -0800
559 osd_types: add recovery counts to object_sum_stats_t
561 Signed-off-by: Sage Weil <sage@inktank.com>
562 (cherry picked from commit 4aea19ee60fbe1106bdd71de2d172aa2941e8aab)