1 commit 45107e21c568dd033c2f0a3107dec8f0b0e58374 (tag: refs/tags/v10.2.2)
2 Author: Jenkins Build Slave User <jenkins-build@trusty-huge--abdffd45-81df-4aa8-a769-e169993c7a0f.localdomain>
3 Date: Tue Jun 14 11:43:24 2016 +0000
7 commit 008c5af59b045f9b6b8046a4c6d5e915cbe18bb3
9 Author: Jason Dillaman <dillaman@redhat.com>
10 Date: Tue Jun 14 07:32:44 2016 -0400
12 Merge pull request #9692 from dillaman/wip-16292
14 jewel: librbd: remove should ignore mirror errors from older OSDs
16 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
18 commit dd1ea65c2c8ae966c1f07ce78f0d1f16c9a315d9
19 Author: Jason Dillaman <dillaman@redhat.com>
20 Date: Mon Jun 13 15:29:43 2016 -0400
22 librbd: remove should ignore mirror errors from older OSDs
24 Fixes: http://tracker.ceph.com/issues/16268
25 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
26 (cherry picked from commit 5a97a9b7ef238c4ceb16225a0b937f9a0cdbb2b6)
28 commit b733244b3dc46e11689ddfb46187877c01347d3a
29 Merge: 1feddef 2656881
30 Author: Jason Dillaman <dillaman@redhat.com>
31 Date: Tue Jun 14 07:24:28 2016 -0400
33 Merge pull request #9691 from dillaman/wip-16260-jewel
35 jewel: librbd: do not shut down exclusive lock while acquiring'
37 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
39 commit 1feddef07c182d5a50b3aa3c4a7ff87f21dbd3e1
40 Merge: ffb64cd a38caf9
41 Author: Jason Dillaman <dillaman@redhat.com>
42 Date: Tue Jun 14 06:57:38 2016 -0400
44 Merge pull request #9690 from dillaman/wip-16290
46 jewel: rbd-mirror: FAILED assert(!m_status_watcher)
48 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
50 commit 26568819e331ef3adec6667a801f07058d94845b
51 Author: Jason Dillaman <dillaman@redhat.com>
52 Date: Mon Jun 13 20:20:33 2016 -0400
54 librbd: track in-flight flush events for journaling
56 The tracking for flush events was accidentally dropped. This
57 can result in the journal being closed too early since it
58 might miss in-flight flush ops.
60 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
61 (cherry picked from commit a1ea1edce9332fa1730625629e3b4e16f02caaf4)
63 commit a85fbb4e9a9a409738e9f031c20a8e2beb1b514f
64 Author: Jason Dillaman <dillaman@redhat.com>
65 Date: Mon Jun 13 12:00:28 2016 -0400
67 librbd: do not shut down exclusive lock while acquiring
69 Fixes: http://tracker.ceph.com/issues/16260
70 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
71 (cherry picked from commit c5694fc6766fb8e213c4b65d2cd7b9d066b07ff7)
73 commit a38caf90c98a04d57b81519803271f9d85fb5d56
74 Author: Mykola Golub <mgolub@mirantis.com>
75 Date: Sun Jun 12 20:32:45 2016 +0300
77 rbd-mirror: FAILED assert(!m_status_watcher)
79 Fixes: http://tracker.ceph.com/issues/16245
80 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
81 (cherry picked from commit b8bfc0f2efb44d3eff7a5fd8bca24516c8815d62)
83 commit ffb64cd0538cee05b4f360fa8334829da268d1b9
84 Merge: 271406c edef63d
85 Author: Jason Dillaman <dillaman@redhat.com>
86 Date: Tue Jun 14 06:54:51 2016 -0400
88 Merge pull request #9654 from dillaman/wip-16246
90 jewel: librbd: recursive lock possible when disabling journaling
92 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
94 commit 271406c77a6176057ba73b55a110a193d6872a48
95 Merge: b5e344e 0579a48
96 Author: Jason Dillaman <dillaman@redhat.com>
97 Date: Tue Jun 14 06:54:31 2016 -0400
99 Merge pull request #9673 from dillaman/wip-16265
101 jewel: rbd-mirror: do not re-use image id from mirror directory if creating image
103 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
105 commit b5e344e1e3670214da803ff6f7eb6e50bf52e46f
106 Merge: 1720664 739f343
107 Author: Jason Dillaman <dillaman@redhat.com>
108 Date: Mon Jun 13 23:37:06 2016 -0400
110 Merge pull request #9674 from dillaman/wip-16267
112 jewel: qa/workunits: ensure replay has started before checking position
114 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
116 commit 739f343ec880eacd13b935d493b5dbfcc5efa387
117 Author: Jason Dillaman <dillaman@redhat.com>
118 Date: Mon Jun 13 00:19:37 2016 -0400
120 qa/workunits: ensure replay has started before checking position
122 Fixes: http://tracker.ceph.com/issues/16248
123 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
124 (cherry picked from commit 6a68b68e0d2741e6694fd28d31766808ba881815)
126 commit 0579a483bf7b0f1cc590fb1dbc6c740c17679dac
127 Author: Jason Dillaman <dillaman@redhat.com>
128 Date: Mon Jun 13 02:09:00 2016 -0400
130 rbd-mirror: reset local image id when creating new image
132 Fixes: http://tracker.ceph.com/issues/16253
133 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
134 (cherry picked from commit 1948047acbc129de2982d53e130da1f577af224b)
136 commit ec809870cc2902d2bdf6543d911e23e71567303c
137 Author: Jason Dillaman <dillaman@redhat.com>
138 Date: Mon Jun 13 02:07:54 2016 -0400
140 rbd-mirror: handle an attempt to delete a non-mirrored image
142 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
143 (cherry picked from commit 45dda67b3ef3d5dc5abb327fc1f242140f004d90)
145 commit 6c303007af20a317f02b5caf7d3cb9f2214d2ee5
146 Author: Jason Dillaman <dillaman@redhat.com>
147 Date: Mon Jun 13 02:03:29 2016 -0400
149 cls_rbd: disallow setting an empty mirror image entry to disabling
151 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
152 (cherry picked from commit 7b2f99a97ff64451f3ae72081186dff41c507271)
154 commit edef63d56bc329638f79ce8017e72810dcd768f1
155 Author: Jason Dillaman <dillaman@redhat.com>
156 Date: Sun Jun 12 21:42:59 2016 -0400
158 librbd: avoid holding owner_lock waiting for exclusive lock
160 Fixes: http://tracker.ceph.com/issues/16235
161 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
162 (cherry picked from commit b96ab805eed49d4bdb494c8919d2e1ee7ad0a7e6)
164 commit 1720664ddcb32dd300b2bd046ff15ed4916676a4
165 Merge: f902309 2eaaf2e
166 Author: Gregory Farnum <greg@gregs42.com>
167 Date: Mon Jun 13 01:26:53 2016 -0700
169 Merge pull request #9656 from gregsfortytwo/wip-jewel-16024
171 Jewel client: fix bugs accidentally disabling readahead
173 commit f902309bc9c159c0d6a798c0398a95f64bb682ed
174 Merge: 89d6545 d61e3dd
175 Author: Gregory Farnum <greg@gregs42.com>
176 Date: Mon Jun 13 01:22:22 2016 -0700
178 Merge pull request #9655 from gregsfortytwo/wip-jewel-15508
180 Jewel mds: order directories by hash and fix simultaneous readdir races
182 commit d61e3ddf6d99a4b9b72fd769d635bf9b2bffaf0e
183 Author: Yan, Zheng <zyan@redhat.com>
184 Date: Mon May 9 22:12:48 2016 +0800
186 client: fix simultaneous readdirs race
188 Current readdir code uses list to track the order of the dentries
189 in readdir replies. When handling a readdir reply, it pushes the
190 resulting dentries to the back of directory's dentry_list. After
191 readdir finishes, the dentry_list reflects how MDS sorts dentries.
193 This method is racy when there are simultaneous readdirs. The fix
194 is use vector instead of list to trace how dentries are sorted in
195 its parent directory. As long as shared_gen doesn't change, each
196 dentry is at fixed position of the vector. So cocurrent readdirs
197 do not affect each other.
199 Fixes: http://tracker.ceph.com/issues/15508
200 Signed-off-by: Yan, Zheng <zyan@redhat.com>
201 (cherry picked from commit 9d297c5e98f814b282dadc379ab70dfa678db73e)
203 Signed-off-by: Greg Farnum <gfarnum@redhat.com
205 commit ba9fa11a235dc6c55b3b03e3a98b17316d06cf27
206 Author: Yan, Zheng <zyan@redhat.com>
207 Date: Mon Apr 25 23:24:46 2016 +0800
209 client: move dir_{release,ordered}_count into class Inode
211 We close Inode::dir when it's empty. Once closing the dir, we lose
212 track of {release,ordered}_count. This causes direcotry to be wrongly
213 marked as complete. (dir is trimmed to empty in the middle of readdir)
215 Signed-off-by: Yan, Zheng <zyan@redhat.com>
216 (cherry picked from commit 235fcf68f5d96a4d9d6cc260d12da912fa7ea4a8)
218 Signed-off-by: Greg Farnum <gfarnum@redhat.com
220 commit f5db278c8cba873e580255dea6dba5227d508df7
221 Author: Yan, Zheng <zyan@redhat.com>
222 Date: Mon Apr 25 17:59:35 2016 +0800
224 ceph_test_libcephfs: check order of entries in readdir result
226 Signed-off-by: Yan, Zheng <zyan@redhat.com>
227 (cherry picked from commit 9b17d145c15a469caa29853312b8dcb0b19f55f0)
229 Signed-off-by: Greg Farnum <gfarnum@redhat.com
231 commit 51a75063f59fcb47d3a4d5f06aa51cab83b76616
232 Author: Yan, Zheng <zyan@redhat.com>
233 Date: Mon Apr 25 15:52:32 2016 +0800
235 mds: don't reset readdir offset if client supports hash order dentry
237 Now the ordering of dentries is stable across directory fragmentation.
238 There is no need to reset readdir offset if directory get fragmented
239 in the middle of readdir.
241 Signed-off-by: Yan, Zheng <zyan@redhat.com>
242 (cherry picked from commit 98a01af2cd8e01f14ab7be32c31a43571ef8bb87)
244 Signed-off-by: Greg Farnum <gfarnum@redhat.com
246 commit 3fe5a09f3e7aa9fc89cd47a261785110c2bf38a2
247 Author: Yan, Zheng <zyan@redhat.com>
248 Date: Mon Apr 25 15:31:27 2016 +0800
250 client: using hash value to compose dentry offset
252 If MDS sorts dentries in dirfrag in hash order, we use hash value to
253 compose dentry offset. dentry offset is:
255 (0xff << 52) | ((24 bits hash) << 28) |
256 (the nth entry hash hash collision)
258 This offset is stable across directory fragmentation.
260 Signed-off-by: Yan, Zheng <zyan@redhat.com>
261 (cherry picked from commit 680766ec131b95271e320f54dfe6d69ea8d4fbb3)
263 Signed-off-by: Greg Farnum <gfarnum@redhat.com
265 commit a65b3ef30123e5d9d3199cf2f5dafd7d9ab8a755
266 Author: Yan, Zheng <zyan@redhat.com>
267 Date: Mon Apr 25 10:50:17 2016 +0800
269 client: record 'offset' for each entry of dir_result_t::buffer
271 This is preparation for using hash value as dentry 'offset'
273 Signed-off-by: Yan, Zheng <zyan@redhat.com>
274 (cherry picked from commit bd6546e5e8bfb4ef8927807492d63d5285534618)
276 Signed-off-by: Greg Farnum <gfarnum@redhat.com
278 commit 8361b988441d073b82809dbafd82fba1c23b13be
279 Author: Yan, Zheng <zyan@redhat.com>
280 Date: Mon May 9 11:51:36 2016 +0800
282 client: fix cached readdir after seekdir
284 Client::seekdir doesn't reset dirp->at_cache_name for a forward seek
285 within same frag. So the dentry with name == at_cache_name may not be
286 the one prior to the readdir postion.
288 Signed-off-by: Yan, Zheng <zyan@redhat.com>
289 (cherry picked from commit 0e32115bae2f1ac2c59b57852976b0de5587abac)
291 Signed-off-by: Greg Farnum <gfarnum@redhat.com
293 commit cf261257f6ad9b0d51f39af5d26beb15e5759672
294 Author: Yan, Zheng <zyan@redhat.com>
295 Date: Thu Apr 21 17:31:10 2016 +0800
297 mds: define end/complete in readdir reply as single u16 flags
299 so that we can introduce new flags for readdir reply.
301 Signed-off-by: Yan, Zheng <zyan@redhat.com>
302 (cherry picked from commit 92cfbdf526d1030891da366299b635e589dd5f8e)
304 Signed-off-by: Greg Farnum <gfarnum@redhat.com
306 commit 9ce73cdeb6056060b299cf92e4c858d1ab2aef2c
307 Author: Yan, Zheng <zyan@redhat.com>
308 Date: Sat Apr 23 16:03:48 2016 +0800
310 mds: sort dentries in CDir in hash order
312 This gives us stable ordering of dentries. (Previously ordering of
313 dentries changes after directory gets fragmented)
315 Signed-off-by: Yan, Zheng <zyan@redhat.com>
316 (cherry picked from commit f483224a0bc70b9eb5f62cd6cbb8b97df5b65953)
318 Signed-off-by: Greg Farnum <gfarnum@redhat.com
320 commit 288160b7e4bec94238d3b24622b4d16808a273e1
321 Author: Yan, Zheng <zyan@redhat.com>
322 Date: Fri Apr 22 09:43:54 2016 +0800
324 client: save readdir result into dir_result_t directly
326 Current code saves the readdir result into MedaRequest, then updates
327 dir_result_t according to MetaRequest. I can't see any reason why
330 Signed-off-by: Yan, Zheng <zyan@redhat.com>
331 (cherry picked from commit db5d60d1b8d01afd43da09a063f00aa6ab312903)
333 Signed-off-by: Greg Farnum <gfarnum@redhat.com
335 commit 75edb5b1c8bcdbc24b4cd6cb811e9c07608f09f5
336 Author: Yan, Zheng <zyan@redhat.com>
337 Date: Fri Apr 22 09:31:00 2016 +0800
339 client: don't allocate dir_result_t::buffer dynamically
341 Signed-off-by: Yan, Zheng <zyan@redhat.com>
342 (cherry picked from commit c41ceb9f1425432295a52965de8d4a23b15fe5e5)
344 Signed-off-by: Greg Farnum <gfarnum@redhat.com
346 commit 98e36d17d42d7b43720685745348317cab4a847f
347 Author: Yan, Zheng <zyan@redhat.com>
348 Date: Thu Apr 21 20:53:55 2016 +0800
350 client: simplify 'offset in frag'
352 don't distinguish leftmost frag from other frags. always use 2 as
353 first entry's offset.
355 Signed-off-by: Yan, Zheng <zyan@redhat.com>
356 (cherry picked from commit 6572c2a24ea2abec4c7eecef92a292c2cc72c762)
358 Signed-off-by: Greg Farnum <gfarnum@redhat.com
360 commit 2eaaf2e524c8b95b1b22b6bd7ba153b52746fd01
361 Author: Patrick Donnelly <pdonnell@redhat.com>
362 Date: Fri Jun 10 17:33:04 2016 -0400
364 client: move readahead ref get/put to obj constr
366 The readahead context was incrementing the file handle reference count but only
367 decreasing in finish which is not called if readahead is a no-op.
369 This fixes a bug caught in testing where readahead was causing inode to become
372 2016-06-10 19:46:48.953018 7f2a4351be80 1 client.4125 dump_inode: DISCONNECTED inode 10000000502 #10000000502 ref 110000000502.head(faked_ino=2307 ref=1 ll_ref=0 cap_refs={1024=0,2048=0,4096=0,8192=0} open={1=0,2=0} mode=100666 size=4194304/0 mtime=2016-06-10 19:29:45.107417 caps=-(0=pAsLsXsFscr) objectset[10000000502 ts 2/4012653 objects 0 dirty_or_tx 0] 0x7f2a24300d00)
373 2016-06-10 19:46:48.953032 7f2a4351be80 2 client.4125 cache still has 0+155 items, waiting (for caps to release?)
375 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
376 (cherry picked from commit b5a0773259ce9f2ef44e8e6925ab11dc1a5e55e6)
378 Signed-off-by: Greg Farnum <gfarnum@redhat.com
380 commit 1ec2ef876d0e5cfe595ebb4a98fabf4958e9e937
381 Author: Patrick Donnelly <pdonnell@redhat.com>
382 Date: Thu May 26 16:32:58 2016 -0400
384 client: use fh min readahead to enable readahead
386 The client was using the configured maximum readahead of 0 which was changed in
387 95ee69989129750fddce6a3b5644238c4b88ed74. This prevented readahead from ever
388 running (without setting a different default from 0).
390 Fixes: http://tracker.ceph.com/issues/16024
392 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
393 (cherry picked from commit 01c179bcce2dc8a269d78eb1be8198b12bd161f7)
395 Signed-off-by: Greg Farnum <gfarnum@redhat.com
397 commit b0bccc3dc11731466f9809013d6deb09f020693b
398 Author: Patrick Donnelly <pdonnell@redhat.com>
399 Date: Fri May 27 11:43:31 2016 -0400
401 client: update comment
403 Default was changed to unlimited in 11e4680e7394e6e02612441c964e05207b97737b.
405 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
406 (cherry picked from commit bee02a073f4c551798bc490618a0e8d862893c25)
408 Signed-off-by: Greg Farnum <gfarnum@redhat.com
410 commit e4104689b2698feccd9ea8432f1d57847effbd07
411 Author: Patrick Donnelly <pdonnell@redhat.com>
412 Date: Thu May 26 15:08:52 2016 -0400
414 client: use layout.get_period() helper
416 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
417 (cherry picked from commit b331d12a43a4177369a003c3ab9d525da6a89950)
419 Signed-off-by: Greg Farnum <gfarnum@redhat.com
421 commit e5759fa8d016d3f8e2a1ba79edb0bf90ab24565b
422 Author: Jason Dillaman <dillaman@redhat.com>
423 Date: Fri Jun 10 15:44:26 2016 -0400
425 librbd: recursive lock possible when disabling journaling
427 If pool-level mirroring is enabled, deleting the journal
428 could cause a deadlock attempting to delete remote peer
429 sync-point snapshots.
431 Fixes: http://tracker.ceph.com/issues/16235
432 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
433 (cherry picked from commit fb255e6c3cd44c8d24c53e3cd70395a11a712574)
435 commit 89d65456ed1303b09e9bc054bbb62c0808db4565
436 Merge: c526386 e15bfff
437 Author: Jason Dillaman <dillaman@redhat.com>
438 Date: Sun Jun 12 08:16:35 2016 -0400
440 Merge pull request #9553 from Abhishekvrshny/wip-16038-jewel
442 jewel: pybind: rbd API should default features parameter to None
444 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
446 commit c526386b4b087029e6fc00315b7726a2cf9caecb
447 Merge: 6f9f830 6af7b22
448 Author: Jason Dillaman <dillaman@redhat.com>
449 Date: Sun Jun 12 08:13:16 2016 -0400
451 Merge pull request #9552 from Abhishekvrshny/wip-15981-jewel
453 jewel: qa: dynamic_features.sh races with image deletion
455 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
457 commit 6f9f8307d7cff313bd2f476236591141d3c45c71
458 Merge: 7edf393 dc38a26
459 Author: Jason Dillaman <dillaman@redhat.com>
460 Date: Sun Jun 12 08:08:39 2016 -0400
462 Merge pull request #9629 from dillaman/wip-16231
464 jewel: rbd-mirror: fix deletion propagation edge cases
466 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
468 commit 7edf393743b2f7811d784e02a42fce13af19e8bc
469 Merge: 39f530a bc658ed
470 Author: Jason Dillaman <dillaman@redhat.com>
471 Date: Sun Jun 12 08:08:23 2016 -0400
473 Merge pull request #9630 from dillaman/wip-16233
475 jewel: rbd-mirror: do not propagate deletions when pool unavailable
477 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
479 commit 39f530a224d85cd12294ce125d8548cbe1e3e1c0
480 Merge: bd454ff cb50679
481 Author: Jason Dillaman <dillaman@redhat.com>
482 Date: Sun Jun 12 08:07:42 2016 -0400
484 Merge pull request #9628 from dillaman/wip-16224
486 jewel: rbd-mirror: fix journal shut down ordering
488 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
490 commit bd454ff3a95244d2be2177180814439667db73f1
491 Merge: 3fe2f1b 3a2cd16
492 Author: Jason Dillaman <dillaman@redhat.com>
493 Date: Sun Jun 12 08:07:10 2016 -0400
495 Merge pull request #9627 from dillaman/wip-16217
497 jewel: rbd-mirror: refresh image after creating sync point
499 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
501 commit 3fe2f1b652d7d6d80f9375174885b002db503f40
502 Merge: 2a9fee9 99ff1fc
503 Author: Sage Weil <sage@redhat.com>
504 Date: Fri Jun 10 21:48:26 2016 -0400
506 Merge pull request #9579 from Abhishekvrshny/wip-16006-jewel
508 jewel: BackoffThrottle spins unnecessarily with very small backoff while the throttle is full
510 Reviewed-by: Sage Weil <sage@redhat.com>
512 commit 2a9fee94f10cba7675f564edbeac35620e8a6602
513 Merge: ac1b354 4a967eb
514 Author: Sage Weil <sage@redhat.com>
515 Date: Fri Jun 10 17:34:19 2016 -0400
517 Merge pull request #9638 from ceph/wip-16211-jewel
519 Jewel: remove reliance on FLAG_OMAP for reads
521 Reviewed-by: Sage Weil <sage@redhat.com>
523 commit bc658ede5b2e68210852b66585bfa5560964f405
524 Author: Jason Dillaman <dillaman@redhat.com>
525 Date: Fri Jun 10 08:15:19 2016 -0400
527 rbd-mirror: do not propagate deletions when pool unavailable
529 Fixes: http://tracker.ceph.com/issues/16229
530 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
531 (cherry picked from commit d321634414fa4b90c66474557ec990dfc935ae29)
533 commit dc38a26e2e48f0a1fabdb51f1819e402e5b214ce
534 Author: Jason Dillaman <dillaman@redhat.com>
535 Date: Fri Jun 10 00:12:06 2016 -0400
537 rbd-mirror: image deleter properly handles multiple snapshots
539 Fixes: http://tracker.ceph.com/issues/16226
540 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
541 (cherry picked from commit d72a8cb67fbdc7361f8f9e265c659ddb96dc0f74)
543 commit 0a74552b5a4c297855f5e04336a9d5cf00441d9e
544 Author: Jason Dillaman <dillaman@redhat.com>
545 Date: Thu Jun 9 22:32:33 2016 -0400
547 rbd-mirror: propagate deletions even if image replayer is stopped
549 If an image deletion which causes the replayer to stop (due to an error)
550 before the deletion is detected, the deletion should still occur.
552 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
553 (cherry picked from commit a0c526a23783fe543737f6445a2d9438cc73b137)
555 commit da6d409ab670e45e34c1dcf7de3f775632423d3f
556 Author: Jason Dillaman <dillaman@redhat.com>
557 Date: Thu Jun 9 21:14:27 2016 -0400
559 qa/workunits/rbd: improve deletion propagation test case
561 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
562 (cherry picked from commit de15b198cd7b5e94016605c8016a5cf38c07c6f6)
564 commit cb50679bad91fa1a0e360dca0331996b543fdadd
565 Author: Jason Dillaman <dillaman@redhat.com>
566 Date: Wed Jun 8 10:12:04 2016 -0400
568 librbd: quickly check for duplicate snap name upon create
570 During journal replay, quickly check for a duplicate snap name
571 before allocating a snapshot sequence from the OSDs and
572 reverting due to the duplicate name.
574 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
575 (cherry picked from commit 8374d45c7644666103f88c410a2b1b781f3a0cb8)
577 commit 43f3bbf130c9914f895bf4834305f951d0228954
578 Author: Jason Dillaman <dillaman@redhat.com>
579 Date: Tue Jun 7 14:45:16 2016 -0400
581 rbd-mirror: stop external replayer before closing remote journaler
583 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
584 (cherry picked from commit 88bd3002082184c045bb82547929b30da1526cfb)
586 commit f0bf15e9d38e3de63c959bac0ae90b609dafc514
587 Author: Jason Dillaman <dillaman@redhat.com>
588 Date: Tue Jun 7 12:42:52 2016 -0400
590 librbd: stop journal recorder before starting external replay
592 Fixes: http://tracker.ceph.com/issues/16165
593 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
594 (cherry picked from commit 5aa6eb2782bdb5cde6a050a5f7a4e683800414c0)
596 commit 3a2cd16e6c35b7b8ba0dd113b9a8cc586c1086b0
597 Author: Jason Dillaman <dillaman@redhat.com>
598 Date: Wed Jun 8 12:49:04 2016 -0400
600 rbd-mirror: refresh image after creating sync point snapshot
602 Fixes: http://tracker.ceph.com/issues/16196
603 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
604 (cherry picked from commit c9a3e3be7ddc31992167d55de12bbe6849447b43)
606 commit 6b77d2268e7b17911f0a6809045d356d97d1621a
607 Author: Jason Dillaman <dillaman@redhat.com>
608 Date: Wed Jun 8 12:03:33 2016 -0400
610 rbd-mirror: consistently use dout/derr for debug logging
612 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
613 (cherry picked from commit 03f5e4a917b3c18f8ccdaa5ce676ed9731dd2a8f)
615 commit ac1b35478eea6bad574fac8641b47c0fcaee20f4
616 Merge: 966186f 03466f0
617 Author: Jason Dillaman <dillaman@redhat.com>
618 Date: Fri Jun 10 12:32:21 2016 -0400
620 Merge pull request #9612 from dillaman/wip-16208
622 jewel: rbd-mirror: support bootstrap canceling
624 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
626 commit 966186f3c20080475d3e692e918cc363cac1ae47
627 Merge: 49ed4ff bddf944
628 Author: Jason Dillaman <dillaman@redhat.com>
629 Date: Fri Jun 10 12:32:02 2016 -0400
631 Merge pull request #9610 from dillaman/wip-16209
633 jewel: librbd: prevent error messages when journal externally disabled
635 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
637 commit 49ed4ffeb2c17f266559137030ab32182750b321
638 Merge: 8e533c8 0014a9e
639 Author: Jason Dillaman <dillaman@redhat.com>
640 Date: Fri Jun 10 12:19:47 2016 -0400
642 Merge pull request #9611 from dillaman/wip-16210
644 jewel: librbd: journal IO error results in failed assertion in AioCompletion
646 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
648 commit 8e533c877e5d7bac84867d418aada1998425ef72
649 Merge: a768a1c e424482
650 Author: Jason Dillaman <dillaman@redhat.com>
651 Date: Fri Jun 10 12:16:49 2016 -0400
653 Merge pull request #9580 from Abhishekvrshny/wip-15996-jewel
655 jewel: librbd: reuse ImageCtx::finisher and SafeTimer for lots of images case
657 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
659 commit a768a1cb7b0062963714361ce94f8a834db44bd4
660 Merge: ba5d490 bb279f1
661 Author: Jason Dillaman <dillaman@redhat.com>
662 Date: Fri Jun 10 12:15:51 2016 -0400
664 Merge pull request #9609 from dillaman/wip-16216
666 jewel: librbd: refresh image if needed in mirror functions
668 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
670 commit ba5d490824efa63c63713fee418631cd684293c4
671 Merge: 41c5c27 3b8cb63
672 Author: Jason Dillaman <dillaman@redhat.com>
673 Date: Fri Jun 10 12:15:32 2016 -0400
675 Merge pull request #9608 from dillaman/wip-16189
677 jewel: cls_rbd: mirror image status summary should read full directory
679 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
681 commit 41c5c273b1f52d0284c6b08f15db3edb17cd674c
682 Merge: 7d217b9 cec6870
683 Author: Jason Dillaman <dillaman@redhat.com>
684 Date: Fri Jun 10 12:15:08 2016 -0400
686 Merge pull request #9556 from Abhishekvrshny/wip-16162-jewel
688 jewel: ceph_test_librbd_fsx crashes during journal replay shut down
690 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
692 commit 7d217b9cc55778fa73f0ce4a0c2c5994f5f31c87
693 Merge: 32f90a7 6c0e202
694 Author: Jason Dillaman <dillaman@redhat.com>
695 Date: Fri Jun 10 12:14:49 2016 -0400
697 Merge pull request #9554 from Abhishekvrshny/wip-16084-jewel
699 jewel: librbd: validate image metadata configuration overrides
701 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
703 commit 32f90a7c98ebd5a272ece71b1af7009be2742cb5
704 Merge: 3715d20c 09200d4
705 Author: Jason Dillaman <dillaman@redhat.com>
706 Date: Fri Jun 10 12:13:06 2016 -0400
708 Merge pull request #9555 from Abhishekvrshny/wip-16147-jewel
710 jewel: Object Map is showing as invalid, even when Object Map is disabled for that Image.
712 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
714 commit 3715d20c25c19ec1d1c58d275cef4e7ddb5b7778
715 Merge: 7ea13df 73464af
716 Author: Jason Dillaman <dillaman@redhat.com>
717 Date: Fri Jun 10 12:12:47 2016 -0400
719 Merge pull request #9550 from Abhishekvrshny/wip-15969-jewel
721 jewel: Initial python APIs to support mirroring
723 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
725 commit 7ea13dfb9d85613d5c4daf92811a786293ffc2be
726 Merge: 2c22131 3084cf3
727 Author: Jason Dillaman <dillaman@redhat.com>
728 Date: Fri Jun 10 12:12:37 2016 -0400
730 Merge pull request #9548 from Abhishekvrshny/wip-15963-jewel
732 jewel: Disabling journaling feature results in "Transport endpoint is not connected" error
734 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
736 commit 2c221318e27fb4c4b68780c0037b9acae5862d6e
737 Merge: 4d68ae0 69a9500
738 Author: Loic Dachary <loic@dachary.org>
739 Date: Fri Jun 10 00:55:47 2016 +0200
741 Merge pull request #9424 from SUSE/wip-16107-jewel
743 jewel: ceph gid mismatch on upgrade from hammer with pre-existing ceph user (SUSE)
745 Reviewed-by: Samuel Just <sjust@redhat.com>
746 Reviewed-by: Loic Dachary <ldachary@redhat.com>
748 commit 4d68ae062b90599c184282b807f7d16cfaf2f6ad
749 Merge: 57b4542 b443fdf
750 Author: Loic Dachary <loic@dachary.org>
751 Date: Fri Jun 10 00:54:52 2016 +0200
753 Merge pull request #8802 from SUSE/wip-15606-jewel
755 jewel: ceph-{mds,mon,osd,radosgw} systemd unit files need wants=time-sync.target
757 Reviewed-by: Samuel Just <sjust@redhat.com>
758 Reviewed-by: Loic Dachary <ldachary@redhat.com>
760 commit 57b45426b5efa7ec4e293f9276f1f4299b5bf3ac
761 Merge: 3cf6533 555cec9
762 Author: Samuel Just <sjust@redhat.com>
763 Date: Thu Jun 9 15:44:13 2016 -0700
765 Merge pull request #9320 from SUSE/wip-16017-jewel
767 jewel: ceph: cli: exception when pool name has non-ascii characters
769 Reviewed-by: Samuel Just <sjust@redhat.com>
771 commit 3cf653328c988da5cf6be678cf3f0cb4c80c094d
772 Merge: a422d03 663d7c2
773 Author: Samuel Just <sjust@redhat.com>
774 Date: Thu Jun 9 15:43:48 2016 -0700
776 Merge pull request #9270 from Abhishekvrshny/wip-15852-jewel
778 jewel: mon/Monitor: memory leak on Monitor::handle_ping()
780 Reviewed-by: Samuel Just <sjust@redhat.com>
782 commit a422d0372719841ea4cc63f87e77ddc1dee7d815
783 Merge: 34b193b 8356021
784 Author: Samuel Just <sjust@redhat.com>
785 Date: Thu Jun 9 15:43:04 2016 -0700
787 Merge pull request #9237 from SUSE/wip-15961-jewel
789 jewel: ceph-osd valgrind invalid reads/writes
791 Reviewed-by: Samuel Just <sjust@redhat.com>
793 commit 34b193be043f0d88c42c5ae177a660b747e81486
794 Merge: e2a035e 64f15b3
795 Author: Samuel Just <sjust@redhat.com>
796 Date: Thu Jun 9 15:42:32 2016 -0700
798 Merge pull request #9103 from Abhishekvrshny/wip-15797-jewel
800 jewel: deadlock in OSD::_committed_osd_maps
802 Reviewed-by: Samuel Just <sjust@redhat.com>
804 commit e2a035eeb19e9043c41e5132d2ea0b8a59ac1bed
805 Merge: 2c35fe7 adfbe95
806 Author: Samuel Just <sjust@redhat.com>
807 Date: Thu Jun 9 15:41:52 2016 -0700
809 Merge pull request #9101 from Abhishekvrshny/wip-15799-jewel
811 jewel: osd boot race with noup being set
813 Reviewed-by: Samuel Just <sjust@redhat.com>
815 commit 2c35fe7e739e99452cf4d039281185e8c4a40b1c
816 Merge: 6528e43 f4306de
817 Author: Samuel Just <sjust@redhat.com>
818 Date: Thu Jun 9 15:40:43 2016 -0700
820 Merge pull request #9104 from Abhishekvrshny/wip-15795-jewel
822 jewel: LibRadosWatchNotifyPPTests/LibRadosWatchNotifyPP.WatchNotify2Timeout/1 segv
824 Reviewed-by: Samuel Just <sjust@redhat.com>
826 commit 6528e4371e0ab1c385e539646d08f4ea1dded893
827 Merge: 50143ed b989084
828 Author: Samuel Just <sjust@redhat.com>
829 Date: Thu Jun 9 15:37:43 2016 -0700
831 Merge pull request #9427 from SUSE/wip-16104-jewel
833 jewel: ceph-disk: workaround gperftool hang
835 Reviewed-by: Loic Dachary <ldachary@redhat.com>
837 commit 50143ed004ef198f2161b9f360bfeccd16503954
838 Merge: b328e99 a32820d
839 Author: Sage Weil <sage@redhat.com>
840 Date: Thu Jun 9 14:55:31 2016 -0400
842 Merge pull request #9614 from ceph/wip-16113-jewel
844 osd: hobject_t::get_max() vs is_max() discrepancy
846 Reviewed-by: Sage Weil <sage@redhat.com>
848 commit 03466f096adcfe3322cad49c959fec976d887860
849 Author: Mykola Golub <mgolub@mirantis.com>
850 Date: Wed May 4 15:30:05 2016 +0300
852 rbd-mirror: don't return split-brain error if we still in MIRROR_PEER_STATE_SYNCING
854 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
855 (cherry picked from commit 3ac620c5d66d8516e68264fcdb5e97b0e803d0ec)
857 commit dfefd343e35b1c69fc2c938c7ebc30352e1320d4
858 Author: Mykola Golub <mgolub@mirantis.com>
859 Date: Tue May 3 12:48:06 2016 +0300
861 rbd-mirror: refactor split-brain detection code
863 to make it more readable and extendable.
865 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
866 (cherry picked from commit 039cd2d2e3bb6a9c5042c125d2c67ec9adc02c47)
868 commit c94e5b740628b98008e5342b8a3b2b888ff7b794
869 Author: Mykola Golub <mgolub@mirantis.com>
870 Date: Tue May 31 15:00:30 2016 +0300
872 rbd-mirror: support bootstrap canceling
874 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
875 (cherry picked from commit 21f895f48498e518c3675a9e851559f4d071f6dd)
877 commit c8a3e759298c3a2adfa67d932178d284619d460e
878 Author: Mykola Golub <mgolub@mirantis.com>
879 Date: Mon May 30 16:24:24 2016 +0300
881 rbd-mirror: return ECANCELED when ImageReplayer start is canceled
883 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
884 (cherry picked from commit f581dbcb2eca108ce9440629b8f00f3229c07b95)
886 commit 0014a9e284c6cfc7678e63b56d707a8ad9b93127
887 Author: Jason Dillaman <dillaman@redhat.com>
888 Date: Tue Jun 7 01:01:09 2016 -0400
890 librbd: flush journal commit positions before starting op
892 Ensure all IO has been properly flushed and committed to the
893 journal before starting an op that could affect the IO path.
895 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
896 (cherry picked from commit 636129653c7cac9665d0c423f6aafad5fd0c480a)
898 commit 3cec45a17a3d8bdcd19c63c31dad6b9150a9fbfd
899 Author: Jason Dillaman <dillaman@redhat.com>
900 Date: Tue Jun 7 00:11:34 2016 -0400
902 librbd: leaked AioCompletion if IO issued after image shut down
904 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
905 (cherry picked from commit d3d4e068396e01c58832e0ea1224ca34bafb808e)
907 commit ef12536830082194da52df3a0dc8e22a3f69cb54
908 Author: Jason Dillaman <dillaman@redhat.com>
909 Date: Mon Jun 6 19:00:47 2016 -0400
911 librbd: resize and snap create can hang on journal replay failure
913 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
914 (cherry picked from commit 1032f19b3c9d9c7916669d04af909131574b3cab)
916 commit c8b4cabea0e1a74a62fd9b25ccb5e0b15df38733
917 Author: Jason Dillaman <dillaman@redhat.com>
918 Date: Mon Jun 6 14:54:23 2016 -0400
920 librbd: missing journal state for flushing/restarting replay
922 Fixes: http://tracker.ceph.com/issues/16077
923 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
924 (cherry picked from commit a7f5bc181c9cd677d39f95ad78134e0f85c22acb)
926 commit bc7649be5867fca46c1e86dacb99c1f8b18ad2e8
927 Author: Jason Dillaman <dillaman@redhat.com>
928 Date: Thu May 12 21:22:56 2016 -0400
930 librbd: track IO in the order issued
932 Fixes: http://tracker.ceph.com/issues/15034
933 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
934 (cherry picked from commit eb8dda5296eb5c19aa27e96d6e92eaa0c352cb62)
936 commit 602ffd78f3de00d6655236dd914aa83006a8f862
937 Author: Jason Dillaman <dillaman@redhat.com>
938 Date: Thu May 12 15:15:04 2016 -0400
940 librbd: AioCompletion should retrieve CephContext from ImageCtx
942 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
943 (cherry picked from commit 133b1ffb21c982003c7aa9dafd585062f9b2eb51)
945 commit 6e20662a9f5b9eabbd83eb91760532d8171d96b8
946 Author: Hector Martin <marcan@marcan.st>
947 Date: Wed May 25 20:41:40 2016 +0900
949 librbd: only mark async completion as done after callback
951 This change in behavior was introduced in fde9f78.
953 Signed-off-by: Hector Martin <marcan@marcan.st>
954 (cherry picked from commit 77f7c1cf829e5417eb356ebf3bf1fbc8ff7a25a5)
956 commit de29be73c043c0cd49b4d35a160ddd3910d423e8
957 Author: Jason Dillaman <dillaman@redhat.com>
958 Date: Mon May 9 18:17:49 2016 -0400
960 librbd: Journal no longer requires AioCompletion for IO events
962 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
963 (cherry picked from commit 82587a31f1d8ba1765f164391796753cf97a1878)
965 commit 65556aa507e3e70352bb61c1549f340af0c4a9fb
966 Author: Jason Dillaman <dillaman@redhat.com>
967 Date: Mon May 9 17:59:09 2016 -0400
969 librbd: bubble journal error up via existing AioObjectRequests
971 The journal cannot directly fail the AioCompletion because it
972 might have one-or-more outstanding requests associated with
975 Fixes: http://tracker.ceph.com/issues/15791
976 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
977 (cherry picked from commit 79c934742fb15c803780519b36070408599a74c5)
979 commit bddf944797df5ffb93b587f8ac245846a48bd2e3
980 Author: Jason Dillaman <dillaman@redhat.com>
981 Date: Mon Jun 6 22:34:30 2016 -0400
983 librbd: potential duplicate snap removal can result in crash
985 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
986 (cherry picked from commit 276fed6b7078158c2cd04fba14a11531c27898e0)
988 commit 4ce4130d0e6deef315dcbd5dc899faf5de9ab0e7
989 Author: Jason Dillaman <dillaman@redhat.com>
990 Date: Thu Jun 2 00:43:53 2016 -0400
992 ObjectCacher: do not merge uncommitted journal bhs
994 Avoid the possibility of an overwrite callback for regions
995 that were never associated with a journal write.
997 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
998 (cherry picked from commit c6060ade16205337de3941a10d05e234b738fa07)
1000 commit 6e645985e77bd0597eab6755b6e4071b79967584
1001 Author: Zhiqiang Wang <zhiqiang@xsky.com>
1002 Date: Wed Feb 24 21:54:34 2016 +0800
1004 ObjectCacher: don't loop the extents of OSDRead in map_read
1006 Looping the extents of OSDRead is done in _readx. The looping in
1007 map_read is not needed.
1009 Signed-off-by: Zhiqiang Wang <zhiqiang@xsky.com>
1010 (cherry picked from commit fae912c3856cab6d03183411eecab90c6e6732d2)
1012 commit c5f281d64221c62e3736f9630204f85d67328670
1013 Author: Zhiqiang Wang <zhiqiang@xsky.com>
1014 Date: Wed Feb 24 21:49:56 2016 +0800
1016 ObjectCacher: fix the bytes_written in writex
1018 The BufferHead returned after map_write may include other dirty data to
1019 the left and/or right. The actual length of data been written is in the
1022 Signed-off-by: Zhiqiang Wang <zhiqiang@xsky.com>
1023 (cherry picked from commit ca6f1681e4baf61682e258c5761536d67bf6bdb8)
1025 commit 1c00d813791cdd8c6e685c1ebf6f93ef4aa0adbe
1026 Author: Zhiqiang Wang <zhiqiang@xsky.com>
1027 Date: Wed Feb 24 21:45:45 2016 +0800
1029 osdc: don't loop the extents of OSDWrite in map_write
1031 We are looping all the extents of the OSDWrite in writex. The looping in
1032 map_write is not needed. And if there are same object in these
1033 extents,they will be mapped multiple times.
1035 Signed-off-by: Zhiqiang Wang <zhiqiang@xsky.com>
1036 (cherry picked from commit 322f1059670898762a890a01af6d3b0dd3ccf826)
1038 commit b48cdb21da2ba02ae4ee5398c38b48e857dba8cf
1039 Author: Jason Dillaman <dillaman@redhat.com>
1040 Date: Thu Jun 2 00:42:30 2016 -0400
1042 librbd: notify image feature update before releasing lock
1044 If a client is waiting for the lock, ensure it sees the latest
1045 version of the image features.
1047 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1048 (cherry picked from commit f601ea835bb78554ac767ccb11789df960765bf9)
1050 commit 680efbdcc3d2e28b6de991e7ad5c18e0d71cc551
1051 Author: Jason Dillaman <dillaman@redhat.com>
1052 Date: Wed Jun 1 23:19:20 2016 -0400
1054 librbd: refresh image after acquiring exclusive lock
1056 It's possible that the object map or journaling features have
1057 been disabled while the lock was not owned.
1059 Fixes: http://tracker.ceph.com/issues/16114
1060 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1061 (cherry picked from commit 03c54f52d15d6283c630bac6f75427e6829f7d0a)
1063 commit bb279f1b288f1069b83d7661588f883716c80d9d
1064 Author: Jon Bernard <jbernard@tuxion.com>
1065 Date: Wed Jun 1 21:01:30 2016 -0400
1067 librbd: refresh image if needed in mirror functions
1069 Fixes: http://tracker.ceph.com/issues/16096
1071 Signed-off-by: Jon Bernard <jbernard@tuxion.com>
1072 (cherry picked from commit a355c8f6d9e792517a8d0e096a99a64474369cfc)
1074 commit 3b8cb634b34dd7742bbdea2ca354a358cb0fe089
1075 Author: Jason Dillaman <dillaman@redhat.com>
1076 Date: Tue Jun 7 09:36:02 2016 -0400
1078 cls_rbd: mirror image status summary should read full directory
1080 Previously only retrieved the status for the first 64 images in
1081 the rbd_mirroring directory.
1083 Fixes: http://tracker.ceph.com/issues/16178
1084 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1085 (cherry picked from commit 61f86e7ec14233ea0dee5b3370595ce050ee28c3)
1087 commit 4a967eb42a7409b9d78d569585af2155414234d2 (refs/remotes/origin/wip-16211-jewel)
1088 Author: Samuel Just <sjust@redhat.com>
1089 Date: Thu Jun 9 10:36:44 2016 -0700
1091 Revert "osd/ReplicatedPG: for copy_get get omap, firstly check ob whether has omap."
1093 This reverts commit 771c869651132013054599f3decfc1017092a25f.
1095 commit fd8f8af2456bc197877793a60d4401751f828032
1096 Author: Samuel Just <sjust@redhat.com>
1097 Date: Thu Jun 9 10:36:39 2016 -0700
1099 Revert "osd/ReplicatedPG: For omap read ops, it should check object wether has omap"
1101 This reverts commit 98caba1d0b4dd334748e3bcaf1bfb3f79f75eb65.
1103 commit d59ca31a4fcc472809b1f1bd3379fc3521c28fb0
1104 Author: Samuel Just <sjust@redhat.com>
1105 Date: Thu Jun 9 10:36:31 2016 -0700
1107 Revert "osd/ReplicatedPG: When do omapclear, it should check object whether is omap."
1109 This reverts commit aeb8141c29cdd337961430bbf3e93a79e3e1bcd3.
1112 src/osd/ReplicatedPG.cc
1114 commit b328e998b2aa066f5f42577abd0c74a5f3d42694
1115 Merge: b1c4c4c 188318b
1116 Author: Nathan Cutler <presnypreklad@gmail.com>
1117 Date: Wed Jun 8 12:00:31 2016 +0200
1119 Merge pull request #8938 from SUSE/wip-15739-jewel
1121 jewel: ceph.spec.in: drop support for RHEL<7 and SUSE<1210 in jewel and above
1123 Reviewed-by: Boris Ranto <branto@redhat.com>
1124 Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
1126 commit f4306de66d6c071cb240a0d77e8f877841f87033
1127 Author: Sage Weil <sage@redhat.com>
1128 Date: Fri May 6 09:09:43 2016 -0400
1130 osdc/Objecter: upper bound watch_check result
1132 This way we always return a safe upper bound on the amount of time
1133 since we did a check. Among other things, this prevents us from
1134 returning a value of 0, which is confusing.
1136 Fixes: http://tracker.ceph.com/issues/15760
1137 Signed-off-by: Sage Weil <sage@redhat.com>
1138 (cherry picked from commit 2e2ce365866a7569b55aff338a82c132aa927089)
1140 commit 64f15b3cfd15faa65e7a36c9779713ea2436cf16
1141 Author: Xinze Chi <xinze@xsky.com>
1142 Date: Wed May 4 09:49:40 2016 +0800
1144 OSD: fix deadlock in OSD::_committed_osd_maps
1146 Fixes: http://tracker.ceph.com/issues/15701
1147 Signed-off-by: Xinze Chi <xinze@xsky.com>
1148 (cherry picked from commit 4fbf3891aab16347d02782f7c1c0400f9e0896af)
1150 commit adfbe9554be2cb79a6cbccc7c4a556139b4aed50
1151 Author: Sage Weil <sage@redhat.com>
1152 Date: Mon May 2 23:28:18 2016 -0400
1154 osd: handle boot racing with NOUP set
1156 This is a follow-on to 7139a232d26beef441ffbc13bc087baab3505ea8,
1157 which handled the NOUP set + clear case when the OSD found out
1158 about the flag being cleared. However, it's possible that the
1159 flag will get cleared but the OSD won't get a map update (because
1160 it hasn't subscribed and is not doing any work).
1162 This means that it is *more* likely than before that we will
1163 restart the boot process even though the OSD did successfully
1164 mark us up. However, as before, it is unavoidable because there
1165 is no notification of whether our boot request succeeds or not.
1167 And it is still mostly harmless (an extra mark down + up cycle).
1169 Fixes: http://tracker.ceph.com/issues/15678
1170 Signed-off-by: Sage Weil <sage@redhat.com>
1171 (cherry picked from commit 11e4242fbdb2f2f6f654d4cb3a7c95d5b38a88c2)
1173 commit e424482d0e79ad0a0c44b14f0977cfa69d1b7f72
1174 Author: Haomai Wang <haomai@xsky.com>
1175 Date: Sun Feb 28 23:35:17 2016 +0800
1177 TaskFinisher: use singleton SafeTimer and Finisher
1180 Signed-off-by: Haomai Wang <haomai@xsky.com>
1182 (cherry picked from commit dc6d6ce8b29de51b69242e569517f69acfe226f4)
1184 commit 99ff1fc34215da3339ccd227c4f17caf8294a32f
1185 Author: Samuel Just <sjust@redhat.com>
1186 Date: Wed May 18 12:09:10 2016 -0700
1188 BackoffThrottle: wait() if past max
1190 Otherwise, we risk spinning on wait_for() with a small
1193 Fixes: http://tracker.ceph.com/issues/15953
1194 Signed-off-by: Samuel Just <sjust@redhat.com>
1195 (cherry picked from commit 6f835726a7df5b29a96849fc1362186fd2116d9b)
1197 commit 5ce43eb7682535deeee149600f1226b87e41defd
1198 Author: Samuel Just <sjust@redhat.com>
1199 Date: Wed May 18 11:49:19 2016 -0700
1201 BackoffThrottle: use wait_for instead of wait_until
1203 On some platforms, wait_until won't surrender the lock
1204 with a negative argument.
1206 Signed-off-by: Samuel Just <sjust@redhat.com>
1207 (cherry picked from commit 846808ff3f3837b1772f293ae71dba5eda609cc4)
1209 commit cec6870572621ed9abbe3791ba6e1a460333dfc0
1210 Author: Jason Dillaman <dillaman@redhat.com>
1211 Date: Thu Jun 2 10:41:18 2016 -0400
1213 test/rbd: fsx needs to shut down the journal
1215 Fixes: http://tracker.ceph.com/issues/16123
1216 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1217 (cherry picked from commit d10ffaafbd2a5831154757b848ed8504dad99069)
1219 commit 09200d4b5002f8ef9e75a9218fe85aaa5da33a8b
1220 Author: xinxin shu <shuxinxin@chinac.com>
1221 Date: Thu Jun 2 14:13:09 2016 +0800
1223 remove invalid objectmap flag when objectmap is disabled
1224 Fixes: http://tracker.ceph.com/issues/16076
1225 Signed-off-by: xinxin shu <shuxinxin@chinac.com>
1227 (cherry picked from commit b2d475686ee7617bb2023d753941e3d6952f0878)
1229 commit 6c0e202573110de522d531e0aa8978e843b5167e
1230 Author: zhuangzeqiang <zhuang.zeqiang@h3c.com>
1231 Date: Sat Oct 7 16:52:07 2017 +0800
1233 rbd: check value of config override when setting image-meta
1235 Fixes: http://tracker.ceph.com/issues/15522
1237 Signed-off-by: zhuangzeqiang <zhuang.zeqiang@h3c.com>
1238 (cherry picked from commit 4538f8152d0e73bdefc09874113c87467bdda622)
1240 commit e15bfff2e822e15e0a34d09825e04cee381d8737
1241 Author: Mykola Golub <mgolub@mirantis.com>
1242 Date: Mon May 23 09:18:34 2016 +0300
1244 pybind/rbd: create/clone/copy: default to None for features param
1246 If None is specified don't set the features so that the defaults is
1249 Fixes: http://tracker.ceph.com/issues/15982
1250 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1251 (cherry picked from commit b8b3a9757f7d517210a91f2893b0961b6b35afab)
1253 commit f9e32ac68a83932945165612dc64c307f0411b19
1254 Author: Mykola Golub <mgolub@mirantis.com>
1255 Date: Mon May 23 09:16:38 2016 +0300
1257 librbd: clone: default to parent features
1259 Fixes: http://tracker.ceph.com/issues/15982
1260 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1261 (cherry picked from commit d305eaad8d57a6f64e6d80eebcd0839a65c9a668)
1263 commit 6af7b223f3d0a8d51cd472cb7024a5ec70d30f61
1264 Author: Mykola Golub <mgolub@mirantis.com>
1265 Date: Thu May 12 09:15:53 2016 +0300
1267 qa: dynamic_features.sh: return error only if it failed on alive QEMU
1270 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1271 (cherry picked from commit 8a71a79d24f2e1f999a5fc0a4154a10401d5a261)
1273 commit 73464af844b45137049b0fff294449ed3a6f13bb
1274 Author: Mykola Golub <mgolub@mirantis.com>
1275 Date: Wed May 11 14:33:00 2016 +0300
1277 test: initial python APIs to support mirroring
1279 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1280 (cherry picked from commit bfad0ca33b9d65dcec65bc1a18596d35fb3098f3)
1282 commit 5c312669ba2d208acaa8e819812e50ce23418208
1283 Author: Mykola Golub <mgolub@mirantis.com>
1284 Date: Wed May 11 14:29:17 2016 +0300
1286 rbd: initial python APIs to support mirroring
1288 Fixes: http://tracker.ceph.com/issues/15656
1289 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1290 (cherry picked from commit ef0ea8ee3c926a31b54e410c18e887415f6ea3cf)
1292 commit 3084cf32463a07cecec66befa1562a187bc1734f
1293 Author: Yuan Zhou <yuan.zhou@intel.com>
1294 Date: Mon May 16 16:18:59 2016 +0800
1296 rbd: close journal before removing
1298 Otherwise there is some unwanted error message.
1300 Fixes: http://tracker.ceph.com/issues/15863
1302 Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
1303 (cherry picked from commit ecdad4acca635d4b9f0b407889dde9985ab3a506)
1305 commit a32820d15fd5d2f817bc5fc94b731f4e7adafbf3 (refs/remotes/origin/wip-16113-jewel)
1306 Author: Samuel Just <sjust@redhat.com>
1307 Date: Thu Jun 2 17:13:09 2016 -0700
1309 src/: remove all direct comparisons to get_max()
1311 get_max() now returns a special singleton type from which hobject_t's
1312 can be assigned and constructed, but which cannot be directly compared.
1314 This patch also cleans up all such uses to use is_max() instead.
1316 This should prevent some issues like 16113 by preventing us from
1317 checking for max-ness by comparing against a sentinel value. The more
1318 complete fix will be to make all fields of hobject_t private and enforce
1319 a canonical max() representation that way. That patch will be hard to
1320 backport, however, so we'll settle for this for now.
1322 Fixes: http://tracker.ceph.com/issues/16113
1323 Signed-off-by: Samuel Just <sjust@redhat.com>
1324 (cherry picked from commit 7c5f2acaa57bd6caaf4b13b48154df3ad6fbe84d)
1326 commit f869594332fb8ffa4d29aae22573afd094c39f54
1327 Author: Samuel Just <sjust@redhat.com>
1328 Date: Thu Jun 2 17:39:09 2016 -0700
1330 PG::replica_scrub: don't adjust pool on max object
1332 Signed-off-by: Samuel Just <sjust@redhat.com>
1333 (cherry picked from commit 8b7b7c7a2379ce77173bbdfd90c98c561d786155)
1335 commit 1737ff3f49080904ef07a7519d200ee608fab446
1336 Author: Samuel Just <sjust@redhat.com>
1337 Date: Thu Jun 2 17:36:21 2016 -0700
1339 hobject: compensate for non-canonical hobject_t::get_max() encodings
1341 This closes a loop-hole that could allow a non-canonical in memory
1342 hobject_t::get_max() object which would return true for is_max(), but
1343 false for *this == hobject_t::get_max().
1345 Fixes: http://tracker.ceph.com/issues/16113
1346 Signed-off-by: Samuel Just <sjust@redhat.com>
1347 (cherry picked from commit 42fad4b76def50a0984bf3de06f78ed434d56954)
1349 commit b1c4c4c456d1d20ccc91de4f762dbe46d8e339a3
1350 Merge: 24404c9 5d9ee88
1351 Author: John Spray <jspray@redhat.com>
1352 Date: Fri Jun 3 12:37:00 2016 +0100
1354 Merge pull request #9430 from ceph/wip-manila-backports
1356 jewel: backports needed for Manila
1358 Reviewed-by: John Spray <john.spray@redhat.com>
1360 commit 24404c928b878d28a34439b8adaf43854547d317
1361 Merge: 1aa81ce 208659f
1362 Author: Jason Dillaman <dillaman@redhat.com>
1363 Date: Thu Jun 2 12:03:12 2016 -0400
1365 Merge pull request #9423 from dillaman/wip-16101
1367 jewel: rbd-mirror: replicate cloned images
1369 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1371 commit 5d9ee88e2a0ee57455581350bafe613fef8e3da2
1372 Author: Xiaoxi Chen <xiaoxchen@ebay.com>
1373 Date: Tue Apr 26 17:51:48 2016 -0500
1375 pybind: configurable cephfs_vol_client prefix and ns_prefix.
1377 Which is useful if we would like to have multiple backends
1378 in manila and potentially set different layout based on prefix.
1380 And also make ns_prefix configurable also in order to support
1385 Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
1386 (cherry picked from commit d1a21b07ede77ab3f2be7a753426d76de0343086)
1388 commit 470605c38f772e5bcc466e71ac232294b41be276
1389 Author: Ramana Raja <rraja@redhat.com>
1390 Date: Wed Apr 13 14:03:51 2016 +0530
1392 ceph_volume_client: evict client also based on mount path
1394 Evict clients based on not just their auth ID, but also based on the
1395 volume path mounted. This is needed for the Manila use-case, where
1396 the clients using an auth ID are denied further access to a share.
1398 Fixes: http://tracker.ceph.com/issues/15855
1400 Signed-off-by: Ramana Raja <rraja@redhat.com>
1401 (cherry picked from commit 68714b9dda8ed6010cad6730e0ddf54b3219150d)
1402 (cherry picked from commit aaa0e9aea9fcf2f63e73e544bd40c10a0d694408)
1404 commit 726292eb305d58661993803dea613e9d98a64f4f
1405 Author: John Spray <john.spray@redhat.com>
1406 Date: Wed May 11 13:18:23 2016 +0100
1408 client: report root's quota in statfs
1410 When user is mounted a quota-restricted inode
1411 as the root, report that inode's quota status
1412 as the filesystem statistics in statfs.
1414 This allows us to have a fairly convincing illusion
1415 that someone has a filesystem to themselves, when
1416 they're really mounting a restricted part of
1417 the larger global filesystem.
1419 Fixes: http://tracker.ceph.com/issues/15599
1420 Signed-off-by: John Spray <john.spray@redhat.com>
1421 (cherry picked from commit b6d2b6d1a51969c210ae75fef93c71ac21f511a6)
1423 commit 46c2bd0864f8f7ace80a8cad07b873d9aa57ead9
1424 Author: John Spray <john.spray@redhat.com>
1425 Date: Fri Apr 1 14:27:31 2016 +0100
1427 pybind: fix unicode handling in CephFSVolumeClient::purge
1429 os.path.join is sensitive to string encoding, but
1430 just doing a straight substitution should not be.
1432 Signed-off-by: John Spray <john.spray@redhat.com>
1433 (cherry picked from commit e590f4d05fdb46747e83e35e66a26d9f4aa0314d)
1435 commit b989084dfc28659445fe08847537f8e5ad275cdd
1436 Author: Loic Dachary <ldachary@redhat.com>
1437 Date: Thu May 26 12:55:51 2016 +0200
1439 ceph-disk: workaround gperftool hang
1441 Temporary workaround: if ceph-osd --mkfs does not
1442 complete within 5 minutes, assume it is blocked
1443 because of https://github.com/gperftools/gperftools/issues/786
1445 References http://tracker.ceph.com/issues/13522
1447 Signed-off-by: Loic Dachary <loic@dachary.org>
1448 (cherry picked from commit c092321c24b9ca493d90a9ccc8f0b4b9a38677f1)
1450 commit 69a9500d900b2d5b9bdb0e989f83fe60ddddeda0
1451 Author: Nathan Cutler <ncutler@suse.com>
1452 Date: Thu May 12 19:23:31 2016 +0200
1454 rpm: unconditionally set ceph user's primary group to ceph (SUSE)
1456 This commit brings the user/group creation into greater semantic alignment
1457 with the Debian packaging.
1459 Fixes: http://tracker.ceph.com/issues/15869
1460 Signed-off-by: Nathan Cutler <ncutler@suse.com>
1461 (cherry picked from commit b3dfa8d90962e60b6841555db830c8ea635f4cce)
1463 commit 208659fdebc888cab35239ec848f27320477420f
1464 Author: Jason Dillaman <dillaman@redhat.com>
1465 Date: Thu May 26 12:49:45 2016 -0400
1467 qa/workunits/rbd: basic cloned image test
1469 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1470 (cherry picked from commit 943ff829874f96f720d6c6299e1212e4da24c6c5)
1472 commit af6be1bc15dfc2757cf74772078dd8516ed889be
1473 Author: Jason Dillaman <dillaman@redhat.com>
1474 Date: Thu May 26 08:22:16 2016 -0400
1476 rbd-mirror: copy snapshot parent image settings
1478 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1479 (cherry picked from commit f5fd09373714ebe8886bcf51bb97732038fffe55)
1481 commit 8405c2c377c7f9e755a349bfc90494f7ee7cc477
1482 Author: Jason Dillaman <dillaman@redhat.com>
1483 Date: Thu May 26 12:01:15 2016 -0400
1485 cls_rbd: asynchronous helper method to set parent
1487 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1488 (cherry picked from commit fcfdebb471650a1730306f6a309f1775ba7a5eee)
1490 commit 26f4edcbb3b24eed98f111a2c77a5380cbf16927
1491 Author: Jason Dillaman <dillaman@redhat.com>
1492 Date: Wed May 25 17:38:06 2016 -0400
1494 rbd-mirror: add support for cloning images from mirrored parent
1496 Fixes: http://tracker.ceph.com/issues/14937
1497 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1498 (cherry picked from commit ae6e03dfb1fa3be61e6deac4fe39982e7e7c18aa)
1500 commit b8b01c57949955b1ff6a6a35dcae05108a2dda58
1501 Author: Jason Dillaman <dillaman@redhat.com>
1502 Date: Wed May 25 17:36:06 2016 -0400
1504 librbd: extend internal API to clone from open parent image
1506 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1507 (cherry picked from commit bfaa112c30da7091fd2d539b80a4a211176a6031)
1509 commit 9081c58a31aa8fa6f966f3b682b9870e2b6f8297
1510 Author: Jason Dillaman <dillaman@redhat.com>
1511 Date: Wed May 25 17:13:59 2016 -0400
1513 cls_rbd: asynchronous helper methods to retrieve mirror image metadata
1515 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1516 (cherry picked from commit 5a26080447cfa4b7bfdacdc13242569258a64076)
1518 commit 2c2f4b251d0c8b870728293d06e9c853856c8092
1519 Author: Jason Dillaman <dillaman@redhat.com>
1520 Date: Wed May 25 15:16:28 2016 -0400
1522 rbd-mirror: helper state machine to open remote/read-only images
1524 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1525 (cherry picked from commit 3731c3c34c15f8dcfbab444bdbf3c05976b03431)
1527 commit 1aa81ce5ba492e8eeea2b20f08b77a18a94cd738
1528 Merge: 54bfefb 0bcc295
1529 Author: Jason Dillaman <dillaman@redhat.com>
1530 Date: Tue May 31 13:11:22 2016 -0400
1532 Merge pull request #9409 from dillaman/wip-16068
1534 jewel: rbd-mirror: support multiple replicated pools
1536 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1538 commit 0bcc295363d9ca20d43fd313084370158513bc62
1539 Author: Jason Dillaman <dillaman@redhat.com>
1540 Date: Fri May 27 11:40:58 2016 -0400
1542 rbd-mirror: cluster-level asok commands need to support multiple pools
1544 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1545 (cherry picked from commit f4339ee8cb64d5f1a164e017fea942600ffb0ea9)
1547 commit e4547c036ef641d48ab03808f59e035b56136745
1548 Author: Jason Dillaman <dillaman@redhat.com>
1549 Date: Thu May 26 23:26:20 2016 -0400
1551 rbd-mirror: replayer should only handle a single pool
1553 The pool watcher now only needs to scan a single pool for
1554 its associated replayer since a peer is inherently tied to
1557 Fixes: http://tracker.ceph.com/issues/16045
1558 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1559 (cherry picked from commit c5a8b780edeb9b62a601f0718459837f3d66e63d)
1561 commit 6fc5328e93b7d005479f925cca1268e7e7e10234
1562 Author: Jason Dillaman <dillaman@redhat.com>
1563 Date: Thu May 26 16:03:59 2016 -0400
1565 rbd-mirror: group peers by local pools
1567 The peer structure is automatically unique per pool due to its
1568 UUID, so grouping local pools by a single peer doesn't work.
1570 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1571 (cherry picked from commit 020f0282a0771c0d321732a62f53cee10a193715)
1574 src/tools/rbd_mirror/ClusterWatcher.cc: trivial resolution
1576 commit 0745cc3db35a349799891c8397249bf8d088ef83
1577 Author: Jason Dillaman <dillaman@redhat.com>
1578 Date: Wed May 25 14:00:34 2016 -0400
1580 rbd-mirror: stop stale replayers before starting new replayers
1582 If the connection details are tweaked for a remote peer, stop
1583 the existing replayer before potentially starting a new replayer
1584 against the same remote.
1586 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1587 (cherry picked from commit 6a2adca2a47b384f64c20996b9fc77010a70bc22)
1589 commit 91f8373613a38d48d71f2762e75e21ec817305be
1590 Author: Jason Dillaman <dillaman@redhat.com>
1591 Date: Thu May 26 13:29:49 2016 -0400
1593 rbd-mirror: normalize debug log message prefix
1595 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1596 (cherry picked from commit d52843190d84d533ab50a1702cf4a829b71ad68b)
1598 commit 5f0d89a9258fdf2f7392c63ca5d6488c4e3f210d
1599 Author: Jason Dillaman <dillaman@redhat.com>
1600 Date: Thu May 26 13:26:57 2016 -0400
1602 qa/workunits/rbd: create secondary replicated pool
1604 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1605 (cherry picked from commit 839544ee6446b959f01290667592e44fc5ee6991)
1607 commit 54bfefb7d108667058eda56fda24b0029a560746
1608 Merge: 522c7f9 61542c1
1609 Author: Jason Dillaman <dillaman@redhat.com>
1610 Date: Tue May 31 11:51:05 2016 -0400
1612 Merge pull request #9373 from dillaman/wip-16055
1614 jewel: journal: support asynchronous shutdown
1616 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1618 commit 522c7f9432e029f4db2b7455fb83b4aeb3ff4a4e
1619 Merge: f04972c 6375c78
1620 Author: Jason Dillaman <dillaman@redhat.com>
1621 Date: Tue May 31 11:49:39 2016 -0400
1623 Merge pull request #9372 from dillaman/wip-15995
1625 jewel: rbd-mirror: Delete local image mirror when remote image mirroring is disabled
1627 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1629 commit 61542c14d34c4192f1468e2d7865fe913cce21b8
1630 Author: Jason Dillaman <dillaman@redhat.com>
1631 Date: Wed May 25 02:31:11 2016 -0400
1633 rbd-mirror: image replay now uses asynchronous journal shutdown
1635 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1636 (cherry picked from commit a1b0a1b1b9a237ae363a52c7b4038b19e87052a5)
1638 commit bf4c45830330b025bf818286e13693b837f1f2c5
1639 Author: Jason Dillaman <dillaman@redhat.com>
1640 Date: Wed May 25 00:21:14 2016 -0400
1642 librbd: integrate with async journaler shutdown API
1644 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1645 (cherry picked from commit ad297850b1be8ed38f77b86913c6821748f3368b)
1647 commit 36cf42a3f47c23db82a8aca7a5560857cc3e0027
1648 Author: Jason Dillaman <dillaman@redhat.com>
1649 Date: Tue May 24 16:12:16 2016 -0400
1651 journal: extend asynchronous shutdown to facade
1653 Fixes: http://tracker.ceph.com/issues/14530
1654 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1655 (cherry picked from commit f40c595255a6828e27abfe63b4209ebae03e237b)
1657 commit 1b0422d7272788561253479a43f5b3dcdbb6282b
1658 Author: Jason Dillaman <dillaman@redhat.com>
1659 Date: Tue May 24 15:53:12 2016 -0400
1661 journal: trimmer now has asynchronous shutdown
1663 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1664 (cherry picked from commit 59ca9916ba2e2b144eff5ee471a314b9c4391936)
1666 commit f913946ff74924fc14c7336fef6c73a4c6edfdfa
1667 Author: Jason Dillaman <dillaman@redhat.com>
1668 Date: Tue May 24 15:36:17 2016 -0400
1670 journal: metadata init and shutdown now asynchronous
1672 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1673 (cherry picked from commit 0543e1b29eb253bf1d9e9af7af6f22fa394dd854)
1675 commit 1a9d60f8244d6ba8697b2254d967907fdb618cdb
1676 Author: Jason Dillaman <dillaman@redhat.com>
1677 Date: Tue May 24 12:06:26 2016 -0400
1679 journal: player shutdown is now handled asynchronously
1681 Fixes: http://tracker.ceph.com/issues/15949
1682 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1683 (cherry picked from commit 79b41346678b3acdeb547fe07e44d8d0543d37a7)
1685 commit 4af5bb1d2d86de68be0cef3713e09dfe0f1a9030
1686 Author: Jason Dillaman <dillaman@redhat.com>
1687 Date: Mon May 23 22:26:05 2016 -0400
1689 test: use randomized write sizes for rbd-mirror stress test
1691 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1692 (cherry picked from commit b9edff2174ff04bb8b6353dd2d2218c64757aae1)
1694 commit df2b8d9f0f399dcf9bb0e3eba3a39e14de504c49
1695 Author: Jason Dillaman <dillaman@redhat.com>
1696 Date: Mon May 23 22:21:33 2016 -0400
1698 journal: eliminate watch delay for object refetches
1700 The randomized write sizes of the modified rbd-mirror stress
1701 test results in a lot of journal object with few entries.
1702 Immediately fetch objects when performing a refetch check prior
1703 to closing an empty object.
1705 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1706 (cherry picked from commit d7b511b854c8ab633dcdb1c935014218b83f4e09)
1708 commit c65614f155ceccebd1960d6042d55e13b31e62ba
1709 Author: Jason Dillaman <dillaman@redhat.com>
1710 Date: Mon May 23 14:57:03 2016 -0400
1712 journal: keep active tag to assist with pruning watched objects
1714 It's possible that there might be additional entries to prune in
1715 objects that haven't been prefetched yet. Keep the active tag
1716 to allow these entries to be pruned after they have been loaded.
1718 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1719 (cherry picked from commit 0fb730e6be632e25d76695e1f37eba542162d620)
1721 commit 30c7f4dbe0a7c515d14be98f3f59ba8a8cdb1dcf
1722 Author: Jason Dillaman <dillaman@redhat.com>
1723 Date: Mon May 23 12:15:49 2016 -0400
1725 journal: update commit entry object number upon overflow
1727 Otherwise the recorded object positions might point to an older
1728 object that doesn't contain the actual entry.
1730 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1731 (cherry picked from commit 5fbf5f82de8214c5c676d38feae7682a006fcab1)
1733 commit fa08330dadb9ce973db866ad641a79d5d2dd290c
1734 Author: Jason Dillaman <dillaman@redhat.com>
1735 Date: Mon May 23 11:01:05 2016 -0400
1737 journal: cleanup watch refetch flag handling
1739 Clear the refetch required flag while scheduling the watch
1740 and remove the stale object after the watch completes if still
1741 empty. Previously, it was possible for the flag to become
1742 out-of-sync with whether or not it was actually refreshed
1745 Fixes: http://tracker.ceph.com/issues/15993
1746 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1747 (cherry picked from commit ff2cc27ae592646b495bf1b614d35bd50c091a3d)
1749 commit 6375c7831de551c52f1dbf74bf9f65be3b6d8adf
1750 Author: Ricardo Dias <rdias@suse.com>
1751 Date: Fri May 13 16:47:25 2016 +0100
1753 rbd-mirror: test: added image-deleter test case when mirroring is disabled
1755 Signed-off-by: Ricardo Dias <rdias@suse.com>
1756 (cherry picked from commit d85e312ead1da7c35d5ee4fe4be3d6e69a68b572)
1758 commit 1ba650539c1e90b82727a6bd9f1c16796b92b821
1759 Author: Ricardo Dias <rdias@suse.com>
1760 Date: Fri May 13 16:44:53 2016 +0100
1762 rbd-mirror: Unregister clients from non-primary images journal
1764 A non-primary image may have registered clients on its journal
1765 (for instance a primary image that was later demoted). We must
1766 unregister the clients when disabling image mirroring with the
1769 Signed-off-by: Ricardo Dias <rdias@suse.com>
1770 (cherry picked from commit 9cb0b180bc8a12ea2ebb0d7e32279b696ddd127e)
1772 commit a53cf28ab95a704b78cfa46cf758c2eec8058619
1773 Author: Ricardo Dias <rdias@suse.com>
1774 Date: Tue Apr 19 12:35:49 2016 +0100
1776 rbd-mirror: test: Added unit test for testing image-deleter thread
1778 Signed-off-by: Ricardo Dias <rdias@suse.com>
1779 (cherry picked from commit ac9514941b0accb6c738ce4aa0953c36cdcf69a6)
1781 commit 78b13a504c32685090bb5b6512be9c050df2d8b6
1782 Author: Ricardo Dias <rdias@suse.com>
1783 Date: Mon Apr 18 12:22:19 2016 +0100
1785 rbd-mirror: test: Fixed test_PoolWatcher to support the new changes in PoolWatcher class
1787 Signed-off-by: Ricardo Dias <rdias@suse.com>
1788 (cherry picked from commit e3677f115e1f369a49227fba51a1d34505d487ac)
1790 commit fef7456f8bc85f32cbdb28ce81198a9eb7d56d3b
1791 Author: Ricardo Dias <rdias@suse.com>
1792 Date: Tue Apr 5 09:47:32 2016 +0100
1794 rbd-mirror: Replayer: bootstrap existing mirrored images
1796 Signed-off-by: Ricardo Dias <rdias@suse.com>
1797 (cherry picked from commit 3c2615aa6da837bfef2365f701f56a34c49b536f)
1799 commit 97eb85f971a74678e4075b16cb5a8e836a985b56
1800 Author: Ricardo Dias <rdias@suse.com>
1801 Date: Thu Apr 28 11:49:43 2016 +0100
1803 rbd-mirror: replayer: Added image-deleter thread to replayer
1805 Fixes: http://tracker.ceph.com/issues/14421
1807 Signed-off-by: Ricardo Dias <rdias@suse.com>
1808 (cherry picked from commit a6d698829d925894e4afcdec0ee42b1fc1205db0)
1810 commit 24406c5f8ea12d2c19573116ea84c90ba7446f8b
1811 Author: Ricardo Dias <rdias@suse.com>
1812 Date: Thu Apr 28 11:48:05 2016 +0100
1814 rbd-mirror: Added image-deleter thread to rbd-mirror
1816 Signed-off-by: Ricardo Dias <rdias@suse.com>
1817 (cherry picked from commit 011984d40bce448fe0febfc6a9fcf57d2c7b4768)
1819 commit 0780230b4af7e4ca923dab5f77735d0a11409202
1820 Author: Ricardo Dias <rdias@suse.com>
1821 Date: Wed Apr 13 15:17:40 2016 +0100
1823 rbd-mirror: Added implementation of image-deleter thread
1825 image-deleter thread will handle the deletion of local images that have
1826 been disabled for mirroring by the primary site.
1828 Signed-off-by: Ricardo Dias <rdias@suse.com>
1829 (cherry picked from commit 6cc6e663ed2ec336a9475d93ab2cb605644e6ee0)
1831 commit 38514adc847a227dbd28318650931a8c2a7df7db
1832 Author: runsisi <runsisi@zte.com.cn>
1833 Date: Wed May 11 20:42:37 2016 +0800
1835 rbd-mirror: librbd::mirror_peer_list never returns -ENOENT
1837 no need to check -ENOENT specially
1839 Signed-off-by: runsisi <runsisi@zte.com.cn>
1840 (cherry picked from commit 81ff42253369a9f57118bd26b29115c86a1748c5)
1842 commit 4e7233ad43d368a5f6e812870cec77545e034186
1843 Author: runsisi <runsisi@zte.com.cn>
1844 Date: Wed May 11 20:52:38 2016 +0800
1846 rbd-mirror: fix typo
1848 Signed-off-by: runsisi <runsisi@zte.com.cn>
1849 (cherry picked from commit 25bfd4c786d0701fe6ae06e3d120098bd82f8aa0)
1851 commit c3b1bf1e530a4cf55585886a4b4038b9d2862471
1852 Author: Mykola Golub <mgolub@mirantis.com>
1853 Date: Wed May 18 10:07:55 2016 +0300
1855 rbd-mirror: calculate behind_master only if mirror tag is not newer than master
1857 Fixes: http://tracker.ceph.com/issues/15916
1858 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1859 (cherry picked from commit cbd8d526f94523c9de3c575d426063e63d7e1802)
1861 commit f04972c8be28fc6d3133363b5474f22ebac5fd15
1862 Merge: c194c5d cb950fc
1863 Author: Jason Dillaman <dillaman@redhat.com>
1864 Date: Tue May 31 11:48:06 2016 -0400
1866 Merge pull request #9377 from dillaman/wip-16063
1868 jewel: test: failure in journal.sh workunit test
1870 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1872 commit cb950fca12395a1c62421d4b0bce64b4a52b2fd4
1873 Author: Mykola Golub <mgolub@mirantis.com>
1874 Date: Wed May 25 21:54:16 2016 +0300
1876 test: workaround failure in journal.sh
1878 With the changes to ensure that the commit position of a new
1879 client is initialized to the minimum position of other clients,
1880 the 'journal inspect/export' commands return zero records because
1881 the master client has committed all of its entries.
1883 Workaround this by restoring the initial commit position after
1884 writing to the image.
1886 Fixes: http://tracker.ceph.com/issues/16011
1887 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1888 (cherry picked from commit e9ed8ac33b1884c6ed5cdfb23023094ec790b116)
1890 commit f92c2a5604d4a8e83504b7283114d3d59bc45f38
1891 Author: Mykola Golub <mgolub@mirantis.com>
1892 Date: Wed May 25 14:51:43 2016 +0300
1894 cls::journal: treat empty commit position as minimal
1896 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1897 (cherry picked from commit 16846e8085b0c594f065322a768e6dfcbd5d2444)
1899 commit c194c5d8d454d0b387e191d03fec9d916271ff7f
1900 Merge: 4d3b668 8fbb555
1901 Author: Jason Dillaman <dillaman@redhat.com>
1902 Date: Tue May 31 11:46:30 2016 -0400
1904 Merge pull request #9376 from dillaman/wip-15994
1906 jewel: cls_journal: initialize empty commit position upon client register
1908 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1910 commit 4d3b66842d4477ec4c4a418a91723fc9b800101c
1911 Merge: dafe375 e5ebb51
1912 Author: Jason Dillaman <dillaman@redhat.com>
1913 Date: Tue May 31 11:45:43 2016 -0400
1915 jewel: librbd: write-after-write might result in an inconsistent replicated image
1917 jewel: librbd: write-after-write might result in an inconsistent replicated image
1919 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1921 commit dafe375640967e10d1a94b02970d399c51980076
1922 Merge: 409fc64 305ebbc
1923 Author: Jason Dillaman <dillaman@redhat.com>
1924 Date: Tue May 31 11:30:47 2016 -0400
1926 Merge pull request #9318 from Abhishekvrshny/wip-15957-jewel
1928 jewel: Metadata config overrides are applied synchronously
1930 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1932 commit 409fc64799aec36e183e6ba2bb25c3bf7e3d603b
1933 Merge: cd6ed4d 0c99028
1934 Author: Jason Dillaman <dillaman@redhat.com>
1935 Date: Tue May 31 11:29:45 2016 -0400
1937 Merge pull request #9317 from Abhishekvrshny/wip-15956-jewel
1939 jewel: rbd-mirror should disable the rbd cache for local images
1941 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1943 commit cd6ed4deb0f4b66a10ea7bd5e027daee3a93d1f4
1944 Merge: 9fa8596 be9e85d
1945 Author: Kefu Chai <tchaikov@gmail.com>
1946 Date: Tue May 31 18:48:58 2016 +0800
1948 Merge pull request #9403 from dachary/wip-16088-jewel
1950 jewel: tests: rm -fr /tmp/*virtualenv*
1952 Reviewed-by: Kefu Chai <kchai@redhat.com>
1954 commit be9e85d83f3d025cec16b7da85d8a2ce1f64e8fa
1955 Author: Loic Dachary <ldachary@redhat.com>
1956 Date: Fri May 20 13:19:07 2016 +0200
1958 tests: rm -fr /tmp/*virtualenv*
1960 Signed-off-by: Loic Dachary <loic@dachary.org>
1961 (cherry picked from commit 8f0eefba00d1c6ad656302a608217fc3395d0401)
1963 commit 9fa85963a8accd669b0f0fbb17f4b721290432c6
1964 Merge: a046d2a 3674341
1965 Author: Kefu Chai <tchaikov@gmail.com>
1966 Date: Tue May 31 13:46:31 2016 +0800
1968 Merge pull request #8968 from Abhishekvrshny/wip-15728-jewel
1970 jewel: osd: acting_primary not updated on split
1972 Reviewed-by: Kefu Chai <kchai@redhat.com>
1974 commit a046d2a8c37182652d5f300f58673f70c8485114
1975 Merge: 954af78 8bbb5ad
1976 Author: Kefu Chai <tchaikov@gmail.com>
1977 Date: Tue May 31 13:42:28 2016 +0800
1979 Merge pull request #9100 from Abhishekvrshny/wip-15856-jewel
1981 jewel: Hammer (0.94.3) OSD does not delete old OSD Maps in a timely fashion (maybe at all?)
1983 Reviewed-by: Kefu Chai <kchai@redhat.com>
1985 commit 954af787526a77b923fe85ed1282ba98277738e4
1986 Merge: e8e572c fae360f
1987 Author: Yehuda Sadeh <yehuda@redhat.com>
1988 Date: Mon May 30 13:53:45 2016 +0300
1990 Merge pull request #9245 from dreamhost/wip-15974-jewel
1992 rgw: fix manager selection when APIs customized
1994 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1996 commit e8e572c6454816119448240fa7813be7995fd250
1997 Merge: c11db6f ffd545b
1998 Author: Orit Wasserman <owasserm@redhat.com>
1999 Date: Mon May 30 11:15:18 2016 +0200
2001 Merge pull request #9239 from yehudasa/wip-15886-jewel
2003 rgw: keep track of written_objs correctly
2004 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2006 commit 8fbb555befb1415ef5218c8aaa149ca44017d73d
2007 Author: Venky Shankar <vshankar@redhat.com>
2008 Date: Thu May 19 22:45:34 2016 +0530
2010 cls_journal: Select min commit position for new clients
2012 When a new client registers, its commit position is initialized
2013 to the least commit position of all other clients.
2015 Fixes: http://tracker.ceph.com/issues/15757
2016 Signed-off-by: Venky Shankar <vshankar@redhat.com>
2017 (cherry picked from commit dd2e3dae8adb3778e7e381db5dbfca0948571c55)
2019 commit 576ff0ca804779d1eb0b1c44d6ce38e0658b6a05
2020 Author: runsisi <runsisi@zte.com.cn>
2021 Date: Mon May 9 15:15:31 2016 +0800
2023 cls_journal: remove duplicated key generation
2025 Signed-off-by: runsisi <runsisi@zte.com.cn>
2026 (cherry picked from commit 715e99c83e1ebc01ceb9eff0f66da8e2b598766a)
2028 commit fae360f0e419266b80f001a25a6864668e772d08
2029 Author: Robin H. Johnson <robin.johnson@dreamhost.com>
2030 Date: Fri May 20 16:00:33 2016 -0700
2032 rgw: fix manager selection when APIs customized
2034 When modifying rgw_enable_apis per RGW instance, such as for staticsites, you
2035 can end up with RESTManager instance being null in some cases, which returns a
2036 HTTP 405 MethodNotAllowed to all requests.
2038 Example configuration to trigger the bug:
2039 rgw_enable_apis = s3website
2042 X-Note: Patch from Yehuda in private IRC discussion, 2016/05/20.
2043 Fixes: http://tracker.ceph.com/issues/15973
2044 Fixes: http://tracker.ceph.com/issues/15974
2045 Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2046 (cherry picked from commit 7c7a465b55f7100eab0f140bf54f9420abd1c776)
2048 commit 8bbb5add6208a552979270baf4623430cf45e1b3
2049 Author: Kefu Chai <kchai@redhat.com>
2050 Date: Fri May 13 11:26:31 2016 +0800
2052 osd/OpRequest: reset connection upon unregister
2054 this helps to free the resources referenced by the connection, among
2055 other things, in the case of MOSDOp, the OSD::Session and OSDMap. this
2056 helps to free the resource earlier and trim the osdmaps in time.
2058 Fixes: http://tracker.ceph.com/issues/13990
2059 Signed-off-by: Kefu Chai <kchai@redhat.com>
2060 (cherry picked from commit 87850e96ea6fa45a8368bacabee50f9e95b40ae9)
2062 commit e97cc2d1e9bcee0a43f54ed592d3078182571874
2063 Author: Kefu Chai <kchai@redhat.com>
2064 Date: Thu May 12 20:28:11 2016 +0800
2066 osd: reset session->osdmap if session is not waiting for a map anymore
2068 we should release the osdmap reference once we are done with it,
2069 otherwise we might need to wait very long to update that reference with
2070 a newer osdmap ref. this appears to be an OSDMap leak: it is held by an
2071 quiet OSD::Session forever.
2073 the osdmap is not reset in OSD::session_notify_pg_create(), because its
2074 only caller is wake_pg_waiters(), which will call
2075 dispatch_session_waiting() later. and dispatch_session_waiting() will
2076 check the session->osdmap, and will also reset the osdmap if
2077 session->waiting_for_pg.empty().
2079 Fixes: http://tracker.ceph.com/issues/13990
2080 Signed-off-by: Kefu Chai <kchai@redhat.com>
2081 (cherry picked from commit 82b0af7cedc3071cd83ee53479f834c23c62b7d0)
2083 commit 555cec9a92568666880d70b9ae8f6e9748eca204
2084 Author: Ricardo Dias <rdias@suse.com>
2085 Date: Tue May 17 18:04:28 2016 +0100
2087 ceph.in: fix exception when pool name has non-ascii characters
2089 When deleting a pool without the --i-really-really-mean-it option, if
2090 the pool name has non-ascii characters, the format of the command
2091 message raises a UnicodeEncodeError exception.
2093 Fixes: http://tracker.ceph.com/issues/15913
2095 Signed-off-by: Ricardo Dias <rdias@suse.com>
2096 (cherry picked from commit 805873fed0135616a4cf8b499d1ba0b10dac004c)
2098 commit 305ebbc36473cf8bfd22513ffe55d3a4a99d5ef1
2099 Author: Jason Dillaman <dillaman@redhat.com>
2100 Date: Wed May 18 19:19:24 2016 -0400
2102 librbd: metadata retrieval added to open image state machine
2104 Fixes: http://tracker.ceph.com/issues/15928
2105 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2106 (cherry picked from commit b64cb31f8e7796175b4709929c017b3236649462)
2108 commit 5c9ecea87d3eb90201a967d8da827018cd728f0d
2109 Author: Jason Dillaman <dillaman@redhat.com>
2110 Date: Wed May 18 17:50:07 2016 -0400
2112 cls_rbd: async version of metadata_list helper method
2114 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2115 (cherry picked from commit 985cb38211c51c95d84479df231c4f53847cb2ec)
2117 commit 0c99028582326c4ac142a03f168ab1bcf0ddd3c2
2118 Author: Jason Dillaman <dillaman@redhat.com>
2119 Date: Wed May 18 20:53:26 2016 -0400
2121 rbd-mirror: disable librbd caching for replicated images
2123 Each image has its own cache and each cache uses its own thread. With
2124 a large replicated cluster, this could result in thousands of extra
2125 threads and gigabytes of extra memory.
2127 Fixes: http://tracker.ceph.com/issues/15930
2128 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2129 (cherry picked from commit ea35f148257282fe3f3ae02fe7a26cf245cda952)
2131 commit 188318b7b567f206d60dfb754fedbb0bfc74ef91
2132 Author: Boris Ranto <branto@redhat.com>
2133 Date: Mon May 23 17:06:19 2016 +0200
2135 rpm: Restore /var/run/ceph context manually
2137 The fixfiles command won't fix label for /var/run/ceph (/run is probably
2138 excluded from relabel), we need to restore the context manually.
2140 Signed-off-by: Boris Ranto <branto@redhat.com>
2141 (cherry picked from commit 6de39ce73737f79d4511dfc4e1d10d7f3733ab1b)
2143 commit ab1f65dd0429647c30fdae1dd97ff6f393dbc1a8
2144 Author: Boris Ranto <branto@redhat.com>
2145 Date: Fri May 20 08:09:42 2016 +0200
2147 rpm: Mute semodule in postun script
2149 Currently, we don't mute the semodule output in postun script. This
2150 results in the following message when removing ceph-selinux package:
2152 libsemanage.semanage_direct_remove_key: Removing last ceph module (no
2153 other ceph module exists at another priority).
2155 The fix is to simply mute the output of the command.
2157 Signed-off-by: Boris Ranto <branto@redhat.com>
2158 (cherry picked from commit 3c104b106540fabdba43e0d04a3828d77f83e89d)
2160 commit 587fb3df704973071114a30bc55288768dbc2720
2161 Author: Nathan Cutler <ncutler@suse.com>
2162 Date: Wed Apr 27 11:13:06 2016 +0200
2164 install-deps.sh: systemd-rpm-macros must be installed on SUSE
2166 Otherwise the script breaks.
2168 Fixes: http://tracker.ceph.com/issues/15627
2169 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2170 (cherry picked from commit a7f5ad5f6f9c01ef81f90a7071b6e2243b6da4e7)
2172 commit 69470d406d2b539e8021afd4def7de931ac91857
2173 Author: Boris Ranto <branto@redhat.com>
2174 Date: Tue May 10 18:20:13 2016 +0200
2176 rpm: Drop SELinux priority setting
2178 Older versions of semodule binary that are in Centos/RHEL do not
2179 support priority setting, dropping it.
2182 Signed-off-by: Boris Ranto <branto@redhat.com>
2183 (cherry picked from commit 7e606f29f499eac83ecb7053ea6874fcfd092924)
2185 commit 128dbc8af0095622d48b962ddd9476aa4140bc16
2186 Author: Boris Ranto <branto@redhat.com>
2187 Date: Wed May 4 09:09:47 2016 +0200
2189 rpm: Fix SELinux relabel on fedora
2191 The SELinux userspace utilities stopped providing versions when they
2192 switched to CIL language. We need to use a different technique to
2196 Signed-off-by: Boris Ranto <branto@redhat.com>
2197 (cherry picked from commit bd26641d705a34a1148a781eea08d203e81b750d)
2199 commit 8182b9a4d2750bb8f0f035d84e9d8476abc62c3c
2200 Author: Nathan Cutler <ncutler@suse.com>
2201 Date: Tue Apr 12 15:33:45 2016 +0200
2203 Test-enable XIO messenger and IB/RDMA support
2205 Fixes: http://tracker.ceph.com/issues/15472
2207 Signed-off-by: Lars Marowsky-Bree <lmb@suse.com>
2208 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2209 (cherry picked from commit d4b74c56d6cbb2c6852bf66f2f34b8a877d7a9ef)
2211 commit 50626cec7a55637764ba379d6cb71e0b485290a8
2212 Author: Nathan Cutler <ncutler@suse.com>
2213 Date: Thu Apr 28 19:29:00 2016 +0200
2215 rpm: do a full make check when --with-tests is given
2217 The check-local target tests the CLI tools only.
2219 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2220 (cherry picked from commit e1514809ae3d2df08a0c47882f9b3bd0ed68d200)
2222 commit fb6858c283d96de15c70fbe8ffc33b5dada82739
2223 Author: Nathan Cutler <ncutler@suse.com>
2224 Date: Tue Apr 26 17:03:28 2016 +0200
2226 rpm: drop sysvinit bits from relabel_files function
2228 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2229 (cherry picked from commit 20df58799a4853ed3798501176988ffaf888936b)
2231 commit db4f2d677df5c9fc00592fc9e003bccb44af6da6
2232 Author: Nathan Cutler <ncutler@suse.com>
2233 Date: Sun Oct 11 18:27:45 2015 +0200
2235 rpm: replace literal paths with RPM macros
2237 The only place we should write out literal paths is in the RPM scriptlets,
2238 and there only for things that are not installed by this package.
2240 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2241 (cherry picked from commit e0346b36fc0e6e17c80c047b13997448ccf1c76e)
2243 commit 3abf89517b0b2142698610debbaa3c6b535424f3
2244 Author: Nathan Cutler <ncutler@suse.com>
2245 Date: Sun Oct 11 18:05:12 2015 +0200
2247 rpm: drop udev/95-ceph-osd-alt.rules
2249 This udev rules file was needed on older RHEL platforms, which are
2250 unsupported as of jewel.
2252 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2253 (cherry picked from commit ee4acb31593dd33da99138998fd0f30ebc2f1a6e)
2255 commit a7e01dd4ff08607fc6d99e41189e3db1a3c1d4da
2256 Author: Nathan Cutler <ncutler@suse.com>
2257 Date: Sun Oct 11 17:20:46 2015 +0200
2259 rpm: global replace $RPM_BUILD_ROOT with %{buildroot}
2261 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2262 (cherry picked from commit bed92b6a86cdef784e89c38952fa779ce5fc5a91)
2264 commit d81cec99421e544e2cf7d212680b04d51ef675f3
2265 Author: Nathan Cutler <ncutler@suse.com>
2266 Date: Sun Oct 11 10:37:47 2015 +0200
2268 rpm: put dependencies in alphabetical order
2270 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2271 (cherry picked from commit 66042c03df012754215ed848e475f2195ee988a0)
2273 commit e8338a5844aea6dad8e61f00dbd94ca4e04df7be
2274 Author: Nathan Cutler <ncutler@suse.com>
2275 Date: Sun Oct 11 10:32:46 2015 +0200
2277 rpm: drop sysvinit-specific dependencies
2279 Obsolete in jewel and above.
2281 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2282 (cherry picked from commit c655cb896ad10e001b95848f4a4b64dd1ef6984f)
2284 commit b18d8ac0d65f91929fc956980d3b5977bb2970e6
2285 Author: Nathan Cutler <ncutler@suse.com>
2286 Date: Sun Oct 11 10:32:05 2015 +0200
2288 rpm: move boost-random dependency to appropriate section
2290 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2291 (cherry picked from commit 46b16c19f73d82cc357b16e6201926a3479046f2)
2293 commit 94efaef9c28347baebc374e27d3e81f143e642e0
2294 Author: Nathan Cutler <ncutler@suse.com>
2295 Date: Sat Apr 23 19:57:49 2016 +0200
2297 rpm: move unified python-sphinx build dependency
2299 Now that the python-sphinx build dependency is unified, move it
2300 to the proper section of the spec file.
2302 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2303 (cherry picked from commit 1d897da861c6134778136fa2b8b33e36c08faff9)
2305 commit 54dc8bf5703e2fb8962a97f7737a6114132b9b20
2306 Author: Nathan Cutler <ncutler@suse.com>
2307 Date: Sat Apr 23 19:41:06 2016 +0200
2309 rpm: drop init-ceph.in-fedora.patch
2311 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2312 (cherry picked from commit e8cf501d0f22c757a0860a0c91dcb1d7a472ed34)
2314 commit 641e5bb0808a14d2b59cba141bad4acf5bbfb63a
2315 Author: Nathan Cutler <ncutler@suse.com>
2316 Date: Sun Oct 11 10:22:37 2015 +0200
2318 rpm: drop dead conditionals
2320 This commit drops conditionals that no longer serve any purpose, since
2321 jewel and above do not support the distro versions they are checking for.
2323 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2324 (cherry picked from commit 1332fac70e537014b5e03810aa983e2c9210d8dc)
2326 commit 4317a17997f21019e1dec59606928a2a9f4d94b9
2327 Author: Nathan Cutler <ncutler@suse.com>
2328 Date: Sun Oct 11 10:18:33 2015 +0200
2330 rpm: drop python-argparse dependency
2332 This was only necessary for older (now unsupported) distro versions.
2334 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2335 (cherry picked from commit 6c42066d488d03142a56f92cff99d9c29d106214)
2337 commit 70466ffd386795082f02d718e804ad9e9c494401
2338 Author: Nathan Cutler <ncutler@suse.com>
2339 Date: Sun Oct 11 10:02:40 2015 +0200
2341 rpm: drop _with_systemd
2343 Ceph versions jewel and above only support systemd.
2345 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2346 (cherry picked from commit 2ca6dd250b6a049f27fa17c5e8ca11674acb63f6)
2348 commit 928a8158aa71012db9f451a4302e8661783b5d37
2349 Author: Nathan Cutler <ncutler@suse.com>
2350 Date: Sun Oct 11 09:43:06 2015 +0200
2352 rpm: drop python_sitelib/sitearch conditional
2354 This conditional was required to support older versions of RHEL/CentOS that are
2355 no longer supported in infernalis and above.
2357 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2358 (cherry picked from commit 98d52120f89af3e93896d0518dbea4c4f660af48)
2360 commit 9f76b9ff31525eac01f04450d72559ec99927496
2361 Author: Sage Weil <sage@redhat.com>
2362 Date: Mon Apr 18 09:16:02 2016 -0400
2364 udev: remove 60-ceph-partuuid-workaround-rules
2366 These were added to get /dev/disk/by-partuuid/ symlinks to work on
2367 wheezy. They are no longer needed for the supported distros (el7+,
2368 jessie+, trusty+), and they apparently break dm by opening devices they
2371 Fixes: http://tracker.ceph.com/issues/15516
2372 Signed-off-by: Sage Weil <sage@redhat.com>
2373 (cherry picked from commit 9f77244b8e0782921663e52005b725cca58a8753)
2375 commit 1ad390197af21d8cd7e507e2959f803028d3d09d
2376 Author: Nathan Cutler <ncutler@suse.com>
2377 Date: Wed Apr 20 17:21:56 2016 +0200
2379 rpm: refrain from installing systemd unit files twice
2381 These files are already installed by systemd/Makefile.am
2383 Fixes: http://tracker.ceph.com/issues/15549
2385 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2386 (cherry picked from commit 6d3cbaa509525f1807ac34bf5fed0fe99255f40f)
2388 commit 9c81f25b76ef2211910e453ba2bc4577fc921d7f
2389 Author: Boris Ranto <branto@redhat.com>
2390 Date: Tue Feb 23 05:57:14 2016 +0100
2392 test/ec: build the libs only when 'make check'
2394 Currently, we are always building the erasure code libraries while we
2395 need them only when 'make check' is run. Moving the test libraries to
2396 check_LTLIBRARIES should fix this for us.
2398 We no longer need to remove the libec libs manually, remove the lines
2401 Signed-off-by: Boris Ranto <branto@redhat.com>
2402 (cherry picked from commit 0bbfea5cf13c138bbb2f0993607fa0dbf756281b)
2404 commit 663d7c2901ddf0b6e4184ec344bf0af00582eaf2
2405 Author: xie xingguo <xie.xingguo@zte.com.cn>
2406 Date: Wed May 4 16:53:18 2016 +0800
2408 mon/Monitor: use CEPH_MON_PORT for CRC output
2410 The default monitor port will be changed from 6789 to 3300, which has
2411 been assigned to us by IANA. So update this accordingly for better
2412 tracing and understanding.
2414 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2415 (cherry picked from commit 2b3d5686d76ee65fceca31d0d3343c2eaa4f2364)
2417 commit 64b948c21a4608a7680012e247f23dd2a3393f3f
2418 Author: xie xingguo <xie.xingguo@zte.com.cn>
2419 Date: Wed May 4 15:03:55 2016 +0800
2421 mon/Monitor: fix memory leak
2423 Fixes: http://tracker.ceph.com/issues/15793
2424 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2425 (cherry picked from commit ae5184ac07523a050584a3d621954baeb0dca01a)
2427 commit 9c3c6d57552a0a2cd448f0e60ded2f96ef9802ef
2428 Author: xie xingguo <xie.xingguo@zte.com.cn>
2429 Date: Wed May 4 14:54:32 2016 +0800
2431 mon/Monitor: use VOID_TEMP_FAILURE_RETRY wrapper for fd close().
2433 This is safer and much more robust.
2435 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2436 (cherry picked from commit bfa40363b2d8fc25b4aed0164579d55137ac9e8b)
2438 commit 544c538d3720d7f18fca29ba15fd47200d3e05fc
2439 Author: xie xingguo <xie.xingguo@zte.com.cn>
2440 Date: Wed May 4 10:02:01 2016 +0800
2442 mon/Monitor: add "host" to tracked_conf_key
2444 The get_tracked_conf_keys() method gets the specified keys
2445 registered and works as filters for configuration changing,
2446 so we can track these key configuration changing and react
2449 Right now graylog prints host in its log entry, so
2450 Monitor::update_log_clients() also reads from conf.host
2451 and pass the host read from conf to graylog. That is
2452 why we shall get "host" to the tracked_conf_key too.
2454 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2455 (cherry picked from commit c79fc3305be42bd6126e8a60ae1f220d86754830)
2457 commit e5ebb51f22c43d49d716129ffcb5f87390b7acab
2458 Author: Jason Dillaman <dillaman@redhat.com>
2459 Date: Thu May 19 15:52:16 2016 -0400
2461 journal: replay position might change after pruning stale tags
2463 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2464 (cherry picked from commit 0f5f1c375d8ef7b301cfd20b6848bdc81a761746)
2466 commit 9ecc3dcb76cc8f6d2904118d6b246d77d10cd9cf
2467 Author: Jason Dillaman <dillaman@redhat.com>
2468 Date: Thu May 19 15:50:04 2016 -0400
2470 librbd: delay commit of overwritten journal event
2472 With the cache enabled and write-after-write IOs to the same
2473 object extents, it was possible for the overwritten journal event
2474 to be committed before the overwriter journal event was written
2475 to disk. If a client crash occurs before the event is written,
2476 the image will be inconsistent on replay.
2478 Fixes: http://tracker.ceph.com/issues/15938
2479 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2480 (cherry picked from commit e8bf64cc85ffe3d2dda23eab1834f7a5f104f6fe)
2482 commit 070dc7c98daaacaa05f72f50561d47ce459984da
2483 Author: Jason Dillaman <dillaman@redhat.com>
2484 Date: Thu May 19 14:13:46 2016 -0400
2486 ObjectCacher: pass new journal tid when overwriting extent
2488 librbd needs to ensure the new journal event has been safely
2489 committed to disk before it can mark an overwritten journal
2492 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2493 (cherry picked from commit 0051316effe0b25804378975b117691d7ad08a3b)
2495 commit 0dfc787ef58fe9aa8177742f7c6e294e3b5d4b89
2496 Author: Jason Dillaman <dillaman@redhat.com>
2497 Date: Thu May 19 13:48:22 2016 -0400
2499 qa/workunits/rbd: record rbd CLI debug messages during mirror stress
2501 The debug messages from 'rbd bench-write' and 'rbd snap create',
2502 in addition to the existing debug messages from rbd-mirror, make
2503 it possible to determine the source of any image inconsistency.
2505 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2506 (cherry picked from commit 714ed5e64e65fed9ac886537becf3a85ae6ae7fd)
2508 commit ffd545bf173c5a076c47541cbe3889175188d73e
2509 Author: Yehuda Sadeh <yehuda@redhat.com>
2510 Date: Mon May 16 14:35:12 2016 -0700
2512 rgw: keep track of written_objs correctly
2514 Fixes: http://tracker.ceph.com/issues/15886
2516 Only add a rados object to the written_objs list if the write
2517 was successful. Otherwise if the write will be canceled for some
2518 reason, we'd remove an object that we didn't write to. This was
2519 a problem in a case where there's multiple writes that went to
2520 the same part. The second writer should fail the write, since
2521 we do an exclusive write. However, we added the object's name
2522 to the written_objs list anyway, which was a real problem when
2523 the old processor was disposed (as it was clearing the objects).
2525 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2526 (cherry picked from commit 8fd74d11682f9d0c9085d2dc445fc3eb5631f6e0)
2528 commit 8356021ef3d3d21fd632d3caa660ba9a03cf80d3
2529 Author: Samuel Just <sjust@redhat.com>
2530 Date: Thu May 12 16:57:49 2016 -0700
2532 Pipe: take a ref to existing while we are waiting
2534 Otherwise, if it is reaped while we are waiting, it'll be a
2537 Fixes: http://tracker.ceph.com/issues/15870
2538 Signed-off-by: Samuel Just <sjust@redhat.com>
2539 (cherry picked from commit b224912d249453d754fc0478d3680f8cfa1a5c22)
2541 commit c11db6f103b2dd0049894a606916a84d66933833
2542 Merge: 7834070 e0dfc55
2543 Author: Jason Dillaman <dillaman@redhat.com>
2544 Date: Fri May 20 14:57:00 2016 -0400
2546 Merge pull request #9232 from jdurgin/wip-mirror-workunit-jewel
2548 jewel: qa/workunits/rbd: fixed rbd_mirror teuthology runtime errors
2550 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2552 commit e0dfc55ac874f2531bd0b88aa1c81156d7f7aec9
2553 Author: Jason Dillaman <dillaman@redhat.com>
2554 Date: Wed May 18 14:17:13 2016 -0400
2556 qa/workunits/rbd: fixed rbd_mirror teuthology runtime errors
2558 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2559 (cherry picked from commit 8ef09c4d8d3c7c6fbc9b6f7ef17cca0179e73468)
2561 commit 7834070fd8ead19e49fb8c766ea3ce8bfe63f032
2562 Merge: 9873fc1 5f09b9a
2563 Author: Jason Dillaman <dillaman@redhat.com>
2564 Date: Fri May 20 09:02:51 2016 -0400
2566 Merge pull request #9226 from dillaman/wip-15950
2568 jewel: rbd-mirror: potential crash during image status update
2570 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2572 commit 9873fc13d5647e94ec6f0152f903dd67b2882b0d
2573 Merge: aee6f7e 6c2973c
2574 Author: Jason Dillaman <dillaman@redhat.com>
2575 Date: Fri May 20 09:02:06 2016 -0400
2577 Merge pull request #9069 from dillaman/fixup-mirror_image_status_list-jewel
2579 jewel: cls::rbd: mirror_image_status_list returned max 64 items
2581 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2583 commit 5f09b9aef8f30d9dc7e5ec934b228d885e6456e2
2584 Author: Jason Dillaman <dillaman@redhat.com>
2585 Date: Thu May 19 10:11:12 2016 -0400
2587 journal: reset watch step after pruning expired tag
2589 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2590 (cherry picked from commit 48c2f4e079000021b6ebe807bb1dba0dc1a6a11d)
2592 commit 2ee1e0a583d0ca851db4671b561eff9d493ca7d3
2593 Author: Jason Dillaman <dillaman@redhat.com>
2594 Date: Wed May 18 11:01:22 2016 -0400
2596 rbd-mirror: additional debug messages during image replayer start/stop
2598 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2599 (cherry picked from commit afc891f7fcb000d106b1d722386f6d81ddeddab6)
2601 commit f9e6bd8f1b6750d500fba3dd134257b7baac08c3
2602 Author: Jason Dillaman <dillaman@redhat.com>
2603 Date: Wed May 18 00:55:01 2016 -0400
2605 rbd-mirror: ensure proper handling of status updates during shutdown
2607 Previously, several shutdown race conditions could occur due to the
2608 use of the async work queue for scheduling updates.
2610 Fixes: http://tracker.ceph.com/issues/15909
2611 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2612 (cherry picked from commit 9ae4edc05660665c3a135536a7c51d4070d28a40)
2614 commit f789d83cbb9dbb1a6daa15585e2be2980ea19616
2615 Author: Jason Dillaman <dillaman@redhat.com>
2616 Date: Tue May 17 23:31:02 2016 -0400
2618 rbd-mirror: track bootstrap state within image status
2620 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2621 (cherry picked from commit e5dd97b4bf4a993911febf34dce90470a2a91d59)
2623 commit e0b3879692d38bcc01d928cef09f74bc850cef86
2624 Author: Jason Dillaman <dillaman@redhat.com>
2625 Date: Tue May 17 23:25:25 2016 -0400
2627 rbd-mirror: combine ImageReplayer stopped and uninitialized states
2629 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2630 (cherry picked from commit a8f6dde4dbae8039380f31e026030a22a89fb4bd)
2632 commit 9c7977da45aef44160efadb48cb2d606568d4a7b
2633 Author: Jason Dillaman <dillaman@redhat.com>
2634 Date: Tue May 17 16:14:42 2016 -0400
2636 rbd-mirror: lock ordering issue in status update callback
2638 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2639 (cherry picked from commit 5c04c1361074ca9e9df1bc1c2dd82dfafc2a1304)
2641 commit 66f7f2d7bda7f2db6871870f5622594d6391b921
2642 Author: Mykola Golub <mgolub@mirantis.com>
2643 Date: Wed May 4 15:23:11 2016 +0300
2645 rbd-mirror: don't unregister asok commands if image replayer start failed
2647 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2648 (cherry picked from commit 2fd6fdd3dc9ecb915362f5e3aa8a224210273540)
2650 commit 569f06f1241309a710a0570d4ede950c1dc6e5d1
2651 Author: Mykola Golub <mgolub@mirantis.com>
2652 Date: Wed May 4 15:25:04 2016 +0300
2654 rbd-mirror: avoid potential deadlock
2656 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2657 (cherry picked from commit 46bf727d43af4975beeb514630a99d59cfb0a406)
2659 commit aee6f7ed791abd63ff9d1158a258d51db6c5ad28
2660 Merge: 2d0669e 0d19390
2661 Author: Jason Dillaman <dillaman@redhat.com>
2662 Date: Fri May 20 09:01:50 2016 -0400
2664 Merge pull request #9217 from dillaman/wip-15945
2666 jewel: journal: live replay might skip entries from previous object set
2668 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2670 commit 0d193905b1d552600b542a466759af054c80e498
2671 Author: Jason Dillaman <dillaman@redhat.com>
2672 Date: Mon May 16 21:17:09 2016 -0400
2674 qa/workunits/rbd: rbd-mirror daemon stress test
2676 This test repeatedly runs rbd bench-write, kills the process
2677 randomly to create an unclean journal shutdown, and verifies
2678 that the image content replicates correctly.
2680 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2681 (cherry picked from commit e2ab3128a37f4f36c9a1de6ddf2c0fe2e48aa7e2)
2683 commit d020b6ab1d10daa92fc99d1506222987b4306b26
2684 Author: Jason Dillaman <dillaman@redhat.com>
2685 Date: Mon May 16 18:08:35 2016 -0400
2687 journal: helper method to detect newer tags
2689 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2690 (cherry picked from commit 0a8a6126ea35344e85af7eb64ffc490938edba51)
2692 commit 56515070710a6723ae4adc3e3b166e9ae9a35fdf
2693 Author: Jason Dillaman <dillaman@redhat.com>
2694 Date: Sun May 15 09:52:41 2016 -0400
2696 journal: skip partially complete tag entries during playback
2698 If a journal client does not fully write out its buffered entries
2699 before quiting, replay should skip over all remaining out-of-
2700 sequence entries for the tag.
2702 Fixes: http://tracker.ceph.com/issues/15864
2703 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2704 (cherry picked from commit 9454f7e4c62437b1c288f371009feba1fd374584)
2706 commit 18f663d834edd03b42e2c08b9428e72fdc6bae9d
2707 Author: Jason Dillaman <dillaman@redhat.com>
2708 Date: Sat May 14 18:58:41 2016 -0400
2710 journal: close, advance, and open object set ordering
2712 Flush in-flight appends to open objects before advancing the
2713 active object set. Additionally, don't start recording to the
2714 new objects until after advancing the active set.
2716 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2717 (cherry picked from commit de830057d0f7286914e019540c6263423cb60428)
2719 commit 27fba6ad7e7cb566d32c6e63f35aff966fc60bd7
2720 Author: Jason Dillaman <dillaman@redhat.com>
2721 Date: Sat May 14 18:13:38 2016 -0400
2723 journal: new ObjectRecorder closed callback
2725 The callback will be invoked if there were in-flight appends
2726 when the close was requested.
2728 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2729 (cherry picked from commit bba91437dbe3b7a9b6da8a61ccc4c597858c8efc)
2731 commit 870c21c738e42d2cf34478bfa0631d602175dadc
2732 Author: Jason Dillaman <dillaman@redhat.com>
2733 Date: Fri May 13 16:34:44 2016 -0400
2735 journal: do not flag append as full if already known to be full
2737 Once an object has overflowed or a close is in-progress, re-attempting
2738 to close the object is not needed since the async process is already
2741 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2742 (cherry picked from commit 45620dc312ca2aeaf084638144aaa4783b622c4a)
2744 commit 1cdebc7b896dd36bfee30f12aa3abd602c15af3e
2745 Author: Jason Dillaman <dillaman@redhat.com>
2746 Date: Fri May 13 16:28:50 2016 -0400
2748 journal: delay object overflow event until in-flight appends settled
2750 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2751 (cherry picked from commit ee8d311a1fcdf7a85cdc168e1740fbaa252e87d3)
2753 commit 821d92af2fcc43ff560f01c78ff699ad7df33daa
2754 Author: Jason Dillaman <dillaman@redhat.com>
2755 Date: Fri May 13 16:17:37 2016 -0400
2757 journal: ignore flush on closed/overflowed object
2759 The journal would be in-progress on transitioning to a new
2760 object recorder in a newer object set. Once the records
2761 re-attach to the new object player they will automatically
2764 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2765 (cherry picked from commit a13cb821f71b6b1b3378464bcc2d8318eb0da48a)
2767 commit 3d860d5db37f77c1e8c76d214529266062caaa75
2768 Author: Jason Dillaman <dillaman@redhat.com>
2769 Date: Fri May 13 16:10:11 2016 -0400
2771 journal: implicitly detach future's flush handler on append
2773 If the future is already in-flight, there is no purpose served
2774 by requesting the future be flushed to disk.
2776 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2777 (cherry picked from commit 1cb9b1a1b25d0f4c2d9a9e22661636e195fc70a0)
2779 commit f98e1289ce10aeb059a0b7d7cc8d17d6f1d60219
2780 Author: Jason Dillaman <dillaman@redhat.com>
2781 Date: Fri May 13 15:22:30 2016 -0400
2783 journal: async callback for advancing the active object set
2785 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2786 (cherry picked from commit ca89abfd9e6f0e8edc3234afea387757ef694826)
2788 commit 86e51ebcb301d823fb5c8b30bdc07107704679b4
2789 Author: Jason Dillaman <dillaman@redhat.com>
2790 Date: Fri May 13 14:49:07 2016 -0400
2792 journal: re-fetch active object before advancing set during replay
2794 During a live replay, it's possible that an append and and overflow
2795 into the next object could race with the live playback of the same
2796 object. Re-fetch an "empty" object at least once before advancing
2797 to next set to ensure all records have been read.
2799 Fixes: http://tracker.ceph.com/issues/15665
2800 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2801 (cherry picked from commit 6056f8c45c99bd37cb18933a37cc238c7e9a7c7d)
2803 commit 2d0669e172c37d38f118332574a474a534d27020
2804 Merge: f3979cd e885f1e
2805 Author: Yehuda Sadeh <yehuda@redhat.com>
2806 Date: Thu May 19 13:08:00 2016 -0700
2808 Merge pull request #9210 from yehudasa/wip-15926-jewel
2810 radosgw-admin: fix 'period push' handling of --url
2812 commit e885f1e3be0f9a0c6457c5387f1c38b6e8b6a492
2813 Author: Casey Bodley <cbodley@redhat.com>
2814 Date: Mon May 16 09:37:05 2016 -0400
2816 radosgw-admin: fix 'period push' handling of --url
2818 was calling send_to_remote_gateway(), but passing 'url' instead of
2819 'remote'. now uses send_to_remote_or_url() to accept either
2821 Fixes: http://tracker.ceph.com/issues/15926
2823 Signed-off-by: Casey Bodley <cbodley@redhat.com>
2825 commit f3979cd1d2fe910185db6dc3894722dd385379bd
2826 Merge: 1356d29 37ecfa6
2827 Author: Boris Ranto <branto@redhat.com>
2828 Date: Thu May 19 12:56:15 2016 +0200
2830 Merge pull request #9194 from ceph/wip-jewel-no-lttng-global-link
2832 Do not link lttng into libglobal
2834 Reviewed-by: Boris Ranto <branto@redhat.com>
2836 commit 37ecfa6c754683cac1c6f4c66a1a491d2fd5db1d
2837 Author: Karol Mroz <kmroz@suse.com>
2838 Date: Mon May 2 14:01:27 2016 +0200
2840 global: don't link lttng into libglobal
2842 Rely on dynamic initialization instead. Linking lttng in this way had
2843 the unfortunate side effect of causing radosgw to segfault (when
2844 daemonized) during sigterm processing (ie. during lttng_ust_exit()).
2846 This was originally removed in 638738f, but accidentally re-added via
2849 Signed-off-by: Karol Mroz <kmroz@suse.com>
2851 commit 1356d29c70afedcbd55599d29aab93d2f79a02ad
2852 Merge: 15c4ad4 16ba13c
2853 Author: Jason Dillaman <dillaman@redhat.com>
2854 Date: Wed May 18 13:23:39 2016 -0400
2856 Merge pull request #9180 from dillaman/wip-15746-jewel
2858 jewel: doc: update mirroring guide to include pool/image status commands
2860 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2862 commit 16ba13c83d678656723173c061318dd83805768a
2863 Author: Mykola Golub <mgolub@mirantis.com>
2864 Date: Thu May 12 11:15:34 2016 +0300
2866 doc: update mirroring guide to include pool/image status commands
2868 Fixes: http://tracker.ceph.com/issues/15746
2869 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2870 (cherry picked from commit 4381e341c435c80793b847115eed616b8359c4e6)
2872 commit 818166e25d2ccac5d9bb3541f6166fcb8c25fd64
2873 Author: Mykola Golub <mgolub@mirantis.com>
2874 Date: Thu May 12 11:11:55 2016 +0300
2876 doc: fixup: "rbd-mirror daemon" instead of "rbd-daemon"
2878 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2879 (cherry picked from commit ddd6345f8f7edcff638ed435aef316ba3e0e40dd)
2881 commit 15c4ad44010c798af7804e287ba71dcc289f806f
2882 Merge: 3a66dd4 7be281d
2883 Author: Sage Weil <sage@redhat.com>
2884 Date: Wed May 18 05:11:55 2016 -0400
2886 Merge pull request #8815 from ktdreyer/wip-15646-jewel-system-targets
2888 jewel: debian: install systemd target files
2890 Reviewed-by: Kefu Chai <kchai@redhat.com>
2892 commit 7be281dab96c15b53fcfc3c2ffe6d17aec84b315
2893 Author: Sage Weil <sage@redhat.com>
2894 Date: Thu Apr 28 09:13:50 2016 -0400
2896 debian/control: dh_systemd_start is in the dh-systemd package
2898 Fixes: http://tracker.ceph.com/issues/15573
2899 Signed-off-by: Sage Weil <sage@redhat.com>
2900 (cherry picked from commit 89154d1e01dbc58dc92f37741031f7ddb0448d2e)
2902 commit e463aa8b92dabdc7c13e150585eb09790da638ba
2903 Author: Kefu Chai <kchai@redhat.com>
2904 Date: Fri Apr 22 21:07:58 2016 +0800
2906 debian: install systemd target files
2908 * enable it using dh_systemd_enable
2909 * start the target using dh_systemd_start
2910 * move the dh_installinit, dh_systemd_enable, dh_systemd_start calls
2911 down, so they can identify the service files if they care about them.
2913 Fixes: http://tracker.ceph.com/issues/15573
2914 Signed-off-by: Kefu Chai <kchai@redhat.com>
2915 (cherry picked from commit f950a0a7f5b35e13668379bc69dcb5d98a2dfc1f)
2917 commit 72c9b6f70752faf779b9272724f428e68d6499bb
2918 Author: Kefu Chai <kchai@redhat.com>
2919 Date: Mon May 9 14:15:36 2016 +0800
2921 osd: remove all stale osdmaps in handle_osd_map()
2923 in a large cluster, there are better chances that the OSD fails to trim
2924 the cached osdmap in a timely manner. and sometimes, it is just unable
2925 to keep up with the incoming osdmap if skip_maps, so the osdmap cache
2926 can keep building up to over 250GB in size. in this change
2928 * publish_superblock() before trimming the osdmaps, so other osdmap
2929 consumers of OSDService.superblock won't access the osdmaps being
2931 * trim all stale osdmaps in batch of conf->osd_target_transaction_size
2932 if skip_maps is true. in my test, it happens when the osd only
2933 receives the osdmap from monitor occasionally because the osd happens
2934 to be chosen when monitor wants to share a new osdmap with a random
2936 * always use dedicated transaction(s) for trimming osdmaps. so even in
2937 the normal case where we are able to trim all stale osdmaps in a
2938 single batch, a separated transaction is used. we can piggy back
2939 the commits for removing maps, but we keep it this way for simplicity.
2940 * use std::min() instead MIN() for type safety
2942 Fixes: http://tracker.ceph.com/issues/13990
2943 Signed-off-by: Kefu Chai <kchai@redhat.com>
2944 (cherry picked from commit 369db9930887d75b498927da9c97733bff4472b6)
2946 commit 6c2973cd08503a3d91eeb881732c79213e42599f
2947 Author: Mykola Golub <mgolub@mirantis.com>
2948 Date: Wed May 11 14:14:46 2016 +0300
2950 cls::rbd: mirror_image_status_list returned max 64 items
2952 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2953 (cherry picked from commit e925ce86243c91e6d64ff8d7b45166e4e3f2650b)
2955 commit 36743419ba49df4f97cdbe9ac25d9b08b0685108
2956 Author: Sage Weil <sage@redhat.com>
2957 Date: Fri Apr 29 15:24:09 2016 -0400
2959 osd/PG: update info.stats.* mappings on split
2961 These are updated in the init and start_peering_interval paths, but not
2964 Fixes: http://tracker.ceph.com/issues/15523
2965 Signed-off-by: Sage Weil <sage@redhat.com>
2966 (cherry picked from commit 8b42294d98dd70715184991da5ba495fbe93d009)
2968 commit b443fdf9402df621400ab7ca66799f597e8b2c23
2969 Author: Nathan Cutler <ncutler@suse.com>
2970 Date: Sat Apr 23 11:42:25 2016 +0200
2972 ceph.spec.in: recommend ntp-daemon on SUSE
2974 SUSE has settled on "ntp-daemon" as the generic package name. The "ntp" and
2975 "chrony" etc. packages have "Provides: ntp-daemon" in their respective spec
2978 References: http://tracker.ceph.com/issues/15419
2979 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2980 (cherry picked from commit 23108547454f53b95e193086d82d433570312ad4)
2982 commit 299f84ccdbf4d91412e216042fb248fd802af89d
2983 Author: Nathan Cutler <ncutler@suse.com>
2984 Date: Thu Apr 7 20:54:21 2016 +0200
2986 deb: make ceph-base and radosgw recommend time-daemon
2988 References: http://tracker.ceph.com/issues/15419
2990 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2991 (cherry picked from commit f27cda03b7a961e445cce4ad35db6417e9e55959)
2993 commit 2da7cb2c7daad3ce2f9d2614e019291f75d4737d
2994 Author: Nathan Cutler <ncutler@suse.com>
2995 Date: Thu Apr 7 20:17:44 2016 +0200
2997 systemd: make Ceph daemon units "want" time-sync.target
2999 Fixes: http://tracker.ceph.com/issues/15419
3001 Signed-off-by: Nathan Cutler <ncutler@suse.com>
3002 (cherry picked from commit df893f395e62c8b1db18a277b38b44cab8b2016f)