1 commit 9411351cc8ce9ee03fbd46225102fe3d28ddf611
2 Author: Jenkins Build Slave User <ceph-release-team@redhat.com>
3 Date: Mon Dec 5 22:15:20 2016 +0000
7 commit a9444915a10038c35d5726485e110e56349fe3df
9 Author: Loic Dachary <loic@dachary.org>
10 Date: Mon Dec 5 14:50:23 2016 +0100
12 Merge pull request #12167 from liewegas/wip-osdmap-encoding-jewel
14 jewel: osd: condition OSDMap encoding on features
16 Reviewed-by: Loic Dachary <ldachary@redhat.com>
18 commit 4d9a28d26d84a1dab90d22a09b1a044c193a41ad
19 Merge: 6d17188 d194db8
20 Author: Loic Dachary <loic@dachary.org>
21 Date: Sat Dec 3 10:57:18 2016 +0100
23 Merge pull request #12067 from SUSE/wip-17953-jewel
25 jewel: mon: OSDMonitor: only reject MOSDBoot based on up_from if inst matches
27 Reviewed-by: Samuel Just <sjust@redhat.com>
29 commit d194db826bb26483f847235bf062ba7b225be147
30 Author: Samuel Just <sjust@redhat.com>
31 Date: Mon Nov 14 11:50:23 2016 -0800
33 OSDMonitor: only reject MOSDBoot based on up_from if inst matches
35 If the osd actually restarts, there is no guarrantee that the epoch will
36 advance past up_from. If the inst is different, it can't really be a
37 dup. At worst, it might be a queued MOSDBoot from a previous inst, but
38 in that case, the real inst would see itself marked up, and then back
39 down causing it to try booting again.
41 Fixes: http://tracker.ceph.com/issues/17899
42 Signed-off-by: Samuel Just <sjust@redhat.com>
43 (cherry picked from commit 033ad5b46c0492134e72a8372e44e3ef1358d2df)
45 commit 6d17188786ef7bd574dd8336d1e97e069db9de74
46 Merge: b168c26 79be070
47 Author: Josh Durgin <jdurgin@redhat.com>
48 Date: Fri Dec 2 08:16:27 2016 -0800
50 Merge pull request #12207 from jdurgin/wip-librados-setxattr-overload-jewel
52 librados: remove new setxattr overload to avoid breaking the C++ ABI
54 Reviewed-by: Sage Weil <sage@redhat.com>
56 commit b168c262f4c04d748b8a71aa6289e13385398764
57 Merge: be5c828 00de014
58 Author: Loic Dachary <loic@dachary.org>
59 Date: Fri Dec 2 10:01:39 2016 +0100
61 Merge pull request #12267 from dachary/wip-17904-jewel
63 jewel: Error EINVAL: removing mon.a at 172.21.15.16:6789/0, there will be 1 monitors
65 Reviewed-by: Samuel Just <sjust@redhat.com>
67 commit 00de0140410ec8457ca25920866f8409f0d54a10
68 Author: Joao Eduardo Luis <joao@suse.de>
69 Date: Wed Nov 2 15:38:36 2016 +0000
71 mon: MonmapMonitor: drop unnecessary 'goto' statements
73 Signed-off-by: Joao Eduardo Luis <joao@suse.de>
74 (cherry picked from commit 20dcb597e35e6961db81831facefbe22cecddec3)
76 commit 25f1b390525d975f90d0c7232b785415431d0f3e
77 Author: Joao Eduardo Luis <joao@suse.de>
78 Date: Wed Nov 2 15:33:52 2016 +0000
80 mon: MonmapMonitor: return success when monitor will be removed
82 Fixes: http://tracker.ceph.com/issues/17725
84 Signed-off-by: Joao Eduardo Luis <joao@suse.de>
85 (cherry picked from commit c9d46cfbf2512bc3495c6901de2b8f711bef9bae)
87 commit be5c82829916c581765f7c0130b738395a27720c
88 Merge: 427f357 3cc29c6
89 Author: Samuel Just <sjust@redhat.com>
90 Date: Thu Dec 1 11:08:04 2016 -0800
92 Merge pull request #12001 from dachary/wip-17915-jewel
94 jewel: filestore: can get stuck in an unbounded loop during scrub
96 Reviewed-by: Samuel Just <sjust@redhat.com>
98 commit 79be070a4d442229d62b168ab87c95b662df1a9c
99 Author: Josh Durgin <jdurgin@redhat.com>
100 Date: Mon Nov 28 22:06:56 2016 -0800
102 librados: remove new setxattr overload to avoid breaking the C++ ABI
104 Fixes: http://tracker.ceph.com/issues/18058
105 Signed-off-by: Josh Durgin <jdurgin@redhat.com>
106 (cherry picked from commit b8ff781ddcf737882163cf56d7c9b11e815fb699)
109 src/include/rados/librados.hpp (trivial namespace change in removed line)
111 commit 4d6f8481b22ecfa5e55b2a6f8f8660f2d0445030
112 Author: Sage Weil <sage@redhat.com>
113 Date: Wed Nov 23 14:15:50 2016 -0500
115 crush: condition latest tunable encoding on features
117 This avoids throwing hammer OSDMap encodings off.
119 Signed-off-by: Sage Weil <sage@redhat.com>
120 (cherry picked from commit 9e5ff86487bd1f5979866b5e16300dd4a3979f97)
122 commit bf96b30eaf552148249953ed4fb654cbb101c3d0
123 Author: Sage Weil <sage@redhat.com>
124 Date: Mon Nov 28 14:35:53 2016 -0500
126 crush/CrushWrapper: encode with features
128 No behavior change yet; just fixing callers.
130 Signed-off-by: Sage Weil <sage@redhat.com>
131 (cherry picked from commit b7c9e055848c8aa951bc48c957cff3ef323ea441)
133 [Updated write_file to use all feaetures]
134 [Updated OSDMonitor.cc to use mon->quorum_features instead of the
135 mon->get_quorum_con_featuers() helper]
136 [trivial conflict from removed write_file and read_file]
139 src/crush/CrushWrapper.h
141 src/mon/OSDMonitor.cc
142 src/tools/ceph_monstore_tool.cc
144 commit c5f5b94fc2e18b38d05f00fec04d2d7e3c35c54c
145 Author: Sage Weil <sage@redhat.com>
146 Date: Mon Nov 28 14:35:24 2016 -0500
148 crush/CrushWrapper: drop unused 'lean' encode() argument
150 No callers, no users.
152 Signed-off-by: Sage Weil <sage@redhat.com>
153 (cherry picked from commit 638a38bbb55c07ad0358a35a56418e66874d1c26)
156 src/crush/CrushWrapper.h
158 [trivial conflict due to removal of write_file and read_file]
160 commit c66c556852b08e18d409e769eb7bd945c35e43cf
161 Author: Sage Weil <sage@redhat.com>
162 Date: Wed Nov 23 13:51:59 2016 -0500
164 osd/osd_types: encode pg_pool_t like hammer if features indicate hammer
166 If the target features are missing the new OSDOp encoding, the
167 first feature we added post-hammer, encode like hammer.
169 Signed-off-by: Sage Weil <sage@redhat.com>
170 (cherry picked from commit 2f8cfb632823ba4e63eaff394392d6af7979d7c8)
172 commit 85caf34924bbfb0e872abd096ec571fff73035ae
173 Author: Sage Weil <sage@redhat.com>
174 Date: Wed Nov 23 13:48:35 2016 -0500
176 osd/osd_types: conditional pg_pool_t encoding
178 Align this with decode.
180 Signed-off-by: Sage Weil <sage@redhat.com>
181 (cherry picked from commit 01d9e8a20bbc3c039f67b040da95018e2c7b00b6)
183 commit 3cc29c6736007c97f58ba3a77ae149225e96d42a
184 Author: Sage Weil <sage@redhat.com>
185 Date: Thu Nov 10 13:56:24 2016 -0500
187 os/filestore/HashIndex: fix list_by_hash_* termination on reaching end
189 If we set *next to max, then the caller (a few lines up) doesn't terminate
190 the loop and will keep trying to list objects in every following hash
191 dir until it reaches the end of the collection. In fact, if we have an
192 end bound we will never to an efficient listing unless we hit the max
195 For one user, this was causing OSD suicides when scrub ran because it
196 wasn't able to list all objects before the timeout. In general, this would
197 cause scrub to stall a PG for a long time and slow down requests.
199 Broken by refactor in 921c4586f165ce39c17ef8b579c548dc8f6f4500.
201 Fixes: http://tracker.ceph.com/issues/17859
202 Signed-off-by: Sage Weil <sage@redhat.com>
203 (cherry picked from commit c5180262a086c2d3895aff4bf0fb0ff9a6666149)
205 commit 427f357f0eed32c9ce17590ae9303a94e8b710e7
206 Merge: 0c38c46 8b595f5
207 Author: Loic Dachary <loic@dachary.org>
208 Date: Wed Nov 9 20:53:18 2016 +0100
210 Merge pull request #11822 from SUSE/wip-17816-jewel
212 jewel: Missing comma in ceph-create-keys causes concatenation of arguments
214 Reviewed-by: Loic Dachary <ldachary@redhat.com>
216 commit 8b595f567407be2a759e4987f33ce79e3763ea49
217 Author: Patrick Donnelly <pdonnell@redhat.com>
218 Date: Sun Sep 18 16:26:29 2016 -0400
220 ceph-create-keys: add missing argument comma
222 The arguments "get" and "client.admin" were being concatenated into
225 Found using ceph-ansible + strace:
227 13031 execve("/usr/bin/ceph", ["ceph", "--cluster=ceph", "--name=mon.", "--keyring=/var/lib/ceph/mon/ceph-ceph-mon0/keyring", "auth", "getclient.admin"], ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", "LANG=en_US.UTF-8", "CLUSTER=ceph", "TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES=134217728", "CEPH_AUTO_RESTART_ON_UPGRADE=no"] <unfinished ...>
229 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
230 (cherry picked from commit 482022233d845b75876b04ca23fb137281a9f6ab)
232 commit 0c38c464fff2280a6345b470f1c83aa6229776cc
233 Merge: eb67259 eea546f
234 Author: Loic Dachary <loic@dachary.org>
235 Date: Mon Nov 7 14:39:48 2016 +0100
237 Merge pull request #11679 from dachary/wip-17734-jewel
239 jewel: Upgrading 0.94.6 -> 0.94.9 saturating mon node networking
241 Reviewed-by: Kefu Chai <kchai@redhat.com>
243 commit eea546fafcf22573e33332ce91e3d112202ac207
244 Author: xie xingguo <xie.xingguo@zte.com.cn>
245 Date: Sat May 21 14:11:55 2016 +0800
247 mon: expose require_jewel_osds flag to user
249 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
250 (cherry picked from commit 83ffc2b761742d563777e50959faa6a6010edae0)
252 commit f8ee076ac4559dc9dbf828121618e78ad11687fd
253 Author: Sage Weil <sage@redhat.com>
254 Date: Fri Oct 21 12:25:08 2016 -0400
256 mon/OSDMonitor: encode OSDMap::Incremental with same features as OSDMap
258 The Incremental encode stashes encode_features, which is
259 what we use later to reencode the updated OSDMap. Use
260 the same features so that the encoding will match!
262 Signed-off-by: Sage Weil <sage@redhat.com>
263 (cherry picked from commit 916ca6a0aaa32bd9c2b449e0d7fbd312c29f06e5)
265 commit 1f629b2ba91c793db34614f319d12594646f5ce2
266 Author: Sage Weil <sage@redhat.com>
267 Date: Thu Oct 13 12:16:40 2016 -0400
269 mon/OSDMonitor: health warn if require_{jewel,kraken} flags aren't set
271 We want to prompt users to set these flags as soon as their
274 Signed-off-by: Sage Weil <sage@redhat.com>
275 (cherry picked from commit 12e508313dbd5d1d38c76859cb7de2ce22404e12)
278 src/mon/OSDMonitor.cc: remove references to kraken
280 if ((osdmap.get_up_osd_features() & CEPH_FEATURE_SERVER_KRAKEN) &&
281 !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) {
282 string msg = "all OSDs are running kraken or later but the"
283 " 'require_kraken_osds' osdmap flag is not set";
284 summary.push_back(make_pair(HEALTH_WARN, msg));
286 detail->push_back(make_pair(HEALTH_WARN, msg));
290 commit 34555f11b068eb335866d4b536c9e10fe1de62e5
291 Author: Sage Weil <sage@redhat.com>
292 Date: Fri Sep 30 18:02:39 2016 -0400
294 mon/OSDMonitor: encode canonical full osdmap based on osdmap flags
296 If the JEWEL or KRAKEN flags aren't set, encode the full map without
297 those features. This ensure that older OSDs in the cluster will be able
298 to correctly encode the full map with a matching CRC. At least, that is
299 true as long as the encoding changes are guarded by those feature bits.
300 That appears to be true currently, and we plan to ensure that it is true
301 in the future as well.
303 Signed-off-by: Sage Weil <sage@redhat.com>
304 (cherry picked from commit 5e0daf6642011bf1222c4dc20aa284966fa5df9f)
307 src/mon/OSDMonitor.cc: removed reference to kraken
309 if (!tmp.test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) {
310 dout(10) << __func__ << " encoding without feature SERVER_KRAKEN" << dendl;
311 features &= ~CEPH_FEATURE_SERVER_KRAKEN;
314 commit eb672598ad8209dcb7b7454fea31f921d255af1f
315 Merge: 5e079cf d48e603
316 Author: Loic Dachary <loic@dachary.org>
317 Date: Fri Nov 4 15:31:05 2016 +0100
319 Merge pull request #11742 from tchaikov/wip-17728-jewel
321 jewel: test/ceph_test_msgr: do not use Message::middle for holding transient…
323 Reviewed-by: Loic Dachary <ldachary@redhat.com>
325 commit 5e079cfd46e4649e0eb24b15cb2c45887f5762fe
326 Merge: 7b3ec11 eb30cc5
327 Author: Loic Dachary <loic@dachary.org>
328 Date: Thu Nov 3 15:54:28 2016 +0100
330 Merge pull request #11746 from liewegas/wip-post-file-key-jewel
332 jewel: ceph-post-file: use new ssh key
334 Reviewed-by: Loic Dachary <ldachary@redhat.com>
335 Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
337 commit eb30cc5ad6b439417298b7c615ff8ae15bf00fa2
338 Author: David Galloway <dgallowa@redhat.com>
339 Date: Fri Aug 19 16:11:32 2016 -0400
341 ceph-post-file: Ignore keys offered by ssh-agent
343 In my case, I had multiple private keys in ssh-agent which resulted in
344 the sftp connection failing despite explicitly specifying the private
347 Signed-off-by: David Galloway <dgallowa@redhat.com>
348 (cherry picked from commit a61fcb2eac35a149b49efdc9b2ffa675afb968e8)
350 commit 43282b0657ff19060dad25df79981ce17a76900f
351 Author: Sage Weil <sage@redhat.com>
352 Date: Wed Nov 2 09:37:41 2016 -0400
354 ceph-post-file: migrate to RSA SSH keys
356 DSA keys are being deprecated: http://www.openssh.com/legacy.html
358 drop.ceph.com will continue to allow the old DSA key but eventually,
359 users submitting logs using ceph-post-file will run into issues when
360 OpenSSH completely drops support for the algorithm.
362 Fixes: http://tracker.ceph.com/issues/14267
364 Signed-off-by: David Galloway <dgallowa@redhat.com>
365 (cherry picked from commit ecd02bf3f1c7a07a3271b2736a9e12dd6e897821)
370 commit d48e603d6c6715fbc127003226d327b79f30713a
371 Author: Sage Weil <sage@redhat.com>
372 Date: Sun Oct 23 18:40:57 2016 -0500
374 msg: adjust byte_throttler from Message::encode
376 Normally we never call encode on a message that has a byte_throttler set
377 because we only use it for messages we received. However, for forwarded
378 messages that we clear_payload() before resending, we *do* reencode, and in
379 that case we need to retake the appropriate number of bytes from the
380 throttler--just like we release them in clear_payload().
382 Signed-off-by: Sage Weil <sage@redhat.com>
383 (cherry picked from commit a9651282f7c16df872757b82d3d2995d92458d5c)
385 commit 1bc616138fea897f36c1c25851f87df91404011c
386 Author: Sage Weil <sage@redhat.com>
387 Date: Sun Oct 23 18:10:00 2016 -0500
389 msg/Message: fix set_middle vs throttler
391 Signed-off-by: Sage Weil <sage@redhat.com>
392 (cherry picked from commit e7bf50b27a495ed75def67025d1ceca83861ba35)
394 commit 5d5b5952322bb6a571c9cd58fd3e683eb32a2509
395 Author: Sage Weil <sage@redhat.com>
396 Date: Sat Oct 22 14:01:34 2016 -0400
398 messages/MForward: reencode forwarded message if target has differing features
400 This ensures we reencode the payload with the
401 appropriate set of features if the client, us, or the
402 target do not have identical features. Otherwise we
403 may forward an encoding with more features than the
406 Signed-off-by: Sage Weil <sage@redhat.com>
407 (cherry picked from commit a433455e59067a844c3df4a0d6080db2ceb4ec59)
409 commit e068c9206a3d618b3b04975d03f61ca64a92c4d4
410 Author: Sage Weil <sage@redhat.com>
411 Date: Wed Sep 28 11:44:28 2016 -0400
413 messages/MForward: fix encoding features
415 We were encoding the message with the sending client's
416 features, which makes no sense: we need to encode with
417 the recipient's features so that it can decode the
420 The simplest way to fix this is to rip out the bizarre
421 msg_bl handling code and simply keep a decoded Message
422 reference, and encode it when we send.
424 We encode the encapsulated message with the intersection
425 of the target mon's features and the sending client's
426 features. This probably doesn't matter, but it's
427 conceivable that there is some feature-dependent
428 behavior in the message encode/decode that is important.
430 Fixes: http://tracker.ceph.com/issues/17365
431 Signed-off-by: Sage Weil <sage@redhat.com>
432 (cherry picked from commit d4f5e88f36e5388ae9e062c4bc49ac1c684a3f3c)
434 commit 158b003751d8bedafdca60d859aef67e69d9a732
435 Author: Michal Jarzabek <stiopa@gmail.com>
436 Date: Sat Jun 4 23:24:06 2016 +0100
438 all: add const to operator<< param
440 Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
441 (cherry picked from commit 0a157e088b2e5eb66177421f19f559ca427240eb)
443 commit 3e1edde98610b11b94c59d23de979d6cd79dd8fe
444 Author: Kefu Chai <kchai@redhat.com>
445 Date: Sat Oct 29 01:54:58 2016 +0800
447 test/ceph_test_msgr: do not use Message::middle for holding transient data
449 Message::middle is used for holding encoded data, so we we can not stuff
450 it with payload and leave the "payload" field empty. this change
451 refactors the ceph_test_msgr by introducing a Payload class which
452 encodes all test data in it.
454 Fixes: http://tracker.ceph.com/issues/17728
455 Signed-off-by: Kefu Chai <kchai@redhat.com>
456 (cherry picked from commit 56896a7ed20869ce91ade4c77c1d6cbab8d50de1)
458 src/test/msgr/test_msgr.cc: do not use the new-style DENC()
459 framework for implementing the encoder of Payload class. DENC() was
460 introduced after jewel was released.
462 commit 8f75bd64768b6984c537dd15b5d9159070b86d91
463 Author: Kefu Chai <kchai@redhat.com>
464 Date: Mon Aug 8 23:20:58 2016 +0800
466 test/ceph_test_msgr: fix circular locking dependency
468 * do not acquire lock when sending message
469 * remove lock in session
470 * reduce the scope guarded by locks for better performance.
472 Fixes: http://tracker.ceph.com/issues/16955
473 Signed-off-by: Kefu Chai <kchai@redhat.com>
474 (cherry picked from commit cf1801c260c42aa93850538eea7a194440ebe350)
476 commit f960db4646a9535bcee6d53740811b84e0678c93
477 Author: Haomai Wang <haomai@xsky.com>
478 Date: Thu Jul 7 14:59:51 2016 +0800
480 ceph_test_msgr: use ceph log infrastructure to output
482 because we want to get the right log sequence which mixes ceph logginer and
483 cerr. Otherwise, cerr output make the logs a little disordered.
485 Signed-off-by: Haomai Wang <haomai@xsky.com>
486 (cherry picked from commit d1268a6aa895ee93cd9fee6fc6c759317e681a85)
488 commit 7b3ec119cb968a26526ad95355c5bf7525fb5346
489 Merge: 5efb6b1 779af22
490 Author: Josh Durgin <jdurgin@redhat.com>
491 Date: Tue Nov 1 17:05:27 2016 -0700
493 Merge pull request #11728 from ceph/wip-librados-upgrade-jewel
495 qa: remove EnumerateObjects from librados upgrade tests
497 commit 5efb6b1c2c9eb68f479446e7b42cd8945a18dd53
498 Merge: 3c9fe54 39b8e78
499 Author: Loic Dachary <loic@dachary.org>
500 Date: Fri Oct 28 14:29:20 2016 +0200
502 Merge pull request #11669 from ceph/wip-jewel-11566
504 rgw: fix put_acls for objects starting and ending with underscore
506 Reviewed-by: Loic Dachary <ldachary@redhat.com>
508 commit 3c9fe545dccf13413bb491098c089d3e4a76bcd2
509 Merge: 5ca8791 6356664
510 Author: Loic Dachary <loic@dachary.org>
511 Date: Thu Oct 27 21:40:26 2016 +0200
513 Merge pull request #11472 from dachary/wip-17510-jewel
515 jewel: ERROR: got unexpected error when trying to read object: -2
517 Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
519 commit 39b8e783defb930b1dd8eeecdfee68d0d886d03b
520 Author: Orit Wasserman <owasserm@redhat.com>
521 Date: Wed Oct 19 21:51:01 2016 +0200
523 rgw: fix put_acls for objects starting and ending with underscore
525 Fixes: http://tracker.ceph.com/issues/17625
526 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
527 (cherry picked from commit 14d4d912c7b47c56b16ae0bdc6bc08d208de3461)
529 commit 5ca879114fcc98b906cac64a5ef5cb2a8568cb60
530 Merge: ed9a824 dc2ffda
531 Author: Matt Benjamin <mbenjamin@redhat.com>
532 Date: Thu Oct 27 13:52:22 2016 -0400
534 Merge pull request #11662 from linuxbox2/jewel-17635
536 jewel: rgw: handle empty POST condition
538 commit ed9a824f2075e15ac245b9aac683cb28183ecd3a
539 Merge: e08b0f3 f5e37ab
540 Author: Loic Dachary <loic@dachary.org>
541 Date: Thu Oct 27 16:48:43 2016 +0200
543 Merge pull request #11634 from dillaman/wip-17590-jewel
545 jewel: journal: do not prematurely flag object recorder as closed
547 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
549 commit 779af22fc920f1fdfdd3fa2b01d8587088372bd4
550 Author: Josh Durgin <jdurgin@redhat.com>
551 Date: Wed Oct 26 16:33:53 2016 -0700
553 qa: remove EnumerateObjects from librados upgrade tests
555 These rely on new rados functionality not present in jewel
557 Signed-off-by: Josh Durgin <jdurgin@redhat.com>
559 commit e08b0f308f5af45c1b1867ab5b757486bba51333
560 Merge: 0aee633 4cb83c1
561 Author: Loic Dachary <loic@dachary.org>
562 Date: Wed Oct 26 23:00:35 2016 +0200
564 Merge pull request #11644 from ceph/wip-17695
566 jewel: librbd: discard after write can result in assertion failure
568 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
570 commit 4cb83c14dbe09d4b371f7b728d9b5c0549e59f1a
571 Author: Jason Dillaman <dillaman@redhat.com>
572 Date: Tue Oct 25 09:43:06 2016 -0400
574 librbd: discard after write can result in assertion failure
576 With journaling enabled, the proper lock is not held when handling
577 a discard after write to overlapping extents. This issue is only present
578 on the jewel branch due to design changes on the master branch.
580 Fixes: http://tracker.ceph.com/issues/17695
581 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
583 commit dc2ffda7819d2ebeed3526d9e6da8f53221818de
584 Author: Yehuda Sadeh <yehuda@redhat.com>
585 Date: Thu Oct 20 10:17:36 2016 -0700
587 rgw: handle empty POST condition
589 Fixes: http://tracker.ceph.com/issues/17635
591 Before accessing json entity, need to check that iterator is valid.
592 If there is no entry return appropriate error code.
594 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
595 (cherry picked from commit 23cb642243e09ca4a8e104f62a3bb7b2cbb6ea12)
597 commit 0aee6331ad93a3caf212b84412bb648171758fff
598 Merge: 06f7d7a cd99a64
599 Author: Loic Dachary <loic@dachary.org>
600 Date: Wed Oct 26 16:47:03 2016 +0200
602 Merge pull request #11657 from dachary/wip-17707-jewel
604 jewel: ceph-disk: using a regular file as a journal fails
606 Reviewed-by: Kefu Chai <kchai@redhat.com>
608 commit 06f7d7a9b2403cf8b7af5301dae575d6f21c71ce
609 Merge: 7ff2c10 7964187
610 Author: Loic Dachary <loic@dachary.org>
611 Date: Wed Oct 26 14:04:20 2016 +0200
613 Merge pull request #11321 from linuxbox2/jewel-11051
615 jewel: rgw: Do not archive metadata by default
617 Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
619 commit 7ff2c108ea12451b6dcb25dab4574f2de68162d1
620 Merge: 0fb486d 2f9a5be
621 Author: Loic Dachary <loic@dachary.org>
622 Date: Wed Oct 26 11:55:49 2016 +0200
624 Merge pull request #11626 from ceph/wip-jewel-11567
626 jewel: don't loop forever when reading data from 0 sized segment.
628 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
630 commit 0fb486d59e1574e936564e4b048a089dee8b267b
631 Merge: bf5c47a 86eef27
632 Author: Loic Dachary <loic@dachary.org>
633 Date: Wed Oct 26 11:39:40 2016 +0200
635 Merge pull request #11478 from dachary/wip-17312-jewel
637 jewel: build/ops: allow building RGW with LDAP disabled
639 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
641 commit cd99a642a088c7cd010e45a81d6680cdfca16ca6
642 Author: Jayashree Candadai <jayaajay@indiana.edu>
643 Date: Fri Oct 21 13:52:05 2016 -0400
645 ceph-disk: allow using a regular file as a journal
647 Because of a missing return, ceph-disk prepare would fail if given a
648 regular file as a journal. If the journal file does not exist, ceph-disk
649 will create it but fail to ensure that the ceph user owns it. The
650 symlink to the journal file is not set when the journal file is
651 specified on the command line and the journal file does not exist at
652 all. The ceph-osd daemon will silently create it as a file but it will
653 not be the file given in argument.
655 Add a test case to verify using a regular file as a journal works as
658 Fixes: http://tracker.ceph.com/issues/17662
660 Signed-off-by: Jayashree Candadai <jayaajay@indiana.edu>
661 Signed-off-by: Loic Dachary <ldachary@redhat.com>
662 (cherry picked from commit db917d50eb5f86a07a5487e130f46a6b1d27672a)
664 commit a80040230cddc395809d2323392c87a4a1fef923
665 Author: Anirudha Bose <ani07nov@gmail.com>
666 Date: Wed Aug 17 12:19:33 2016 +0530
670 Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
671 (cherry picked from commit f7a15ccfa2cc214c3688a2b41ac45be1abfb7700)
674 src/ceph-disk/setup.py: python 2.7 restriction not backported
676 commit e200b17016a1a7cd103affde2d2b265916755498
677 Author: Anirudha Bose <ani07nov@gmail.com>
678 Date: Wed Aug 17 12:15:25 2016 +0530
680 ceph-disk: Set space_symlink to the path, not file object
682 Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
683 (cherry picked from commit d290454cf5f660c1681eefd70a38e79da683525f)
685 commit 9191825c06b3d92e2caa26c9efdb69a79cc3964b
686 Author: Anirudha Bose <ani07nov@gmail.com>
687 Date: Wed Aug 17 12:13:53 2016 +0530
689 ceph-disk: Use os.path.isabs instead of .startswith('/')
691 Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
692 (cherry picked from commit 6f795356de00dd7c33282183b11a03da800fde7b)
694 commit f1c2de768535ce18259d4fc187cd370766c1e6cf
695 Author: Anirudha Bose <ani07nov@gmail.com>
696 Date: Sun Jun 19 05:10:27 2016 +0530
698 ceph-disk: Use context manager with FileLock
700 acquire and release methods of FileLock are dropped
702 Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
703 (cherry picked from commit c1011d514ce0c7d340a5acd6f9c640165e169156)
705 commit 26cb5b6bfbd6eee46bfa3cf005b1cd9f06b0e262
706 Author: Anirudha Bose <ani07nov@gmail.com>
707 Date: Sun Jun 19 04:05:42 2016 +0530
709 ceph-disk: Fix bug in FileLock
711 Python fcntl.lockf() accepts a file descriptor, not a file object
713 Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
714 (cherry picked from commit df9cc2ce938a969f4044b63fd80030d00f64f060)
716 commit 91a9ca374f646966e31b015928a2cc60bc5225aa
717 Author: Anirudha Bose <ani07nov@gmail.com>
718 Date: Thu Jun 16 16:37:00 2016 +0530
720 ceph-disk: Use true integer division in get_dev_size
722 Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
723 (cherry picked from commit f1bb72c82806cc03e85e0b19c83d61409c6b2d51)
725 commit 2373ccb7a991069406e344b91fa70c0b2d1aa5e0
726 Author: Anirudha Bose <ani07nov@gmail.com>
727 Date: Tue Jun 14 21:42:02 2016 +0530
729 ceph-disk: Compatibility fixes for Python 3
731 ceph-disk: Misc cleanups
733 Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
734 (cherry picked from commit d0e29c74f84a2ed3014a516c0106172619314bdc)
737 src/ceph-disk/tox.ini: python3 is not supported in jewel
739 commit 79cf6330d67ad52af5690f4d4efd29aa2722acb2
740 Author: Shylesh Kumar <shmohan@redhat.com>
741 Date: Thu Jul 7 20:45:57 2016 +0530
743 ceph-disk: change ownership of init file to ceph:ceph
745 Fixes: http://tracker.ceph.com/issues/16280
746 Signed-off-by: Shylesh Kumar <shmohan@redhat.com>
747 (cherry picked from commit aab9d03e1b50ba10a383663088400b9fabe306cb)
749 commit 796418746ecd2a4971e365499c6952e131e74913
750 Author: root <root@ceph-node1.homeoffice.wal-mart.com>
751 Date: Mon Sep 12 14:30:43 2016 +0530
753 rgw: Do not archive metadata by default
755 Fixes: http://tracker.ceph.com/issues/17256
756 Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
757 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
759 (cherry picked from commit c617ea83e0cca0061af18e0811c7ef8b4e836519)
761 commit bf5c47a28abe6d91dfdace8d6803a7016bbf02fb
762 Merge: 7714689 1eedf18
763 Author: Loic Dachary <loic@dachary.org>
764 Date: Tue Oct 25 15:49:55 2016 +0200
766 Merge pull request #11642 from tchaikov/wip-17685-jewel
768 jewel: mon: fix missing osd metadata (again)
770 Reviewed-by: Loic Dachary <ldachary@redhat.com>
772 commit 77146891ab254bc796e38e2a45b8500c0119745f
773 Merge: 3ccc17b e8e1acb
774 Author: Loic Dachary <loic@dachary.org>
775 Date: Tue Oct 25 15:40:01 2016 +0200
777 Merge pull request #11467 from dachary/wip-17262-jewel
779 jewel: rbd-nbd IO hang
781 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
783 commit 1eedf181176ce75212a8cfbb87ac927350a826ed
784 Author: John Spray <john.spray@redhat.com>
785 Date: Wed May 25 17:56:51 2016 +0100
787 mon: fix missing osd metadata (again)
789 The JSON output was getting broken by continuing
792 Fixes: http://tracker.ceph.com/issues/17685
793 Signed-off-by: John Spray <john.spray@redhat.com>
794 (cherry picked from commit c5700ce4b45b3a385fe4c2111da852bea7d86da2)
796 commit f5e37abefcb015b2cb58295cfdf109fd6f5833b0
797 Author: Jason Dillaman <dillaman@redhat.com>
798 Date: Mon Oct 17 09:48:20 2016 -0400
800 journal: do not prematurely flag object recorder as closed
802 Fixes: http://tracker.ceph.com/issues/17590
803 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
804 (cherry picked from commit 2be6367cb0119d86dfecfa94eb4a3a102c40162a)
806 commit 2f9a5beb9a903220b70a780b30564d9741e9f0e5
807 Author: Marcus Watts <mwatts@redhat.com>
808 Date: Thu Oct 13 21:12:36 2016 -0400
810 Don't loop forever when reading data from 0 sized segment.
812 The 0 sized segment can arise depending on how
813 the client uploads the object in the first place.
814 The cpu loop then happens during a swift `GET'.
816 Signed-off-by: Marcus Watts <mwatts@redhat.com>
817 (cherry picked from commit 46c5f9773246522e66bb2cca49345d0b62a16c42)
819 commit 3ccc17b81d2794406d803ff4210e930a1fa67455
820 Merge: 112b89d 0b30a1d
821 Author: Loic Dachary <loic@dachary.org>
822 Date: Mon Oct 24 12:03:13 2016 +0200
824 Merge pull request #10757 from dachary/wip-17056-jewel
826 jewel: mon/osdmonitor: decouple adjust_heartbeat_grace and min_down_reporters
828 Reviewed-by: Kefu Chai <kchai@redhat.com>
830 commit 112b89dc315dd1240d68eb50fba1438057002327
831 Merge: 7ab1e02 0dcefd2
832 Author: Loic Dachary <loic@dachary.org>
833 Date: Mon Oct 24 12:03:01 2016 +0200
835 Merge pull request #10759 from dachary/wip-16866-jewel
837 jewel: OSD: ceph osd df does not show summarized info correctly if one or more OSDs are out
839 Reviewed-by: Kefu Chai <kchai@redhat.com>
841 commit 7ab1e0275101a30c2d318bcd55787f61c687328f
842 Merge: e053b20 4f9e02c
843 Author: Loic Dachary <loic@dachary.org>
844 Date: Mon Oct 24 11:55:41 2016 +0200
846 Merge pull request #11590 from dachary/wip-17642-jewel
848 jewel: TestJournalReplay: sporadic assert(m_state == STATE_READY || m_state == STATE_STOPPING) failure
850 Reviewed-by: Loic Dachary <ldachary@redhat.com>
852 commit 4f9e02c40ac5359f344d29f20332ec6ed8575b8e
853 Author: Jason Dillaman <dillaman@redhat.com>
854 Date: Thu Oct 13 10:04:24 2016 -0400
856 test: TestJournalReplay test cases need to wait for committed journal event
858 Fixes: http://tracker.ceph.com/issues/17566
859 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
860 (cherry picked from commit 1bdf7a425eb7436838c9445ea2c8ab42dfd3a1b6)
862 commit e8e1acb1d5154b749d251efa88b45e8ad3edb2bb
863 Author: Jason Dillaman <dillaman@redhat.com>
864 Date: Thu Sep 8 11:51:34 2016 -0400
866 librbd: ignore cache busy errors when shrinking an image
868 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
869 (cherry picked from commit 4ce663845679dc35f2f15b893c6f988c4a60b25b)
872 src/test/librbd/operation/test_mock_ResizeRequest.cc:
873 when_resize does not have the allow_shrink argument because
874 d1f2c557b2c039730baca9efa3f5244bc19dcb1a has not been
877 commit ba2e87e0443069b0552b698cc7a508898a3f585d
878 Author: Jason Dillaman <dillaman@redhat.com>
879 Date: Thu Sep 8 09:59:37 2016 -0400
881 librbd: invalidate cache before trimming image
883 Any potential writeback outside the extents of a shrunk image
884 would result in orphaned objects.
886 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
887 (cherry picked from commit 3f93a1917437ba7b69b306e4ff971b79e8b79c89)
889 commit d7c0873ea77234b7b736080c3de4012d2f6adaee
890 Author: Jason Dillaman <dillaman@redhat.com>
891 Date: Wed Sep 7 11:49:26 2016 -0400
893 rbd-nbd: mask out-of-bounds IO errors caused by image shrink
895 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
896 (cherry picked from commit c6cfb616a846959a2cd1c0e540b14668c61a2afd)
898 commit 0ce342d39f359d23c92ab94efb910b84a634094a
899 Author: Jason Dillaman <dillaman@redhat.com>
900 Date: Mon Sep 5 10:01:45 2016 -0400
902 rbd-nbd: fix kernel deadlock during teuthology testing
904 Fixes: http://tracker.ceph.com/issues/16921
905 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
906 (cherry picked from commit ce7c1520a8019f011fa34dd898af317f78974577)
908 commit e053b2085b0d0be0e8c9912c82c7142bb0871783
909 Merge: f6d7290 caf08d7
910 Author: Casey Bodley <cbodley@users.noreply.github.com>
911 Date: Thu Oct 20 11:17:49 2016 -0400
913 Merge pull request #11519 from dachary/wip-17576-jewel
915 jewel: RGW loses realm/period/zonegroup/zone data: period overwritten if somewhere in the cluster is still running Hammer
917 Reviewed-by: Casey Bodley <cbodley@redhat.com>
919 commit f6d729082359b450950513080c9c08461d6f557c
920 Merge: 9e9a38d 40689d1
921 Author: Casey Bodley <cbodley@users.noreply.github.com>
922 Date: Thu Oct 20 11:17:22 2016 -0400
924 Merge pull request #11471 from dachary/wip-17511-jewel
926 jewel: s3tests-test-readwrite failing with 500
928 Reviewed-by: Casey Bodley <cbodley@redhat.com>
930 commit 9e9a38df303749147a638f0df42ad875c829d294
931 Merge: 9b0fa2b 5a53ffa
932 Author: Casey Bodley <cbodley@users.noreply.github.com>
933 Date: Thu Oct 20 11:16:38 2016 -0400
935 Merge pull request #11469 from dachary/wip-17538-jewel
937 jewel: rgw:user email can modify to empty when it has values
939 Reviewed-by: Casey Bodley <cbodley@redhat.com>
941 commit 9b0fa2b27386dd0c09aead832c9f049ef10b26fb
942 Merge: 0eac635 4babd3f
943 Author: Loic Dachary <loic@dachary.org>
944 Date: Thu Oct 20 16:31:10 2016 +0200
946 Merge pull request #11466 from dachary/wip-17290-jewel
948 jewel: ImageWatcher: use after free within C_UnwatchAndFlush
950 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
952 commit 0eac63545da063a8bbab4b1ea6c9a765023617fc
953 Merge: 51d5ed0 b73356b
954 Author: Loic Dachary <loic@dachary.org>
955 Date: Thu Oct 20 16:30:53 2016 +0200
957 Merge pull request #11464 from dachary/wip-17373-jewel
959 jewel: image.stat() call in librbdpy fails sometimes
961 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
963 commit 51d5ed0ddbe7e1018be1fa46c912d2e0ca07a984
964 Merge: d2150fb b410c8e
965 Author: Loic Dachary <loic@dachary.org>
966 Date: Thu Oct 20 16:30:44 2016 +0200
968 Merge pull request #11463 from dachary/wip-17384-jewel
970 jewel: helgrind: TestLibRBD.TestIOPP potential deadlock closing an image with read-ahead enabled
972 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
974 commit d2150fb54e894039e03855352708fad6b08d75d0
975 Merge: f8989ef 32d84e0
976 Author: Loic Dachary <loic@dachary.org>
977 Date: Thu Oct 20 16:30:32 2016 +0200
979 Merge pull request #11462 from dachary/wip-17404-jewel
981 jewel: update_features API needs to support backwards/forward compatibility
983 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
985 commit f8989ef7a79dd37f58fc9bddbd1e3fcd83e14f42
986 Merge: ac2ce6d 7d6801b
987 Author: Loic Dachary <loic@dachary.org>
988 Date: Thu Oct 20 16:28:18 2016 +0200
990 Merge pull request #11459 from dachary/wip-17483-jewel
992 jewel: RBD should restrict mirror enable/disable actions on parents/clones
994 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
996 commit ac2ce6dcda27a70a45e17270cab4d5e9a856abc7
997 Merge: cd48521 391936a
998 Author: Loic Dachary <loic@dachary.org>
999 Date: Thu Oct 20 16:27:36 2016 +0200
1001 Merge pull request #11460 from dachary/wip-17482-jewel
1003 jewel: Enable/Disable of features is allowed even the features are already enabled/disabled
1005 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1007 commit cd48521cde8bb69b6879977f51404a3014571a84
1008 Merge: 410a368 dd93e00
1009 Author: Loic Dachary <loic@dachary.org>
1010 Date: Thu Oct 20 16:26:53 2016 +0200
1012 Merge pull request #11461 from dachary/wip-17481-jewel
1014 jewel: Proxied operations shouldn't result in error messages if replayed
1016 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1018 commit 410a368e9bdf31f6512be5e9a783c7990ba9003f
1019 Merge: 07a8d8a d66bb7a
1020 Author: Loic Dachary <loic@dachary.org>
1021 Date: Thu Oct 20 12:42:01 2016 +0200
1023 Merge pull request #11431 from ceph/wip-jewel-tarball
1025 jewel: build/ops: include more files in "make dist" tarball
1027 Reviewed-by: Nathan Cutler <ncutler@suse.cz>
1028 Reviewed-by: Boris Ranto <branto@redhat.com>
1030 commit 07a8d8aedfa101a52e4764cc211fd2a1d8f36582
1031 Merge: 62f7f64 50fd48f
1032 Author: Loic Dachary <loic@dachary.org>
1033 Date: Thu Oct 20 11:48:49 2016 +0200
1035 Merge pull request #11474 from dachary/wip-17350-jewel
1037 jewel: rgw:response information is error when geting token of swift account
1039 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1041 commit 62f7f646b85f81c0c812f3d5adc1926d4cee3f7d
1042 Merge: 638590c 91bd342
1043 Author: Loic Dachary <loic@dachary.org>
1044 Date: Thu Oct 20 11:47:43 2016 +0200
1046 Merge pull request #11492 from SUSE/wip-17575-jewel
1048 jewel: aarch64: Compiler-based detection of crc32 extended CPU type is broken
1050 Reviewed-by: Kefu Chai <kchai@redhat.com>
1052 commit 638590c97a5365df118c72aab2e510ffcd2a9470
1053 Merge: c58d626 6575545
1054 Author: Loic Dachary <loic@dachary.org>
1055 Date: Thu Oct 20 11:28:29 2016 +0200
1057 Merge pull request #11475 from dachary/wip-17349-jewel
1059 jewel: Modification for TEST S3 ACCESS section in INSTALL CEPH OBJECT GATEWAY page
1061 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1063 commit c58d62677449b08023b761762a52cc4ceaf69def
1064 Merge: 3cb4bf4 7423661
1065 Author: Loic Dachary <loic@dachary.org>
1066 Date: Thu Oct 20 11:27:54 2016 +0200
1068 Merge pull request #11473 from dachary/wip-17509-jewel
1070 jewel: Config parameter rgw keystone make new tenants in radosgw multitenancy does not work
1072 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1074 commit 3cb4bf43b923a71872525b0222b4b0fc73664fb0
1075 Merge: fb74b16 de672a0
1076 Author: Loic Dachary <loic@dachary.org>
1077 Date: Thu Oct 20 11:27:18 2016 +0200
1079 Merge pull request #11201 from ceph/wip-backport-logrotate-jewel
1081 jewel: build/ops: backport 'logrotate: Run as root/ceph'
1083 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1085 commit fb74b1688603c0351e80ed504be4faad320a67e6
1086 Merge: 9d3373d 25a35d4
1087 Author: Loic Dachary <loic@dachary.org>
1088 Date: Thu Oct 20 11:22:45 2016 +0200
1090 Merge pull request #11126 from tchaikov/wip-17179-jewel
1092 jewel: add a tool to rebuild mon store from OSD
1094 Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
1095 Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
1097 commit 9d3373d71f8af16a8f0220aa0d0682e2f3bb5a8c
1098 Merge: 0c83eb3 eb6c3cb
1099 Author: Loic Dachary <loic@dachary.org>
1100 Date: Thu Oct 20 09:39:15 2016 +0200
1102 Merge pull request #11563 from ceph/wip-jewel-acl-underscore
1104 rgw: fix regression with handling double underscore
1106 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1108 commit eb6c3cbcc6cadd4eff9de0d6332f42c785486f7b
1109 Author: Yehuda Sadeh <yehuda@redhat.com>
1110 Date: Thu Sep 29 18:35:59 2016 -0700
1112 rgw: set correct instance on the object
1114 Fixes: http://tracker.ceph.com/issues/17443
1116 This was broken by commit bc840afafdfe5e528e5c1b711e71420ac3cb5a67
1118 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1119 (cherry picked from commit d2ada35c8c0d938a704ecf9974988ea30a9c0105)
1121 commit 0c83eb355e989fb6ed38a3b82f9705fd5d700e89
1122 Merge: 7496388 f400ff2
1123 Author: Loic Dachary <loic@dachary.org>
1124 Date: Wed Oct 19 23:14:23 2016 +0200
1126 Merge pull request #11548 from dachary/wip-17609-jewel
1128 jewel: tests: ceph-disk must ignore debug monc
1130 Reviewed-by: Sage Weil <sage@redhat.com>
1132 commit 7496388468688763cab7fab9cc2f61cfaeeb4e7c
1133 Merge: f8055a9 d205b74
1134 Author: Loic Dachary <loic@dachary.org>
1135 Date: Wed Oct 19 23:11:24 2016 +0200
1137 Merge pull request #11411 from dachary/wip-17245-jewel
1139 jewel: tests: scsi_debug fails /dev/disk/by-partuuid
1141 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1143 commit f8055a9453e228079a8c61ba398e93e9fbdcf55a
1144 Merge: 3b2d360 dea93dc
1145 Author: Loic Dachary <loic@dachary.org>
1146 Date: Wed Oct 19 23:11:04 2016 +0200
1148 Merge pull request #10884 from dachary/wip-17149-jewel
1150 jewel: ceph-disk: expected systemd unit failures are confusing
1152 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1154 commit 084108e440b7b9b8f0d36282dd4eba64a4b96f4b
1155 Author: Orit Wasserman <owasserm@redhat.com>
1156 Date: Wed Aug 31 22:25:57 2016 +0200
1158 rgw: fix regression with handling double underscore
1160 Fixes: http://tracker.ceph.com/issues/16856
1161 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
1162 (cherry picked from commit bc840afafdfe5e528e5c1b711e71420ac3cb5a67)
1164 commit 3b2d36039305bc070ac1eaf5142d5b5bfa7accb1
1165 Merge: d15d6dc 483d8c4
1166 Author: Loic Dachary <loic@dachary.org>
1167 Date: Wed Oct 19 16:50:44 2016 +0200
1169 Merge pull request #11408 from dachary/wip-17345-jewel
1171 jewel: Ceph Status - Segmentation Fault
1173 Reviewed-by: Kefu Chai <kchai@redhat.com>
1175 commit d15d6dc896d0ac30ddff4354600d7c2ecb61b54a
1176 Merge: d4197dc 5ae4f31
1177 Author: Loic Dachary <loic@dachary.org>
1178 Date: Wed Oct 19 16:50:22 2016 +0200
1180 Merge pull request #11407 from dachary/wip-17360-jewel
1182 jewel: ceph-objectstore-tool crashes if --journal-path <a-directory>
1184 Reviewed-by: Kefu Chai <kchai@redhat.com>
1186 commit d4197dcae43b073d121c4b12ff7cca2f619745e1
1187 Merge: 54bb909 c94244d
1188 Author: Loic Dachary <loic@dachary.org>
1189 Date: Wed Oct 19 09:47:00 2016 +0200
1191 Merge pull request #11158 from dillaman/wip-rbdmap-jewel
1193 jewel: systemd: add install section to rbdmap.service file
1195 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1197 commit 54bb9092a8d658ab2f352ed8c850d719b2468d83
1198 Merge: dc59575 c3c2910
1199 Author: Loic Dachary <loic@dachary.org>
1200 Date: Wed Oct 19 09:46:19 2016 +0200
1202 Merge pull request #10862 from dachary/wip-17095-jewel
1204 jewel: rpm: ceph installs stuff in %_udevrulesdir but does not own that directory
1206 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1208 commit f400ff222e531feb00de3ebf1860a0d4bcca736e
1209 Author: Loic Dachary <ldachary@redhat.com>
1210 Date: Tue Oct 18 17:33:23 2016 +0200
1212 tests: ceph-disk: force debug monc = 0
1214 The sh function will collect both stderr and stdout and debug
1215 will mess the json parsing.
1217 Fixes: http://tracker.ceph.com/issues/17607
1219 Signed-off-by: Loic Dachary <ldachary@redhat.com>
1220 (cherry picked from commit 469a53a4adc335ea4ff8e34a958b12f0f222a6c1)
1222 commit dc59575b2fec477bdcf152f91a02532fcdfd1a10
1223 Merge: 778d884 c2cf21d
1224 Author: Loic Dachary <loic@dachary.org>
1225 Date: Wed Oct 19 08:56:46 2016 +0200
1227 Merge pull request #10860 from dachary/wip-17121-jewel
1229 jewel: the %USED of ceph df is wrong
1231 Reviewed-by: Kefu Chai <kchai@redhat.com>
1232 Reviewed-by: Samuel Just <sjust@redhat.com>
1234 commit 778d884512d2cf298c60634cda9a6f66dc2b948b
1235 Merge: 82edc5b a25a483
1236 Author: Loic Dachary <loic@dachary.org>
1237 Date: Wed Oct 19 01:35:13 2016 +0200
1239 Merge pull request #10886 from dachary/wip-17144-jewel
1241 jewel: mark_all_unfound_lost() leaves unapplied changes
1243 Reviewed-by: David Zafman <dzafman@redhat.com>
1245 commit 82edc5bc526e02d7c535d01642d8ef7f00d19939
1246 Merge: c4f4f8a e6ac214
1247 Author: Loic Dachary <loic@dachary.org>
1248 Date: Tue Oct 18 13:05:43 2016 +0200
1250 Merge pull request #10784 from dachary/wip-17067-jewel
1252 jewel: Request exclusive lock if owner sends -ENOTSUPP for proxied maintenance op
1254 Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
1256 commit 25a35d43a8bf7e1a7d78d5d1d2a5556dff98f5e8
1257 Author: Kefu Chai <kchai@redhat.com>
1258 Date: Mon Oct 10 18:43:39 2016 +0800
1260 doc: fill keyring with caps before passing it to ceph-monstore-tool
1262 to make sure the recovered monitor store is ready for use.
1264 Signed-off-by: Kefu Chai <kchai@redhat.com>
1265 (cherry picked from commit af8e21163735377071b6832d8a81b035bb835257)
1267 commit 73ea9264803bdf53a5da64992c1b91e94633f5e3
1268 Author: Kefu Chai <kchai@redhat.com>
1269 Date: Mon Oct 10 16:32:27 2016 +0800
1271 tools/ceph_monstore_tool: bail out if no caps found for a key
1273 we take it as an error if no caps is granted to an entity in the
1274 specified keyring file when rebuilding the monitor db.
1276 Signed-off-by: Kefu Chai <kchai@redhat.com>
1277 (cherry picked from commit b4bd4004a836121c11b0bb97d8123df54c271f04)
1279 commit 4ebf87bccdb17bd04b2c615e6278a7816ae1ff43
1280 Author: Kefu Chai <kchai@redhat.com>
1281 Date: Fri Sep 30 17:58:14 2016 +0800
1283 tools/ceph_monstore_tool: update pgmap_meta also when rebuilding store.db
1285 we should rebuild pgmap_meta table from the collected osdmaps
1287 Fixes: http://tracker.ceph.com/issues/17400
1288 Signed-off-by: Kefu Chai <kchai@redhat.com>
1289 (cherry picked from commit cdfa7a69f63d047205dcfccd63b5d58ab0d4695b)
1291 commit d2deed6bfbc5693e3bd8a10a2f9be8df8ef1b0e5
1292 Author: xie xingguo <xie.xingguo@zte.com.cn>
1293 Date: Sun Sep 18 11:40:56 2016 +0800
1295 tools/rebuild_mondb: kill compiling warning
1299 [ 72%] Building CXX object src/tools/CMakeFiles/ceph-objectstore-tool.dir/RadosDump.cc.o
1300 /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc: In function ‘int update_mon_db(ObjectStore&, OSDSuperblock&, const string&, const string&)’:
1301 /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:289:22: warning: ‘crc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
1302 if (have_crc && osdmap.get_crc() != crc) {
1304 /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:238:14: note: ‘crc’ was declared here
1307 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
1308 (cherry picked from commit f16a31476a3f9b44a7c3dabf0dfd2a0d015b11b9)
1310 commit 09701269de225e556099b9e5c511faa44acae024
1311 Author: xie xingguo <xie.xingguo@zte.com.cn>
1312 Date: Sun Sep 18 10:33:56 2016 +0800
1314 tools/rebuild_mondb: avoid unnecessary result code cast
1316 In general we return negative codes for error cases, so there is
1317 no need perform the cast here.
1319 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
1320 (cherry picked from commit 6a1c01d334fe65124043aa68a6e0cfaea43836b5)
1322 commit 5191b06294cf505716d0c64ac36528e9ea57b0a8
1323 Author: Kefu Chai <kchai@redhat.com>
1324 Date: Sat Oct 1 14:18:55 2016 +0800
1326 doc: add rados/operations/disaster-recovery.rst
1328 document the process to recover from leveldb corruption.
1330 Fixes: http://tracker.ceph.com/issues/17179
1331 Signed-off-by: Kefu Chai <kchai@redhat.com>
1332 (cherry picked from commit 79a9f299253e24d20547131b3c9c9e0667e3b869)
1334 src/tools/rebuild_mondb.cc:
1335 remove the code change in this file from this commit.
1336 and the code gets removed is added in anther commit.
1338 commit 8c8d5ce529fa826bc0d453edf5fb5e98e29294d3
1339 Author: Kefu Chai <kchai@redhat.com>
1340 Date: Mon Aug 29 19:53:11 2016 +0800
1342 tools/ceph_monstore_tool: add "rebuild" command
1344 Fixes: http://tracker.ceph.com/issues/17179
1345 Signed-off-by: Kefu Chai <kchai@redhat.com>
1346 (cherry picked from commit d909fa035c8fbbded786b2ca072acc10ea6b6052)
1348 commit 1fcb0bb81a8989b31a79bc565354f6817ceb12d7
1349 Author: Kefu Chai <kchai@redhat.com>
1350 Date: Mon Aug 29 19:52:19 2016 +0800
1352 tools/ceph-objectstore-tool: add "update-mon-db" command
1354 Fixes: http://tracker.ceph.com/issues/17179
1355 Signed-off-by: Kefu Chai <kchai@redhat.com>
1357 src/tools/CMakeLists.txt: this file was added in master, so
1358 update src/CMakeLists.txt instead
1359 src/tools/Makefile-server.am: jewel is still using autotools,
1360 so update this file also.
1361 src/tools/rebuild_mondb.cc: move the code spilled into
1362 doc/rados/troubleshooting/troubleshooting-mon.rst
1363 by accident back to this commit.
1364 (cherry picked from commit 24faea7ce446bbf09cbd4a9d3434dd5444a6c295)
1366 commit 416750258fb63064a36eaf53f586a51fc3ea63e0
1367 Author: Kefu Chai <kchai@redhat.com>
1368 Date: Wed Aug 31 13:11:24 2016 +0800
1370 mon/AuthMonitor: make AuthMonitor::IncType public
1372 so ceph-objectstore-tool is able to use it when rebuilding monitor
1375 Fixes: http://tracker.ceph.com/issues/17179
1376 Signed-off-by: Kefu Chai <kchai@redhat.com>
1377 (cherry picked from commit 19ef4f16b3aba04119ac647cd6261c74a57ce829)
1379 commit c4f4f8a72421e9c43c09eb9dfb5a3c6fe2123886
1380 Merge: ded7c27 5ef9085
1381 Author: Samuel Just <sjust@redhat.com>
1382 Date: Mon Oct 17 11:56:30 2016 -0700
1384 Merge pull request #10885 from dachary/wip-17145-jewel
1386 jewel: PG::choose_acting valgrind error or ./common/hobject.h: 182: FAILED assert(!max || (*this == hobject_t(hobject_t::get_max())))
1388 Reviewed-by: Samuel Just <sjust@redhat.com>
1390 commit ded7c27a2d0fc0ae307321de2bf419e065c36ba1
1391 Merge: bdcdedd 58b7c52
1392 Author: Samuel Just <sjust@redhat.com>
1393 Date: Mon Oct 17 11:54:29 2016 -0700
1395 Merge pull request #10883 from dachary/wip-17141-jewel
1397 jewel: PG::_update_calc_stats wrong for CRUSH_ITEM_NONE up set items
1399 Reviewed-by: Samuel Just <sjust@redhat.com>
1401 commit bdcdedd32f9e8a71735ae1d4d3ca18b41bde3378
1402 Merge: 757f8e8 3bb2a9e
1403 Author: Loic Dachary <loic@dachary.org>
1404 Date: Mon Oct 17 18:08:46 2016 +0200
1406 Merge pull request #11420 from dachary/wip-17556-jewel
1408 jewel: librbd::Operations: update notification failed: (2) No such file or directory
1410 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1412 commit 757f8e87e0aa39af05f0bc7b8146c826191e8032
1413 Merge: 4d2bc33 bd63666
1414 Author: Loic Dachary <loic@dachary.org>
1415 Date: Mon Oct 17 18:08:32 2016 +0200
1417 Merge pull request #10857 from dachary/wip-16984-jewel
1419 jewel: Disabling pool mirror mode with registered peers results orphaned mirrored images
1421 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1423 commit 4d2bc33101aaadbab73cdae3327fc0888a15e25a
1424 Merge: 23d91cf 18a66cb
1425 Author: Loic Dachary <loic@dachary.org>
1426 Date: Mon Oct 17 17:55:10 2016 +0200
1428 Merge pull request #10645 from dachary/wip-16458-jewel
1430 jewel: Potential crash during journal::Replay shut down
1432 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1434 commit 23d91cfcd1c77766972577639ef72db353076e37
1435 Merge: 51c2794 775c78d
1436 Author: Loic Dachary <loic@dachary.org>
1437 Date: Mon Oct 17 17:54:55 2016 +0200
1439 Merge pull request #10652 from dachary/wip-16951-jewel
1441 jewel: ceph 10.2.2 rbd status on image format 2 returns (2) No such file or directory
1443 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1445 commit 51c279425e26626884ec54add6043c7ed3873920
1446 Merge: ee32be2 bb81f9d
1447 Author: Loic Dachary <loic@dachary.org>
1448 Date: Mon Oct 17 17:37:41 2016 +0200
1450 Merge pull request #11337 from SUSE/wip-17060-jewel
1452 jewel: librbd: cannot disable journaling or remove non-mirrored, non-primary image
1454 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1456 commit ee32be2ae3c328238fd2bbb953c18d3b9f0a51b1
1457 Merge: 7d0dd1c 2b27212
1458 Author: Loic Dachary <loic@dachary.org>
1459 Date: Mon Oct 17 17:37:06 2016 +0200
1461 Merge pull request #10650 from dachary/wip-16868-jewel
1463 jewel: Prevent the creation of a clone from a non-primary mirrored image
1465 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1467 commit 7d0dd1cf6f6568f86fa593de0a7845462a510d31
1468 Merge: f1c21c6 1c76ef4
1469 Author: Loic Dachary <loic@dachary.org>
1470 Date: Mon Oct 17 17:06:51 2016 +0200
1472 Merge pull request #11433 from dillaman/wip-17416-jewel
1474 jewel: rbd-mirror: improve resiliency of stress test case
1476 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1478 commit f1c21c6f01e20949753198e5f3ad160e0213cc5b
1479 Merge: 986a8b5 80e25b0
1480 Author: Loic Dachary <loic@dachary.org>
1481 Date: Mon Oct 17 17:04:11 2016 +0200
1483 Merge pull request #10796 from dillaman/wip-17059-jewel
1485 jewel: rbd: bench io-size should not be larger than image size
1487 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1489 commit 986a8b5eacbf0d6084121eef8407088a24d27ffd
1490 Merge: c7b7f2e 10e603b
1491 Author: Loic Dachary <loic@dachary.org>
1492 Date: Mon Oct 17 14:28:06 2016 +0200
1494 Merge pull request #11414 from dachary/wip-17477-jewel
1496 jewel: Crash in Client::_invalidate_kernel_dcache when reconnecting during unmount
1498 Reviewed-by: John Spray <john.spray@redhat.com>
1500 commit c7b7f2e8c0de596255e651ae5e499c586f1e4493
1501 Merge: ada7edd 3320da0
1502 Author: Loic Dachary <loic@dachary.org>
1503 Date: Mon Oct 17 14:27:53 2016 +0200
1505 Merge pull request #11412 from dachary/wip-17479-jewel
1507 jewel: Duplicate damage table entries
1509 Reviewed-by: John Spray <john.spray@redhat.com>
1511 commit ada7edd1d21073b71c1d4538ab66b15b978cf418
1512 Merge: 1412b17 3a79db1
1513 Author: Loic Dachary <loic@dachary.org>
1514 Date: Mon Oct 17 14:27:43 2016 +0200
1516 Merge pull request #11415 from dachary/wip-17476-jewel
1518 jewel: Failure in snaptest-git-ceph.sh
1520 Reviewed-by: John Spray <john.spray@redhat.com>
1522 commit 1412b171c057fabd05abaf9adcf31aa29a4f5b00
1523 Merge: 368c96c 0a17741
1524 Author: Loic Dachary <loic@dachary.org>
1525 Date: Mon Oct 17 14:27:30 2016 +0200
1527 Merge pull request #11416 from dachary/wip-17474-jewel
1529 jewel: Failure in dirfrag.sh
1531 Reviewed-by: John Spray <john.spray@redhat.com>
1533 commit 368c96c513cd5424d7935fc02edd6297fb680bb7
1534 Merge: 4486e3b 2c4e1c1
1535 Author: Loic Dachary <loic@dachary.org>
1536 Date: Mon Oct 17 14:27:17 2016 +0200
1538 Merge pull request #11418 from dachary/wip-17246-jewel
1540 jewel: Log path as well as ino when detecting metadata damage
1542 Reviewed-by: John Spray <john.spray@redhat.com>
1544 commit 4486e3b5e00e809bc3391613cc5160810ce5bf1e
1545 Merge: b174220 5173563
1546 Author: Loic Dachary <loic@dachary.org>
1547 Date: Mon Oct 17 14:27:04 2016 +0200
1549 Merge pull request #11419 from dachary/wip-17244-jewel
1551 jewel: Failure in snaptest-git-ceph.sh
1553 Reviewed-by: John Spray <john.spray@redhat.com>
1555 commit b1742204e10d563573bbda82917b843c01b20420
1556 Merge: 54240c4 c0db9fb
1557 Author: Loic Dachary <loic@dachary.org>
1558 Date: Mon Oct 17 14:26:30 2016 +0200
1560 Merge pull request #10877 from dachary/wip-16946-jewel
1562 jewel: client: nlink count is not maintained correctly
1564 Reviewed-by: John Spray <john.spray@redhat.com>
1566 commit 54240c4d3dfeef97c6fba343fe501f0303c73f1b
1567 Merge: 8b5aa5d 430ab1b
1568 Author: Loic Dachary <loic@dachary.org>
1569 Date: Mon Oct 17 13:40:13 2016 +0200
1571 Merge pull request #10758 from dachary/wip-17007-jewel
1573 jewel: ceph-disk should timeout when a lock cannot be acquired
1575 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1577 commit caf08d731c7cec40fe6635189de877d1f047e8b4
1578 Author: Orit Wasserman <owasserm@redhat.com>
1579 Date: Tue Oct 11 14:18:29 2016 +0200
1581 rgw: avoid corruption when running old radosgw-admin on a newer rgw
1583 Fixes:http://tracker.ceph.com/issues/17371
1584 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
1585 (cherry picked from commit 8eab9454b4d45ed8092a1292bd1904ef928c2120)
1587 commit e5f7854ddfc2a6c123d77b1d33e659b4f870fbe6
1588 Author: Orit Wasserman <owasserm@redhat.com>
1589 Date: Tue Oct 11 11:19:01 2016 +0200
1591 rgw: Fix missing master zone for default region conversion
1593 Fixes:http://tracker.ceph.com/issues/17371
1594 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
1595 (cherry picked from commit cd3bccdef2ecd1d294ab1192ab3b9e731b5592e0)
1597 commit ec2fb022307eea93a802f80307b957bfb2581249
1598 Author: Orit Wasserman <owasserm@redhat.com>
1599 Date: Tue Oct 11 11:00:00 2016 +0200
1601 rgw: mark configuration as converted to avoid corruption when running older admins
1603 Fixes: http://tracker.ceph.com/issues/17371
1604 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
1605 (cherry picked from commit ceafa2863dd9c02da8a30c5a5324b472ed5d3404)
1607 commit 8b5aa5d94fd24793c160372f02b02735632b5fd0
1608 Merge: 6baac41 2311ab2
1609 Author: Loic Dachary <loic@dachary.org>
1610 Date: Fri Oct 14 18:13:09 2016 +0200
1612 Merge pull request #10864 from dachary/wip-17131-jewel
1614 jewel: Jewel: segfault in ObjectCacher::FlusherThread
1616 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1618 commit 6baac417eb95df880b97cdc720e6b00f6f8f27d8
1619 Merge: 19922c5 ca8fc6f
1620 Author: Sage Weil <sage@redhat.com>
1621 Date: Fri Oct 14 09:26:32 2016 -0500
1623 Merge pull request #11417 from dachary/wip-17347-jewel
1625 jewel: ceph-create-keys: sometimes blocks forever if mds allow is set
1627 Reviewed-by: Sage Weil <sage@redhat.com>
1629 commit 19922c5b818e82c297dfc0d2eb914276945e9a2e
1630 Merge: 952a81a 35660d1
1631 Author: Sage Weil <sage@redhat.com>
1632 Date: Fri Oct 14 09:25:42 2016 -0500
1634 Merge pull request #11272 from aiicore/wip-17402-jewel
1636 jewel: OSDMonitor: Missing nearfull flag set
1638 Reviewed-by: Sage Weil <sage@redhat.com>
1640 commit 952a81aed3bae88239e448fcae1ce73e725d9966
1641 Merge: e34b7da 165e5ab
1642 Author: Sage Weil <sage@redhat.com>
1643 Date: Fri Oct 14 09:24:42 2016 -0500
1645 Merge pull request #11193 from SUSE/wip-17377-jewel
1647 jewel: LIBRADOS modify Pipe::connect() to return the error code
1649 Reviewed-by: Sage Weil <sage@redhat.com>
1651 commit e34b7dad7e11f1db45f2bd636b1f3ed73742540a
1652 Merge: f9c969e 7d92e2e
1653 Author: Sage Weil <sage@redhat.com>
1654 Date: Fri Oct 14 09:23:30 2016 -0500
1656 Merge pull request #10861 from dachary/wip-17135-jewel
1658 jewel: ceph mon Segmentation fault after set crush_ruleset ceph 10.2.2
1660 Reviewed-by: Sage Weil <sage@redhat.com>
1662 commit f9c969eb54fef6f474bc8f784735123039ffeccc
1663 Merge: 4bcc21b 117aa35
1664 Author: Sage Weil <sage@redhat.com>
1665 Date: Fri Oct 14 09:22:05 2016 -0500
1667 Merge pull request #10855 from dachary/wip-16657-jewel
1669 jewel: i386 tarball gitbuilder failure on master
1671 Reviewed-by: Sage Weil <sage@redhat.com>
1673 commit 4bcc21b9288ed046a2781e95e781bfc71636b9c1
1674 Merge: 92a3538 5d0e2f8
1675 Author: Loic Dachary <loic@dachary.org>
1676 Date: Fri Oct 14 15:37:25 2016 +0200
1678 Merge pull request #11409 from dachary/wip-17341-jewel
1680 jewel: librados memory leaks from ceph::crypto (WITH_NSS)
1682 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1684 commit 92a353847852dbec003e4795e3322d2a92752b9d
1685 Merge: 67d0ded 8833c64
1686 Author: Loic Dachary <loic@dachary.org>
1687 Date: Fri Oct 14 13:45:46 2016 +0200
1689 Merge pull request #11311 from dzafman/wip-scrub-boundary-jewel
1691 jewel: osd: adjust scrub boundary to object without SnapSet
1693 Reviewed-by: Sage Weil <sage@redhat.com>
1695 commit 67d0ded8d3ceda56ab7c0aaca25f3c1c51731c72
1696 Merge: 52e596f 9cb45e1
1697 Author: Loic Dachary <loic@dachary.org>
1698 Date: Fri Oct 14 13:43:27 2016 +0200
1700 Merge pull request #11231 from badone/wip-17376
1702 jewel: common: Log.cc: Assign LOG_INFO priority to syslog calls
1704 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1706 commit 52e596ffe0b8a83bfeae0ad836227a73d7d6facb
1707 Merge: 65e8bbc cca589f
1708 Author: Loic Dachary <loic@dachary.org>
1709 Date: Fri Oct 14 13:30:05 2016 +0200
1711 Merge pull request #9872 from odivlad/fix-init-el7-jewel
1713 jewel: remove SYSTEMD_RUN from initscript
1715 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1717 commit 91bd342df6de15263004f3a41c285f6658a16d45
1718 Author: Alexander Graf <agraf@suse.de>
1719 Date: Mon Sep 26 10:26:30 2016 +0200
1721 AArch64: Detect crc32 extension support from assembler
1723 The used compiler may or may not be recent enough to recognize the
1724 crc32 extended cpu type. However, it does not really have to know about
1725 them either, since all we do is pass inline assembly instructions to
1728 This patch moves the crc cpu extension detection from compiler based
1729 to assembler based, so that we can build optimized code even when the
1730 compiler does not know about the cpu type yet.
1732 Signed-off-by: Alexander Graf <agraf@suse.de>
1734 (manual backport of e70ab48b7f6d39a281b3ec65098535a55018b681 - manual backport
1735 was undertaken because jewel uses autotools)
1737 commit 65e8bbccdb73cc6696736367a3df59ea3dcfda1f
1738 Merge: 7c9f1c7 086f6e0
1739 Author: Casey Bodley <cbodley@users.noreply.github.com>
1740 Date: Thu Oct 13 14:52:30 2016 -0400
1742 Merge pull request #10891 from dachary/wip-16793-jewel
1744 jewel: rgw: upgrade from old multisite to new multisite fails
1746 Reviewed-by: Casey Bodley <cbodley@redhat.com>
1748 commit 7c9f1c7940c77451b2d44ef22a278fdfb2938cea
1749 Merge: e3839ab 27626ba
1750 Author: Casey Bodley <cbodley@users.noreply.github.com>
1751 Date: Thu Oct 13 14:51:59 2016 -0400
1753 Merge pull request #10889 from dachary/wip-17143-jewel
1755 jewel: rgw: rgw file uses too much CPU in gc/idle thread
1757 Reviewed-by: Casey Bodley <cbodley@redhat.com>
1759 commit e3839ab5ce63abd248d886dcf362f3a6c49f382e
1760 Merge: 0561550 416ec6f
1761 Author: Casey Bodley <cbodley@users.noreply.github.com>
1762 Date: Thu Oct 13 14:51:38 2016 -0400
1764 Merge pull request #10868 from dachary/wip-17064-jewel
1766 jewel: rgw: radosgw daemon core when reopen logs
1768 Reviewed-by: Casey Bodley <cbodley@redhat.com>
1770 commit 05615509d946c340d03af7e407a31e3e53447ac8
1771 Merge: abc8e3d f034fd0
1772 Author: Casey Bodley <cbodley@users.noreply.github.com>
1773 Date: Thu Oct 13 14:51:17 2016 -0400
1775 Merge pull request #10867 from dachary/wip-17118-jewel
1777 jewel: rgw: period commit return error when the current period has a zonegroup which doesn't have a master zone
1779 Reviewed-by: Casey Bodley <cbodley@redhat.com>
1781 commit abc8e3dd0388778d01a19f3de15a1ffcb662549f
1782 Merge: 8adc55d 83a91ba
1783 Author: Loic Dachary <loic@dachary.org>
1784 Date: Thu Oct 13 17:43:52 2016 +0200
1786 Merge pull request #11367 from linuxbox2/jewel-s3-versioning
1788 jewel: rgw: S3 object versioning fails when applied on a non-master zone
1790 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1792 commit 8adc55d0d3f98acde4d91ba6f8ab9fb379ec10d9
1793 Merge: 50404ae 77ea511
1794 Author: Loic Dachary <loic@dachary.org>
1795 Date: Thu Oct 13 16:43:04 2016 +0200
1797 Merge pull request #11342 from SUSE/wip-17505-jewel
1799 jewel: rgw: doc: description of multipart part entity is wrong
1801 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1803 commit 50404aef1f36cd2035c4384ecdf608910e6cb215
1804 Merge: f1c55ad de0c4e1
1805 Author: Loic Dachary <loic@dachary.org>
1806 Date: Thu Oct 13 16:42:45 2016 +0200
1808 Merge pull request #11330 from cbodley/wip-17073
1810 jewel: rgw: RGWDataSyncCR fails on errors from RGWListBucketIndexesCR
1812 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1814 commit f1c55ad7eeeb633e5ad3414e37ebb5dacccb930b
1815 Merge: a336110 e2ce857
1816 Author: Loic Dachary <loic@dachary.org>
1817 Date: Thu Oct 13 16:39:06 2016 +0200
1819 Merge pull request #11139 from cbodley/wip-radosgw-admin-man-jewel
1821 jewel: add orphan options to radosgw-admin --help and man page
1823 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1825 commit a336110785ea06f4404f136dddcce61660d85b2f
1826 Merge: 79885ae cf47628
1827 Author: Loic Dachary <loic@dachary.org>
1828 Date: Thu Oct 13 16:35:57 2016 +0200
1830 Merge pull request #10832 from ceph/jewel-default-quota
1832 jewel: rgw - default quota fixes
1834 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1836 commit 79885ae86be1e444985446ab8315a21ad6d24634
1837 Merge: 9d1f756 54b6b5e
1838 Author: Loic Dachary <loic@dachary.org>
1839 Date: Thu Oct 13 14:58:33 2016 +0200
1841 Merge pull request #10107 from xiaoxichen/wip-16313-jewel
1843 jewel: client: FAILED assert(root_ancestor->qtree == __null)
1845 Reviewed-by: John Spray <john.spray@redhat.com>
1846 Reviewed-by: Yan, Zheng <zyan@redhat.com>
1848 commit d205b74e07ab364378afb4fc63cb08814a8a1f4e
1849 Author: Loic Dachary <ldachary@redhat.com>
1850 Date: Tue Aug 23 12:17:00 2016 +0200
1852 tests: populate /dev/disk/by-partuuid for scsi_debug
1854 The scsi_debug SCSI devices do not have a symlink in /dev/disk/by-partuuid
1855 because they are filtered out by 60-persistent-storage.rules. That was
1856 worked around by 60-ceph-partuuid-workaround-rules which has been
1857 removed by 9f76b9ff31525eac01f04450d72559ec99927496.
1859 Add create rules targetting this specific case, only for tests since the
1860 problem does not show in real use cases.
1862 Fixes: http://tracker.ceph.com/issues/17100
1864 Signed-off-by: Loic Dachary <loic@dachary.org>
1865 (cherry picked from commit 7cbf1f0a5eced402e6c7242015550668e3b568f3)
1867 commit 86eef272304f3896a9cda5cde7e882d09d0269c0
1868 Author: Daniel Gryniewicz <dang@redhat.com>
1869 Date: Fri Jun 10 11:33:56 2016 -0400
1871 Allow building RGW with LDAP disabled
1873 Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
1874 (cherry picked from commit 38abfcb5d036c050a363533a2c7b658d528d3612)
1876 commit 657554574414dcece6126bfa1b4008b038c3f729
1877 Author: la-sguduru <SGuduru@walmartlabs.com>
1878 Date: Thu May 12 11:53:25 2016 +0530
1880 doc: Modification for "TEST S3 ACCESS" section
1882 Signed-off-by: SirishaGuduru sirishaguduru99@gmail.com
1883 (cherry picked from commit 27d6cf0c6958de9f0533bedb90a74c4020b53675)
1885 commit 50fd48fbdc8f4f0e9151eb405eb112b710304bb9
1886 Author: qiankunzheng <zheng.qiankun@h3c.com>
1887 Date: Fri Mar 18 13:58:22 2016 -0400
1889 rgw:response information is error when geting token of swift account
1890 The header is X-Trans-Id instead of x-amz-request-id in the response header
1893 Signed-off-by: Qiankun Zheng <zheng.qiankun@h3c.com>
1894 (cherry picked from commit 08e909d0b844e8be3cb82d6add3e87d38e19e80e)
1896 commit 742366116d368d3adff4b7941a4751d362073b35
1897 Author: SirishaGuduru <SGuduru@walmartlabs.com>
1898 Date: Mon Sep 19 10:21:06 2016 +0530
1900 doc: Radosgw multitenancy config paramater change
1902 Radosgw multitenancy configuration parameter
1903 "rgw keystone make new tenants" never works even
1904 applied. When gone through the code, itseems this
1905 parameter is not used. But "rgw keystone implicit
1906 tenants" works as the code looks for this.
1908 Modified the configuration parameter in two files
1909 mentioned below from "rgw keystone make new tenants"
1910 to "rgw keystone implicit tenants"
1912 Fixes: http://tracker.ceph.com/issues/17293
1914 Signed-off-by: SirishaGuduru <SGuduru@walmartlabs.com>
1915 (cherry picked from commit bd9695d50cfd472508a8a704f1ea5fc62dc08faf)
1917 commit 635666412c464228edb014b525abb0af3a55ac50
1918 Author: Yang Honggang <joseph.yang@xtaotech.com>
1919 Date: Tue Oct 4 09:18:09 2016 +0800
1921 rgw: fix versioned object IO error
1923 When accessing a copied destination object, its source object's instance ID
1924 information is needed, however it's missing now in the destination object's
1927 In order to fix this problem, we can record source object's version_id/instance
1928 into dest object's manifest(a new filed 'tail_instance' is added). When creating
1929 a new object(not copy), 'tail_instance' should be equal to its instance value.
1930 When copy/get a object, 'tail_instance' should always be used to get the right
1933 Fixes: http://tracker.ceph.com/issues/17111
1934 Signed-off-by: Yang Honggang <joseph.yang@xtaotech.com>
1936 (cherry picked from commit d43b69e529328f73da6c29cd746557788a989ae0)
1938 commit 40689d1acab4da963d05540eb837fd12a4411269
1939 Author: Yehuda Sadeh <yehuda@redhat.com>
1940 Date: Fri Sep 30 16:13:00 2016 -0700
1942 rgw: don't fail if lost race when setting acls
1944 Fixes: http://tracker.ceph.com/issues/16930
1946 When concurrently setting acls on object/bucket, we could lose in a race.
1947 Instead of retry, just return success (same effect as if we won and then
1948 other writer overwrote us).
1950 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1951 (cherry picked from commit 6e9a915b565923081f609048072b8d75716a74ea)
1953 commit 5a53ffa8a9e8590ea0d1992fad9a30cde135cbac
1954 Author: Yehuda Sadeh <yehuda@redhat.com>
1955 Date: Wed Oct 5 11:41:42 2016 -0700
1957 rgw: remove user email index using helper function
1959 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1960 (cherry picked from commit 10dbfc540aef5c3d45b7e3aabe61090c302f47ab)
1962 commit ad54bf9a0dc541cb6d664edec9ca7f3ec6ffbc93
1963 Author: Weijun Duan <duanweijun@h3c.com>
1964 Date: Sat Feb 27 04:28:14 2016 -0500
1966 rgw:user email can modify to empty
1968 Fixes: http://tracker.ceph.com/issues/13286
1970 Signed-off-by: Weijun Duan <duanweijun@h3c.com>
1971 (cherry picked from commit ebfd713d9a40e1cb33dfdf2198c20d621e387e36)
1973 commit 4babd3fa335351bd4327cded47a1ffe5a8cfd897
1974 Author: Jason Dillaman <dillaman@redhat.com>
1975 Date: Sat Sep 17 08:29:15 2016 -0400
1977 librbd: corrected use-after-free in ImageWatcher
1979 Fixes: http://tracker.ceph.com/issues/17289
1980 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1981 (cherry picked from commit 2f4d4868e3b721c932c35ae7e8f0dd96b36a37fc)
1983 commit 1ca4dc6d1bd6aebece500c6e91f6a9871af0e1f1
1984 Author: Jason Dillaman <dillaman@redhat.com>
1985 Date: Fri Sep 9 10:42:50 2016 -0400
1987 librbd: possible deadlock if cluster connection closed after image
1989 Fixes: http://tracker.ceph.com/issues/17254
1990 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1991 (cherry picked from commit 818c2f2abc972f689acb7d783c2a684bcc9e6e51)
1993 commit b73356b500f9ff364c09e6d78e62fc0e79fbfbac
1994 Author: Jason Dillaman <dillaman@redhat.com>
1995 Date: Tue Sep 20 07:25:36 2016 -0400
1997 librbd: block name prefix might overflow fixed size C-string
1999 The issue which resulted in too large v2 image ids was fixed
2002 Fixes: http://tracker.ceph.com/issues/17310
2003 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2004 (cherry picked from commit 61734d266c6ee476c2f5fcfbbaefc7d0c7939617)
2006 commit b410c8ea2164eb53ee7882859f0a977b67cf8b80
2007 Author: Jason Dillaman <dillaman@redhat.com>
2008 Date: Tue Sep 20 10:19:45 2016 -0400
2010 librbd: potential deadlock closing image with in-flight readahead
2012 Fixes: http://tracker.ceph.com/issues/17198
2013 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2014 (cherry picked from commit c971d58f8a5550b19374b74bb89d69143423479b)
2016 commit 32d84e0eed671f0cfe37057d59f0afe1b63f3c4d
2017 Author: Jason Dillaman <dillaman@redhat.com>
2018 Date: Tue Sep 20 14:47:36 2016 -0400
2020 librbd: update_features should handle Infernalis OSDs
2022 Fixes: http://tracker.ceph.com/issues/17330
2023 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2024 (cherry picked from commit 8cb2ccda1b847e0f33c0d34bf57e9ec29bbbb43b)
2026 commit b4e13808b004fd10d342e3daa17a3d4e830d4d00
2027 Author: Jason Dillaman <dillaman@redhat.com>
2028 Date: Tue Sep 20 14:34:16 2016 -0400
2030 cls/rbd: set_features should adjust the mask to known features
2032 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2033 (cherry picked from commit a26c7a5cacebf8814e20a2f3d5b69c20d8798871)
2035 commit dd93e009a222e8e86041661742b4df9c92b097f7
2036 Author: Vikhyat Umrao <vumrao@redhat.com>
2037 Date: Mon Jun 27 23:36:09 2016 +0530
2039 rbd: cleanup - Proxied operations shouldn't result
2040 in error messages if replayed
2042 Fixes: http://tracker.ceph.com/issues/16130
2044 Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
2045 (cherry picked from commit d09c9c471f40f15c14f392a93a04353ca30b1c5e)
2047 commit 391936a30cc6022f067cb11c2e39bd47b9e58d61
2048 Author: Lu Shi <shi.lu@h3c.com>
2049 Date: Wed Jun 15 09:24:43 2016 +0800
2051 librbd: enable/disable of features is not allowed when already enabled/disabled
2053 Fixes: http://tracker.ceph.com/issues/16079
2055 Signed-off-by: Lu Shi <shi.lu@h3c.com>
2056 (cherry picked from commit a8a633396a4105991c9643c2b39391621934c26d)
2058 commit 7d6801bdd376f8eb5e1fbfa8f3a9f4de5dc710a1
2059 Author: zhuangzeqiang <zhuang.zeqiang@h3c.com>
2060 Date: Sat Jun 25 10:21:25 2016 +0800
2062 rbd: restrict mirror enable/disable actions on parents/clones
2064 Fixes: http://tracker.ceph.com/issues/16056
2066 Signed-off-by: zhuangzeqiang zhuang.zeqiang@h3c.com
2067 (cherry picked from commit 11dee0bbf0a85f2c197192d0560bd486bc2ad6fc)
2069 commit cf476284ae9089e73e5fdf5ddfefdd5842246190
2070 Author: root <root@ceph-node1.homeoffice.wal-mart.com>
2071 Date: Sun Jun 19 13:06:06 2016 +0530
2073 rgw: Add documentation for RGW default quota
2075 Fixes http://tracker.ceph.com/issues/16447
2077 This was modified to use size in kB, rather than size in bytes, since
2078 Jewel has not yet been converted to use size in bytes.
2080 Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
2081 Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2082 (cherry picked from commit e3ab3476146cf0fe604783e9e5a0d63237271735)
2084 commit 22348154ad51c20d73aa7715695244b8d85fac37
2085 Author: root <root@ceph-node1.homeoffice.wal-mart.com>
2086 Date: Sun Jun 19 12:48:42 2016 +0530
2088 rgw: Do not bother to check against conf values during quota handling
2090 Fixes http://tracker.ceph.com/issues/16447
2092 This was modified to use size in kB, rather than size in bytes, since
2093 Jewel has not yet been converted to use size in bytes.
2095 Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
2096 Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2097 (cherry picked from commit 17d2c1712a5b72315a47ab0f8380331bfd478c0b)
2099 commit 0b8ecce6ac5abafe0175c941dbf55862b1515b1d
2100 Author: root <root@ceph-node1.homeoffice.wal-mart.com>
2101 Date: Mon May 23 15:34:58 2016 +0530
2103 rgw: Let the default quota settings take effect during user creation
2105 Fixes http://tracker.ceph.com/issues/16447
2107 Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
2108 Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2109 (cherry picked from commit 400d7c982f18efd7cf96acfc3a63078791d1ec0a)
2111 commit 1c76ef4e3ea7cb401345af0938d6b76652061d05
2112 Author: Mykola Golub <mgolub@mirantis.com>
2113 Date: Sat Oct 1 11:21:21 2016 +0300
2115 journal: ensure in-flight ops are complete destroying journaler
2117 Fixes: http://tracker.ceph.com/issues/17446
2118 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2119 (cherry picked from commit a25b1d7cbebb7b19cebee4cfb362cd744bbb4607)
2121 commit 9bc5e444543fade1f6d78788cadeb7bfdd29710b
2122 Author: Mykola Golub <mgolub@mirantis.com>
2123 Date: Thu Sep 29 16:55:22 2016 +0300
2125 journal: complete action only after notification completed
2127 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2128 (cherry picked from commit 55762cca2bf586d037cb9f32775ec158dc3287c1)
2130 commit 74873322da011d0e6221c90ff39d137de80720ce
2131 Author: Jason Dillaman <dillaman@redhat.com>
2132 Date: Tue Oct 4 21:29:31 2016 -0400
2134 qa/workunits: reduce amount of client IO for rbd-mirror stress
2136 Journal IO is faster now, resulting in OSDs quickly filling up
2137 under the stress test case.
2139 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2140 (cherry picked from commit a6dd6b50d632aa6995a0f4b6fc5e1a1bda23e2a0)
2142 commit d51a2f6689391274bba41f9359acb9395574e629
2143 Author: Jason Dillaman <dillaman@redhat.com>
2144 Date: Tue Oct 4 12:22:06 2016 -0400
2146 rbd-mirror: potential race allocating tag during shut down
2148 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2149 (cherry picked from commit 8c2ff9bce61a8af024150b8be9dee484f339f7df)
2151 commit cea000c6225c809b35b6c643919a01d940522c55
2152 Author: Jason Dillaman <dillaman@redhat.com>
2153 Date: Fri Sep 30 12:32:37 2016 -0400
2155 librbd: ignore attempts to request lock if already lock owner
2157 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2158 (cherry picked from commit 355c79cb7c955e62e3153cf28046a9b8a6d0d25c)
2160 commit 912ce3728c09b2bf613da287f5013b97920cc27c
2161 Author: Jason Dillaman <dillaman@redhat.com>
2162 Date: Fri Sep 30 12:59:16 2016 -0400
2164 journal: clean up object recorder closed/overflow callback
2166 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2167 (cherry picked from commit 24faead086a50ea1b9614268d4dd5f3ea7bbe445)
2169 commit 310f3f79cf54daeefa8f00aba0d7b692261e4a33
2170 Author: Jason Dillaman <dillaman@redhat.com>
2171 Date: Thu Sep 29 08:36:53 2016 -0400
2173 journal: delay moving overflowed buffers until quiesced
2175 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2176 (cherry picked from commit 4483531aa3aa3d0f298778062e2b9a339ad05075)
2178 commit 9f3614377043efb56c606905a4b4f5c86b3e074e
2179 Author: Jason Dillaman <dillaman@redhat.com>
2180 Date: Thu Sep 29 08:19:52 2016 -0400
2182 journal: use reverse iterator search to find flush record
2184 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2185 (cherry picked from commit a96065815558e50361af4c701c23e5248962dfe0)
2187 commit 21502d90ecc72e70faa19b1202f9c7095341aaec
2188 Author: Jason Dillaman <dillaman@redhat.com>
2189 Date: Wed Sep 28 08:35:36 2016 -0400
2191 journal: avoid holding lock while sending journal append
2193 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2194 (cherry picked from commit dc77a629ed353d586b63f0bd8e20f54a7595afba)
2196 commit e0de824f7e728b06025a572a0c8213ef9fb1f112
2197 Author: Jason Dillaman <dillaman@redhat.com>
2198 Date: Wed Sep 21 15:41:55 2016 -0400
2200 rbd-mirror: wait for in-flight event commit notifications
2202 Fixes: http://tracker.ceph.com/issues/17355
2203 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2204 (cherry picked from commit f810c106ad4e9ae94494801fea6c580d81b9156b)
2206 commit efa12f7187b6e037c22ba62563030eb883dab5f9
2207 Author: Jason Dillaman <dillaman@redhat.com>
2208 Date: Tue Oct 11 13:55:21 2016 -0400
2210 journal: fix AsyncOpTracker compiler error
2212 The master branch has an async JournalTrimmer which shouldn't be
2213 backported to the Jewel branch yet. This change addresses the
2214 missing sync AsyncOpTracker::wait_for_ops method from the backported
2217 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2219 commit 2460a3dbe7d04f1a4daa44d7367d24d47fa070fb
2220 Author: Jason Dillaman <dillaman@redhat.com>
2221 Date: Wed Sep 21 13:02:34 2016 -0400
2223 common: move AsyncOpTracker to common library
2225 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2226 (cherry picked from commit 72d8992f054a7e36f92fdd2e01278ce3b9ede2eb)
2229 src/journal/CMakeLists.txt: doesn't exist in Jewel
2231 commit 1748b38da48beb8e25dc5ca831a540d389a963ee
2232 Author: Jason Dillaman <dillaman@redhat.com>
2233 Date: Thu Jul 28 16:35:48 2016 -0400
2235 librbd: support deleting image by id instead of name
2237 The rbd-mirror daemon will use this API to delete images instead
2238 of attempting to use the local image name.
2240 Fixes: http://tracker.ceph.com/issues/16227
2241 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2242 (cherry picked from commit 87b32d15914207f61595c1c943817d983faceacd)
2244 commit bb5f6b6872e81291176543e954bf3654eb88120f
2245 Author: Jason Dillaman <dillaman@redhat.com>
2246 Date: Wed Jul 13 14:49:06 2016 -0400
2248 rbd-mirror: use pool id + global image id as deletion primary key
2250 Fixes: http://tracker.ceph.com/issues/16538
2251 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2252 (cherry picked from commit 25203a8a9d59ff025d223ec1afaeb14946d54993)
2254 commit 96d551d7e8f10f98cc0a6ae5d90d33e6bca968a5
2255 Author: Jason Dillaman <dillaman@redhat.com>
2256 Date: Thu Sep 15 18:14:15 2016 -0400
2258 rbd-mirror: concurrent access of event might result in heap corruption
2260 Fixes: http://tracker.ceph.com/issues/17283
2261 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2262 (cherry picked from commit ac9ad37ab80db8913f9f1149707bd0009f8235c4)
2264 commit 8070d6a560044e5b45af7bd6995345ab30489d84
2265 Author: Ricardo Dias <rdias@suse.com>
2266 Date: Wed Sep 21 23:08:18 2016 +0100
2268 rbd-mirror: test: Fixed timeout problem in rbd_mirror_stress.sh
2270 Signed-off-by: Ricardo Dias <rdias@suse.com>
2271 (cherry picked from commit 5c737038dd6d44bd76605587486ddf9457bc2d96)
2273 commit 6ea4cde78ac7db6081e83d2530552946368021ef
2274 Author: Ricardo Dias <rdias@suse.com>
2275 Date: Tue Sep 6 17:28:22 2016 +0100
2277 rbd: Fix race between journal flush and append events
2279 Signed-off-by: Ricardo Dias <rdias@suse.com>
2280 (cherry picked from commit aa959e71fe5a8cec43de75007fc9cef8de5ee3a5)
2282 commit 180a86b61498e6a27a59c7673f74e32ce1ae02cf
2283 Author: Ricardo Dias <rdias@suse.com>
2284 Date: Wed Sep 7 15:26:34 2016 +0100
2286 journal: make librados call async in ObjectRecorder
2288 Signed-off-by: Ricardo Dias <rdias@suse.com>
2289 (cherry picked from commit 7b740f5b4ac1c66ac3c80782d2d34e846d00fddd)
2291 commit 5edbfe278532225aaaa6bb3fe6bef84a4c693d83
2292 Author: Ricardo Dias <rdias@suse.com>
2293 Date: Mon Jul 25 17:00:50 2016 +0100
2295 journal: increase concurrency of journal recorder
2297 Signed-off-by: Ricardo Dias <rdias@suse.com>
2298 (cherry picked from commit 5c88edd68a1ee7c77f11e4113251fbe5768b8d99)
2300 commit 9ad132e670564c738e448bf719503cc73525fd8a
2301 Author: Jason Dillaman <dillaman@redhat.com>
2302 Date: Mon Sep 19 11:24:17 2016 -0400
2304 journal: send update notification when tag allocated
2306 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2307 (cherry picked from commit f1cd613e3d8ccb6d05b9adfe1956927991a4f4fe)
2309 commit f9aae06152e281c271f50201a8dd1852a132447f
2310 Author: Jason Dillaman <dillaman@redhat.com>
2311 Date: Tue Sep 13 21:54:46 2016 -0400
2313 librbd: new journal listener event for force promotion
2315 Fixes: http://tracker.ceph.com/issues/16974
2316 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2317 (cherry picked from commit fd005490e95d7fca85be4cad34344a58986f64d6)
2319 commit 4f5ce86349e246e12abe8e0c55380f400bf05ebb
2320 Author: Jason Dillaman <dillaman@redhat.com>
2321 Date: Tue Sep 13 16:38:51 2016 -0400
2323 librbd: helper class for quiescing in-flight async ops
2325 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2326 (cherry picked from commit 39d9e5cc9b38de2ee9ad2faf8e04253314160811)
2328 commit 829ff8c5fa9d9470f1e5370cf601509809b39674
2329 Author: Jason Dillaman <dillaman@redhat.com>
2330 Date: Tue Sep 13 12:37:53 2016 -0400
2332 librbd: unify journal event callbacks into single interface
2334 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2335 (cherry picked from commit dbbcecf4a289ca36b734b7bda9530cc0a59f84ac)
2337 commit 41cf3d93356bde801c32dec4b7a21ae065295aa7
2338 Author: Jason Dillaman <dillaman@redhat.com>
2339 Date: Tue Sep 13 16:28:50 2016 -0400
2341 journal: expose ability to retrieve partial tag list
2343 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2344 (cherry picked from commit 277b6dd9f13a8390cbf7c9ac7a313813ecad4d27)
2346 commit 2f9e6412982826fe0712a0b98e004c405b60fac3
2347 Author: Jason Dillaman <dillaman@redhat.com>
2348 Date: Wed Sep 14 08:49:39 2016 -0400
2350 qa/workunits/rbd: fix remove mirrored image race conditions
2352 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2353 (cherry picked from commit a0f65b968b350629dfad978c191fc878ca26d093)
2355 commit 2ec5e93806f8487bdc5f8df23740aab5738cde1f
2356 Author: Jason Dillaman <dillaman@redhat.com>
2357 Date: Tue Sep 13 12:32:45 2016 -0400
2359 qa/workunits/rbd: new mirroring forced promotion test
2361 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2362 (cherry picked from commit a43268a4a30c06233152d531cbf2550224fb8a15)
2364 commit 5d1d898e1132325cae7045dc764a533878d56e00
2365 Author: Jason Dillaman <dillaman@redhat.com>
2366 Date: Tue Sep 20 13:31:36 2016 -0400
2368 test/rbd: fix possible mock journal race conditions
2370 Fixes: http://tracker.ceph.com/issues/17317
2371 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2372 (cherry picked from commit 471898392372ba4c404376410fb56f3af5287c80)
2374 commit 775a999e8bac9d0dc02cb40f0206b96c5864b8d1
2375 Author: Mykola Golub <mgolub@mirantis.com>
2376 Date: Wed Jul 6 12:59:25 2016 +0300
2378 qa/workunits/rbd: before removing image make sure it is not bootstrapped
2380 If an image is being bootstrapped, it implies that the rbd-mirror
2381 daemon currently has the image open. The removal API will prevent the
2382 removal of any image that is opened by another client.
2384 Works-around: http://tracker.ceph.com/issues/16555
2385 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2386 (cherry picked from commit 9737a8d6cbaf1b79bbc6008249d39acbae883941)
2388 commit 3bbd8ba4282ea7f3fa286d0a1944e9e93d321365
2389 Author: Jason Dillaman <dillaman@redhat.com>
2390 Date: Tue Sep 27 14:47:02 2016 -0400
2392 librbd: fix journal create compilation error
2394 The synchronous journal create method no longer exists on the master
2395 branch and the associated change to introduce an asynchronous journal
2396 creation state machine should be delayed to provide more testing time
2397 on the master branch before being backported to jewel.
2399 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2401 commit 89c6618df89dc0d5d3eb1f855f6f93c72be75939
2402 Author: Jason Dillaman <dillaman@redhat.com>
2403 Date: Thu Aug 11 21:11:07 2016 -0400
2405 test: fixed unused function warnings in unittest_rbd_mirror
2407 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2408 (cherry picked from commit 3545d9ed19be8d3956f0db901ea9d3bb8b10d13d)
2410 commit ca94f25aa960bb352043a9d53eee361071d537da
2411 Author: Jason Dillaman <dillaman@redhat.com>
2412 Date: Thu Aug 11 20:48:27 2016 -0400
2414 rbd-mirror: prevent syncing to non-primary image after failover
2416 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2417 (cherry picked from commit beaef377d69f555277b706afff944a15086da28e)
2419 commit 7a434842ac2a2799b611aa87422009c244418922
2420 Author: Jason Dillaman <dillaman@redhat.com>
2421 Date: Mon Aug 8 23:45:46 2016 -0400
2423 rbd-mirror: demote/promote in same cluster results in split-brain
2425 Fixes: http://tracker.ceph.com/issues/16855
2426 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2427 (cherry picked from commit a6901ca1a065419426b3ad704e27e43ba8d591b8)
2429 commit f8f3bbd7246d9a1d5a82f6b0b112f185323a5fb3
2430 Author: Jason Dillaman <dillaman@redhat.com>
2431 Date: Thu Aug 11 19:39:21 2016 -0400
2433 librbd: normalize journal promotion/demotion events
2435 A non-primary image's commit possition won't accurately reflect
2436 the current demotion/promotion chain. Therefore, directly specify
2437 the predecessor for promotion events.
2439 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2440 (cherry picked from commit ac590e85a472533005cad73c82b2d61db161ab7a)
2442 commit 4baea6ace14bd834a3cb2c1d9d5202e94546e264
2443 Author: Jason Dillaman <dillaman@redhat.com>
2444 Date: Thu Aug 11 19:09:09 2016 -0400
2446 librbd: block RPC requests when demoting the image
2448 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2449 (cherry picked from commit 8b195e1fc8fe70a0e5417934302d5831b1f8dfb3)
2451 commit 8ccdad6d9d09e0f09431df6d3ebb2fbed47040c6
2452 Author: Jason Dillaman <dillaman@redhat.com>
2453 Date: Tue Aug 9 12:24:19 2016 -0400
2455 librbd: separate journal::TagData predecessor data into new struct
2457 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2458 (cherry picked from commit 718befdae711141ef4a1e2e9f5e9aca97f1b5513)
2460 commit 13daaffb451e7187d5492a82bb85488c1bfe55d2
2461 Author: Jason Dillaman <dillaman@redhat.com>
2462 Date: Mon Aug 8 20:57:45 2016 -0400
2464 rbd-mirror: include tag tid in bootstrap debug log messages
2466 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2467 (cherry picked from commit 47d1e625006d554164f020e496a847735240ec95)
2469 commit d775680dc4eb53c08a692e746dd65c57a560496d
2470 Author: Jason Dillaman <dillaman@redhat.com>
2471 Date: Mon Aug 8 10:39:01 2016 -0400
2473 qa/workunits/rbd: demote/promote image on same cluster
2475 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2476 (cherry picked from commit e6aa18ea0df6dc4d1add597bc2d972c79699bf4c)
2478 commit f7ffbfa71d6f8c417b140ce434b7714cd0053b09
2479 Author: Mykola Golub <mgolub@mirantis.com>
2480 Date: Wed Aug 10 13:46:46 2016 +0300
2482 rbd-mirror: option to automatically resync after journal client disconnect
2484 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2485 (cherry picked from commit 77fd6a1c2016262d734b0bb5387e6b6a41232e8b)
2488 src/common/config_opts.h: trivial resolution
2490 commit 0b402390381dfbfcf4d3810f3179f90c4aa995ef
2491 Author: Mykola Golub <mgolub@mirantis.com>
2492 Date: Wed Jul 27 13:45:32 2016 +0300
2494 rbd-mirror: stop replay when client is disconnected
2496 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2497 (cherry picked from commit 330dba00ba3153ba2862eef52714e0dceae05192)
2499 commit 80aa7e0b4fae6f71a34e28ad1225e3540f9606ed
2500 Author: Mykola Golub <mgolub@mirantis.com>
2501 Date: Wed Aug 10 11:22:16 2016 +0300
2503 rbd-mirror: resync was possible only when image replayer start had succeeded
2505 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2506 (cherry picked from commit 4bf6912f3c75560b89324fc29286028750f122c1)
2508 commit 170476e408308fad622063eddbd282a38a28ed89
2509 Author: Mykola Golub <mgolub@mirantis.com>
2510 Date: Tue Jul 26 16:10:30 2016 +0300
2512 rbd-mirror: decode_client_meta should return false on error
2514 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2515 (cherry picked from commit cd5eb36e98f46a1d84bddeafa4e7dcad415aa4a2)
2517 commit 7382e1a5a2b801cdfcbf7cda109343c365d005f3
2518 Author: Mykola Golub <mgolub@mirantis.com>
2519 Date: Wed Aug 3 14:19:51 2016 +0300
2521 rbd: new command to disconnect journal client
2523 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2524 (cherry picked from commit fc3ba54b3c101498a08a3f34ac8f7eab0152ad7c)
2526 commit d3ad2ff9dff192d93d2fbef82ec0ccd37809d2ca
2527 Author: Mykola Golub <mgolub@mirantis.com>
2528 Date: Wed Jul 27 14:06:42 2016 +0300
2530 librbd: optionally flag "laggy" journal clients disconnected
2532 Fixes: http://tracker.ceph.com/issues/14738
2533 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2534 (cherry picked from commit b8eafefba9f2221a0ce927568795cb1c3ac0fa9c)
2536 commit 4056e360117b3aacfba2ae98cd4ecb60e356730c
2537 Author: Mykola Golub <mgolub@mirantis.com>
2538 Date: Wed Jul 13 15:49:40 2016 +0300
2540 journal: allow to trim journal for "laggy" clients
2542 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2543 (cherry picked from commit 0b8b1aaedc10f7f46e91bf6ad809414feb770c8d)
2545 commit 3aec576572066a4329488c0b4420fe863cbbeeb2
2546 Author: Mykola Golub <mgolub@mirantis.com>
2547 Date: Wed Jul 27 13:42:19 2016 +0300
2549 cls/journal: add async client_update_state method
2551 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2552 (cherry picked from commit 58b8c66d5bfa60e6dd3ad2ec79360c2eca165c58)
2554 commit d66bb7a991affb8b77eb9440d7c8874cc0b3bbf4
2555 Author: Ken Dreyer <kdreyer@redhat.com>
2556 Date: Mon Oct 3 14:43:25 2016 -0600
2558 build: include more files in "make dist" tarball
2560 Include all the documentation, qa, and CMakeLists.txt files in the "make
2563 Kraken and newer releases will already do this. This change is
2564 restricted to releases that still use autotools.
2566 The purpose of this change is to make it easier to apply downstream
2567 patches on an unpacked upstream tarball, because often those patches are
2568 cherry-picks of commits that touch files under doc/, qa/, or
2571 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2573 commit 9d1f756dfa1775338c2fa1cf6bfafd45b842b75f
2574 Merge: 59f0f4c 57f08fe
2575 Author: Loic Dachary <loic@dachary.org>
2576 Date: Tue Oct 11 12:30:44 2016 +0200
2578 Merge pull request #11389 from jcsp/wip-17466-jewel
2580 jewel: mon: don't crash on invalid standby_for_fscid
2582 Reviewed-by: John Spray <john.spray@redhat.com>
2584 commit 59f0f4c7cc81b20fc584b8e6fff84887ec9c26dd
2585 Merge: b747903 c2d4239
2586 Author: Loic Dachary <loic@dachary.org>
2587 Date: Tue Oct 11 12:30:25 2016 +0200
2589 Merge pull request #10997 from batrick/i17105-backport
2591 jewel: multimds: allow_multimds not required when max_mds is set in ceph.conf at startup
2593 Reviewed-by: John Spray <john.spray@redhat.com>
2595 commit b7479037472c7ce633e2130fb6dbc302dbb3affb
2596 Merge: db2e822 cf211d7
2597 Author: Loic Dachary <loic@dachary.org>
2598 Date: Tue Oct 11 12:30:03 2016 +0200
2600 Merge pull request #10958 from ukernel/jewel-16764
2602 jewel: client: fix shutdown with open inodes
2604 Reviewed-by: John Spray <john.spray@redhat.com>
2606 commit db2e8224853dc344b71871317204f13a0a53d808
2607 Merge: 4769027 1bc047b
2608 Author: Loic Dachary <loic@dachary.org>
2609 Date: Tue Oct 11 12:29:36 2016 +0200
2611 Merge pull request #10921 from jcsp/wip-client-lock-backport
2613 jewel: client: add missing client_lock for get_root
2615 Reviewed-by: John Spray <john.spray@redhat.com>
2617 commit 4769027f0c83cb22f25186356b56e86b49579b8b
2618 Merge: f49bac2 494687b
2619 Author: Loic Dachary <loic@dachary.org>
2620 Date: Tue Oct 11 12:29:05 2016 +0200
2622 Merge pull request #11400 from ceph/wip-rbd-cli-jewel
2624 jewel: krbd-related CLI patches
2626 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2628 commit f49bac2cbbda6aefef676b03f6656a98ec390b87
2629 Merge: 2a348d2 5ab5e82
2630 Author: Loic Dachary <loic@dachary.org>
2631 Date: Tue Oct 11 11:03:40 2016 +0200
2633 Merge pull request #11171 from ceph/wip-rasize-doc-jewel
2635 jewel: doc: fix description for rsize and rasize
2637 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2639 commit 3bb2a9ed9602b0d280a357f53bc90c6cf83ffe32
2640 Author: Jason Dillaman <dillaman@redhat.com>
2641 Date: Mon Oct 10 11:57:03 2016 -0400
2643 librbd: ignore notify errors on missing image header
2645 The rename op on v1 images fails since the header no longer exists. In
2646 the general case, the removal of the header object will also fail the
2647 watcher which has its own recovery path.
2649 Fixes: http://tracker.ceph.com/issues/17549
2650 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2651 (cherry picked from commit fe3e2eafa087f81c9ab59f3fbc39600d6adaa9c2)
2653 commit 5173563fbfc2799cc2328468bb197d65a94b4d7a
2654 Author: Yan, Zheng <zyan@redhat.com>
2655 Date: Fri Sep 2 16:19:29 2016 +0800
2657 client: properly set inode number of created inode in replay request
2659 Fixes: http://tracker.ceph.com/issues/17172
2660 Signed-off-by: Yan, Zheng <zyan@redhat.com>
2661 (cherry picked from commit e59385f16afc607ec700397b0bea5229ce69df30)
2663 commit 2c4e1c1cd1d01e51d5e4ad500d6b31832591d201
2664 Author: John Spray <john.spray@redhat.com>
2665 Date: Tue Sep 6 13:16:04 2016 +0100
2667 mds: log path with CDir damage messages
2669 Previously you just got the inode number, which
2670 wasn't terribly useful for e.g. a missing fragment
2671 object, as you couldn't readily resolve the parent
2674 Fixes: http://tracker.ceph.com/issues/16973
2675 Signed-off-by: John Spray <john.spray@redhat.com>
2676 (cherry picked from commit 439cd5e1b4725e594786785189a37184243828d9)
2679 src/mds/CDir.cc: the go_bad() prototype which is part of the
2680 context of the patch has changed.
2682 commit d52f190d449a2e68baed0659367795ebfb0dcb3d
2683 Author: John Spray <john.spray@redhat.com>
2684 Date: Tue Sep 6 13:07:38 2016 +0100
2686 mds: s/used_ions/used_inos/
2688 Signed-off-by: John Spray <john.spray@redhat.com>
2689 (cherry picked from commit bd3645fb07714d43fb7bd3d66b7e34b33768a8e8)
2691 commit 494687b7f11d0c9ca56d96b6b4480de96847bec2
2692 Author: Ilya Dryomov <idryomov@gmail.com>
2693 Date: Fri Oct 7 12:32:43 2016 +0200
2695 rbd: expose rbd unmap options
2697 Reuse rbd map -o infrastructure to expose rbd unmap options in
2698 a similar fashion. Currently it's just one bool option, but we may
2699 need more in the future.
2701 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2702 (cherry picked from commit 620f5e1455fdcb05cd3873c1e260141849829e35)
2705 doc/man/8/rbd.rst [ PR #9151 ("rbd: add methods to set and get
2706 snapshot limits") not in jewel ]
2708 commit 6b0226774e2f09f98751e6fa3b0125a960417cc0
2709 Author: Ilya Dryomov <idryomov@gmail.com>
2710 Date: Fri Oct 7 11:14:16 2016 +0200
2712 rbd: fix up terminology in help texts
2714 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2715 (cherry picked from commit ba8f9ee791d55c4cf25ad751213ea6ba770b7434)
2717 commit 071bd4778547930d9aab9340dcabbb6d9ffdd890
2718 Author: Ilya Dryomov <idryomov@gmail.com>
2719 Date: Mon Oct 3 14:09:11 2016 +0200
2721 rbd: recognize lock_on_read option
2723 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2724 (cherry picked from commit e857b7896527b676155d6e01c78567337dc33b1c)
2726 commit 7d0714e17557ad281bd92907e10462894a482ce9
2727 Author: Ilya Dryomov <idryomov@gmail.com>
2728 Date: Tue Oct 4 10:21:36 2016 +0200
2730 doc: clarify rbd size units
2732 It wasn't clear from the man page that --size defaults to M.
2734 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2735 (cherry picked from commit d38dc29ed588b8933da3b66e46e1f0dd4cbb2cf4)
2738 doc/man/8/rbd.rst [ PR #9066 ("rbd: introduce a simple bench
2739 for read") not in jewel ]
2741 commit ca8fc6fc8baae2e4da842e16e25b91d304702cb5
2742 Author: John Spray <john.spray@redhat.com>
2743 Date: Sat Jul 23 22:56:45 2016 +0100
2745 ceph-create-keys: fix existing-but-different case
2747 We just have to refrain from calling get-or-create
2748 if the named key already exists, to avoid potentially
2749 having an error when the default creation args don't
2750 match the key as it has already been created, such
2751 as on certain upgrades.
2753 Fixes: http://tracker.ceph.com/issues/16255
2754 Signed-off-by: John Spray <john.spray@redhat.com>
2755 (cherry picked from commit 278196d86c52b0be3cb9c17ed7f8f3e3502a217a)
2757 commit 0a17741861faa1643bc338459397072268e469bd
2758 Author: Yan, Zheng <zyan@redhat.com>
2759 Date: Tue Sep 20 18:07:56 2016 +0800
2761 client: fix readdir vs fragmentation race
2763 following sequence of events tigger the race
2765 client readdir frag 0* -> got item 'A'
2766 MDS merges frag 0* and frag 1*
2767 client send readdir request (frag 1*, offset 2, readdir_start 'A')
2768 MDS reply items (that are after item 'A') in frag *
2770 Fixes: http://tracker.ceph.com/issues/17286
2771 Signed-off-by: Yan, Zheng <zyan@redhat.com>
2772 (cherry picked from commit feb63776d4f2b03ece189715fdd75da5cae2afc2)
2774 commit 3a79db10f259d66ca17c2152cf639a63f245505d
2775 Author: Yan, Zheng <zyan@redhat.com>
2776 Date: Wed Sep 14 18:22:01 2016 +0800
2778 mds: remove fail-safe queueing replay request
2780 MDSRank::queue_one_replay() does not create active request
2781 immediately, it just queues corresponding C_MDS_RetryMessage
2782 for execution. So the fail-safe code can queue an extra replay
2783 request. This can cause replay requests be processed out-of-order
2785 Fixes: http://tracker.ceph.com/issues/17271
2786 Signed-off-by: Yan, Zheng <zyan@redhat.com>
2787 (cherry picked from commit d755a4a78242293dd3103bdd0748292df3034563)
2789 commit 10e603b1e3024c760cd5567dbbc73fbb3c1281f3
2790 Author: Yan, Zheng <zyan@redhat.com>
2791 Date: Wed Sep 21 21:57:25 2016 +0800
2793 client: fix segment fault in Client::_invalidate_kernel_dcache().
2795 when umounting, root can be NULL
2797 Fixes: http://tracker.ceph.com/issues/17253
2798 Signed-off-by: Yan, Zheng <zyan@redhat.com>
2799 (cherry picked from commit ddea9a5b78151c0abe834e4a9872f7cf5f918ebc)
2801 commit 3320da0adb346af15a5d50a45e0aea5ca234eb79
2802 Author: John Spray <john.spray@redhat.com>
2803 Date: Mon Sep 19 15:18:24 2016 +0100
2805 mds: catch duplicates in DamageTable
2807 There was an implicit assumption in the code that callers
2808 wouldn't hit the notify_*damaged paths twice because they would
2809 have checked is_*_damaged paths first.
2811 However, that's not really true in all cases, e.g. scrub
2812 code isn't required to respect existing damage entries
2813 when trying to load a CDir.
2815 Simply fix this by having the DamageTable notify* functions
2816 check the key they're inserting doesn't already exist.
2818 Fixes: http://tracker.ceph.com/issues/17173
2819 Signed-off-by: John Spray <john.spray@redhat.com>
2820 (cherry picked from commit c9cfaef104e9aaefad55583d7e54f8b4665904b3)
2822 commit 5d0e2f8690b08418fc404dc43df7a3a16ac83309
2823 Author: Casey Bodley <cbodley@redhat.com>
2824 Date: Fri Sep 2 14:13:19 2016 -0400
2826 common: only call crypto::init once per CephContext
2828 Fixes: http://tracker.ceph.com/issues/17205
2830 Signed-off-by: Casey Bodley <cbodley@redhat.com>
2831 (cherry picked from commit 9dfc1537564c4ce65e4d0230a83f0d8d47503b16)
2833 commit 483d8c41a241aa917878284765aef2ba2ced0bb3
2834 Author: Brad Hubbard <bhubbard@redhat.com>
2835 Date: Tue Jun 14 17:34:44 2016 +1000
2837 cephx: Fix multiple segfaults due to attempts to encrypt or decrypt
2838 an empty secret and a null CryptoKeyHandler
2840 Fixes: http://tracker.ceph.com/issues/16266
2841 Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2842 (cherry picked from commit 009e777fbd18602e5fd66f97bdad95e977e6fecc)
2844 commit 5ae4f316b2cf37ce5d13b1ced4b65962c5583882
2845 Author: Kefu Chai <kchai@redhat.com>
2846 Date: Tue Sep 20 17:39:24 2016 +0800
2848 os/filestore/FileJournal: fail out if FileJournal is not block device or regular file
2850 otherwise JournalingFileStore will assert when deleting FileJournal
2851 which still has the non block/regular file opened.
2853 Fixes: http://tracker.ceph.com/issues/17307
2854 Signed-off-by: Kefu Chai <kchai@redhat.com>
2855 (cherry picked from commit 7431eec6fd24cd08ca6c76a9893e3f6e8c63a916)
2857 commit 2a348d23e5a047bf6a9c80140cf31ba2d6d4113f
2858 Merge: da04ac0 29a8701
2859 Author: Loic Dachary <loic@dachary.org>
2860 Date: Mon Oct 10 20:30:54 2016 +0200
2862 Merge pull request #10812 from SUSE/wip-17094-jewel
2864 jewel: build/ops: ceph-osd-prestart.sh fails confusingly when data directory does not exist
2866 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2868 commit da04ac055188e2e84d21b29feee3069bb95e5ebe
2869 Merge: a80aacf 1a7faefd
2870 Author: Matt Benjamin <mbenjamin@redhat.com>
2871 Date: Mon Oct 10 10:46:33 2016 -0400
2873 Merge pull request #11335 from linuxbox2/jewel-nfs
2875 jewel: rgw: nfs backports
2877 commit a80aacf048c2809bc2b7fd7e2f41e12b5470c5ab
2878 Merge: e795450 a10d700
2879 Author: Matt Benjamin <mbenjamin@redhat.com>
2880 Date: Mon Oct 10 10:45:07 2016 -0400
2882 Merge pull request #11332 from linuxbox2/jewel-ldap
2884 jewel: rgw: combined LDAP backports
2886 commit c2d4239331e397e6a48b1ee7a4c69dad0c951f94
2887 Author: Patrick Donnelly <pdonnell@redhat.com>
2888 Date: Mon Aug 29 16:25:10 2016 -0400
2890 mds: remove max_mds config option
2892 It is now required that all changes to max_mds use the run-time `ceph fs
2893 set max_mds` command. The rationale for this change is that it is
2894 confusing to have a configuration for max_mds which is only observed at
2895 file system creation.
2897 Fixes: http://tracker.ceph.com/issues/17105
2899 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2900 (cherry picked from commit 52f4e545e0ce4782d5f2239d31080d392c12eba2)
2902 commit e7954500dab4f3e3bead824ba0da66105940e36a
2903 Merge: eac384a 0b93a9a
2904 Author: Sage Weil <sage@redhat.com>
2905 Date: Mon Oct 10 08:54:02 2016 -0500
2907 Merge pull request #10761 from dachary/wip-16377-jewel
2909 jewel: msgr/async: Messenger thread long time lock hold risk
2911 Reviewed-by: Sage Weil <sage@redhat.com>
2913 commit eac384a5a158191e3276940d340ee2fe0b4b4b73
2914 Merge: c21e1de d94e5bc
2915 Author: Sage Weil <sage@redhat.com>
2916 Date: Mon Oct 10 08:52:59 2016 -0500
2918 Merge pull request #10278 from SUSE/wip-16667-jewel
2920 jewel: incorrect value of CINIT_FLAG_DEFER_DROP_PRIVILEGES
2922 Reviewed-by: Sage Weil <sage@redhat.com>
2924 commit 57f08fe72269b573d95791b44f25de044d40fba6
2925 Author: John Spray <john.spray@redhat.com>
2926 Date: Fri Sep 30 21:57:35 2016 +0100
2928 mds: make mds_role_t member order match constructor
2930 Previously this was mildy confusing.
2932 Signed-off-by: John Spray <john.spray@redhat.com>
2933 (cherry picked from commit 63d711d4e9decd2940c55aa697e6a588593da23a)
2935 commit c19326cef28ca3764340434cacc1f77e5899b887
2936 Author: John Spray <john.spray@redhat.com>
2937 Date: Mon Oct 3 07:33:27 2016 +0100
2939 mon: don't crash on invalid standby_for_fscid
2941 Fixes: http://tracker.ceph.com/issues/17466
2942 Signed-off-by: John Spray <john.spray@redhat.com>
2943 (cherry picked from commit 92fdcf36bd7d57b97f5d887d0370a181860e388c)
2945 commit cbd9a39e83258a7fa98d3d33aea652def17d3906
2946 Author: John Spray <john.spray@redhat.com>
2947 Date: Mon Oct 3 07:40:12 2016 +0100
2949 messages: fix MMDSBeacon constructor
2951 This was leaving garbage in some fields during decode
2952 when decoding messages with an older version.
2954 Fixes: http://tracker.ceph.com/issues/17466
2955 Signed-off-by: John Spray <john.spray@redhat.com>
2956 (cherry picked from commit f1fb667dfd21cd241f4f45ce9ef3f8393d114c60)
2958 commit c21e1de83294fea247bd2a458143639544f91f6d
2959 Merge: 8a84877 f7d23d5
2960 Author: Loic Dachary <loic@dachary.org>
2961 Date: Mon Oct 10 12:26:02 2016 +0200
2963 Merge pull request #10794 from SUSE/wip-17082-jewel
2965 jewel: disable LTTng-UST in openSUSE builds
2967 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2969 commit 8a8487711339596f2f22da572e59a194c6166c69
2970 Merge: 4c526a4 47605a2
2971 Author: Loic Dachary <loic@dachary.org>
2972 Date: Mon Oct 10 12:21:59 2016 +0200
2974 Merge pull request #9739 from vumrao/wip-vumrao-16337
2976 jewel: osd: add peer_addr in heartbeat_check log message
2978 Reviewed-by: Samuel Just <sjust@redhat.com>
2980 commit 4c526a4211f29a5151c5d79d3f0aa221f3d24221
2981 Merge: c362c71 5ffee35
2982 Author: Loic Dachary <loic@dachary.org>
2983 Date: Mon Oct 10 12:20:30 2016 +0200
2985 Merge pull request #9388 from vumrao/wip-vumrao-16069
2987 jewel: mon: Display full flag in ceph status if full flag is set
2989 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2991 commit c362c71ef34b136112852cce7a769a8bac30626c
2992 Merge: f707d1d 79e2acb
2993 Author: Loic Dachary <loic@dachary.org>
2994 Date: Mon Oct 10 12:03:51 2016 +0200
2996 Merge pull request #10496 from Abhishekvrshny/wip-16583-jewel
2998 jewel: mon crash: crush/CrushWrapper.h: 940: FAILED assert(successful_detach)
3000 Reviewed-by: Kefu Chai <kchai@redhat.com>
3002 commit f707d1d4f1cae66927e630da9a4524d2af6c9a11
3003 Merge: 84adafe f337a07
3004 Author: Loic Dachary <loic@dachary.org>
3005 Date: Mon Oct 10 09:31:29 2016 +0200
3007 Merge pull request #11018 from ceph/wip-17223-jewel
3009 jewel: krbd qa scripts and concurrent.sh test fix
3011 Reviewed-by: Loic Dachary <ldachary@redhat.com>
3013 commit cca589fdb18147ea61e79b8d98b886ef30cd65d5
3014 Author: Vladislav Odintsov <odivlad@gmail.com>
3015 Date: Mon Jul 4 15:29:22 2016 +0300
3017 init-radosgw: do not use systemd-run in sysvinit
3019 `systemd-run` logic in initscripts was introduced because of ticket
3020 http://tracker.ceph.com/issues/7627.
3022 If we have systemd-based operating system, we should use systemd unit files
3023 from systemd directory to start/stop ceph daemons.
3024 Otherwise, `daemon()` from `/etc/init.d/functions` on systemd distro starts service
3025 in `system.slice` and everything works well.
3027 `systemd-run` can not be run on non-systemd distros, so it's not needed
3030 also, ceph-disk is now able to run the "systemctl"
3031 to enable and start the ceph-osd, and ceph-deploy is also now
3032 playing well with systemd when it comes to ceph-mon and ceph-mds
3034 Fixes: http://tracker.ceph.com/issues/16440
3036 Signed-off-by: Vladislav Odintsov <odivlad@gmail.com>
3037 (cherry picked from commit 1fd4f92a025e80092b8d08d9b7da2e0b73a52f0f)
3039 commit 83a91baff05f03f907fb80702ae1c68194b5308b
3040 Author: Yehuda Sadeh <yehuda@redhat.com>
3041 Date: Thu Jun 30 17:36:16 2016 -0700
3043 rgw: forward input data when forwarding set_bucket_version to master
3045 Fixes: http://tracker.ceph.com/issues/16494
3047 Needed to keep input data around to be forwarded correctly. Also, master
3048 does not send any data back, so don't try to parse anything.
3050 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
3051 (cherry picked from commit 1eec00bef1e5540bf3e31d1f8fb1645eb64b1e62)
3053 commit 0986aff2aafdf64847a7e9608abb84edaea59eb1
3054 Author: Yehuda Sadeh <yehuda@redhat.com>
3055 Date: Thu Jun 30 17:34:38 2016 -0700
3057 rgw: set args when rebuilding req_info
3059 Was missing args, so it didn't sign requests with subresources
3060 correctly when forwarding.
3062 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
3063 (cherry picked from commit dd1068c54e50671d8904b99189823418a5a5bc07)
3065 commit bb81f9dd83da76704a5b6ba3e718fef3ac918290
3066 Author: Jason Dillaman <dillaman@redhat.com>
3067 Date: Fri Aug 12 12:39:45 2016 -0400
3069 librbd: permit disabling journaling if in corrupt state
3071 Fixes: http://tracker.ceph.com/issues/16740
3072 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
3073 (cherry picked from commit 6afb884d755697528684fad54dbb69b15d4386f1)
3075 commit b14d7f148c8f64d2e2da533fe2b35661536810c4
3076 Author: Jason Dillaman <dillaman@redhat.com>
3077 Date: Fri Aug 12 12:21:02 2016 -0400
3079 librbd: new journal policy to disable initializing the journal
3081 This will be used in the case where the journal is being disabled.
3083 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
3084 (cherry picked from commit 73e4c65c809a1e4161229f49285b21b2cfc623ca)
3087 src/librbd/Makefile.am (no CreateRequest.h or RemoveRequest.h in jewel)
3089 commit 77ea51138f05b4fa1c603ade0e62f961ec708441
3090 Author: weiqiaomiao <wei.qiaomiao@zte.com.cn>
3091 Date: Wed Aug 10 14:11:43 2016 +0800
3093 doc/radosgw: fix description of response elements 'Part'
3095 Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
3096 (cherry picked from commit 9c3fe46a7eb89aedc52582737c200e58d63738a5)
3098 commit 1a7faefd035aa8f31ab11ddfe1046989d0e69aac
3099 Author: Matt Benjamin <mbenjamin@redhat.com>
3100 Date: Wed Sep 21 17:18:20 2016 -0400
3102 rgw_file: pre-assign times
3104 Set unix timestamps based on RGW values for creation, modification
3105 time for buckets, objects in stat requests. Regard any saved
3106 value of these in unix attributes as an overlay.
3108 Fixes: http://tracker.ceph.com/issues/17367
3110 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3111 (cherry picked from commit 969750e96380859a350e25015bc8cbf9bdf88512)
3113 Fixes: http://tracker.ceph.com/issues/17394
3115 commit 0c932b9078a249bcb9dbb8c425788787f1cd48f2
3116 Author: Matt Benjamin <mbenjamin@redhat.com>
3117 Date: Tue Sep 20 17:32:03 2016 -0400
3119 rgw_file: fix set_attrs operation
3121 The effective part of this change is to always set a value
3122 for RGW_ATTR_UNIX_KEY1 (because it is expected later).
3124 Secondarily, do not pass the address of the to-set attributes
3125 buffer::list as remove attrs--this is confusing.
3127 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3128 (cherry picked from commit 08afb40b2812270a6af3cd1965e8c03c10392ace)
3130 Fixes: http://tracker.ceph.com/issues/17393
3132 commit 0de33909012f2a8305ff2038906669c78070cbcd
3133 Author: Matt Benjamin <mbenjamin@redhat.com>
3134 Date: Thu Apr 14 19:18:37 2016 -0400
3136 rgw_file: implement rgw_setattr
3138 Introduce a new RGWSetattrs RGWOp descendant, to create or replace
3139 sets of attrs on buckets or objects.
3141 This version of the change uses the standard RGWRADOS::set_attrs op
3142 (we want attribute changes to (e.g.) sync with other changes).
3144 Previous versions of this changed incorrectly masked the values
3145 of st->st_ino in RGWFileHandle::stat(), now fixed.
3147 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3148 (cherry picked from commit 4de1c3c260265f821ebee842d49cb35bf49d8e4e)
3150 Fixes: http://tracker.ceph.com/issues/17311
3151 Fixes: http://tracker.ceph.com/issues/17332
3153 commit 00f3fbe7dc940d8c9176a8da35fccd42e6ddc10f
3154 Author: zhangweibing <zhangweibing@unitedstack.com>
3155 Date: Fri Aug 26 10:49:48 2016 +0800
3157 rgw: remove duplicated calls to getattr
3159 Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
3160 (cherry picked from commit 87b550ed2fba472d4ef2e1f771bb5f9fd248804f)
3162 Fixes: http://tracker.ceph.com/issues/17327
3164 commit c53992856d6058b71bed55337c3830dbaefb6823
3165 Author: Min Chen <chenmin@xsky.com>
3166 Date: Fri Aug 19 01:02:50 2016 -0400
3168 rgw: rgw file fix bug of rgw_lookup can not exact match file name
3170 bug reproduce steps:
3171 in nfs-client (connect to nfs-ganesha server):
3172 1. mv file file.rename
3173 2. stat file // get file attrs, not return with -ENOENT
3176 RGWStatLeafRequest does not exact match the file name,
3177 just take file name as a prefix filter
3179 Signed-off-by: Min Chen <chenmin@xsky.com>
3180 (cherry picked from commit 9d813bafc8e197507457c58ab4f365ccdb7f3589)
3182 Fixes: http://tracker.ceph.com/issues/17326
3184 commit 9f5c7377143c56b169a62a96dba5c6ff800e4d5c
3185 Author: Yan Jun <yan.jun8@zte.com.cn>
3186 Date: Tue Aug 23 12:51:10 2016 +0800
3188 rgw: fix the wrong return value
3190 Here `parent->readdir` will return negative numbers When there is an error.
3191 so we should just return it.
3193 Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
3194 (cherry picked from commit c979be7810793534715c24c6a9f7c8b0ed31de8d)
3196 Fixes: http://tracker.ceph.com/issues/17325
3198 commit cf1353c24917ecb9056272da7f6b3e73bba11fa8
3199 Author: Matt Benjamin <mbenjamin@redhat.com>
3200 Date: Wed Aug 17 10:28:48 2016 -0400
3202 rgw_file: restore local definition of RGWLibFS gc interval
3204 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3205 (cherry picked from commit 31936caa09b46e86700faad969adfa9d43176206)
3207 Fixes: http://tracker.ceph.com/issues/17323
3209 commit 7a648ed991630541b5875a329820b67b269af570
3210 Author: Matt Benjamin <mbenjamin@redhat.com>
3211 Date: Tue Aug 23 16:50:42 2016 -0400
3213 rgw_file: explain semantics of RGWFileHandle::commit
3215 Add a comment explaining why the method currently returns 0
3218 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3219 (cherry picked from commit b1da1354320cc5f69277b225a293a03cc2a5054f)
3221 commit 0135da74e2a08fccc2e2da9f1b7e55478bf79157
3222 Author: Matt Benjamin <mbenjamin@redhat.com>
3223 Date: Tue Aug 23 15:57:06 2016 -0400
3225 ceph_timer: prefer using directive to typedef
3227 This change replaces the existing member-hook typedef as well as
3228 the new set-type typedefs, so committed separately.
3230 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3231 (cherry picked from commit f7d4d418658d2091652033045abdb4bfbeb637aa)
3233 commit 2a9233f1fbff38c12d378d5b6528a7e576a62e3e
3234 Author: Matt Benjamin <mbenjamin@redhat.com>
3235 Date: Tue Aug 23 14:18:43 2016 -0400
3237 librgw: add API version defines for librgw and rgw_file
3239 This change borrows the major, minor+extra format used by libcephfs.
3240 The version numbering is starting at 1,1,0 on the theory that the
3241 implicit version at Jewel is 1,0,0.
3243 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3244 (cherry picked from commit 355ccc5ded7f0b459bca24bc8b504b41807c583d)
3246 commit 2d6966f7e1f4c6dab12f7500746f1021b52d91af
3247 Author: Matt Benjamin <mbenjamin@redhat.com>
3248 Date: Wed Aug 17 11:24:01 2016 -0400
3250 rgw file: allow RGWLibFS::write_completion_interval_s to be set in conf
3252 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3253 (cherry picked from commit 70dad0fba561edaf0bb4e746e29b92a4e9b014b2)
3255 commit 7071845f2e477648c322f0072e54490c47ed4154
3256 Author: Matt Benjamin <mbenjamin@redhat.com>
3257 Date: Wed Aug 17 11:00:22 2016 -0400
3259 rgw_file: log on write completion events at level 10
3261 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3262 (cherry picked from commit d1e512d8c0e20df5a96ccb5f775a7a2ca123efbe)
3264 commit 95310c7f960eead2e22bc02c0e9d94ec863cafd6
3265 Author: Matt Benjamin <mbenjamin@redhat.com>
3266 Date: Wed Aug 17 10:52:58 2016 -0400
3268 rgw_file: add RGW_OPEN_FLAG_STATELESS as a synonym for V3
3270 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3271 (cherry picked from commit da596eb3af69c2cdf191893eb44a8947662634cf)
3273 commit 697d4ef7837061bb6b5ebaad07ae86836cdbe126
3274 Author: Matt Benjamin <mbenjamin@redhat.com>
3275 Date: Tue Aug 16 18:17:53 2016 -0400
3277 rgw_file: implement stateless write completion timer
3279 Implements a temporal mechanism to enforce write completion for setups
3280 which lack open state tracking (e.g., NFS3).
3282 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3283 (cherry picked from commit 2c83ed4bd43fcb5d5497151a157b1dc08022fed9)
3285 commit 4a31509c5ae7e40dd1538b2075287d8cc202f159
3286 Author: Matt Benjamin <mbenjamin@redhat.com>
3287 Date: Fri Aug 12 16:52:51 2016 -0400
3289 rgw_file: fix/update rgw_create flag arguments
3291 Allow passing POSIX open flags as well as api call flags. Needed
3294 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3295 (cherry picked from commit 2d0ea2b4649e76cbbb87f44c57754d7ea9c46dce)
3297 commit 73f9a0b147914f3ef4f7b69a3b57899034406bca
3298 Author: Matt Benjamin <mbenjamin@redhat.com>
3299 Date: Fri Aug 12 10:39:21 2016 -0400
3301 rgw_file: fix/update rgw_open flag arguments
3303 Allow passing POSIX open flags as well as api call flags. Needed
3306 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3307 (cherry picked from commit ada29f7f8323be2301588941bcd5c60190b32a4b)
3309 commit 4ceb70eba4d777ecc34cce9d1d10002807a6e770
3310 Author: Matt Benjamin <mbenjamin@redhat.com>
3311 Date: Tue Aug 9 16:49:41 2016 -0400
3313 rgw file: remove busy-wait in RGWLibFS::gc()
3315 This is a background thread. However, CPU is wasted.
3317 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3318 (cherry picked from commit ca33241286f52d849dbde8092507131b8b1108cc)
3320 Fixes: http://tracker.ceph.com/issues/17321
3321 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3323 commit 8e1515b068991567136042fb11384fb0fd0620fe
3324 Author: Matt Benjamin <mbenjamin@redhat.com>
3325 Date: Tue Aug 9 14:23:00 2016 -0400
3327 rgw_file: unlock() must precede out label
3329 In lookup_handle(...).
3331 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3332 (cherry picked from commit 9f64f34e481278a683e962b17c7aa811005783a8)
3334 commit 88eeaa967494ba6b536d493d06bc4bdbe92e452f
3335 Author: Matt Benjamin <mbenjamin@redhat.com>
3336 Date: Sun Aug 7 18:39:33 2016 -0400
3338 rgw nfs: fix write continuations
3340 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3341 (cherry picked from commit b4d079f2b5a4d49b2ba7576b272a2a3f3b0d66c8)
3343 commit f0b1799910564706766fccb8ec2b1c2c27a10467
3344 Author: Matt Benjamin <mbenjamin@redhat.com>
3345 Date: Fri Aug 5 10:03:33 2016 -0400
3347 rgw nfs: don't leak fh->mtx in lookup_handle()
3349 This change fixes a serious latent locking problem, noticed after
3350 updating the ganesha/rgw driver invalidation after renames.
3352 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3353 (cherry picked from commit d74d46170d7104a6553674f111bbdbe3a116cf54)
3355 commit f16ac90f9c097352de2763215f0c83812503e815
3356 Author: Matt Benjamin <mbenjamin@redhat.com>
3357 Date: Mon Aug 8 10:18:35 2016 -0400
3359 rgw file: refuse to rename directories
3361 The representation of paths as an aggregate involving any
3362 number of objects argues against ever permitting such
3365 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3366 (cherry picked from commit 297220fd2a96c0cf34701127b8cf724e24e6865f)
3368 commit 23b749f93ed9a7de93aabc871df0adeeebac4e0f
3369 Author: Matt Benjamin <mbenjamin@redhat.com>
3370 Date: Wed Aug 3 13:53:15 2016 -0400
3372 rgw_file: refuse ops on deleted targets
3374 Detect these illegal cases, as they are indicate various incorrect
3377 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3378 (cherry picked from commit 34224ecd8360e03603a1a5dd1c1c9f0a31f1c1d5)
3380 commit 345de45cbf5932174222b733bf71820e818fbfd5
3381 Author: Matt Benjamin <mbenjamin@redhat.com>
3382 Date: Thu Apr 14 19:18:37 2016 -0400
3384 rgw_file: implement rgw_setattr
3386 Introduce a new RGWSetattrs RGWOp descendant, to create or replace
3387 sets of attrs on buckets or objects.
3389 This version of the change uses the standard RGWRADOS::set_attrs op
3390 (we want attribute changes to (e.g.) sync with other changes).
3392 Previous versions of this changed incorrectly masked the values
3393 of st->st_ino in RGWFileHandle::stat(), now fixed.
3395 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3396 (cherry picked from commit 4de1c3c260265f821ebee842d49cb35bf49d8e4e)
3398 commit 88b5027850618f14c562d07ba25a664fd4c22771
3399 Author: Matt Benjamin <mbenjamin@redhat.com>
3400 Date: Wed Jul 13 10:16:59 2016 -0400
3402 rgw_file: refuse partial, out-of-order writes
3404 A single file object may be opened only once per gateway
3405 instance, and writes to that object must be complete, and in-order.
3408 If an invalid write is seen, deletes the current write transaction.
3410 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3411 (cherry picked from commit 12aded803e24539266ce9698c678088e2158a82a)
3413 commit be243695c1309acfc293f7080cf213edbc558d14
3414 Author: Matt Benjamin <mbenjamin@redhat.com>
3415 Date: Tue Jul 12 17:43:43 2016 -0400
3417 rgw_file: fix rename cases and unify unlink
3419 Rather ordinary rename cases failed in the unlink step. Fix this,
3420 unifying the unlink path while at it.
3422 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3423 (cherry picked from commit 05af1fbb870a905ea8903594dfc607d346c9dd31)
3425 commit a10d700697d8f432aca2b1bff6766e2478ac060d
3426 Author: Harald Klein <hari@vt100.at>
3427 Date: Wed Aug 31 17:41:26 2016 +0200
3429 add ldap auth custom search filter feature patch - http://tracker.ceph.com/issues/17185
3431 Signed-off-by: Harald Klein <hari@vt100.at>
3432 (cherry picked from commit c935885ae9d5fd413495448a0b0e5fce899c9b73)
3434 Fixes: http://tracker.ceph.com/issues/17185
3436 commit 7486638563c1eeda7781dcf58b0c536d11f17a0b
3437 Author: Matt Benjamin <mbenjamin@redhat.com>
3438 Date: Thu Aug 18 10:54:16 2016 -0400
3440 rgw ldap: protect rgw::from_base64 from non-base64 input
3442 Also adds unit tests for:
3443 1. empty output from from_base64 (turns out to be harmless)
3444 2. random and specific non-base64 and sort strings
3445 (modified from upstream to avoid alteration of src/test/test_rgw_token.cc)
3447 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3448 (cherry picked from commit 0a4c91ec7652d02673a9b156cd16144d778a3844)
3450 Fixes: http://tracker.ceph.com/issues/17324
3452 commit 68788fb898118c826b136b7cd7f60265a6dfef79
3453 Author: Matt Benjamin <mbenjamin@redhat.com>
3454 Date: Fri Aug 5 10:02:03 2016 -0400
3456 rgw ldap: enforce simple_bind w/LDAPv3
3458 Found by Harald Klein <hklein@redhat.com>.
3460 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3461 (cherry picked from commit 08d54291435e4d1cb5e02cda3951bc6e8510b0e2)
3463 commit 871caeb5011b06d54bd41370ee20ba38e84c9ac0
3464 Author: Matt Benjamin <mbenjamin@redhat.com>
3465 Date: Mon Aug 1 17:36:17 2016 -0400
3467 rgw: add reinit/rebind logic (ldap)
3469 Gracefully handle stale LDAP connections by rebinding--verified
3470 with MS AD. Rebind is attempted once per request until rebound--
3471 not worse than misconfiguring the environment.
3473 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3474 (cherry picked from commit 9b8fccf68789ba5c5986766c544b23aeada0e87e)
3476 commit de0c4e1281b5b67af1459aa11fbb292a0cae2ab2
3477 Author: Casey Bodley <cbodley@redhat.com>
3478 Date: Tue Aug 16 16:58:51 2016 -0400
3480 rgw: RGWDataSyncCR fails on errors from RGWListBucketIndexesCR
3482 Fixes: http://tracker.ceph.com/issues/17073
3484 Signed-off-by: Casey Bodley <cbodley@redhat.com>
3485 (cherry picked from commit e77a523f1d74768f4fef58c05cc167705d219036)
3487 commit 8833c64459edb77fa0d394b2eda2f79cd0f6dba9
3488 Author: Samuel Just <sjust@redhat.com>
3489 Date: Mon Oct 3 10:34:51 2016 -0700
3491 PG: block writes and scan log for scrub using inclusive upper bound
3493 See comment in commit.
3495 Signed-off-by: Samuel Just <sjust@redhat.com>
3497 commit 0e2338e5ec5441e5fc173a7af69343c775b02a13
3498 Author: David Zafman <dzafman@redhat.com>
3499 Date: Mon Oct 3 14:34:19 2016 -0700
3501 osd_types,PG: force the map used in _scrub to be sorted correctly
3503 Previously, ScrubMap::objects was always sorted bitwise (nibblewise
3504 before the comparator change was made. It didn't matter because we
3505 always scrubbed whole hash values. Now, we need the objects in the
3506 objectstore ordering because we may be missing objects at the tail of
3507 the scanned range and need them to show up at the tail of the
3508 ScrubMap::objects mapping. We don't need to do anything else to handle
3509 the upgrade process since the actual objects *in* the map were
3510 determined by the objectstore ordering.
3512 Signed-off-by: Samuel Just <sjust@redhat.com>
3513 (cherry picked from commit 6d410e97232afdad4f226151333b209d8b50f4ed)
3515 commit 16f9d95204f3eca6908ae241e5bacc48b006cb23
3516 Author: Samuel Just <sjust@redhat.com>
3517 Date: Wed Sep 28 13:24:56 2016 -0700
3519 src/osd: relax the requirement that we scrub a whole hash value
3521 Previously, we needed to scrub all objects in clones in a single
3522 hash value mainly to ensure that _scrub had access to all clones
3523 of a single object at the same time. Instead, just avoid letting
3524 head or snapdir be a boundary (see the comment in the commit
3527 Signed-off-by: Samuel Just <sjust@redhat.com>
3528 (cherry picked from commit 27bdc8ce6d0a7d8ae47f29540f281ba417e16b4c)
3530 commit 2176c847d588fbec654653db48c4ad156a87aac2
3531 Author: Samuel Just <sjust@redhat.com>
3532 Date: Wed Sep 28 13:25:42 2016 -0700
3534 hobject: clarify is_snap and has_snapset for max
3536 Signed-off-by: Samuel Just <sjust@redhat.com>
3537 (cherry picked from commit a2c27c9423b43b8c5633fb0af95f28b0de94b365)
3539 commit 84adafe3fe6f57d49b4bdf1e036e1b686e6b0f55
3540 Merge: 5246f81 fb36dd0
3541 Author: Matt Benjamin <mbenjamin@redhat.com>
3542 Date: Fri Sep 30 14:02:43 2016 -0400
3544 Merge pull request #10656 from dachary/wip-16564-jewel
3546 jewel: cors auto memleak
3548 commit 35660d1aabd8b27bf3ba71e50d00ba1cf1cecf00
3549 Author: Igor Podoski <igor.podoski@ts.fujitsu.com>
3550 Date: Wed Sep 14 07:36:43 2016 -0400
3552 mon: OSDMonitor: Missing nearfull flag set
3554 Output from 'ceph -s -f json-pretty' wans't showing nearfull flag set.
3556 Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>
3557 (cherry picked from commit 754887b575795ef96cda095f7f0d8c898e20f00f)
3559 commit 5246f8135124dd49466268ead3c8c10d241c94f9
3560 Merge: 9c464a5 3cb0a5e
3561 Author: Josh Durgin <jdurgin@redhat.com>
3562 Date: Thu Sep 29 15:54:05 2016 -0700
3564 Merge pull request #11252 from ceph/wip-offline-split-jewel
3566 ceph-objectstore-tool: add a way to split filestore directories offline
3568 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3570 commit 9c464a55c8ffe7278450c88cc208f2f2e7bce1a0
3571 Merge: 085e9e3 457d78f
3572 Author: Yehuda Sadeh <yehuda@redhat.com>
3573 Date: Thu Sep 29 11:34:44 2016 -0700
3575 Merge pull request #10866 from dachary/wip-17122-jewel
3577 jewel: COPY broke multipart files uploaded under dumpling
3579 commit 085e9e369c5c6fbe48f888009e3997d86dcaf968
3580 Merge: cb46489 23d73dc
3581 Author: Yehuda Sadeh <yehuda@redhat.com>
3582 Date: Thu Sep 29 11:32:09 2016 -0700
3584 Merge pull request #10890 from dachary/wip-17140-jewel
3586 jewel: rgw: period commit loses zonegroup changes: region_map converted repeatedly
3588 commit cb46489b92b14c5722368e88a4c66712ecc1623d
3589 Merge: a0fce63 cefd6f5
3590 Author: Yehuda Sadeh <yehuda@redhat.com>
3591 Date: Thu Sep 29 10:51:09 2016 -0700
3593 Merge pull request #11021 from cbodley/wip-16794
3595 jewel: rgw: back off bucket sync on failures, don't store marker
3597 commit a0fce6302013b2e9ddad8466d7ab34c370d3786e
3598 Merge: 4e61538 92581a3
3599 Author: Yehuda Sadeh <yehuda@redhat.com>
3600 Date: Thu Sep 29 10:49:28 2016 -0700
3602 Merge pull request #10657 from dachary/wip-16792-jewel
3604 jewel: metadata sync can skip markers for failed/incomplete entries
3606 commit 3cb0a5e0b0517701ad3b44bdf6d4b60d6a51e8ee
3607 Author: Josh Durgin <jdurgin@redhat.com>
3608 Date: Fri Aug 5 11:45:00 2016 -0700
3610 ceph-objectstore-tool: add a way to split filestore directories offline
3612 Use the usual split code, and split each dir that meets the
3613 usual split criteria.
3615 This can be run with lower than usual split settings, to avoid costly
3616 online splits. To make sure the directories are not merged again, use
3617 a load merge threshold (e.g. filestore merge threshold = 1), and
3618 adjust the split multiplier accordingly.
3620 Fixes: http://tracker.ceph.com/issues/17220
3621 Signed-off-by: Josh Durgin <jdurgin@redhat.com>
3622 (cherry picked from commit e7b0428e0e8d8f5459311dc698d94a3ac4f04684)
3625 src/os/filestore/FileStore.cc
3626 src/tools/ceph_objectstore_tool.cc
3627 (trivial resolution)
3629 commit de672a09f1e2b29de1e0e6e15d26be99315c41b9
3630 Author: Boris Ranto <branto@redhat.com>
3631 Date: Fri Aug 5 11:14:53 2016 +0200
3633 logrotate: Run as root/ceph
3635 Currently, we run the logrotate scripts as ceph/ceph but that way we
3636 cannot rotate the scripts created by qemu (they are root/ceph and 644).
3637 The original su line was introduced in commit 73d7bed9 because logrotate
3638 complained that the directory was writable by a non-root group and it
3639 needed a su line to supress that error. This way, we keep the group
3640 settings and we can access and rotate the qemu logs as well.
3642 Signed-off-by: Boris Ranto <branto@redhat.com>
3644 commit 4e61538d9f1b372f28e61ad94c368c782be09d92
3645 Merge: ecc2377 e72e7a2
3646 Author: Sage Weil <sage@redhat.com>
3647 Date: Tue Sep 27 15:37:17 2016 -0500
3649 Merge pull request #10888 from dachary/wip-17062-jewel
3651 jewel: tests: fix TestClsRbd.mirror_image failure in upgrade:jewel-x-master-distro-basic-vps
3653 commit 9cb45e11ec392da7c22578539b99619bdbf37e35
3654 Author: Brad Hubbard <bhubbard@redhat.com>
3655 Date: Tue May 10 16:44:44 2016 +1000
3657 log: Log.cc: Assign LOG_INFO priority to syslog calls
3659 LOG_DEBUG prio messages are not logged by a default syslog
3660 configuration so log at LOG_INFO instead.
3662 Fixes: http://tracker.ceph.com/issues/15808
3663 Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
3664 (cherry picked from commit 3ab5a660a45506d6c4c41bfeb5babdf188e62b3d)
3666 commit 165e5abdbf6311974d4001e43982b83d06f9e0cc
3667 Author: Vikhyat Umrao <vumrao@redhat.com>
3668 Date: Fri Apr 1 16:55:36 2016 +0530
3670 librados: modify Pipe::connect() to return the error code
3672 Fixes: http://tracker.ceph.com/issues/15308
3674 Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
3675 (cherry picked from commit cad38dca0c90fb2ee4b589f336f8272122f50ad6)
3677 commit 5ab5e8268174bd34a095a1e96a1a969ad9e3531b
3678 Author: Andreas Gerstmayr <andreas.gerstmayr@gmail.com>
3679 Date: Thu Sep 15 22:02:23 2016 +0200
3681 doc: fix description for rsize and rasize
3683 Signed-off-by: Andreas Gerstmayr <andreas.gerstmayr@gmail.com>
3684 (cherry picked from commit a004254a02cafdee848a382f893f89c3c5a9845a)
3686 commit c94244d3b132b6cf1f8ad309644cf48739282f04
3687 Author: Jelle vd Kooij <vdkooij.jelle@gmail.com>
3688 Date: Thu Sep 1 00:42:34 2016 +0200
3690 Add Install section to systemd rbdmap.service file
3692 Signed-off-by: Jelle vd Kooij <vdkooij.jelle@gmail.com>
3693 (cherry picked from commit 57b6f656e17124a5ab4cd1400840d9c7c87a3cc3)
3695 commit e2ce8576f547b1e073c169ef331c7063319d9783
3696 Author: tserlin <tserlin@redhat.com>
3697 Date: Mon Sep 19 14:40:12 2016 -0400
3699 Add two options to radosgw-admin.rst manpage
3701 Add '--job-id' and '--max-concurrent-ios' to Orphan Search Options
3703 Fixes: http://tracker.ceph.com/issues/17281
3704 Signed-off-by: Thomas Serlin <tserlin@redhat.com>
3705 (cherry picked from commit 697f30d86f49b73c981c06375ab2937570b1db01)
3707 commit 4e66f9e9d1179204a6fdf08e43608a852d2b7fd3
3708 Author: Ken Dreyer <kdreyer@redhat.com>
3709 Date: Thu Sep 15 12:56:39 2016 -0600
3711 radosgw-admin: add "--orphan-stale-secs" to --help
3713 The radosgw-admin --help did not include the description of the
3714 `--orphan-stale-secs` option of the `orphans find` command. The option
3715 sets the number of seconds to wait before declaring an object to be an
3718 Fixes: http://tracker.ceph.com/issues/17280
3719 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
3720 (cherry picked from commit 354059ae43b4f4cc797da1669715399cd96a4738)
3722 commit bfa90a152867e0277ae05c64b6bdc429b659b9a5
3723 Author: Ken Dreyer <kdreyer@redhat.com>
3724 Date: Thu Sep 15 11:40:14 2016 -0600
3726 doc: add "--orphan-stale-secs" to radosgw-admin(8)
3728 The radosgw-admin(8) manual page did not include the description of the
3729 `--orphan-stale-secs` option of the `orphans find` command. The option sets
3730 the number of seconds to wait before declaring an object to be an
3733 Fixes: http://tracker.ceph.com/issues/17280
3734 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
3735 (cherry picked from commit a676c516069cc448591018ecf4f7d1f7f7bc3bfd)
3737 commit cefd6f51068df3ed04c755b1167dd146b85a0741
3738 Author: Yehuda Sadeh <yehuda@redhat.com>
3739 Date: Wed Jul 20 12:59:50 2016 -0700
3741 rgw: fix collection of object sync errors
3743 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
3744 (cherry picked from commit aacc31f72cef6f151459e4a0543850edeeaf1938)
3746 commit aa369817c9bf10cffa420bfb88a27957407fb625
3747 Author: Yehuda Sadeh <yehuda@redhat.com>
3748 Date: Wed Jul 20 12:43:48 2016 -0700
3750 rgw: fix marker tracker completion handling
3752 Was not tracking high markers correctly. Could only work if there was a single
3753 hole in the completion range. Just keep a map of all the complete entries.
3755 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
3756 (cherry picked from commit f5801c726efdc2f3067a071e6bb5ac83fd0cd147)
3758 commit bce19a39b6f6ff23b6373f82ed2e6e12d65a77ef
3759 Author: Yehuda Sadeh <yehuda@redhat.com>
3760 Date: Wed Jul 20 12:42:52 2016 -0700
3762 rgw: collect() stops if error encoutered
3764 and returns true if needed to be called again
3766 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
3767 (cherry picked from commit 5528932e4c327a0fb0ce34a676eb59707a575325)
3769 commit f82b59363d12e38446b4f06f554b932a3cbdb1fb
3770 Author: Yehuda Sadeh <yehuda@redhat.com>
3771 Date: Tue Jul 19 15:32:03 2016 -0700
3773 rgw: back off bucket sync on failures, don't store marker
3775 Fixes: http://tracker.ceph.com/issues/16742
3777 If we fail on any single entry in bucket, skip updating the marker tracker
3778 so that next time we'll go over that entry, and back off. This will trigger
3779 a report to the data sync error repo and eventually a retry on the failing
3782 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
3783 (cherry picked from commit 1f3fec807043fd313ef7c66ff48f18b82c8bfa66)
3785 commit f337a0720713329b5305ddd9e5c18e8d2b11b475
3786 Author: Ilya Dryomov <idryomov@gmail.com>
3787 Date: Fri Jun 3 17:24:48 2016 +0200
3789 krbd: don't segfault if images are unmapped concurrently
3791 "rbd map c" can die from a NULL dereference on any of this_pool,
3792 this_image or this_snap in wait_for_udev_add():
3800 However unlikely, this segfault is triggered by the rbd/concurrent.sh
3801 workunit on a regular basis.
3803 Similarly, "rbd showmapped" can die if an image to be listed is
3806 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3807 (cherry picked from commit 2bfecb1c0a0b2a314a5d137e6ca2cccd9ddc9b54)
3809 commit 2399d4ae54780cb18c313a8da79b697a70a87146
3810 Author: Ilya Dryomov <idryomov@gmail.com>
3811 Date: Fri May 13 17:57:12 2016 +0200
3813 qa: rbd/simple_big.sh: drop extraneous sudo
3815 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3816 (cherry picked from commit 6643f4d9723e5d9c5195680ac9abb9915ef42a56)
3818 commit 472cb29c5712c4fbbeaef26cdfddc1afd5f2945d
3819 Author: Ilya Dryomov <idryomov@gmail.com>
3820 Date: Fri May 13 15:05:53 2016 +0200
3822 qa: rbd/concurrent.sh: suppress rbd map output
3824 rbd_map_image() echoes the id of the image and is used in command
3827 id=$(rbd_map_image "${image}")
3829 Output from rbd map isn't consumed and clobbers the return.
3831 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3832 (cherry picked from commit a7d4189587e343a581660f1a118f6667c26e5bd4)
3834 commit 667d42aad7e19e36200ee7cd979efdd19154876a
3835 Author: Ilya Dryomov <idryomov@gmail.com>
3836 Date: Thu May 12 15:07:12 2016 +0200
3838 qa: rbd: don't modprobe, chown sysfs files or udevadm settle
3840 This is a followup to 38a572011dbb ("qa: rbd/map-snapshot-io.sh: don't
3841 chown sysfs files") for the rest of the workunits:
3843 - /sys/bus/rbd/add_single_major is used if present, so chown'ing
3844 /sys/bus/rbd/add doesn't help. Use sudo on rbd map instead.
3846 - Don't modprobe or udevadm settle - rbd CLI tool takes care of that.
3848 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3849 (cherry picked from commit 6bddef8ecff97f732bf707d9ba6d2386bc147f5a)
3851 commit 866c3e594b754d10bf960375f8498ba573c531dd
3852 Author: Ilya Dryomov <idryomov@gmail.com>
3853 Date: Wed May 11 17:26:39 2016 +0200
3855 qa: rbd/map-snapshot-io.sh: don't chown sysfs files
3857 /sys/bus/rbd/add_single_major is used if present, so chown'ing
3858 /sys/bus/rbd/add doesn't help. Use sudo on rbd map instead.
3860 Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3861 (cherry picked from commit 38a572011dbbf8298cb7ba8ebf43909967eec689)
3863 commit cf211d7dc2eef46cb409b425caa72aac1b24bd7c
3864 Author: John Spray <john.spray@redhat.com>
3865 Date: Sun Jul 24 17:19:55 2016 +0100
3867 client: fix shutdown with open inodes
3869 This piece of code was dereferencing an invalid
3870 iterator (invalidated by call to erase())
3872 Fixes: http://tracker.ceph.com/issues/16764
3873 Signed-off-by: John Spray <john.spray@redhat.com>
3874 (cherry picked from commit d642b4faec3266f609e4871ccdccdcd73707dc23)
3876 commit 1bc047b1c6ccc1a1757c97e52da5e4db5bc8f801
3877 Author: Patrick Donnelly <pdonnell@redhat.com>
3878 Date: Wed Jun 29 15:45:30 2016 -0400
3880 client: add missing client_lock for get_root
3882 A segmentation fault was observed in a recent test failure
3883 (test_client_cache_size) [1]. An analysis of the core dump revealed that the
3884 client->root inode was NULL. The client log [2] showed that the root inode was
3885 deleted prior to the segfault:
3887 2016-06-27 14:24:13.358500 7fe75cff9700 20 client.4161 _ll_put 0x7fe76000ba40 100000003e9 1 -> 0
3888 2016-06-27 14:24:13.358502 7fe75cff9700 10 client.4161 put_inode on 100000003e9.head(faked_ino=0 ref=1 ll_ref=0 cap_refs={} open={} mode=41777 size=0/0 mtime=2016-06-27 14:24:10.700562 caps=pAsLsXsFs(0=pAsLsXsFs) 0x7fe76000ba40)
3889 2016-06-27 14:24:13.358513 7fe75cff9700 15 inode.put on 0x7fe76000ba40 100000003e9.head now 0
3890 2016-06-27 14:24:13.358515 7fe75cff9700 10 client.4161 remove_cap mds.0 on 100000003e9.head(faked_ino=0 ref=0 ll_ref=0 cap_refs={} open={} mode=41777 size=0/0 mtime=2016-06-27 14:24:10.700562 caps=pAsLsXsFs(0=pAsLsXsFs) 0x7fe76000ba40)
3891 2016-06-27 14:24:13.358538 7fe75cff9700 15 client.4161 remove_cap last one, closing snaprealm 0x7fe76000c1b0
3892 2016-06-27 14:24:13.358544 7fe75cff9700 20 client.4161 put_snap_realm 1 0x7fe76000c1b0 1002 -> 1001
3893 2016-06-27 14:24:13.358546 7fe75cff9700 10 client.4161 put_inode deleting 100000003e9.head(faked_ino=0 ref=0 ll_ref=0 cap_refs={} open={} mode=41777 size=0/0 mtime=2016-06-27 14:24:10.700562 caps=- 0x7fe76000ba40)
3895 After looking through the reference count inc/dec, I noticed this mismatched inc/dec:
3897 2016-06-27 14:24:13.352622 7fe75dffb700 3 client.4161 ll_forget 100000003e9 1
3898 2016-06-27 14:24:13.352601 7fe7767fc700 1 -- 172.21.15.58:0/3762258427 >> 172.21.15.57:6804/11121 conn(0x7fe789bf3b60 sd=20 :-1 s=STATE_OPEN_MESSAGE_READ_FOOTER_AND_DISPATCH pgs=7 cs=1 l=0). == rx == mds.0 seq 1473 0x7fe764037a80 client_reply(???:470 = 0 (0) Success safe) v1
3899 2016-06-27 14:24:13.352665 7fe75dffb700 20 client.4161 _ll_put 0x7fe76000ba40 100000003e9 1 -> 1
3900 2016-06-27 14:24:13.352687 7fe75d7fa700 3 client.4161 ll_lookup 0x7fe76000ba40 testdir
3901 2016-06-27 14:24:13.352699 7fe75d7fa700 20 client.4161 _lookup have dn testdir mds.-1 ttl 0.000000 seq 0
3902 2016-06-27 14:24:13.352705 7fe75d7fa700 15 inode.get on 0x7fe760011da0 100000003ea.head now 537
3903 2016-06-27 14:24:13.352693 7fe76effd700 1 -- 172.21.15.58:0/3762258427 <== mds.0 172.21.15.57:6804/11121 1473 ==== client_reply(???:470 = 0 (0) Success safe) v1 ==== 27+0+0 (3458149698 0 0) 0x7fe764037a80 con 0x7fe789bf3b60
3904 2016-06-27 14:24:13.352708 7fe75d7fa700 10 client.4161 _lookup 100000003e9.head(faked_ino=0 ref=3 ll_ref=1 cap_refs={} open={} mode=41777 size=0/0 mtime=2016-06-27 14:24:10.700562 caps=pAsLsXsFs(0=pAsLsXsFs) 0x7fe76000ba40) testdir = 100000003ea.head(faked_ino=0 ref=537 ll_ref=999 cap_refs={} open={} mode=40755 size=0/0 mtime=2016-06-27 14:24:13.325297 caps=pAsLsXsFsx(0=pAsLsXsFsx) COMPLETE parents=0x7fe750001f50 0x7fe760011da0)
3906 This sequence of ll_forget/ll_lookup is repeated in this test several hundred times. This is the prior sequence (in one thread):
3908 2016-06-27 14:24:13.324896 7fe75dffb700 3 client.4161 ll_forget 100000003e9 1
3909 2016-06-27 14:24:13.324904 7fe75dffb700 20 client.4161 _ll_put 0x7fe76000ba40 100000003e9 1 -> 1
3910 2016-06-27 14:24:13.324915 7fe75dffb700 3 client.4161 ll_lookup 0x7fe76000ba40 testdir
3911 2016-06-27 14:24:13.324921 7fe75dffb700 20 client.4161 _lookup have dn testdir mds.-1 ttl 0.000000 seq 0
3912 2016-06-27 14:24:13.324931 7fe75dffb700 15 inode.get on 0x7fe760011da0 100000003ea.head now 621
3913 2016-06-27 14:24:13.324904 7fe7767fc700 1 -- 172.21.15.58:0/3762258427 >> 172.21.15.57:6804/11121 conn(0x7fe789bf3b60 sd=20 :-1 s=STATE_OPEN_MESSAGE_READ_FOOTER_AND_DISPATCH pgs=7 cs=1 l=0). == rx == mds.0 seq 1387 0x7fe764026720 client_reply(???:385 = 0 (0) Success safe) v1
3914 2016-06-27 14:24:13.324934 7fe75dffb700 10 client.4161 _lookup 100000003e9.head(faked_ino=0 ref=3 ll_ref=2 cap_refs={} open={} mode=41777 size=0/0 mtime=2016-06-27 14:24:10.700562 caps=pAsLsXsFs(0=pAsLsXsFs) 0x7fe76000ba40) testdir = 100000003ea.head(faked_ino=0 ref=621 ll_ref=998 cap_refs={} open={} mode=40755 size=0/0 mtime=2016-06-27 14:24:13.321021 caps=pAsLsXsFsx(0=pAsLsXsFsx) COMPLETE parents=0x7fe750001f50 0x7fe760011da0)
3916 The key line is `_lookup 100000003e9.head(...)`. ll_ref=2 is the expected count
3917 after this sequence but, as we see at 14:24:13.352708, ll_ref=1.
3919 This racing behavior is not serialized by client_lock because
3920 Client::get_root() does not lock the client_lock. Additionally, this race is
3921 not easy to identify in the logs because Client::get_root() does not use
3922 Client::_ll_get to increment the reference, which hides the increments in the
3923 logs. Instead it directly increments the reference using Inode:ll_get().
3925 This commit adds the client_lock for Client::get_root() and
3926 Client::get_root_ino() (which may not strictly be necessary but can't hurt).
3928 [1] http://pulpito.ceph.com/pdonnell-2016-06-27_06:54:23-fs-wip-pdonnell-i16164---basic-smithi/280361/
3929 [2] http://qa-proxy.ceph.com/teuthology/pdonnell-2016-06-27_06:54:23-fs-wip-pdonnell-i16164---basic-smithi/280361/remote/smithi058/log/ceph-client.0.23448.log.gz
3931 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3932 (cherry picked from commit 208e3b6fd58237b309aae15b18dcd82672b133af)
3934 commit 086f6e0c07c807dc5001e40d18a72d53c5a10f66
3935 Author: Orit Wasserman <owasserm@redhat.com>
3936 Date: Wed Jul 20 13:02:03 2016 +0200
3938 rgw: fix upgrade from old multisite to new multisite configuration
3940 We need to store the updated current period after adding the old converted regions
3942 Fixes: http://tracker.ceph.com/issues/16751
3943 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
3944 (cherry picked from commit 6d7841c6f050f6bd813d54df65d38e7f6934d22d)
3946 commit 23d73dca4e8fd9472b8e39d9219fda90323478fb
3947 Author: Casey Bodley <cbodley@redhat.com>
3948 Date: Tue Aug 23 15:10:44 2016 -0400
3950 rgw: delete region map after upgrade to zonegroup map
3952 convert_regionmap() reads the region map and uses it to initialize the
3953 zonegroup map. but it doesn't remove the region_map afterwards, so
3954 radosgw (and some radosgw-admin commands) will keep doing this on
3955 startup, overwriting any changes made to the period/zonegroup map
3957 Fixes: http://tracker.ceph.com/issues/17051
3959 Signed-off-by: Casey Bodley <cbodley@redhat.com>
3960 (cherry picked from commit 215cd6f6ff7b8cb74df6dc3b94a5928f56ab9540)
3962 commit 27626ba9cc7495e312bf5caba6be8d6ee2f1ea64
3963 Author: Matt Benjamin <mbenjamin@redhat.com>
3964 Date: Wed Aug 17 10:28:48 2016 -0400
3966 rgw_file: restore local definition of RGWLibFS gc interval
3968 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3969 (cherry picked from commit 31936caa09b46e86700faad969adfa9d43176206)
3971 commit 91b65e7b4976103ea45c923bac9d21321d962773
3972 Author: Matt Benjamin <mbenjamin@redhat.com>
3973 Date: Tue Aug 9 16:49:41 2016 -0400
3975 rgw file: remove busy-wait in RGWLibFS::gc()
3977 This is a background thread. However, CPU is wasted.
3979 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
3980 (cherry picked from commit ca33241286f52d849dbde8092507131b8b1108cc)
3982 commit e72e7a26f22022e6520232481f66f509367073a1
3983 Author: Jason Dillaman <dillaman@redhat.com>
3984 Date: Fri Aug 12 14:44:09 2016 -0400
3986 qa/workunits: support filtering cls_rbd unit test cases
3988 Fixes: http://tracker.ceph.com/issues/16529
3989 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
3990 (cherry picked from commit 0891ede57cd254aa75c66301fde4a2eb6957a3d6)
3992 commit a25a4835ef91f2c249107a3f402c299d8c5c40da
3993 Author: Samuel Just <sjust@redhat.com>
3994 Date: Fri Jun 3 14:41:13 2016 -0700
3996 ReplicatedPG: call op_applied for submit_log_entries based repops
3998 Signed-off-by: Samuel Just <sjust@redhat.com>
3999 (cherry picked from commit 8bde0ae122f384817f4e522604379d1e9b21d8d9)
4001 commit 5ef90856ce26761b31cfd4eb1bea4dfbe88cfb13
4002 Author: Tao Chang <changtao@hihuron.com>
4003 Date: Mon May 9 09:50:17 2016 -0400
4005 Cleanup: delete find_best_info again
4007 After called find_best_info find a auth_pg_shard, it must be not incomplete,
4008 so it will not enter find_best_info again.
4010 Signed-off-by: Tao Chang <changtao@hihuron.com>
4011 (cherry picked from commit a25cfc4d46c03d8d78e0254c728ea5c29e2246e1)
4013 commit dea93dc35859ebf31366dfe5f2b8c2ebebc4f6a6
4014 Author: Boris Ranto <branto@redhat.com>
4015 Date: Mon Jun 27 11:48:17 2016 +0200
4017 ceph-disk: do not activate device that is not ready
4019 If the journal (or data) device is not ready when we are activating the
4020 data (or journal) device, just print an info message and exit with 0 so
4021 that the ceph-disk systemd service won't fail in this case.
4023 Fixes: http://tracker.ceph.com/issues/15990
4024 Signed-off-by: Boris Ranto <branto@redhat.com>
4025 (cherry picked from commit 73a7a65f65b1f6e90c4cae101bd43fabaeac3045)
4027 commit 58b7c52db2df0105aea3fbc36a0b2bc0d299415f
4028 Author: Samuel Just <sjust@redhat.com>
4029 Date: Thu Aug 11 08:57:51 2016 -0700
4031 PG: use upset rather than up for _update_calc_stats
4033 Fixes: http://tracker.ceph.com/issues/16998
4034 Signed-off-by: Samuel Just <sjust@redhat.com>
4035 (cherry picked from commit 200cae8c9db99b3dede377f74413cc0b15033e1f)
4037 commit 4e2b4917c30b431f87b0da0d090664f2210f7ad2
4038 Author: Samuel Just <sjust@redhat.com>
4039 Date: Thu Aug 11 08:57:35 2016 -0700
4041 PG: introduce and maintain upset
4043 Signed-off-by: Samuel Just <sjust@redhat.com>
4044 (cherry picked from commit 80a5c21d97116e7a66351a0e1f5d9b561f8663ac)
4046 commit c0db9fb831dc67ae138056c2f03c31dcc7f6adbf
4047 Author: Jeff Layton <jlayton@redhat.com>
4048 Date: Mon Aug 1 09:01:15 2016 -0400
4050 ceph: don't fudge the ctime in stat() unless it's really older than the mtime
4052 The current code just looks at the sec field, but the difference may
4053 only be evident in the nsec field.
4055 Signed-off-by: Jeff Layton <jlayton@redhat.com>
4056 (cherry picked from commit 14ee7bcbf0bdd6553dc1b78898ae429aae644100)
4058 commit 66cd43bfedddbbc82e3c303554f089f20eabf0f6
4059 Author: Jeff Layton <jlayton@redhat.com>
4060 Date: Mon Aug 1 09:01:15 2016 -0400
4062 client: only skip querying the MDS in _lookup when we have the necessary caps
4064 If we don't have the caps we'll need later, then we must reissue the
4065 lookup to get them regardless of whether we have a lease on the
4068 Fixes: http://tracker.ceph.com/issues/16668
4069 Signed-off-by: Jeff Layton <jlayton@redhat.com>
4070 (cherry picked from commit 9e8476743eef195a0a9bc6ef82392a8781e82549)
4072 commit fb4a9398a8d60f40ed4c8f57965de54dac1df983
4073 Author: Jeff Layton <jlayton@redhat.com>
4074 Date: Mon Aug 1 09:01:14 2016 -0400
4076 client: plumb a mask argument into _lookup
4078 ...and attempt to pass in a sane value there, based on what we'll do
4079 with the resulting inode.
4081 Signed-off-by: Jeff Layton <jlayton@redhat.com>
4082 (cherry picked from commit f3605d39e53b3ff777eb64538abfa62a5f98a4f2)
4084 commit b5cbd5766fbf2a9ff5ee0e58b4ea42c706f4505a
4085 Author: Jeff Layton <jlayton@redhat.com>
4086 Date: Mon Aug 1 09:01:14 2016 -0400
4088 client: add mask parameter to _do_lookup
4090 We need to allow callers to specify caps to acquire during a lookup, as
4091 they may need to scrape certain info out of the inode later. Allow them
4092 to pass in a mask. For now, _lookup just passes in 0 for the mask,
4093 but verify_reply_trace passes in the regetattr_mask to match what we'd
4094 request in the _getattr request if there were a traceless reply.
4096 Signed-off-by: Jeff Layton <jlayton@redhat.com>
4097 (cherry picked from commit a2ce16f8bfdb16ac485b8c4ad9a51ade5c256a5b)
4099 commit 416ec6ff91c602f385385acd8ac458ac58f13222
4100 Author: weiqiaomiao <wei.qiaomiao@zte.com.cn>
4101 Date: Tue Aug 16 14:19:20 2016 +0800
4103 rgw: fix radosgw daemon core when reopen logs
4105 the rgw_user_st_syn thread use the pointer meta_mgr in RGWUserStatsCache::sync_all_users() fuction, so we should close the thread before delete the pointer in RGWRados::finalize() function when close storage before reopen_logs.
4107 Fixes: http://tracker.ceph.com/issues/17036
4109 Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
4110 (cherry picked from commit ea5d7fdd7fa978deadeee42bc0ea33fb11662e59)
4112 commit f034fd0a7b959dc3553fb0708da989ba6ac77db3
4113 Author: weiqiaomiao <wei.qiaomiao@zte.com.cn>
4114 Date: Wed Aug 24 09:38:03 2016 +0800
4116 rgw: fix period update --commit return error
4118 period commit return error when the current period has a zonegroup which doesn't have a master zone
4120 Fixes: http://tracker.ceph.com/issues/17110
4121 Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
4122 (cherry picked from commit fcedda6e5dfbaff3975b4474d8546cf77f78cc83)
4124 commit 457d78f4f497fdaa0f0f116228ebf135a1ce7fb6
4125 Author: Yehuda Sadeh <yehuda@redhat.com>
4126 Date: Thu Jul 7 18:01:54 2016 -0700
4128 rgw: adjust manifest head object
4130 adjust the manifest head object:
4131 - when reading manifest, set the head object to the object
4132 we read the manifest from (and its size). Some manifests are
4133 broken and point at a different object
4134 - when copying multipart object, set the manifest head object to
4135 point at the new head object
4137 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
4138 (cherry picked from commit 419264586fc46337322f0d60b0ffcdcce3bb5c5a)
4140 commit 77e497da5c618a30fb908cb3915aa1ca7279ce7f
4141 Author: Yehuda Sadeh <yehuda@redhat.com>
4142 Date: Thu Jul 7 15:49:07 2016 -0700
4144 rgw: adjust objs when copying obj with explicit_objs set
4146 If the head object contains data, need to set it in the list of
4147 objs (in addition to being pointed at by head_obj).
4149 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
4150 (cherry picked from commit 1e012112b99004745952accc6fb11ada5e8e0045)
4152 commit c1250ee6cbc4a7710399e603ff3ee0e46aa92d49
4153 Author: Yehuda Sadeh <yehuda@redhat.com>
4154 Date: Thu Jul 7 15:36:33 2016 -0700
4156 rgw: patch manifest to handle explicit objs copy issue
4158 Fixes: http://tracker.ceph.com/issues/16435
4160 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
4161 (cherry picked from commit b51476466e5bb03bbaa6e428bb6bb189a259b9fd)
4163 commit 2311ab24049805ea274451607949ba9b54028470
4164 Author: Yan, Zheng <zyan@redhat.com>
4165 Date: Fri Jul 15 11:32:18 2016 +0800
4167 ObjectCacher: fix last_write check in bh_write_adjacencies()
4169 Make the last_write check in bh_write_adjacencies() match corresponding
4172 Fixes: http://tracker.ceph.com/issues/16610
4173 Signed-off-by: Yan, Zheng <zyan@redhat.com>
4174 (cherry picked from commit ce166c2cd706b8573deabd331d29544e75e85972)
4176 commit c3c2910fbe8c6cc206e1cd70d267503f8ab36e74
4177 Author: Nathan Cutler <ncutler@suse.com>
4178 Date: Sun Aug 7 23:08:48 2016 +0200
4180 rpm: proper packaging of udev directories
4182 The issue here is that ceph.spec.in does not package the directories
4183 /usr/lib/udev and /usr/lib/udev/rules.d. The problem was not showing because
4184 hdparm, which is brought in as a build dependency, packages these directories.
4185 However, in SUSE a recent update to hdparm changes that and the problem
4188 This PR addresses the issue by adding udev as a build dependency, which should
4189 cover /usr/lib/udev, and by adding explicit "%dir %{_udevrulesdir}" to the
4190 packages that put files in this directory.
4192 Fixes: http://tracker.ceph.com/issues/16949
4193 Signed-off-by: Nathan Cutler <ncutler@suse.com>
4194 (cherry picked from commit 1a164bc94d661b9d83b4a80e957712ed6f5cd122)
4196 commit 7d92e2ea1855a21f9a444c716c590e90dcb9f978
4197 Author: songbaisen <song.baisen@zte.com.cn>
4198 Date: Mon Apr 25 10:34:42 2016 +0800
4200 crush: When consider rule size use the correct method.
4202 Signed-off-by: song baisen <song.baisen@zte.com.cn>
4203 (cherry picked from commit 4cf4791ea1200528ccc0d65b3d4a0fbc234c5df0)
4205 commit c2cf21dcce9f481a53c8309800707c80c77754e1
4206 Author: Kefu Chai <kchai@redhat.com>
4207 Date: Fri Aug 5 14:27:43 2016 +0800
4209 mon/PGMonitor: calc the %USED of pool using used/(used+avail)
4212 "the raw space used by this pool" / "the raw space of the whole cluster"
4213 as the %USED. but it's wrong:
4215 - there is chance that not all OSDs are assigned to the pool in question
4216 - we can not utilize all the raw space for the pool: there is overhead.
4217 and the size of available space for a pool is capped by the assigned
4218 OSD with minimal free space.
4221 USED / (USED + AVAIL)
4222 as the %USED. so once we have no AVAIL space left, %USED will be 100%.
4224 Fixes: http://tracker.ceph.com/issues/16933
4225 Signed-off-by: Kefu Chai <kchai@redhat.com>
4226 (cherry picked from commit 08532ea166dfd97c548d9f1fb478e163021cdda3)
4228 commit 109da6fd2fa8a6f8e56a1fe2daa6a738bb2a1fde
4229 Author: Kefu Chai <kchai@redhat.com>
4230 Date: Sun Aug 7 00:58:04 2016 +0800
4232 mon/PGMonitor: mark dump_object_stat_sum() as static
4234 so we can test this method without create an instance of PGMonitor.
4236 Signed-off-by: Kefu Chai <kchai@redhat.com>
4237 (cherry picked from commit af3d3e25823ca9b40ddf09835edb82795ac68f33)
4239 commit bd636662a2ff26d9af13955b08f9ab20f29de771
4240 Author: Jason Dillaman <dillaman@redhat.com>
4241 Date: Fri Aug 12 09:52:21 2016 -0400
4243 librbd: fix possible inconsistent state when disabling mirroring
4245 Fixes: http://tracker.ceph.com/issues/16984
4246 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4247 (cherry picked from commit 7cfedb54ea0cf496cc4b55d08a787abc2d6a4bbe)
4249 commit 117aa35094c059dbf5770b01ac13a583471e54aa
4250 Author: Kefu Chai <kchai@redhat.com>
4251 Date: Sun Jun 26 01:02:03 2016 +0800
4253 common: instantiate strict_si_cast<long> not strict_si_cast<int64_t>
4255 this fixes the build on armf.
4257 on 32bit platforms, cstdint is very likely to
4259 typedef long long int int64_t;
4261 this results in compilation error like
4263 `common/strtol.cc:190:75: error: duplicate explicit instantiation of 'T
4264 strict_si_cast(const char, std::string) [with T = long long int;
4265 std::string = std::basic_string]'
4268 template int64_t strict_si_cast(const char *str, std::string *err);
4271 we can address this by instantiate the primitive type of `long long`
4272 instead of `in64_t`.
4274 Fixes: http://tracker.ceph.com/issues/16398
4275 Signed-off-by: Kefu Chai <kchai@redhat.com>
4276 (cherry picked from commit 31db4c5f9f725e13e38f3c90744e299e023d02a4)
4278 commit d93eda88048d2bcefe4be3ea0aaa6ca0289eabbf
4279 Author: Vikhyat Umrao <vumrao@redhat.com>
4280 Date: Thu May 26 23:30:25 2016 +0530
4282 common: add int64_t template for strict_si_cast()
4284 Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
4285 (cherry picked from commit 8e429d05370fbe7935212d0ae9608e7547f39860)
4287 commit f7cd28460147530cfd265a593b32d02adb93abe6
4288 Author: Kefu Chai <tchaikov@gmail.com>
4289 Date: Sat Apr 30 18:31:37 2016 +0800
4291 common/config: cast OPT_U32 options using uint32_t
4293 the OPT_U32 options was translated using strict_si_cast<int>(), and then
4294 cast the converted result to uint32_t. this could cause integer
4295 underflow. we could have lifted the burden of checking invalid input
4296 from the user of this option to the strict_si_cast<>() function. so in
4297 this change, we use strict_si_cast<uint32_t>() instead, before casting
4298 the converted value into `uint32_t`.
4300 Signed-off-by: Kefu Chai <tchaikov@gmail.com>
4301 (cherry picked from commit b7babd6aa671d688eef0af61ca17fd11eec22773)
4303 commit 518883d939f34ec0afa03aea1bac35960fb579f2
4304 Author: Loic Dachary <ldachary@redhat.com>
4305 Date: Thu Aug 25 09:09:40 2016 +0200
4307 Revert "common: add int64_t template for strict_si_cast()"
4309 This reverts commit e3a99c082e3ebd56d5b40d7d94d98e35629df81e.
4311 commit 29a87012f560c213e34b893cd8dd9dedfd0b11da
4312 Author: Nathan Cutler <ncutler@suse.com>
4313 Date: Mon Aug 22 11:52:45 2016 +0200
4315 ceph-osd-prestart.sh: check existence of OSD data directory
4317 Fixes: http://tracker.ceph.com/issues/17091
4318 Signed-off-by: Nathan Cutler <ncutler@suse.com>
4319 (cherry picked from commit d6ffa770784f0efb88827ee7c65ff2e5f9029434)
4321 commit 80e25b00554e3955f7bee2e03eba6c55a955999b
4322 Author: Jason Dillaman <dillaman@redhat.com>
4323 Date: Fri Aug 12 08:26:49 2016 -0400
4325 rbd: bench io-size should not be larger than image size
4327 Fixes: http://tracker.ceph.com/issues/16967
4328 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4329 (cherry picked from commit 113775eb583fa28a669c6dc1f8dbf47a8ecd789c)
4332 src/tools/rbd/action/BenchWrite.cc: trivial resolution
4334 commit f7d23d59535dee004686c5baa79c7b0815ab610a
4335 Author: Michel Normand <normand@linux.vnet.ibm.com>
4336 Date: Fri Aug 5 15:19:50 2016 +0200
4338 LTTng-UST disabled for openSUSE
4340 LTTng-UST not yet supported in openSUSE so do not enable lltng for it.
4341 The (1) is where is defined "is_opensuse"
4343 Remove value for test of suse_version in spec file
4344 and change related comment from SLES12 to SLE
4345 as per comment in https://github.com/ceph/ceph/pull/10592
4347 (1) https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto#Detect_a_distribution_flavor_for_special_code
4349 Fixes: http://tracker.ceph.com/issues/16937
4350 Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
4351 (cherry picked from commit 7da19b6db7eaefb5fe159375cc5a465a722d3897)
4353 commit e6ac214f8a6d8773de032c83f5fdd7c65b68d53f
4354 Author: Jason Dillaman <dillaman@redhat.com>
4355 Date: Thu Jul 28 15:09:53 2016 -0400
4357 librbd: request exclusive lock if current owner cannot execute op
4359 The initial krbd implementation will not support executing maintenance
4360 ops and instead will return -EOPNOTSUPP. In this case, librbd can take
4361 the lock and execute the operation.
4363 Fixes: http://tracker.ceph.com/issues/16171
4364 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4365 (cherry picked from commit d2d2d90d64663905c2b81f7809f1d636db6b7fb1)
4367 commit 0b93a9a1e7929bc0709ec139fbc6686783f99044
4368 Author: Wei Jin <wjin.cn@gmail.com>
4369 Date: Thu Apr 28 19:00:48 2016 +0800
4371 fast dispatch heartbeat message
4373 Signed-off-by: Wei Jin <wjin.cn@gmail.com>
4374 (cherry picked from commit 6f1f717446314618db7a165c75dfd6a76a01f55e)
4376 commit 0dcefd2352c06b719960a2df970ac3cbdcce8f52
4377 Author: xie xingguo <xie.xingguo@zte.com.cn>
4378 Date: Mon Jul 18 13:57:08 2016 +0800
4380 mon/osdmonitor: fix incorrect output of "osd df" due to osd out
4382 If an osd is automatically marked as out, the output of "osd df"
4383 is not right, as follow:
4385 -5 10.00999 - 5586G 2989G 2596G 0 0 host ceph192-9-9-8
4386 11 0.90999 1.00000 931G 542G 388G 58.25 0.99 osd.11
4387 14 0.90999 1.00000 931G 530G 400G 56.97 0.97 osd.14
4388 20 0.90999 1.00000 931G 716G 214G 76.99 1.31 osd.20
4389 22 0.90999 1.00000 931G 477G 453G 51.29 0.87 osd.22
4390 26 0.90999 0 0 0 0 0 0 osd.26
4391 28 0.90999 1.00000 931G 587G 343G 63.09 1.07 osd.28
4392 30 0.90999 1.00000 931G 602G 328G 64.75 1.10 osd.30
4393 16 0.90999 1.00000 931G 589G 341G 63.34 1.08 osd.16
4394 18 0.90999 1.00000 931G 530G 400G 56.93 0.97 osd.18
4395 24 0.90999 1.00000 931G 202G 728G 21.77 0.37 osd.24
4396 32 0.90999 1.00000 931G 477G 454G 51.23 0.87 osd.32
4398 Two problems are identified from the above output:
4400 1. the total capacity(total, total used, total avial)
4401 only includes osd.32, osd.24, osd.18, osd.16, osd.30, osd.28, and other
4402 healthy osds such as osd.11, osd.14 etc. are excluded.
4404 2. the average utilization/deviation are forced resetted.
4406 Fixes: http://tracker.ceph.com/issues/16706
4407 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
4408 (cherry picked from commit 1e4735440ca329f4b95d9bd6f58d9efab7d28d20)
4410 commit ac27352743a4ac1e4a4bec422d41a0ad8f17e41a
4411 Author: xie xingguo <xie.xingguo@zte.com.cn>
4412 Date: Fri Jul 15 16:08:33 2016 +0800
4414 mon/osdmonitor: initialize local variable "kb_avail_i"
4416 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
4417 (cherry picked from commit 98f50cebe1d1708adeeb6fc6d0aa2cdc85ac942c)
4419 commit 430ab1b83e67dfb697b034e669b06b7a600bcc6b
4420 Author: Loic Dachary <ldachary@redhat.com>
4421 Date: Tue Jul 12 16:56:52 2016 +0200
4423 ceph-disk: timeout ceph-disk to avoid blocking forever
4425 When ceph-disk runs from udev or init script, it is in the background
4426 and should it block for any reason, it may keep a lock forever. All
4427 calls to ceph-disk in these context are changed to timeout.
4429 The TimeoutStartSec= and TimeoutStopSec= which are both set via
4430 TimeoutSec= do not apply to Type=oneshot services.
4432 https://www.freedesktop.org/software/systemd/man/systemd.service.html
4434 Fixes: http://tracker.ceph.com/issues/16580
4436 Signed-off-by: Loic Dachary <loic@dachary.org>
4437 (cherry picked from commit bed1a5cc05a9880b91fc9ac8d8a959efe3b3d512)
4439 commit 0b30a1d210710593678462b287ff33f22de52323
4440 Author: Zengran Zhang <zhangzengran@h3c.com>
4441 Date: Mon Apr 25 22:45:56 2016 -0400
4443 mon/osdmonitor: decouple adjust_heartbeat_grace and min_down_reporters
4445 if cancel mon_osd_adjust_heartbeat_grace, we must set mon_osd_min_down_reporters to zero.
4446 otherwise the next checking for
4447 reporters_by_subtree.size() >= g_conf->mon_osd_min_down_reporters
4448 will allways be fail.the two options should take effect respectively...
4450 Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
4451 (cherry picked from commit 7ac5ca5698cfdaab019bf282b537bcc897f9444c)
4453 commit 92581a388462039a7f4dc748e8318c4226f068d3
4454 Author: Yehuda Sadeh <yehuda@redhat.com>
4455 Date: Wed Jul 20 12:43:48 2016 -0700
4457 rgw: fix marker tracker completion handling
4459 Was not tracking high markers correctly. Could only work if there was a single
4460 hole in the completion range. Just keep a map of all the complete entries.
4462 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
4463 (cherry picked from commit f5801c726efdc2f3067a071e6bb5ac83fd0cd147)
4465 commit fb36dd0c7a72ce5f3affd69d1f77e6222e26de94
4466 Author: Yan Jun <yan.jun8@zte.com.cn>
4467 Date: Tue Jun 28 16:17:58 2016 +0800
4469 rgw: fix potential memory leaks in RGWPutCORS_ObjStore_S3::get_params
4471 We should free `data` before return or jump to `done_err` label.
4473 Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
4474 (cherry picked from commit 69c6cf551754e51debb4e645716a89e29517f4ee)
4476 commit 775c78d4bb31640a006d255ec0cb3818b6a5d23a
4477 Author: Jason Dillaman <dillaman@redhat.com>
4478 Date: Thu Aug 4 20:40:10 2016 -0400
4480 librbd: prevent creation of v2 image ids that are too large
4482 The librbd API is capped at 24 characters for expressing the
4483 object prefix for data blocks (including trailing null byte).
4485 Fixes: http://tracker.ceph.com/issues/16887
4486 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4487 (cherry picked from commit 4de7c8d0a7222c83268d03b99015c6b9d25f124d)
4489 commit 2b272126de6ea6e75b9dcf4fedac5c216093e36d
4490 Author: Mykola Golub <mgolub@mirantis.com>
4491 Date: Mon Jul 4 13:54:32 2016 +0300
4493 librbd: prevent creation of clone from non-primary mirrored image
4495 Fixes: http://tracker.ceph.com/issues/16449
4496 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
4497 (cherry picked from commit ba849e3b04a5c513849d40a7fe4151375265302a)
4499 commit 18a66cb375bf6540a3908f843b004c652eacc2dc
4500 Author: Jason Dillaman <dillaman@redhat.com>
4501 Date: Wed Jun 22 18:09:29 2016 -0400
4503 librbd: journal::Replay no longer holds lock while completing callback
4505 Fixes: http://tracker.ceph.com/issues/16433
4506 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4507 (cherry picked from commit 3112a93b49c24f9ae101a7f252c8e708e0d3e260)
4509 commit 79e2acb9a585ede5b97d804550b5394f277e7cc4
4510 Author: Kefu Chai <kchai@redhat.com>
4511 Date: Fri Jul 1 20:44:35 2016 +0800
4513 crush: reset bucket->h.items[i] when removing tree item
4515 * crush: so we don't see the reference after the removing, this keeps
4516 check_item_loc() happy, and move_bucket() use check_item_loc() to see if
4517 the removed bucket disappears after the removal.
4518 * test: also add unittest_crush_wrapper::CrushWrapper.insert_item
4520 Fixes: http://tracker.ceph.com/issues/16525
4521 Signed-off-by: Kefu Chai <kchai@redhat.com>
4522 (cherry picked from commit a7069c7aab6b3f605f3d8f909af96f87977e8698)
4524 commit d94e5bc0903a40d8ea353327ddaa7b8567b95f5f
4525 Author: Casey Bodley <cbodley@redhat.com>
4526 Date: Wed Apr 27 16:53:26 2016 -0400
4528 common: fix value of CINIT_FLAG_DEFER_DROP_PRIVILEGES
4530 0x16 (binary 10110) was overlapping two other flags
4532 Signed-off-by: Casey Bodley <cbodley@redhat.com>
4533 (cherry picked from commit dfb897ad576e4861a3cb75d85dffbbeaad5e980e)
4535 commit 54b6b5e42bca2b7f05b9ff77315de61d3ba14daf
4536 Author: Yan, Zheng <zyan@redhat.com>
4537 Date: Wed Jun 8 17:47:58 2016 +0800
4539 client: kill QuotaTree
4541 Multiple clients can modify cephfs at the same time. It is
4542 very tricky to keep QuotaTree consistant with the global FS
4543 hiberarchy. This patch kills the quota tree.
4545 After removing the quota tree, we traverse inode's path to
4548 Fixes: http://tracker.ceph.com/issues/16066
4549 Fixes: http://tracker.ceph.com/issues/16067
4550 Signed-off-by: Yan, Zheng <zyan@redhat.com>
4551 (cherry picked from commit 161954bbfeb13d5588668637d5258221948128ea)
4553 commit 47605a2fdde65265e3c4dc60aac206c6ae712be5
4554 Author: Sage Weil <sage@redhat.com>
4555 Date: Fri May 6 09:46:06 2016 -0400
4557 msg/msg_types: update sockaddr, sockaddr_storage accessors
4559 Return sockaddr_storage by value. New sockaddr-based accessors.
4561 Signed-off-by: Sage Weil <sage@redhat.com>
4562 Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
4563 (cherry picked from commit 0038d362d38181bd348881bc0fbe717211eb8d15)
4565 commit d5c77c8ff6ad0e4b4242669e4f218f607f433310
4566 Author: Vikhyat Umrao <vumrao@redhat.com>
4567 Date: Fri May 20 15:47:23 2016 +0530
4569 osd: add peer_addr in heartbeat_check log message
4571 Fixes: http://tracker.ceph.com/issues/16337
4573 Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
4574 (cherry picked from commit f235b9cc1541d33c210e2d56e8061e8908b91ac9)
4576 commit 5ffee353cb947bfb79925ca4d62daec248c3ba4a
4577 Author: Vikhyat Umrao <vumrao@redhat.com>
4578 Date: Fri May 20 23:09:46 2016 +0530
4580 mon : Display full flag in ceph status if
4583 Fixes: http://tracker.ceph.com/issues/16069
4585 Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
4586 (cherry picked from commit 6b1c894b2b083bf6cead21e9f96d304b2eb7887d)