1 commit 3a66dd4f30852819c1bdaa8ec23c795d4ad77269 (tag: refs/tags/v10.2.1, refs/remotes/gh/jewel)
2 Author: Jenkins Build Slave User <jenkins-build@trusty-huge--11a52675-9585-4db4-a514-798db40d6da2.localdomain>
3 Date: Thu May 12 21:48:00 2016 +0000
7 commit d93a90ec2743c9aec229891c3b0da72b038cffad
9 Author: Loic Dachary <loic@dachary.org>
10 Date: Thu May 12 17:30:14 2016 +0200
12 Merge pull request #8853 from ceph/wip-jewel-backports
14 jewel: several backports
16 Reviewed-by: Loic Dachary <ldachary@redhat.com>
18 commit cb35d7c25bb1df2a8eff01432d27c5d3bbb196af
19 Merge: 0e1b633 b6ebb25
20 Author: Ilya Dryomov <idryomov@gmail.com>
21 Date: Thu May 12 16:50:33 2016 +0200
23 Merge pull request #9041 from vshankar/jewel-15721-backport
25 jewel: rbd: helpful error message on map failure
27 Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
29 commit 0e1b6336b60af6bceaf9dbc8ce544fcb7af71961
30 Merge: bfdf709 867f798
31 Author: Yehuda Sadeh <yehuda@redhat.com>
32 Date: Wed May 11 12:33:50 2016 -0700
34 Merge pull request #9081 from yehudasa/wip-rgw-period-commit-jewel
36 rgw: period commit fix
38 commit bfdf709dff9bd3d60d11950d4b2d8741ad0cb113
39 Merge: bf1474f 9d5162f
40 Author: Gregory Farnum <greg@gregs42.com>
41 Date: Wed May 11 12:24:23 2016 -0700
43 Merge pull request #8969 from Abhishekvrshny/wip-15731-jewel
45 jewel: MDSAuthCap parse no longer fails on paths with hyphens
47 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
49 commit bf1474f86ce1a102d15c54ee0e1b11005fe48191
50 Merge: 7a37155 52ca195
51 Author: Gregory Farnum <greg@gregs42.com>
52 Date: Wed May 11 12:23:28 2016 -0700
54 Merge pull request #8970 from Abhishekvrshny/wip-15732-jewel
56 jewel: MDS incarnation no longer gets lost after remove filesystem
58 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
60 commit 7a37155d798aebc688fb4a06056dc4761062b098
61 Merge: e83764c e6aa453
62 Author: Gregory Farnum <greg@gregs42.com>
63 Date: Wed May 11 12:20:03 2016 -0700
65 Merge pull request #8971 from Abhishekvrshny/wip-15738-jewel
67 jewel: handle standby-replay nodes properly in upgrades
69 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
71 commit e83764c03b9e88dd2a8ef848269768ffb8b6a703
72 Merge: 4916950 dccb5ef
73 Author: Yehuda Sadeh <yehuda@redhat.com>
74 Date: Wed May 11 10:38:30 2016 -0700
76 Merge pull request #9054 from yehudasa/wip-rgw-admin-output-jewel
78 jewel: rgw admin output
80 commit 49169501a922034c2686dd88365d438e12605116
81 Merge: aa24358 f071d8c
82 Author: Yehuda Sadeh <yehuda@redhat.com>
83 Date: Wed May 11 10:38:17 2016 -0700
85 Merge pull request #9053 from yehudasa/wip-15745-jewel
87 jewel: rgw: handle stripe transition when flushing final pending_data_bl
89 commit aa243585508eedf87b2e9e558cc63c014f84b3b0
90 Merge: f88e2df 9bb17db
91 Author: Yehuda Sadeh <yehuda@redhat.com>
92 Date: Wed May 11 10:38:02 2016 -0700
94 Merge pull request #9047 from ceph/wip-rgw-period-delete-jewel
96 jewel: rgw: period delete fixes
98 commit f88e2df881c045f52f78516aa08def8569be6ecf
99 Merge: a614858 a496b70
100 Author: Sage Weil <sage@redhat.com>
101 Date: Wed May 11 12:30:18 2016 -0400
103 Merge pull request #9076 from dillaman/wip-cmake-test-rbd-mirror-jewel
105 jewel: cmake: fix rbd compile errors
107 commit a496b705ed48da187b341392530f7e8579637310
108 Author: Jason Dillaman <dillaman@redhat.com>
109 Date: Tue May 10 22:37:01 2016 -0400
111 cmake: fix rbd compile errors
113 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
114 (cherry picked from commit 8d4c00d1bec431f8c721195c81684c4095079c1d)
116 commit 9a46e13f3ca9915d71f01bb3506818db59c31a7b
117 Author: runsisi <runsisi@zte.com.cn>
118 Date: Thu Apr 28 10:22:07 2016 +0800
120 cmake: add library cls_journal for target unittest_librbd
122 otherwise if we want to generate target unittest_librbd we need to
123 (re)generate cls_journal manually
125 Signed-off-by: runsisi <runsisi@zte.com.cn>
126 (cherry picked from commit 7efb29416b789fcb7e68aab554d6033e6b5ebb43)
128 commit a6148582432ff36110145ba642d2e0f38e5872b3
129 Merge: 7a4810d 48b732f
130 Author: Kefu Chai <tchaikov@gmail.com>
131 Date: Wed May 11 16:50:41 2016 +0800
133 Merge pull request #9063 from dachary/wip-15838-jewel
135 jewel: tests: make check fails on ext4
137 Reviewed-by: Kefu Chai <kchai@redhat.com>
139 commit 48b732fbfac1fa6af10bec0ef900029b71204c26
140 Author: Loic Dachary <ldachary@redhat.com>
141 Date: Mon May 2 10:42:24 2016 +0200
143 tests: enable make check on ext4 (part 2)
145 Followup of 475cc08c330e639b226f2ab57dedbe4495f63022
147 Signed-off-by: Loic Dachary <ldachary@redhat.com>
148 (cherry picked from commit b0b3a068d4fcc7b739c5dd3d68297e2d517c378e)
150 commit e1c67d4684c485711b2b9af02edabe161f3d7779
151 Author: Sage Weil <sage@redhat.com>
152 Date: Sat Apr 30 17:12:05 2016 -0400
154 qa/workunits/ceph-helpers.sh: make ceph-osd behave on ext4
156 Signed-off-by: Sage Weil <sage@redhat.com>
157 (cherry picked from commit 475cc08c330e639b226f2ab57dedbe4495f63022)
159 commit 867f798d9c364ab5400a61d83cbaef0da9a57b27
160 Author: Casey Bodley <cbodley@redhat.com>
161 Date: Tue May 10 15:51:27 2016 -0400
163 radosgw-admin: 'period commit' sends to new master zone by default
165 if no --remote or --url is given, set --remote = master_zone_id to
166 override the rest_master_conn (which refers to the old master zone)
168 Fixes: http://tracker.ceph.com/issues/15828
170 Signed-off-by: Casey Bodley <cbodley@redhat.com>
171 (cherry picked from commit fbe1a05355549dfe0c05750683eeb61e275950c2)
173 commit a6a6c13c751bbb74ba4f12dc593cd054aabed87c
174 Author: Casey Bodley <cbodley@redhat.com>
175 Date: Tue May 10 15:48:33 2016 -0400
177 radosgw-admin: allow --remote to specify zone or zonegroup id
179 --remote was only looking for zonegroup connections. extended to check
180 for zone connections as well
182 updated the usage to clarify that it expects zone/zonegroup ids
184 Signed-off-by: Casey Bodley <cbodley@redhat.com>
185 (cherry picked from commit 9fcff89ee1e60009fa367e33c915a90354c9a9cc)
187 commit dccb5efb128233affaa544b43f93aa4b3d557259
188 Author: Casey Bodley <cbodley@redhat.com>
189 Date: Thu May 5 09:59:49 2016 -0400
191 radosgw-admin: 'zonegroup add' prints updated zonegroup
193 Signed-off-by: Casey Bodley <cbodley@redhat.com>
194 (cherry picked from commit d355208023fe08a7e16f1078c872286048c4bcc6)
196 commit bd6b5fc5d49c08f574b84a2705a8de4a1d5f8ed1
197 Author: Casey Bodley <cbodley@redhat.com>
198 Date: Thu May 5 09:59:32 2016 -0400
200 radosgw-admin: 'zonegroup modify' prints updated zonegroup
202 Signed-off-by: Casey Bodley <cbodley@redhat.com>
203 (cherry picked from commit a033f40caf60083111886aa804fcdbf3ee60aef8)
205 commit c1e92df545d0a8db64c84879bc09023c98783fe4
206 Author: Casey Bodley <cbodley@redhat.com>
207 Date: Thu May 5 09:56:47 2016 -0400
209 radosgw-admin: 'zone modify' prints updated zone
211 Signed-off-by: Casey Bodley <cbodley@redhat.com>
212 (cherry picked from commit 8a639014a6f2dd950062aa405bbee1762ca23e09)
214 commit f071d8c6885786ac5fd5400381369945704abaa8
215 Author: Yehuda Sadeh <yehuda@redhat.com>
216 Date: Thu May 5 14:02:25 2016 -0700
218 rgw: handle stripe transition when flushing final pending_data_bl
220 Fixes: http://tracker.ceph.com/issues/15745
222 When complete_writing_data() is called, if pending_data_bl is not empty
223 we still need to handle stripe transition correctly. If pending_data_bl
224 has more data that we can allow in current stripe, move to the next one.
226 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
227 (cherry picked from commit b7a7d41839558b1a8786a66e27d9d80e606f61c7)
229 commit 7a4810d1f51c072f6406a7306743ad7577476c76
230 Merge: 67809b8 10b393b
231 Author: Samuel Just <sjust@redhat.com>
232 Date: Tue May 10 11:14:40 2016 -0700
234 Merge pull request #9052 from dillaman/wip-cmake-rbd-mirror-replay-status-jewel
236 jewel: cmake: add missing source file to rbd_mirror/image_replayer
238 Reviewed-by: Samuel Just <sjust@redhat.com>
240 commit 10b393bd90ed76ad41d2123aae5700e171a8e9bc
241 Author: Casey Bodley <cbodley@redhat.com>
242 Date: Fri Apr 29 17:33:03 2016 -0400
244 cmake: add missing source file to rbd_mirror/image_replayer
246 fixes an undefined reference when linking librbd_mirror_internal.a
248 Signed-off-by: Casey Bodley <cbodley@redhat.com>
249 (cherry picked from commit 2f3f56170ab47fc10d4232101ae2e85398a4c299)
251 commit 67809b8e3d71b3cba5ce91e542e840c099c927cd
252 Merge: e15854c 8bb4c7f
253 Author: Sage Weil <sage@redhat.com>
254 Date: Tue May 10 14:10:05 2016 -0400
256 Merge pull request #9051 from athanatos/wip-15815-jewel
260 Reviewed-by: Sage Weil <sage@redhat.com>
262 commit 8bb4c7f92ca784a116d0f7a9a22677b514e7e6ca
263 Author: Sage Weil <sage@redhat.com>
264 Date: Fri Apr 22 16:38:14 2016 -0400
266 ceph_test_keyvaluedb: clean up test dir
268 Just like ceph_test_objectstore
270 Signed-off-by: Sage Weil <sage@redhat.com>
271 (cherry picked from commit 2b075aa52d4475338c0f3cd3360e1ee4de8befa7)
273 commit 108cdfdff65bcce98cb3b2da799fe46bed4421f4
274 Author: Allen Samuels <allen.samuels@sandisk.com>
275 Date: Fri Apr 22 14:06:56 2016 -0400
277 ceph_test_keyvaluedb: fixup unit test for keyvaluedb
279 Fixes: http://tracker.ceph.com/issues/15435
280 Signed-off-by: Allen Samuels <allen.samuels@sandisk.com>
281 (cherry picked from commit 85c14de20936ff9ee224f9b6569a73f9bae75f19)
283 commit e15854ce98291b3186e9cfadb6cb47a401a4c8ae
284 Merge: 7686c62 815967a
285 Author: Jason Dillaman <dillaman@redhat.com>
286 Date: Tue May 10 13:52:54 2016 -0400
288 Merge pull request #9050 from dillaman/wip-15821
290 jewel: rbd-mirror: image sync needs to handle snapshot size and protection status
292 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
294 commit 815967ab97631f65c44cd200971cc8056e94d89e
295 Author: Jason Dillaman <dillaman@redhat.com>
296 Date: Mon May 9 18:25:39 2016 -0400
298 test: add missing header dependency for MockJournaler
300 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
301 (cherry picked from commit fa91919c856ac8186545bc8f8da31a8f438a9b5d)
303 commit 32189573c2da9e1922b6bfae232a62a909797e1a
304 Author: Jason Dillaman <dillaman@redhat.com>
305 Date: Wed May 4 10:23:49 2016 -0400
307 rbd-mirror: image sync object copy was not properly mapping snapshots
309 When the snapshot sequence is out-of-sync between remote and local
310 clusters (expected), the objects would not be written with the
311 correct snapshot context.
313 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
314 (cherry picked from commit dd8f08039bf5354a0413c9da4263d1075243e9c9)
316 commit d3dc919991a013eb45d55a8b6a04628d089d000a
317 Author: Jason Dillaman <dillaman@redhat.com>
318 Date: Wed May 4 10:23:25 2016 -0400
320 rbd-mirror: clean up image sync debug messages
322 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
323 (cherry picked from commit acca475fe5c9ff024c7f76397e7f49e4c4558b09)
325 commit 58e0612a7bb66f6c50dcfc27ed0f1e49d6ec08fa
326 Author: Jason Dillaman <dillaman@redhat.com>
327 Date: Wed May 4 00:12:05 2016 -0400
329 librbd: readahead should not read past end of image
331 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
332 (cherry picked from commit adb14303ccf8a26ed5536bb692ae63d92ac40a9f)
334 commit 7dadecb96a4f856d18fcccffb323941b1149ceaa
335 Author: Jason Dillaman <dillaman@redhat.com>
336 Date: Tue May 3 23:17:12 2016 -0400
338 test: randomize rbd-mirror test case IO
340 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
341 (cherry picked from commit 0d75f2ce61cee164da4e5b7ffb4e69c286e6036a)
343 commit 7aef2976084b8be858e354a05dae12df30743737
344 Author: Jason Dillaman <dillaman@redhat.com>
345 Date: Tue May 3 23:15:58 2016 -0400
347 rbd-mirror: don't set object map to nonexistent during image sync
349 The object maps are initialized to nonexistent at snapshot creation,
350 so this operation is unnecessary.
352 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
353 (cherry picked from commit fe5d4a811f9d9d1160ff7104fe9243cc17ef1bef)
355 commit 58e90f1bcb53a38be2491ac7797f170de324af9a
356 Author: Jason Dillaman <dillaman@redhat.com>
357 Date: Tue May 3 23:01:30 2016 -0400
359 librbd: improve object map debug messages
361 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
362 (cherry picked from commit 2c657752a5067e11405dca59461ce9cbdf062602)
364 commit 6c1af50b67e1a1769bb3d30d28e45fee8b13bb71
365 Author: Jason Dillaman <dillaman@redhat.com>
366 Date: Tue May 3 22:53:52 2016 -0400
368 test: snapshot stress test rbd-mirror image sync
370 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
371 (cherry picked from commit 468287bd182fa0cd02f7551ad6d729ff67ab1a22)
373 commit 0f84aaf011f1a62250948647069cc7fbd6c45699
374 Author: Jason Dillaman <dillaman@redhat.com>
375 Date: Tue May 3 21:42:05 2016 -0400
377 rbd-mirror: allocate empty object map during snapshot create
379 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
380 (cherry picked from commit 57a7fe0f44c5542a72120d0beed8b38e9ccd66db)
382 commit fa8a61df1570893e222c0d9431ba61e192a23c40
383 Author: Jason Dillaman <dillaman@redhat.com>
384 Date: Fri Apr 29 16:43:07 2016 -0400
386 librbd: optionally skip object map creation upon snapshot
388 This feature is used by rbd-mirror during image bootstrap since
389 it will directly create an empty object map.
391 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
392 (cherry picked from commit db16240c79be7e28d65edac2088352b9b146da5f)
394 commit a140753b6b01215f832cc9524e3532e825e4c2f2
395 Author: Jason Dillaman <dillaman@redhat.com>
396 Date: Mon Apr 25 15:11:28 2016 -0400
398 rbd-mirror: refactor snapshot create into its own state machine
400 Initial implementation will resize the image (if needed) and create
401 the snapshot. It is stubbed out for future state machines for handling
402 object map and clones.
404 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
405 (cherry picked from commit 8adc47fbf8efa3991bd247be43b786676fe5fff9)
407 commit ef1e4c874adba51bc5a3acbbf3177174f25da088
408 Author: Jason Dillaman <dillaman@redhat.com>
409 Date: Thu Apr 14 21:47:19 2016 -0400
411 rbd-mirror: sync snapshot protection status during bootstrap
413 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
414 (cherry picked from commit e6fba2b2306c8f04ce088fb15ef70e1dac282ff3)
416 commit c790da5aef0cb6a5573d86d0a8298d850b63ef25
417 Author: Jason Dillaman <dillaman@redhat.com>
418 Date: Sat Apr 9 13:30:56 2016 -0400
420 test: stub test cases for rbd-mirror image bootstrap
422 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
423 (cherry picked from commit d0f732877213ba9eec9d3158b839c5a4c796e7ab)
425 commit 7a7889572789e1bec9cb72e08a0d66d8302d7639
426 Author: Jason Dillaman <dillaman@redhat.com>
427 Date: Tue Apr 5 00:03:12 2016 -0400
429 test: share journal::MockJournaler between librbd and rbd-mirror
431 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
432 (cherry picked from commit 04db7ddec661ef195077c3fab06f248705b17220)
435 src/test/librbd/test_mock_Journal.cc: MockJournaler moved to new file
437 commit 7686c628b199dd2f3f58b70e7ab3bbb9c1f199c1
438 Merge: 63d2d23 f221fed
439 Author: Jason Dillaman <dillaman@redhat.com>
440 Date: Tue May 10 13:40:32 2016 -0400
442 Merge pull request #9040 from dillaman/wip-15818
444 jewel: librbd: potential concurrent event processing during journal replay
446 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
448 commit 63d2d2396d80fd7d9fd439488d08e8747846d181
449 Merge: 1bb1a3a f18b14b
450 Author: Jason Dillaman <dillaman@redhat.com>
451 Date: Tue May 10 13:39:46 2016 -0400
453 Merge pull request #9038 from dillaman/wip-15817
455 jewel: journal: incorrectly computed object offset within set
457 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
459 commit 1bb1a3a4862e5bb5a99c7549d499564deecbdafe
460 Merge: abbe69e 8605040
461 Author: Jason Dillaman <dillaman@redhat.com>
462 Date: Tue May 10 13:39:06 2016 -0400
464 Merge pull request #9039 from dillaman/wip-15820
466 jewel: librbd: client-side handling for incompatible object map sizes
468 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
470 commit 86050402066d1f5d680ec777826386a5760e3456
471 Author: Jason Dillaman <dillaman@redhat.com>
472 Date: Wed May 4 17:00:59 2016 -0400
474 librbd: guard object map against incompatible image sizes
476 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
477 (cherry picked from commit 42d3d3ac2d33360aae071330cfa34b87c87eadc5)
479 commit 7448d29027dafe1abd1e6ebff6f0fe5bb15e4b07
480 Author: Jason Dillaman <dillaman@redhat.com>
481 Date: Wed May 4 15:16:17 2016 -0400
483 librbd: properly handle object map open returning error code
485 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
486 (cherry picked from commit 570de56bfc7fd2edd5cf1cf5b7b92084cd3352a3)
488 commit 764b3bd413b81d2c98f8c325100661ee41a571bc
489 Author: Jason Dillaman <dillaman@redhat.com>
490 Date: Wed May 4 15:01:58 2016 -0400
492 librbd: add client-side memory constraint when loading object map
494 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
495 (cherry picked from commit 2dd34b2c7b8c376817aafe5cfdda7aa9cfb60e1a)
497 commit abbe69e19af6d453095e03adbaaaef680ed80958
498 Merge: 05d5749 5ec1f79
499 Author: Jason Dillaman <dillaman@redhat.com>
500 Date: Tue May 10 13:30:49 2016 -0400
502 Merge pull request #9048 from dillaman/wip-15819
504 jewel: librbd: constrain size of AioWriteEvent journal entries
506 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
508 commit 5ec1f79086e4841aa27c12531a1220f69ed3cccb
509 Author: Jason Dillaman <dillaman@redhat.com>
510 Date: Fri May 6 00:08:38 2016 -0400
512 librbd: split large AioWrite journal events
514 Ensure that AioWrite journal events fit within a single
517 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
518 (cherry picked from commit 70b9fbf2745c795fe345f0298a2f30af80a12985)
520 commit f1a2e6aeaa22233f13878d004cbe905a42bdc744
521 Author: Jason Dillaman <dillaman@redhat.com>
522 Date: Thu May 5 21:30:18 2016 -0400
524 journal: prohibit journal entries larger than the soft object size
526 This avoids complications like a librbd write event of 128MB trying
527 to fit within a 24MB journal object.
529 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
530 (cherry picked from commit d5f307dec10429a1ffc042919b71ac25466a1b72)
532 commit 05d574926df94b4fa2e0186f31d5050bd0b39ed3
533 Merge: 495313f 2d906e6
534 Author: Jason Dillaman <dillaman@redhat.com>
535 Date: Tue May 10 13:28:11 2016 -0400
537 Merge pull request #9036 from dillaman/wip-15814
539 jewel: librbd: fix get/list mirror image status API
541 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
543 commit 2d906e600a8d81aae15bcf3f8b2fc694537890d4
544 Author: Mykola Golub <mgolub@mirantis.com>
545 Date: Tue May 10 12:29:12 2016 +0300
547 rbd-mirror: fixup to get/list mirror image status API
549 - embed name and rbd_mirror_image_info_t into rbd_mirror_image_status_t;
550 - index image status list by image id to make 'start' work correctly;
551 - provide rbd_mirror_image_status_list_cleanup function.
554 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
555 (cherry picked from commit e6c709b3a8be489a900178b8b0d962705d5687e9)
557 commit 495313f355955463f747be9e6650fe8796c0d124
558 Merge: 9750610 617004e
559 Author: Jason Dillaman <dillaman@redhat.com>
560 Date: Tue May 10 13:15:23 2016 -0400
562 Merge pull request #9003 from dillaman/wip-15743
564 jewel: librbd: reduce log level for image format 1 warning
566 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
568 commit 9750610ebf7f4d853dee23adaf6109c2c6b63ee0
569 Merge: 0218f0b fb7eb4e
570 Author: Jason Dillaman <dillaman@redhat.com>
571 Date: Tue May 10 13:13:27 2016 -0400
573 Merge pull request #9010 from dillaman/wip-15736
575 jewel: rbd-mirror: admin socket commands to start/stop/restart mirroring
577 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
579 commit fb7eb4e6548b6536fccb6fd38b18a5ced0f9ee4b
580 Author: Mykola Golub <mgolub@mirantis.com>
581 Date: Thu Apr 28 09:32:33 2016 +0300
583 rbd-mirror: admin socket commands to start/stop/restart mirroring
585 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
586 (cherry picked from commit a22cf518f9cc0872f72a8a850ea01558094ebd00)
588 commit 8e46e4383a15f022e9213c6710671e6241e7fb6c
589 Author: Mykola Golub <mgolub@mirantis.com>
590 Date: Sun May 1 22:04:46 2016 +0300
592 qa/workunits/rbd: fix rbd-mirror log file name
594 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
595 (cherry picked from commit 4c28fc2aa378c10ce6e78b1a2f98d5e14ac211e9)
597 commit d73073a400807f2aa62d0eadc8ff6a8537ca04fa
598 Author: Mykola Golub <mgolub@mirantis.com>
599 Date: Thu Apr 28 09:23:35 2016 +0300
601 rbd-mirror: make image replayer asok commands available when not started
603 Initially the asok commands were registered only after the image
604 replayer start (and unregistered on stop) because their names were
605 built using remote pool and image names, which became known only after
608 Now, the asok commands are registered on the image replayer construction
609 using the temporary name "remote_pool_name/global_image_id". They are
610 re-registered using "remote_pool_name/remote_image_name" when the
611 image replayer is started. Also the commands are not unregistered on
612 the image replayer stop.
614 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
615 (cherry picked from commit 21790484dc66e97e7625b5b2afabb7efe3a92b08)
617 commit 24ea574a94c009d64d480bc3f887d4b0325d26d8
618 Author: Josh Durgin <jdurgin@redhat.com>
619 Date: Fri Apr 1 18:15:33 2016 -0700
621 qa/workunits/rbd: add env vars to adapt rbd_mirror.sh to teuthology
623 With these set, this script can work in teuthology, where we want to
624 control the how daemons run and their log locations, valgrind
625 settings, etc. The workunit task always sets CEPH_ID, and allows
626 other env vars to be configured optionally.
628 The RBD_MIRROR_USE_EXISTING_CLUSTER option can also speed up local testing.
630 Signed-off-by: Josh Durgin <jdurgin@redhat.com>
631 (cherry picked from commit dcd11a1f262e0c56bb1b37d54283cda06abbf4c7)
633 commit 21220a1fa668d4080eb7c4844cafeefffa77ecdc
634 Author: Josh Durgin <jdurgin@redhat.com>
635 Date: Thu Apr 7 16:57:14 2016 -0700
637 qa: rbd_mirror.sh: change parameters to cluster rather than daemon name
639 Daemon name is only useful to differentiate asok and pid filenames, so
640 just inline its use there. Everywhere else replace the 'daemon'
641 parameter with cluster or local_cluster as appropriate.
643 Remove the CLUSTER{1,2}_DAEMON vars as well, since they are no longer
646 Signed-off-by: Josh Durgin <jdurgin@redhat.com>
647 (cherry picked from commit 5fe64fa806f3bbdbdb950a5643238cc2508814b0)
649 commit 0218f0b0750b88f308f3ee0837b4e4efc7aeea63
650 Merge: a152b32 c1960de
651 Author: Jason Dillaman <dillaman@redhat.com>
652 Date: Tue May 10 13:04:09 2016 -0400
654 Merge pull request #9005 from dillaman/wip-15716
656 jewel: rbd-nbd: fix rbd-nbd aio callback error handling
658 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
660 commit a152b32016529633a810fc901a2c980ab1169b27
661 Merge: 54177d0 0e95ee4
662 Author: Jason Dillaman <dillaman@redhat.com>
663 Date: Tue May 10 13:03:38 2016 -0400
665 jewel: librbd: unlock image if journal error encountered during lock
667 jewel: librbd: unlock image if journal error encountered during lock
669 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
671 commit 54177d00f06ab3d712c8837832de080e452205de
672 Merge: b6b3cdd a73b9dd
673 Author: Jason Dillaman <dillaman@redhat.com>
674 Date: Tue May 10 13:02:24 2016 -0400
676 Merge pull request #9009 from dillaman/wip-15713
678 jewel: librbd: possible race condition leads to use-after-free
680 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
682 commit a73b9dd670bcd3a77611c7240d86963b29527983
683 Author: Jason Dillaman <dillaman@redhat.com>
684 Date: Tue May 3 07:41:30 2016 -0400
686 librbd: possible race condition leads to use-after-free
688 The invoke async operation state machine can complete before the
689 owner lock is released. Use a stack reference to prevent
692 Fixes: http://tracker.ceph.com/issues/15690
693 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
694 (cherry picked from commit d9421a25b582e41550526714b71fb55f05abb1de)
696 commit b6b3cdd40c60775c27b631cd8670e95bc84a5219
697 Merge: a3e2e41 28ac027
698 Author: Jason Dillaman <dillaman@redhat.com>
699 Date: Tue May 10 12:53:30 2016 -0400
701 Merge pull request #9004 from dillaman/wip-15708
703 jewel: rbd: help message distinction between commands and aliases
705 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
707 commit a3e2e410f5ef6308fcfd59baf607c49112f69138
708 Merge: ade4359 82838e3
709 Author: Jason Dillaman <dillaman@redhat.com>
710 Date: Tue May 10 12:53:00 2016 -0400
712 Merge pull request #8972 from Abhishekvrshny/wip-15697-jewel
714 jewel: python: clone operation will fail if config overridden with "rbd default format = 1"
716 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
718 commit ade4359b15d18ab51ab00168339d1aadcdffacbb
719 Merge: 7f95348 451246d
720 Author: Jason Dillaman <dillaman@redhat.com>
721 Date: Tue May 10 12:50:43 2016 -0400
723 Merge pull request #9008 from dillaman/wip-15698
725 jewel: rbd-mirror: lockdep error during bootstrap
727 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
729 commit 9bb17dbb1ce2ae910927e120cf35da9ee4c98225 (refs/remotes/gh/wip-rgw-period-delete-jewel)
730 Author: Casey Bodley <cbodley@redhat.com>
731 Date: Fri May 6 15:57:22 2016 -0400
733 rgw: fix for duplicates in list_periods()
735 Signed-off-by: Casey Bodley <cbodley@redhat.com>
736 (cherry picked from commit abed30befd86c68922759a66db589285fe01e54b)
738 commit 7ea6e78aa0aa3b86d663dab3f69998e5cd3a5177
739 Author: Casey Bodley <cbodley@redhat.com>
740 Date: Fri May 6 15:18:46 2016 -0400
742 rgw: 'period delete' cleans up all period objects
744 Fixes: http://tracker.ceph.com/issues/15469
746 Signed-off-by: Casey Bodley <cbodley@redhat.com>
747 (cherry picked from commit a286b32224d4a9757058415f98a2feff683ac520)
749 commit 451246df64890e39205d20d40eb5676893a7e1db
750 Author: Jason Dillaman <dillaman@redhat.com>
751 Date: Mon May 2 10:33:50 2016 -0400
753 librbd: disable automatic refresh of image upon lock message
755 There is no need to refresh the image upon request/release/acquire
756 of the exclusive lock. The next IO or maintenance op will kick off
757 the refresh. This is interfering with the refresh state machine
758 unit test case (since two concurrent refreshes shouldn't be possible).
760 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
761 (cherry picked from commit ee617a0ca56d752daf62bfffa59219b2c540a428)
763 commit 9e058fc852090ecb1b3a8daa3e0ee9df9d5eba3c
764 Author: Jason Dillaman <dillaman@redhat.com>
765 Date: Mon May 2 10:26:29 2016 -0400
767 librbd: update_features should release lock if acquired
769 There is a small window where requests are unblocked and before
770 the image is shut down where new requests can be accepted. These
771 are correctly canceled during the shut down, but it can lead to
774 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
775 (cherry picked from commit 608e09851396a9eeb7cf6dc1c7f687ef7a033601)
777 commit e653a1541ca7df29d01e8524a3f3b597fa0fb67b
778 Author: Jason Dillaman <dillaman@redhat.com>
779 Date: Mon May 2 09:27:29 2016 -0400
781 librbd: avoid applying refreshed image config within librados callback
783 There is a potential that a synchronous API call could deadlock a
786 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
787 (cherry picked from commit ce5c701bc47b0959f8453b6b92dee4804d3b1d75)
789 commit a5996e5ad64e01fcde50fc46bf9861b2d163f0c4
790 Author: Jason Dillaman <dillaman@redhat.com>
791 Date: Mon May 2 08:42:35 2016 -0400
793 rbd-mirror: don't use temporary string for snap operation
795 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
796 (cherry picked from commit 06faf83bbfab000c8200a9cbe781adb0082b3f7b)
798 commit a891919b85f44a7d81fb2fb84d1b8d7258b3fbdc
799 Author: Jason Dillaman <dillaman@redhat.com>
800 Date: Mon May 2 08:31:54 2016 -0400
802 librbd: avoid recursive locking within operation state machine
804 Fixes: http://tracker.ceph.com/issues/15664
805 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
806 (cherry picked from commit 91a4890ee78c25391c1548fdacb2b51c46a47415)
808 commit 7f953488b46642ed3825349d41a34b0faeb6a76b
809 Merge: 8963af7 895c975
810 Author: Jason Dillaman <dillaman@redhat.com>
811 Date: Tue May 10 12:47:01 2016 -0400
813 Merge pull request #8869 from Abhishekvrshny/wip-15669-jewel
815 jewel: Errors encountered disabling object-map while flatten is in-progress
817 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
819 commit 8963af73823285e9261acf6305778903a8f4205d
820 Merge: 978f30e 63738d4
821 Author: Jason Dillaman <dillaman@redhat.com>
822 Date: Tue May 10 12:46:12 2016 -0400
824 Merge pull request #8870 from Abhishekvrshny/wip-15668-jewel
826 jewel: rbd disk-usage CLI command should support calculating full image usage
828 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
830 commit 978f30e100fa91c148fd2aeaadad2f6e7bb94f9a
831 Merge: 1dceb38 32c0901
832 Author: Jason Dillaman <dillaman@redhat.com>
833 Date: Tue May 10 12:35:41 2016 -0400
835 Merge pull request #8868 from Abhishekvrshny/wip-15666-jewel
837 jewel: rbd CLI to retrieve rbd mirror state for a pool / specific image
840 src/tools/rbd_mirror/ImageReplayer.cc: trivial resolution
842 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
844 commit 1dceb38538d9c8a13551ef8b9217cb5757089576
845 Merge: 2495f08 357ad37
846 Author: Jason Dillaman <dillaman@redhat.com>
847 Date: Tue May 10 12:33:33 2016 -0400
849 Merge pull request #9046 from dillaman/wip-fix-snapc-validation-jewel
851 jewel: librbd: put the validation of image snap context earlier
853 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
855 commit 357ad37a4facc9917866c780892c7cd0e21653fd
856 Author: runsisi <runsisi@zte.com.cn>
857 Date: Wed Apr 20 09:55:39 2016 +0800
859 librbd: put the validation of image snap context earlier
861 we'd better validate the snap context right after we got the mutable
862 metadata before we could go any further
864 Signed-off-by: runsisi <runsisi@zte.com.cn>
865 (cherry picked from commit ca8ae66ba42e7a598ad23ed911938589dc288456)
867 commit 2495f08a64b352cbd21432b708fdd8e4090b67bb
868 Merge: 5e9128d 125aab8
869 Author: Jason Dillaman <dillaman@redhat.com>
870 Date: Tue May 10 12:31:10 2016 -0400
872 Merge pull request #8867 from Abhishekvrshny/wip-15661-jewel
874 jewel: Parent image is closed twice if error encountered while opening
876 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
878 commit 5e9128dc8b4af16512f689d556baa7d6e08ae1f8
879 Merge: c167514 af1c0bc
880 Author: Jason Dillaman <dillaman@redhat.com>
881 Date: Tue May 10 12:30:12 2016 -0400
883 Merge pull request #8866 from Abhishekvrshny/wip-15660-jewel
885 jewel: rbd-mirror can crash if start up is interrupted
887 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
889 commit c16751431baed0322765e502bf750b7f9be49e78
890 Merge: 5e89e82 a2eb187
891 Author: Jason Dillaman <dillaman@redhat.com>
892 Date: Tue May 10 12:29:02 2016 -0400
894 Merge pull request #9044 from dillaman/wip-librbd-bad-header-jewel
896 jewel: librbd: does not crash if image header is too short
898 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
900 commit a2eb187658d045160fb85f6c1d9437eaa49f0830
901 Author: Kefu Chai <kchai@redhat.com>
902 Date: Thu Apr 28 00:59:34 2016 +0800
904 librbd: does not crash if image header is too short
906 if something goes wrong with the object, and returns a chunk shorter
907 than expected, don't panic
909 Signed-off-by: Kefu Chai <kchai@redhat.com>
910 (cherry picked from commit 7b52183addda83f98c8b1f37d3de20ca0fc4687b)
912 commit 5e89e821f3e9b368b6d4963824e334acbd49cceb
913 Merge: f99aba4 8cae07c
914 Author: Jason Dillaman <dillaman@redhat.com>
915 Date: Tue May 10 12:26:48 2016 -0400
917 Merge pull request #8803 from SUSE/wip-15605-jewel
919 jewel: Potential double free of SetSnapRequest instance
921 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
923 commit f99aba4a869bbb6dda5353a6f5c9c65da32dcd02
924 Merge: 9d40896 9b2c173
925 Author: Jason Dillaman <dillaman@redhat.com>
926 Date: Tue May 10 12:16:09 2016 -0400
928 Merge pull request #8865 from Abhishekvrshny/wip-15649-jewel
930 jewel: possible double-free of object map invalidation request upon error
932 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
934 commit b6ebb25afc3d75d834311a9931b08c84e858a5e4
935 Author: Venky Shankar <vshankar@redhat.com>
936 Date: Thu May 5 15:28:16 2016 +0530
938 rbd: helpful error message on map failure
940 Failure to map an rbd image provides pretty much nothing to
941 debug (or rectify) the nature of failure. This change tries
942 to improve the same by providing helpful error messages (by
943 pointing to dmesg, etc..).
945 Fixes: http://http://tracker.ceph.com/issues/15816
946 Signed-off-by: Venky Shankar <vshankar@redhat.com>
948 commit f221fedb3b34bccd80383096d6ccfa19a4a72db9
949 Author: Jason Dillaman <dillaman@redhat.com>
950 Date: Fri May 6 11:16:37 2016 -0400
952 librbd: assertion to ensure no concurrent processing of replay events
954 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
955 (cherry picked from commit 44827a3e8e02529be84c829a76ef01f70e0d20ee)
957 commit 37f08e6e15b21eec2dedfd5e497619165cd3d117
958 Author: Jason Dillaman <dillaman@redhat.com>
959 Date: Fri May 6 11:05:50 2016 -0400
961 journal: suppress notifications if client still in try_pop_front loop
963 One such example is popping the last entry from an object. The next
964 object will be automatically prefetched. When that object is received,
965 we do not want to alert the user that entries are available since
966 try_pop_front already indicated more records were available.
968 Fixes: http://tracker.ceph.com/issues/15755
969 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
970 (cherry picked from commit 3b8d21ac13865791d8fc4c519f47c1f7d6096e76)
972 commit 82c04c5ad3476805d8c4f7569e1eba41244ad2c7
973 Author: Jason Dillaman <dillaman@redhat.com>
974 Date: Fri May 6 09:47:01 2016 -0400
976 librbd: delay processing of next journal entry until flush in-progress
978 When replaying a journal flush event, do not start processing the next
979 journal entry until after the flush is in progress to ensure the barrier
980 is correctly guarding against future writes.
982 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
983 (cherry picked from commit 5d205ef33cb8b5517f141d46a62947dd583500e0)
985 commit 9d40896d280f44080623b1d9a0d9aba35ae410c5
986 Merge: bc764b6 075ee03
987 Author: Yehuda Sadeh <yehuda@redhat.com>
988 Date: Tue May 10 08:31:02 2016 -0700
990 Merge pull request #8930 from theanalyst/wip-15707-jewel
992 jewel: multisite: Issues with Deleting Buckets
994 commit bc764b6af7fb7f5aea6bc5fd8c8f5b7174949a90
995 Merge: 8bbe2a9 7029b9c
996 Author: Yehuda Sadeh <yehuda@redhat.com>
997 Date: Tue May 10 08:30:52 2016 -0700
999 Merge pull request #9029 from theanalyst/wip-15680
1001 jewel: rgw: radosgw-admin zone set cuts pool names short if name starts with a period
1003 commit 8bbe2a924d9b27582c130f045e1fede29171f159
1004 Merge: 80beeff 5fdca84
1005 Author: Yehuda Sadeh <yehuda@redhat.com>
1006 Date: Tue May 10 08:30:03 2016 -0700
1008 Merge pull request #9022 from yehudasa/wip-rgw-leak-3-jewel
1010 jewel: rgw: leak fixes
1012 commit 80beeff4b1bf89fba6c36b59ffcec61aa8fc975e
1013 Merge: b9cb6bd d93fa13
1014 Author: Yehuda Sadeh <yehuda@redhat.com>
1015 Date: Tue May 10 08:29:52 2016 -0700
1017 Merge pull request #9021 from yehudasa/wip-rgw-xstorageurl-fix-jewel
1019 jewel: rgw: fix printing wrong X-Storage-Url in Swift's TempAuth.
1021 commit b9cb6bd73593da4312889c928fba8f02a50b1533
1022 Merge: ce2f028 f37318a
1023 Author: Yehuda Sadeh <yehuda@redhat.com>
1024 Date: Tue May 10 08:29:27 2016 -0700
1026 Merge pull request #9020 from yehudasa/wip-15597-jewel
1028 jewel: rgw: fix issue #15597
1030 commit ce2f028268509361700980d47dabe5429127910f
1031 Merge: 1cba195 a28fe02
1032 Author: Yehuda Sadeh <yehuda@redhat.com>
1033 Date: Tue May 10 08:29:18 2016 -0700
1035 Merge pull request #9019 from yehudasa/wip-rgw-admin-zonegroup-jewel
1037 jewel: radosgw-admin: add missing --zonegroup-id to usage
1039 commit 1cba1951898e8d21dbfd6b8e354ebaa29f48b720
1040 Merge: 4ead0f9 1d28aac
1041 Author: Yehuda Sadeh <yehuda@redhat.com>
1042 Date: Tue May 10 08:29:03 2016 -0700
1044 Merge pull request #9018 from yehudasa/wip-15626-jewel
1046 rgw: add AWS4 completion support for RGW_OP_SET_BUCKET_WEBSITE
1048 commit 4ead0f98dccf79f65878384ac0f45b9f3e2ad97c
1049 Merge: 6f23218 c08e90e
1050 Author: Yehuda Sadeh <yehuda@redhat.com>
1051 Date: Tue May 10 08:28:50 2016 -0700
1053 Merge pull request #9017 from yehudasa/wip-15625-jewel
1055 jewel: rgw: segfault at RGWAsyncGetSystemObj
1057 commit 6f23218bbcee8190acfdf0ae7b76e6e742015d91
1058 Merge: 2650806 e69bfa1
1059 Author: Yehuda Sadeh <yehuda@redhat.com>
1060 Date: Tue May 10 08:28:37 2016 -0700
1062 Merge pull request #9016 from yehudasa/wip-rgw-admin-modify-jewel
1064 jewel: radosgw-admin: update usage for zone[group] modify
1066 commit 26508062cbb13ba28252735449784dd4b63175af
1067 Merge: fdf8dcb 11d599c
1068 Author: Yehuda Sadeh <yehuda@redhat.com>
1069 Date: Tue May 10 08:27:56 2016 -0700
1071 Merge pull request #9015 from yehudasa/wip-rgw-zonegroup-remove-jewel
1073 jewel: radosgw-admin: zonegroup remove command
1075 commit f18b14b00fd3b8fbf3007f9eeb9424bbaf5ee14a
1076 Author: Jason Dillaman <dillaman@redhat.com>
1077 Date: Mon May 9 11:22:48 2016 -0400
1079 journal: incorrectly computed object offset within set
1081 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1082 (cherry picked from commit f3372a1bcf81fcfd75e7ef5901dbcdc1daa062a3)
1084 commit 466b7fe3d5cd6da8de993169da4c0e4c0990e703
1085 Author: xie xingguo <xie.xingguo@zte.com.cn>
1086 Date: Fri Apr 22 09:45:30 2016 +0800
1088 tools/crushtool: add straw2 support for help message
1090 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
1091 (cherry picked from commit 6448ea283b4e1519682ecb29f18fbb767752d496)
1093 commit d6692ed70aebc5387997660e9e2b025e96eff96f
1094 Author: Alfredo Deza <adeza@redhat.com>
1095 Date: Wed Apr 20 16:23:55 2016 -0400
1097 install-deps: remove distribute requirement
1099 Because it was meant for Ubuntu 12.04 and it is installing directly
1100 from PyPI on newer releases that aren't being built for 12.04
1102 Signed-off-by: Alfredo Deza <adeza@redhat.com>
1103 (cherry picked from commit 64f14d43a829f998b9a2ad5f3d87095560914e2a)
1105 commit 3011edab65e78156346ff7de655707619589bd7a
1106 Author: Alfredo Deza <adeza@redhat.com>
1107 Date: Wed Apr 20 15:48:19 2016 -0400
1109 tools: remove installation for distribute. It is no longer maintained and breaks builds
1111 Signed-off-by: Alfredo Deza <adeza@redhat.com>
1112 (cherry picked from commit d02bd9cb70479b7373c5b65e42e9c57f8eae55f1)
1114 commit 45a1f01aa4baa1913c335efb2f8b3941f3c0f791
1115 Author: Alexandre Derumier <aderumier@odiso.com>
1116 Date: Fri Apr 29 03:30:05 2016 +0200
1118 set 128MB tcmalloc cache size by bytes
1120 (cherry picked from commit d1d144c03bc9050931d86d635a16363bd2b73fd0)
1122 commit bb1aeb7c7bb296d9264f051519d100ecf1f50f1d
1123 Author: Alexandre Derumier <aderumier@odiso.com>
1124 Date: Thu Apr 28 22:55:37 2016 +0200
1126 etc/default/ceph: set 128MB tcmalloc cache size
1128 Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
1129 (cherry picked from commit 9decbd1026c6ab0474c73a26a9c84c24557beb8a)
1131 commit 617004ef26b6c97621a85a44b78cc7b0708fe161
1132 Author: Jason Dillaman <dillaman@redhat.com>
1133 Date: Tue May 10 08:33:03 2016 -0400
1135 test: update rbd integration cram test to remove format 1 warning
1137 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1138 (cherry picked from commit 098038fad47b181a9ddd11767397082b05405be5)
1140 commit 7029b9c3b0c02c9f20f6079243521458d28b2ab4
1141 Author: Yehuda Sadeh <yehuda@redhat.com>
1142 Date: Mon Apr 25 15:09:47 2016 -0700
1144 rgw: fix suffix in RGWZoneParams::fix_pool_names()
1146 Fixes: http://tracker.ceph.com/issues/15598
1148 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1149 (cherry picked from commit 6f6b0c925994b0369eda390a6b3fd20005e70c9b)
1151 commit f37318af823f76ba7bf05e09da83141b569bf579
1152 Author: Yehuda Sadeh <yehuda@redhat.com>
1153 Date: Mon May 9 14:23:03 2016 -0700
1157 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1158 (cherry picked from commit d53ffbfe65611425b08af71e0d24bfe2a0076f1e)
1160 commit a8b800b903f0f1144efe0cf3568b02b3e200c3b2
1161 Author: Yehuda Sadeh <yehuda@redhat.com>
1162 Date: Tue Apr 26 11:31:43 2016 -0700
1164 rgw: upgrade default zonegroup and set correct zone[group] id
1166 Fixes: http://tracker.ceph.com/issues/15597
1168 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1169 (cherry picked from commit 27806c71922eef2f4cde360d7ba40dee9d5bd4bd)
1171 commit 5fdca846aaea9afd16828d33ccc279c4dcdbcd4c
1172 Author: Yehuda Sadeh <yehuda@redhat.com>
1173 Date: Thu May 5 10:57:05 2016 -0700
1175 rgw: RGWHTTPClient requests can unregister themselves early
1177 No need to wait for req_state to complete anymore.
1179 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1180 (cherry picked from commit 91f61d68bf5fc39152d75fbc633f088e17d53d9e)
1183 src/rgw/rgw_http_client.cc
1185 commit 5609eb1bae0fc55b24a3025621597590f30aaad4
1186 Author: Yehuda Sadeh <yehuda@redhat.com>
1187 Date: Wed May 4 18:08:38 2016 -0700
1189 rgw: move around sync_env.init()
1191 call sync_env.init() even if we're initalized in RGWRemoteDataLog::init()
1193 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1194 (cherry picked from commit 3d8442effc1c175e0b7c5064ed41bc642f6cdcb0)
1196 commit faf6b2d25e89b7a84ed262c08b0a858dbf4199da
1197 Author: Yehuda Sadeh <yehuda@redhat.com>
1198 Date: Tue May 3 12:01:55 2016 -0700
1200 rgw: rados crs, explicit cleanup
1202 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1203 (cherry picked from commit 1c876eb3873692042c0af3644f8ee3ad15ffdbf5)
1205 commit b55514c390b22605fabdf3a8e5011415f57e6da8
1206 Author: Yehuda Sadeh <yehuda@redhat.com>
1207 Date: Tue May 3 12:00:46 2016 -0700
1209 rgw: RGWHTTPManager, avoid referring to req_data->client when completing
1211 this is past calling req_data->finish(), client can be destroyed by now
1213 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1214 (cherry picked from commit 7ada4df124a71eae413e7dec0e25264a8deffcad)
1216 commit 2d0cd8a08bb26f519d2b9b59bfe54f014cc36a1f
1217 Author: Yehuda Sadeh <yehuda@redhat.com>
1218 Date: Tue May 3 11:59:11 2016 -0700
1220 rgw: civetweb_callback() refer to store inside lock
1222 pe->store might change when reconfiguring
1224 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1225 (cherry picked from commit 2ca38dab071c7d20a224a4e1dacfd68548fe52dd)
1227 commit 2f65b313d08a5c9dfde220353eaa54204531b1ee
1228 Author: Yehuda Sadeh <yehuda@redhat.com>
1229 Date: Tue May 3 10:03:14 2016 -0700
1231 rgw: RGWPeriodPusher, stop http manager explicitly
1233 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1234 (cherry picked from commit 98433e589f2a8b519726ed23b1565c5eb331c68e)
1236 commit e5312b10aaa000d942468bf51d2164c689add279
1237 Author: Yehuda Sadeh <yehuda@redhat.com>
1238 Date: Tue May 3 10:02:02 2016 -0700
1240 rgw: RGWHTTPManager, can call stop() more than once
1242 destructor calls stop(), but it can be also called explicitly, if caller
1243 wants to ensure requests are not being handled anymore.
1245 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1246 (cherry picked from commit bdce81a2ae00f154420386e107a104cbf100d96d)
1248 commit cbea993562b03f75ceb0bdb7c02d72e5b51ae0fa
1249 Author: Yehuda Sadeh <yehuda@redhat.com>
1250 Date: Tue May 3 10:01:33 2016 -0700
1252 rgw: RGWReadRESTResourceCR, fix refcounting
1254 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1255 (cherry picked from commit d1ec31def71505dc95139fbdd3b49c92fec1d296)
1257 commit 93a65f3306e21c1bc34f5a95d85deeba746adb62
1258 Author: Yehuda Sadeh <yehuda@redhat.com>
1259 Date: Tue May 3 09:59:47 2016 -0700
1261 rgw: RGWReadRemoteDataLogShardCR fix destructor
1263 was missing destructor, constructor was broken
1265 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1266 (cherry picked from commit 95162a4c1bf61f7329e363b7efd5686f7e1025f0)
1268 commit 2de16690b6a404a365af5d9f526de044873f9729
1269 Author: Yehuda Sadeh <yehuda@redhat.com>
1270 Date: Mon May 2 18:13:17 2016 -0700
1272 rgw: RGWDataSyncStatusManager, cleanup if failing init
1274 init can be called more than once, ended up with leaking some resources
1276 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1277 (cherry picked from commit 14cd44e0847fd914068f48dd0208ce7c1fe4eecb)
1279 commit 57266e6b78851f8e6167f15ad8dbf7195d561371
1280 Author: Yehuda Sadeh <yehuda@redhat.com>
1281 Date: Fri Apr 29 13:04:13 2016 -0700
1283 rgw: rest crs, explicitly call cleanup
1285 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1286 (cherry picked from commit a3a3f4f5883f3fc2bf47a7ebfa538206b7ab51d9)
1288 commit 6b86332ca3ee35eb522cbf88408b7fd5f3070772
1289 Author: Yehuda Sadeh <yehuda@redhat.com>
1290 Date: Thu Apr 28 17:03:21 2016 -0700
1292 rgw: more leaks fixes
1294 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1295 (cherry picked from commit cb797d4fd754b4a33eb34c249da3aabc65a7aba3)
1297 commit 0fb48546a9fe6eb497833a6566353229e0923d3f
1298 Author: Yehuda Sadeh <yehuda@redhat.com>
1299 Date: Wed Apr 27 16:39:36 2016 -0700
1301 rgw: drop a reference to http op
1303 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1304 (cherry picked from commit 4442d1c19acfc28c2dd4a011365ebebe08750963)
1306 commit d93fa132bba597e71c4dd483663d2069e7117bf1
1307 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
1308 Date: Sun Apr 24 17:41:55 2016 +0200
1310 rgw: fix printing wrong X-Storage-Url in Swift's TempAuth.
1312 If the option "rgw_swift_account_in_url" is being set to true,
1313 both user and subuser IDs will be present in the X-Storage-Url
1314 header generated by the implementation of Swift API's TempAuth.
1315 This patch rectifies this behavior and makes that only the user
1316 identifier will be placed there.
1318 Fixes: http://tracker.ceph.com/issues/15667
1319 Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
1320 (cherry picked from commit 88f4c67d822388d2038454a25ead7e9a11f404b5)
1322 commit a28fe02c933e2ec7ea969a974f961769052e9d38
1323 Author: Casey Bodley <cbodley@redhat.com>
1324 Date: Tue Apr 26 15:20:45 2016 -0400
1326 radosgw-admin: add missing --zonegroup-id to usage
1328 also clarified that --rgw-zone takes the zone by name
1330 Signed-off-by: Casey Bodley <cbodley@redhat.com>
1331 Reported-by: John Wilkins <jowilkin@redhat.com>
1332 (cherry picked from commit 97fad754565b262529073e1b9f8d1799bfdfe0de)
1334 commit c08e90ea20b8ed96c7fe8638f725cf5abefc6783
1335 Author: Yehuda Sadeh <yehuda@redhat.com>
1336 Date: Wed Apr 27 15:09:55 2016 -0700
1338 rgw: don't allow any concurrent sync requests on the same key
1340 We used to allow concurrent requests, as long as these had different op,
1341 which wasn't correct.
1343 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1344 (cherry picked from commit edea6d58dd25995bcc1ed4fc5be6f72ce4a6835a)
1346 commit 6c61341697b99db34466c9e7e90aa7867048d651
1347 Author: Yehuda Sadeh <yehuda@redhat.com>
1348 Date: Tue Apr 26 15:59:33 2016 -0700
1350 rgw: collect children after waiting for them
1352 Otherwise we're going to busy loop there.
1354 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1355 (cherry picked from commit 806fb85d18653910863ba6b8cb56b8db1a0fa3d2)
1357 commit 4a5f33dd975eb44f908b8a90a7ad2e4beb17b354
1358 Author: Yehuda Sadeh <yehuda@redhat.com>
1359 Date: Tue Apr 26 15:29:41 2016 -0700
1361 rgw: don't pass object context into async coroutines
1363 Fixes: http://tracker.ceph.com/issues/15625
1365 The async read data/attrs coroutines may outlive the callers. Instead
1366 of introducing a complicated refcounting scheme, just don't pass it in.
1367 Anyway, it was not thread safe, and the benefit of using it is not
1370 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1371 (cherry picked from commit b225d1758057efc30721aad25447d54fa36e4cb2)
1373 commit 1d12f82a24f78769bcebb32cb379445e04f35e46
1374 Author: Yehuda Sadeh <yehuda@redhat.com>
1375 Date: Thu Apr 21 17:24:16 2016 -0700
1377 rgw: check for status >= 0
1381 check only verified that status was > 0, so we ended not updating mtime for
1382 the target object. This resulted in a continuous sync of objects.
1384 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1385 (cherry picked from commit 255f19d9ef964536f2db17f70749f489330262a6)
1387 commit a288a054c18fedda9ac3230d392f5a41a140ca9a
1388 Author: Yehuda Sadeh <yehuda@redhat.com>
1389 Date: Fri Apr 22 14:23:22 2016 -0700
1391 rgw: don't try to delete object if does not exist
1393 If we know that the object does not exist, no need to remove it.
1395 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1396 (cherry picked from commit 8d59a30d56b5f197a293f7fba6ebb1a630a33a05)
1398 commit 308b9f54e9fa07d071335bb2d953a50a5095c464
1399 Author: Yehuda Sadeh <yehuda@redhat.com>
1400 Date: Fri Apr 22 11:55:28 2016 -0700
1402 rgw, cls/rgw: store removed object mtime in bi log
1404 Store the mtime of the object that was removed in the bucket index log.
1405 This will be used in data sync.
1407 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1408 (cherry picked from commit 80d64049937e1930ea8273fdad76a51493a5e14a)
1410 commit 1d28aac642d940bb1c63733406999a7b027e05f2
1411 Author: Javier M. Mellid <jmunhoz@igalia.com>
1412 Date: Wed Apr 27 20:28:08 2016 +0200
1414 rgw: add AWS4 completion support for RGW_OP_SET_BUCKET_WEBSITE
1416 Fixes: http://tracker.ceph.com/issues/15626
1418 Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
1419 (cherry picked from commit 05373354e4725c3fc675df652fbf97da26160bcb)
1421 commit e69bfa14e184716c4ab6bf01746edf5c9663a8e1
1422 Author: Casey Bodley <cbodley@redhat.com>
1423 Date: Wed Apr 27 18:06:45 2016 -0400
1425 radosgw-admin: update usage for zone[group] modify
1427 the help strings indicated that only --master could be changed
1429 Signed-off-by: Casey Bodley <cbodley@redhat.com>
1430 (cherry picked from commit 410d432d11541a29c3fd4608a070cecf8dc2766e)
1432 commit 11d599cda659a42ddde43f34307c5e3553596c54
1433 Author: Casey Bodley <cbodley@redhat.com>
1434 Date: Fri May 6 14:26:46 2016 -0400
1436 test/rgw: add test_zonegroup_remove
1438 Signed-off-by: Casey Bodley <cbodley@redhat.com>
1439 (cherry picked from commit e2b27c7266f0ace372dbf94e062598fd7a575795)
1441 commit 928ccf4952052ab19044de1a8f20246075d54832
1442 Author: Casey Bodley <cbodley@redhat.com>
1443 Date: Fri May 6 14:26:23 2016 -0400
1445 test/rgw: index zones by name instead of insertion order
1447 Signed-off-by: Casey Bodley <cbodley@redhat.com>
1448 (cherry picked from commit 6327ade12bf0255c3b35bd6407f1dd2bcc6936fa)
1450 commit 5edacdccc61d565a0e91af452f9297d559a474e4
1451 Author: Casey Bodley <cbodley@redhat.com>
1452 Date: Mon May 2 11:38:24 2016 -0400
1454 radosgw-admin: add missing 'zonegroup remove'
1456 Fixes: http://tracker.ceph.com/issues/15684
1458 Signed-off-by: Casey Bodley <cbodley@redhat.com>
1459 (cherry picked from commit db0fa48ed5958d37928f893acd44cd66b6b9b990)
1461 commit 6b1d9ebb80478c1dfe0e974377bd4fb070a5d417
1462 Author: Casey Bodley <cbodley@redhat.com>
1463 Date: Mon May 2 11:36:58 2016 -0400
1465 rgw: RGWZoneGroup::remove_zone() takes zone id
1467 Signed-off-by: Casey Bodley <cbodley@redhat.com>
1468 (cherry picked from commit 3a451511fb38a5f1cd83ca3610c91141e7279f63)
1470 commit 0e95ee4bd16f4d54d1da476b51fd0fd0829d69ed
1471 Author: Jason Dillaman <dillaman@redhat.com>
1472 Date: Tue May 3 10:15:08 2016 -0400
1474 librbd: unlock image if journal error encountered during lock
1476 Explicitly unlock to prevent a client from accidentally blacklisting
1477 itself when retrying the lock.
1479 Fixes: http://tracker.ceph.com/issues/15709
1480 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1481 (cherry picked from commit a11f5e8e55fc448ed60616cbf66a3ea7db2247b9)
1483 commit fdf8dcb772d8313a3a801bf265f022505dba934d
1484 Merge: 030883f 0de6345
1485 Author: Sage Weil <sage@redhat.com>
1486 Date: Mon May 9 13:54:58 2016 -0400
1488 Merge pull request #9006 from athanatos/wip-15655-jewel
1490 OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1
1492 Reviewed-by: Sage Weil <sage@redhat.com>
1494 commit c1960debf5c8696f365cd670dedeea01d2a3b9a8
1495 Author: cy.l@inwinstack.com <cy.l@inwinstack.com>
1496 Date: Sat Apr 30 15:22:29 2016 +0800
1498 rbd-nbd: Fix aio_callback error handling
1500 Change aio_callback return code handling for NBD_CMD_READ command.
1503 http://tracker.ceph.com/issues/15604
1505 Signed-off-by: Chang-Yi Lee <cy.l@inwinstack.com>
1506 (cherry picked from commit ee211295441b126a995c07820176cfc966ab61c5)
1508 commit 4e87c1cd7e923f4254ce43e92e1cce4329fd86dd
1509 Author: cy.l@inwinstack.com <cy.l@inwinstack.com>
1510 Date: Wed Apr 27 11:00:25 2016 +0800
1512 Fix RBD-NBD aio_callback error handling
1516 Signed-off-by: Chang-Yi Lee <cy.l@inwinstack.com>
1517 (cherry picked from commit f8f6c1dc865b7ed642fec3f416e5eca5e91523d0)
1519 commit 28ac027f6f86635d320f0f5e25582452011d9bed
1520 Author: YongQiang <he.yongqiang@h3c.com>
1521 Date: Fri Apr 22 11:20:31 2016 -0400
1523 rbd:make a distinction of help message between ''rbd snap rollback" and "rbd snap revert"
1525 Fixes: https://tracker.ceph.com/issues/15521
1527 Signed-off-by: Yongqiang He <he.yongqiang@h3c.com>
1528 (cherry picked from commit 1bf26509c6efd06a8facc0e45ab42255592ca74d)
1530 commit 039554d7ad8cfd82bcb6d4c6564f6dd46320a24f
1531 Author: Jason Dillaman <dillaman@redhat.com>
1532 Date: Wed May 4 13:36:06 2016 -0400
1534 librbd: reduce log level for image format 1 warning
1536 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1537 (cherry picked from commit c87f383b65ccc2e91645394f1c75de1c2d52e1e1)
1539 commit 030883f41d3d2d8f297b3d3f6e7c7fa5a06ea4c0
1540 Author: xie xingguo <xie.xingguo@zte.com.cn>
1541 Date: Tue Apr 26 15:12:17 2016 +0800
1543 osdc/Objecter: fix race condition for sortbitwise flag detection
1545 During list_objects/list_nobjects(), we are checking osdmap's
1546 sortbitwise flag setting without holding rwlock in hand, which
1547 is a potential race condition.
1549 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
1550 (cherry picked from commit 7fb6be706be2454cc2a831df29808997f0aa5ab3)
1552 commit 82838e340e0ab7c593618f5807ea5868ecd6bc48
1553 Author: Jason Dillaman <dillaman@redhat.com>
1554 Date: Mon May 2 15:06:51 2016 -0400
1556 librbd: default clone operation to image format 2
1558 Image format 1 doesn't support clones, so unless the user
1559 overrode the setting, default to format 2.
1561 Fixes: http://tracker.ceph.com/issues/15685
1562 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1563 (cherry picked from commit f24c70f54343aa6698af8ac1f0774282b0659968)
1565 commit ca13a9554d8a9d97428c2096b5a2ae8e25d08a9e
1566 Author: Jason Dillaman <dillaman@redhat.com>
1567 Date: Mon May 2 14:51:31 2016 -0400
1569 librbd: add rbd_image_options_is_set helper method to API
1571 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1572 (cherry picked from commit 2633b045e0b57827cc10c2e7707bd5a5e344e59a)
1574 commit e6aa4533feb9c8e6d15c820f54dd719c378dd26e
1575 Author: John Spray <john.spray@redhat.com>
1576 Date: Fri Apr 29 20:12:20 2016 +0100
1578 mds: fix upgrades with replay daemons in map
1580 In the new world, a standby replay daemon which
1581 is actively replaying has its rank set. In the old
1582 world it did not: map this during the upgrade/downgrade
1583 paths in decode/encode.
1585 Fixes: http://tracker.ceph.com/issues/15591
1586 Signed-off-by: John Spray <john.spray@redhat.com>
1587 (cherry picked from commit d94115aa2a4bd92c56552e9fd11205d391a1c673)
1589 commit 6c1b792b7b2fba729f21b0f10ec70d14b830ffa9
1590 Author: John Spray <john.spray@redhat.com>
1591 Date: Wed Mar 30 12:06:27 2016 +0100
1593 doc: add cephfs daemon management docs
1595 Principally to tell people how to configure
1596 standby, but more generally as a place to define
1597 our terms for GIDs etc.
1599 Signed-off-by: John Spray <john.spray@redhat.com>
1600 (cherry picked from commit 97dd6897efaa14d3f8859a791949f9d246769620)
1602 commit bf44c6d434a41b90c0739e493a022cb3d3df5554
1603 Author: John Spray <john.spray@redhat.com>
1604 Date: Wed Mar 30 12:05:43 2016 +0100
1606 mds: omit fscid in single-filesystem status output
1608 Signed-off-by: John Spray <john.spray@redhat.com>
1609 (cherry picked from commit ec8f3db3e5c26b60b9333e86453e1b17324a8cfa)
1611 commit be5274c3f47ecb0dca0facca37d4a90c68b37027
1612 Author: John Spray <john.spray@redhat.com>
1613 Date: Thu Mar 24 13:23:26 2016 +0000
1615 mds: simplify standby/standby-replay logic
1617 This used to use an arcane set of constants
1618 in standby_for_rank, combined with daemons sometimes
1619 sending requests to enter state STANDBY_REPLAY.
1621 Simplify this so that there is only one place we
1622 put daemons into standby replay, and that is
1623 in tick->maybe_promote_staandby.
1625 There is a behavioural change in here, which is
1626 that we used to sometimes promote standbys to
1627 be standby-replay, even if they didn't have
1628 "standby replay = true", when they did have
1629 a standby_for_rank or standby_for_name set.
1630 I'm calling that a bug, and making it so that
1631 daemons will only go into standby-replay if
1632 "standby replay = true" is set.
1634 Signed-off-by: John Spray <john.spray@redhat.com>
1635 (cherry picked from commit 2a2a56b2d0e9e4224cae27f80d990b787e209bed)
1637 commit ae3ce5b8741eaf65d03aeb7b74925a75e5ef2598
1638 Author: John Spray <john.spray@redhat.com>
1639 Date: Thu Mar 24 13:13:55 2016 +0000
1641 messages: add MMDSBeacon::standby_replay
1643 So that daemons can explicitly say that they
1644 want to be standby replay, instead of using
1645 magic standby_for_rank values.
1647 Because in some cases daemons would indicate this
1648 with a beacon requesting STANDBY_REPLAY state, we
1649 also munge these during decode to be normal STANDBY
1650 requests with standby_replay=true.
1652 Signed-off-by: John Spray <john.spray@redhat.com>
1653 (cherry picked from commit cdf8a29f81475a000824ce8942f02d9d570ec3bb)
1655 commit 02e3edd93c0f4ef6e0d11df1f35187f74c7ea2ff
1656 Author: John Spray <john.spray@redhat.com>
1657 Date: Tue Mar 22 17:44:22 2016 +0000
1659 mds: remove ONESHOT_REPLAY mode
1661 This predated cephfs-journal-tool. Don't bother
1662 with any backwards-compatibility mechanisms here, as
1663 it was a seriously niche undocumented thing.
1665 On the off chance that someone ran an old ceph-mds against
1666 a newer ceph-mon with oneshot enabled, it shouldn't break
1667 anything, it just won't do what they want.
1669 Signed-off-by: John Spray <john.spray@redhat.com>
1670 (cherry picked from commit edfda9c6b0a0c8b75ebff5f06017aa475339b1fd)
1672 commit 52ca195221ffa86b778346e847aeec817329c651
1673 Author: John Spray <john.spray@redhat.com>
1674 Date: Thu Apr 7 12:53:00 2016 +0100
1676 mds: remove stale comments
1678 A little bit of detritus from the MDS->MDSRank refactor.
1680 Signed-off-by: John Spray <john.spray@redhat.com>
1681 (cherry picked from commit e9b58e7ff97646e557c5b3e2c86a067d2d136149)
1683 commit c1279d8ff8716a54622bf98bd29ce40faa2bf41d
1684 Author: John Spray <john.spray@redhat.com>
1685 Date: Thu Apr 7 12:37:08 2016 +0100
1687 mds: remove inc array from mdsmap
1689 Instead, use the MDSMap epochs to provide the `inc` that
1690 we populate into mds_info_t for use by the daemons.
1692 It is not necessary to respect the current value of inc
1693 in old maps, because the per-rank counters were necessarily
1694 lower numbers than the overall map epoch (incrementing
1695 the counters always corresponded to a map change).
1697 Fixes: http://tracker.ceph.com/issues/15399
1698 Signed-off-by: John Spray <john.spray@redhat.com>
1699 (cherry picked from commit 30a375ebf814245fbbb5155fd39d8ff673f0a32a)
1701 commit 9d5162fe102301bc94065f99a20b3067395dde2a
1702 Author: John Spray <john.spray@redhat.com>
1703 Date: Thu Sep 24 14:03:58 2015 +0100
1705 test/mds: add test for symbols in paths
1707 Especially, hyphens.
1709 Signed-off-by: John Spray <john.spray@redhat.com>
1710 (cherry picked from commit 4e9327f64e5965c57c0eeea397060dc2ab43cfbf)
1712 commit af3a4e4af36b5159721b634e216edcab9a171155
1713 Author: John Spray <john.spray@redhat.com>
1714 Date: Tue Apr 12 02:49:32 2016 +0100
1716 mds: fix auth caps with hyphen in path
1718 Quirk of the boost spirit char() fn, hyphens
1719 are treated as range delimiters unless they're
1720 the last character in the set.
1723 Signed-off-by: John Spray <john.spray@redhat.com>
1724 (cherry picked from commit f82fa5f59a80851581573553be07e8f1620ee346)
1726 commit 075ee0310888d012c56c494291b873be47393e47
1727 Author: Abhishek Lekshmanan <abhishek@suse.com>
1728 Date: Tue Apr 19 15:20:53 2016 +0200
1730 rgw_op: pass delete bucket op to master zone first
1732 Basically first ask the master to process a delete bucket request before
1733 we process it in the zone locally, otherwise we reach a situation where
1734 we drop the bucket locally and master will still maintain an index
1736 Fixes: http://tracker.ceph.com/issues/15540
1737 Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
1738 (cherry picked from commit da6b44a6e47399493adae53ad3c36a029f1e2a23)
1740 commit 1527b56a888a65fa28223cd9c9cdb06d1575973c
1741 Author: Abhishek Lekshmanan <abhishek@suse.com>
1742 Date: Tue Apr 19 15:20:07 2016 +0200
1744 rgw: add errno entry for -ENOTEMPTY
1746 currently if master returns an -ENOTEMTPY, we return a -EIO as we dont
1747 have an entry for this
1749 Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
1750 (cherry picked from commit 40c3bfef8cc3bce7d15fbb0e135c1a909ee59368)
1752 commit 791eba81a5467dd5de4f1680ed0deb647eb3fb8b
1753 Author: Alexandre Derumier <aderumier@odiso.com>
1754 Date: Thu Apr 28 22:48:52 2016 +0200
1756 fix deb package /etc/default/ceph location
1758 commit 7384a14f243519547a61534d22e21e6069aae016 have introduce
1759 the /etc/default/ceph file at a wrong location : /etc/default/ceph/ceph
1761 (cherry picked from commit 13804fafd4c33068d8ed6d0480b594daec0f9341)
1763 commit d9851351aeb6d45a2df1c107b23e77c992926d0a
1764 Author: xie xingguo <xie.xingguo@zte.com.cn>
1765 Date: Tue Apr 26 11:13:32 2016 +0800
1767 mon/OSDMonitor: improve reweight_by_utilization() logic
1769 By calling reweight_by_utilization() method, we are aiming at an evener result
1770 of utilization among all osds. To achieve this, we shall decrease weights of
1771 osds which are currently overloaded, and try to increase weights of osds which
1772 are currently underloaded when it is possible.
1773 However, we can't do this all at a time in order to avoid a massive pg migrations
1774 between osds. Thus we introduce a max_osds limit to smooth the progress.
1776 The problem here is that we have sorted the utilization of all osds in a descending
1777 manner and we always try to decrease the weights of the most overloaded osds
1778 since they are most likely to encounter a nearfull/full transition soon, but
1779 we won't increase the weights from the most underloaded(least utilized by contrast)
1780 at the same time, which I think is not quite reasonable.
1782 Actually, the best thing would probably be to iterate over teh low and high osds
1783 in parallel, and do the ones that are furthest from the average first.
1785 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
1786 (cherry picked from commit e7a32534ebc9e27f955ff2d7a8d1db511383301e)
1788 commit b0543fdfdebc6766fe927b4cc34a4369e7f86544
1789 Author: xie xingguo <xie.xingguo@zte.com.cn>
1790 Date: Mon Apr 25 15:43:03 2016 +0800
1792 mon/OSDMonitor: avoid potential expensive grace calculation
1794 The grace calculation during check_failure() is now very complicated
1795 and time-consuming. Therefore we shall skip this when it is possible.
1797 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
1798 (cherry picked from commit 3557903d5d57642179b2ae137bedc389974b1956)
1800 commit 53686dfac0622a981374d448ce8229eb3984e5c2
1801 Author: Sage Weil <sage@redhat.com>
1802 Date: Fri Apr 29 22:01:56 2016 -0400
1804 mon/OSDMonitor: max_osds must be > 0 for reweight-by-*
1806 Include a few test cases.
1808 Signed-off-by: Sage Weil <sage@redhat.com>
1809 (cherry picked from commit 84bd0dce18f6dd0c35d7e6cfee91ce8c5a0f4db7)
1811 commit ec416556e516b60ab490c424a4e45fa9ff8f8fd0
1812 Merge: 442c31b f4d63af
1813 Author: John Spray <jspray@redhat.com>
1814 Date: Tue May 3 08:05:23 2016 -0500
1816 Merge pull request #8787 from xiaoxichen/wip-15631
1818 jewel: CephFSVolumeClient should isolate volumes by RADOS namespace
1820 Reviewed-by: John Spray <john.spray@redhat.com>
1822 commit 0de63455cbf662435ff57a35b9d98187091dcec7 (refs/remotes/gh/wip-sam-testing-jewel)
1823 Author: Samuel Just <sjust@redhat.com>
1824 Date: Thu Apr 28 13:47:48 2016 -0700
1826 OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1
1828 Fixes: http://tracker.ceph.com/issues/15655
1829 Signed-off-by: Samuel Just <sjust@redhat.com>
1830 (cherry picked from commit c121bc51a5a877a49094cfbd3bd16af1f3ae5090)
1832 commit 63738d4d154d983d98021a09daa24607df64b979
1833 Author: Jason Dillaman <dillaman@redhat.com>
1834 Date: Thu Apr 28 15:53:59 2016 -0400
1836 rbd: disk usage now includes all snapshots by default
1838 Added a new "--from-snap" optional to restrict the calculation to
1839 specific subsets of snapshots and the HEAD revision.
1841 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1842 (cherry picked from commit 1ccdcb5b6c1cfd176a86df4f115a88accc81b4d0)
1844 commit 895c975651b722832befeb829a43acc55823740b
1845 Author: Jason Dillaman <dillaman@redhat.com>
1846 Date: Thu Apr 28 12:48:59 2016 -0400
1848 librbd: block RPC requests while updating features
1850 Disabling the journal and object map require acquiring the exclusive
1851 lock locally. We don't want to start executing long-running ops
1852 for this quick process.
1854 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1855 (cherry picked from commit db7aaff0f6d7a57e2b36d22b609f915f9b2b3893)
1857 commit 1f0056a427cd46793934c59c49aa225da2237628
1858 Author: Jason Dillaman <dillaman@redhat.com>
1859 Date: Thu Apr 28 12:43:24 2016 -0400
1861 librbd: return -ESHUTDOWN when a refresh is requested on a closed image
1863 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1864 (cherry picked from commit ed132a1eb10e6b2eb4bc465658eb0379daca3d67)
1866 commit 6da1a84f16f4478ec17bdd4f50d9b0a02178c444
1867 Author: Jason Dillaman <dillaman@redhat.com>
1868 Date: Thu Apr 28 12:42:49 2016 -0400
1870 librbd: synchronous block_writes should return possible error result
1872 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1873 (cherry picked from commit 88e76cb3c9a74b4718ad39c827f2194666f5be2a)
1875 commit 04ef40e7652ff05146289a6e9e15ce2290a1ee32
1876 Author: Jason Dillaman <dillaman@redhat.com>
1877 Date: Thu Apr 28 11:46:20 2016 -0400
1879 librbd: refresh image before executing maint op
1881 If a maint op is interrupted and restarted, it's possible that the
1882 image will need to be refreshed.
1884 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1885 (cherry picked from commit 9cf6821bd9f58c181720a5c8156cec5ab33d35d4)
1887 commit 64cb6455f384f5ecc20abcf4d4ec6596569ac4c0
1888 Author: Jason Dillaman <dillaman@redhat.com>
1889 Date: Thu Apr 28 11:10:25 2016 -0400
1891 librbd: reduce log level when lock owner not detected
1893 This can happen under normal operating conditions and the
1894 lock request is automatically retried.
1896 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1897 (cherry picked from commit 5a4893b7a7e50cc399696e1d0cb4d4f8785e723d)
1899 commit 49cfb0e48014610d04233a6c7549bbc3756dd3f6
1900 Author: Jason Dillaman <dillaman@redhat.com>
1901 Date: Thu Apr 28 10:52:15 2016 -0400
1903 librbd: reduce log level for interrupted maint ops
1905 Fixes: http://tracker.ceph.com/issues/15572
1906 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1907 (cherry picked from commit 1617328402345c68bf5d54828da6d687e51ef42b)
1909 commit 32c09015a16ef8dee535d2c81825a2590f7f15e7
1910 Author: Mykola Golub <mgolub@mirantis.com>
1911 Date: Sun Apr 24 19:39:40 2016 +0300
1913 qa/workunits/rbd: test mirror status in pool directory
1915 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1916 (cherry picked from commit f15cd51a1ddbd4079a8218bc2446a4bf68f95107)
1918 commit 9a30a89abc5749c37d26d39c175e51259f63caec
1919 Author: Mykola Golub <mgolub@mirantis.com>
1920 Date: Thu Apr 21 09:52:47 2016 +0300
1922 rbd-mirror: in replay status store number of entries behind master
1924 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1925 (cherry picked from commit e4229d1d4b163f1003e68fef1db63f796393ba23)
1927 commit 15a9131fd2d55191c3082c6692f5e8f714fcff71
1928 Author: Mykola Golub <mgolub@mirantis.com>
1929 Date: Fri Apr 15 08:42:17 2016 +0300
1931 librbd: API to retrieve image mirroring status
1933 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1934 (cherry picked from commit a2045d61874f9e418b5b3c3136af4482603c8e7f)
1936 commit 98ca7f3904a9c8ff9a661f153069a8747a51431b
1937 Author: Mykola Golub <mgolub@mirantis.com>
1938 Date: Wed Apr 6 14:57:29 2016 +0300
1940 test: MockJournaler: add get_cached_client method
1942 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1943 (cherry picked from commit 7633407ab584ce8c7777a525554773c2a358ce5f)
1945 commit e57c4d8f0832abcf431029b04da43e043a479d19
1946 Author: Mykola Golub <mgolub@mirantis.com>
1947 Date: Tue Apr 5 14:42:09 2016 +0300
1949 rbd: CLI to retrieve rbd mirror state for a pool / specific image
1952 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1953 (cherry picked from commit fe5207278d884464c05d6808245a0c4df03c441c)
1955 commit 6111a25448fda1824ca6b3007fcdece1970674d6
1956 Author: Mykola Golub <mgolub@mirantis.com>
1957 Date: Tue Apr 5 14:40:50 2016 +0300
1959 rbd-mirror: store replay status in mirroring object
1962 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1963 (cherry picked from commit 52b2fe14cfc932b2aa53ce76a3150ce87ce4d377)
1965 commit f22514201c3b49d93593fad27360deb7b715493d
1966 Author: Mykola Golub <mgolub@mirantis.com>
1967 Date: Tue Apr 5 14:25:11 2016 +0300
1969 test: cls_rbd: methods to store/retrieve mirroring status
1971 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1972 (cherry picked from commit 8aefad59813489cee112f46b3fe10331bb039b57)
1974 commit 4a3f0d23ba4b96a28de661e219dcb52165bbbeac
1975 Author: Mykola Golub <mgolub@mirantis.com>
1976 Date: Tue Apr 5 14:24:07 2016 +0300
1978 cls::rbd:: methods to store/retrieve mirroring status
1980 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1981 (cherry picked from commit 17dd40df4f4201cf0c0c6d58b1728177c5ee726b)
1983 commit 62c60144311518e7e7947791a17608ed1765f971
1984 Author: Mykola Golub <mgolub@mirantis.com>
1985 Date: Fri Apr 1 08:27:03 2016 +0300
1987 objclass: add method to list watchers
1989 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1990 (cherry picked from commit 44a31d2b770ef016271f9285447c601921b9c838)
1992 commit 442c31bcf73899767c7fa198427712bbdf767067
1993 Merge: 6e5091e d302617
1994 Author: Boris Ranto <branto@redhat.com>
1995 Date: Mon May 2 08:35:09 2016 +0200
1997 Merge pull request #8843 from SUSE/wip-msd-typo-fix-jewel
1999 systemd: fix typo in preset file
2001 Reviewed-by: Boris Ranto <branto@redhat.com>
2003 commit 125aab8dc4300dc9c67b2d4ca219cfbd60ab0924
2004 Author: Jason Dillaman <dillaman@redhat.com>
2005 Date: Wed Apr 27 15:56:11 2016 -0400
2007 librbd: propagate any image refresh errors back to caller
2009 Previously, the saved error code was only propagated when an image
2012 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2013 (cherry picked from commit 105ef8a24aa6ac8719f68c5a9366129ddb41ee88)
2015 commit 5fe4beac0ed68ebf33fa69ba7a3082d2072bb9ce
2016 Author: Jason Dillaman <dillaman@redhat.com>
2017 Date: Wed Apr 27 15:45:25 2016 -0400
2019 librbd: avoid second close attempt of invalid parent image
2021 Fixes: http://tracker.ceph.com/issues/15574
2022 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2023 (cherry picked from commit e91e7f8d9ce10f0d19c48facfb6318d6b49798e8)
2025 commit af1c0bce9184c55aa88b4082db9302239009af36
2026 Author: Jason Dillaman <dillaman@redhat.com>
2027 Date: Wed Apr 27 15:22:59 2016 -0400
2029 rbd-mirror: interrupting image replay startup can cause crash
2031 Properly shut down the journaler if a shut down has been requested
2032 while start up is in-progress.
2034 Fixes: http://tracker.ceph.com/issues/15630
2035 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2036 (cherry picked from commit 3a71052a5b14af34ed81f6ee77f862f576a7a5cc)
2038 commit 9b2c17392a2d9543f05d0cb8486183edf84eb2c3
2039 Author: runsisi <runsisi@zte.com.cn>
2040 Date: Thu Apr 28 09:05:33 2016 +0800
2042 librbd: fix potential assertion for object map invalidation
2044 if update_flags fails we should not go any further, or the async request
2045 will be removed from m_image_ctx.async_requests twice
2047 Signed-off-by: runsisi <runsisi@zte.com.cn>
2048 (cherry picked from commit dd0eb719a50e9fb24eca5a840c2e8adb53be41b2)
2050 commit 6e5091e454018e42ebe79bc4ec70cd24bfaeb36d
2051 Author: Nathan Cutler <ncutler@suse.com>
2052 Date: Sat Apr 30 16:21:13 2016 +0200
2054 systemd: fix typo in preset file
2056 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2057 (cherry picked from commit 80be4a8cbf1d42232ff61494d035e7abd90c2c14)
2059 commit d3026174f87ede746a0ab0aa96b0efbf5e77b161
2060 Author: Nathan Cutler <ncutler@suse.com>
2061 Date: Sat Apr 30 16:21:13 2016 +0200
2063 systemd: fix typo in preset file
2065 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2066 (cherry picked from commit 80be4a8cbf1d42232ff61494d035e7abd90c2c14)
2068 commit 9cdad1f348a67e3f4daec617210340b14a2dd49a
2069 Merge: 96b3726 37ccacf
2070 Author: Boris Ranto <branto@redhat.com>
2071 Date: Fri Apr 29 08:22:01 2016 +0200
2073 Merge pull request #8801 from SUSE/wip-15633-jewel
2075 jewel: ceph-{mds,mon,osd} packages need scriptlets with systemd code
2077 Reviewed-by: Nathan Cutler <ncutler@suse.com>
2078 Reviewed-by: Boris Ranto <branto@redhat.com>
2080 commit 8cae07c10b9cb62af87d494724586c945f181127
2081 Author: runsisi <runsisi@zte.com.cn>
2082 Date: Thu Apr 21 14:48:55 2016 +0800
2084 librbd: fix potential double free of SetSnapRequest instance
2086 if image feature EXCLUSIVE_LOCK is not enabled we should not try to
2087 initialize the exclusive lock, or we may end with two async Contexts
2088 to finish the same SetSnapRequest instance
2090 Fixes: http://tracker.ceph.com/issues/15571
2091 Signed-off-by: runsisi <runsisi@zte.com.cn>
2092 (cherry picked from commit 0a6eaac12fe29762c3dd29068f9427840cfea100)
2094 commit 37ccacf7d1ce57291d6cbadd416fb96aed7db36a
2095 Author: Boris Ranto <branto@redhat.com>
2096 Date: Wed Apr 27 18:10:51 2016 +0200
2098 rpm: Add rpm scripts for ceph-rbd-mirror
2100 We are currently missing the systemd scripts for the new ceph-rbd-mirror
2101 daemons. This patch introduces them.
2103 Signed-off-by: Boris Ranto <branto@redhat.com>
2104 (cherry picked from commit 14652f32165f72efde569a939179fc26584ab155)
2106 commit c729bdd4bcb974081899c65934d3fdb9e0e96316
2107 Author: Boris Ranto <branto@redhat.com>
2108 Date: Wed Apr 27 18:00:08 2016 +0200
2110 rpm: Start all the targets in %post
2112 We need to have the sub-targets active for the ceph.target to be able
2113 to propagate its calls to the services. If the sub-target is inactive,
2114 the main target won't propagate the stop/restart calls.
2116 Signed-off-by: Boris Ranto <branto@redhat.com>
2117 (cherry picked from commit 73f457986753b504fd088c1fa064608aa9d340c9)
2119 commit c72f0bc3d4fb9a3f5abfefcf8d2775721d95b33a
2120 Author: Nathan Cutler <ncutler@suse.com>
2121 Date: Tue Apr 19 14:48:41 2016 +0200
2123 rpm: implement scriptlets for the post-split daemon packages
2125 This patch gives each of the ceph-{mds,mon,osd,radosgw} packages its own
2126 %post, %preun, and %postun scriptlets dealing with the package's unit files.
2128 The scriptlets of ceph-base are adapted to handle the ceph.target unit file
2131 The scriptlets of ceph-mon handle ceph-create-keys services in addition to ceph-mon.
2133 The scriptlets of ceph-osd handle ceph-disk services in addition to ceph-osd.
2135 Fixes: http://tracker.ceph.com/issues/14941
2136 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2137 Signed-off-by: Boris Ranto <branto@redhat.com>
2138 (cherry picked from commit 644aba9270714e5e231ac7d7e3437477837531eb)
2140 commit 81f407337da18b5b555c6737e394a0e054d7c7da
2141 Author: Nathan Cutler <ncutler@suse.com>
2142 Date: Tue Apr 19 14:51:01 2016 +0200
2144 systemd: enable all the ceph .target services by default
2146 Some distros, like Fedora and openSUSE, have a policy that all services are
2147 disabled by default.
2149 This patch changes that default for the ceph.target and
2150 ceph-{mds,mon,osd,radosgw}.target services.
2152 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2153 Signed-off-by: Boris Ranto <branto@redhat.com>
2154 (cherry picked from commit 53b1a6799c2ce08acc8382e4aa996d1bde700316)
2156 commit f4d63af533b22f740d809272e2e47ebc9d8d6845
2157 Author: Xiaoxi Chen <xiaoxchen@ebay.com>
2158 Date: Wed Apr 6 22:50:05 2016 +0800
2160 python_cephfs: rule out empty/None volume_id
2162 Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
2163 (cherry picked from commit 73368069dd466cdbde1ebeae97771d603ce431f5)
2165 commit b609017a52e3140e9ff6314b8d312a409af52a57
2166 Author: Xiaoxi Chen <xiaoxchen@ebay.com>
2167 Date: Wed Apr 6 22:45:02 2016 +0800
2169 python-cephfs: use rados namespace for data isolation.
2171 As cephfs dir layout supports rados namespace in jewel, it would be
2172 good to use rados namespace instead of pool, since it is free,
2173 we always enforce namespace isolation for volumes.
2175 The meaning of "data_isolated" flag changed a bit, it's no longer used
2176 for security isolation, referring to physical isolation
2177 (i.e. potentially using different OSDs).
2179 Also, (de)authorize based on namespace.
2181 Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
2182 (cherry picked from commit 0e1d013ea690c18f7fa6e2a19500f854a9949091)
2184 commit 96b3726d74cb7bbcacdd22e0ab0fe233e4c4d829
2185 Author: Tamil Muthamizhan <tmuthamizhan@MacBook-Air.local>
2186 Date: Tue Apr 26 17:34:52 2016 -0700
2188 Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
2190 s/ceph-deploy/ceph-tests, hence removing ceph-deploy folder
2192 commit 77fdbf1747d73fd809607efd3325cc38b2fbafc0
2193 Author: Tamil Muthamizhan <tamil@magna002.ceph.redhat.com>
2194 Date: Fri Apr 22 18:25:46 2016 -0400
2196 Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
2198 renamed the workunit and test to reflect reality and for better clarity
2200 (cherry picked from commit 0fd358b877c611bf67c94b4a2dacbe65e17deae9)
2202 commit 1fa533e83d8e541315aa4925a6192ab0401b688b
2203 Author: Alexandre Derumier <aderumier@odiso.com>
2204 Date: Sun Apr 24 09:55:35 2016 +0200
2206 fix ceph init script
2208 commit 65963739cd6815b8008282c8f64cd64365662e60 have introduce a bug
2210 test variables need to be quoted, or -n always return true, even if variables don't exist
2212 (cherry picked from commit b581dd56bea09520c154611ecea91ebe399058d3)
2214 commit 7acbefadace28412f395bb98aec5651d5ec70666
2215 Author: David Zafman <dzafman@redhat.com>
2216 Date: Mon Apr 18 18:27:52 2016 -0700
2218 test: Fix ceph-objectstore-tool test to run manually from src non-cmake
2220 Fix init-ceph to handle it when CEPH_* values set
2222 Signed-off-by: David Zafman <dzafman@redhat.com>
2223 (cherry picked from commit 5e8e03b4d030db57c93047551d5b92db0b604063)
2225 commit af4b31cb9770d1710d038c557d547373f58a89a8
2226 Author: James Page <james.page@ubuntu.com>
2227 Date: Tue Apr 5 16:58:58 2016 +0100
2229 Drop --setuser/--setgroup from osd prestart
2231 These are not supported by /usr/lib/ceph/ceph-osd-prestart.sh,
2232 resulting in warnings:
2234 ceph-osd-prestart.sh[23367]: getopt: unrecognized option '--setuser'
2235 ceph-osd-prestart.sh[23367]: getopt: unrecognized option '--setgroup'
2237 --setuser and --setgroup are only needed for the ceph-osd process.
2239 Signed-off-by: James Page <james.page@ubuntu.com>
2240 (cherry picked from commit 74977f78840fe95b67788f3aa135ac69a2353c43)
2242 commit 8a86d08e38a8b68ba5e04b2cc4f59a2983481ee7
2243 Author: Dan van der Ster <daniel.vanderster@cern.ch>
2244 Date: Fri Apr 22 11:19:30 2016 +0200
2246 osd: fix backwards min/max osd utilization
2248 Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
2249 (cherry picked from commit 7529851f2a186501664461916f785da8456ad612)