1 commit b1e0532418e4631af01acbc0cedd426f1905f4af
2 Author: Jenkins Build Slave User <ceph-release-team@redhat.com>
3 Date: Tue Feb 21 15:12:34 2017 +0000
7 commit 83af8cdaaa6d94404e6146b68e532a784e3cc99c
9 Author: Nathan Cutler <presnypreklad@gmail.com>
10 Date: Mon Jan 23 17:49:54 2017 +0100
12 Merge pull request #13041 from SUSE/wip-18448-hammer
14 hammer: osd: filestore: FALLOC_FL_PUNCH_HOLE must be used with FALLOC_FL_KEEP_SIZE
16 Reviewed-by: Sage Weil <sage@redhat.com>
18 commit 585508358f6412b179175a7812b76330ec5dda0d
19 Merge: 4e4d3f0 eabe906
20 Author: John Spray <jspray@redhat.com>
21 Date: Mon Jan 23 12:26:27 2017 +0100
23 Merge pull request #13022 from SUSE/wip-18602-hammer
25 hammer: cephfs test failures (ceph.com/qa is broken, should be download.ceph.com/qa)
27 Reviewed-by: John Spray <john.spray@redhat.com>
29 commit 4e4d3f0fd86840609940f6b336f6aaf54a8695bc
30 Merge: 9036fee cf9678c
31 Author: John Spray <jspray@redhat.com>
32 Date: Mon Jan 23 12:25:43 2017 +0100
34 Merge pull request #13039 from SUSE/wip-fs-thrash-xfs
36 tests: run fs/thrash on xfs instead of btrfs
38 Reviewed-by: John Spray <john.spray@redhat.com>
40 commit eabe9064aed3693599e3b6053b57eafb835d35da
41 Author: John Spray <john.spray@redhat.com>
42 Date: Tue Jan 17 17:12:46 2017 +0100
44 qa: update remaining ceph.com to download.ceph.com
46 Fixes: http://tracker.ceph.com/issues/18574
47 Signed-off-by: John Spray <john.spray@redhat.com>
48 (cherry picked from commit 549d993d3fd8ffffa280ed4a64aca41d1c6f2da1)
50 commit 5485b49da39b9f07a4216ff26f8ec9e04590ddf8
51 Author: Nathan Cutler <ncutler@suse.com>
52 Date: Sat Jan 21 14:54:52 2017 +0100
54 os/filestore: FALLOC_FL_PUNCH_HOLE must be used with FALLOC_FL_KEEP_SIZE
56 Signed-off-by: xinxin shu <xinxin.shu@intel.com>
57 (cherry picked from commit 7bd95b595fddb8a4e618a2c7df1ba04eccf0829d)
60 src/os/FileStore.cc (in master, this file is in a different location)
62 commit cf9678c998600e76e94777b2904ba3047d051bb8
63 Author: Nathan Cutler <ncutler@suse.com>
64 Date: Sat Jan 21 14:24:25 2017 +0100
66 tests: run fs/thrash on xfs instead of btrfs
68 Signed-off-by: Nathan Cutler <ncutler@suse.com>
70 commit 9036feed9bd9f386dc013dee8326071ef0b4cbee
71 Merge: 33c7ab7 fa5c625
72 Author: Nathan Cutler <presnypreklad@gmail.com>
73 Date: Sat Jan 21 10:00:04 2017 +0100
75 Merge pull request #12824 from SUSE/wip-18449-hammer
77 hammer: [teuthology] update rbd/singleton/all/formatted-output.yaml to support ceph-ci
79 commit 33c7ab7480aa8d0ee80d6a47f91f4488515e07f8
80 Merge: ef8ae1f ef513a7
81 Author: Nathan Cutler <presnypreklad@gmail.com>
82 Date: Fri Jan 20 23:10:10 2017 +0100
84 Merge pull request #12906 from SUSE/wip-15943-hammer
86 hammer: osd/PG: fix cached_removed_snaps bug in PGPool::update after map gap
88 Reviewed-by: Samuel Just <sjust@redhat.com>
90 commit ef8ae1ff13b297c68ed4f1d0e01aba8d20dc5007
91 Merge: c51602f 8bab745
92 Author: Nathan Cutler <presnypreklad@gmail.com>
93 Date: Fri Jan 20 23:02:05 2017 +0100
95 Merge pull request #12805 from SUSE/wip-18432-hammer
97 hammer: ceph-create-keys loops forever
99 Reviewed-by: Nathan Cutler <ncutler@suse.com>
101 commit c51602f0106e3681c143a2cfd94a08428e966caf
102 Merge: 48687c7 83e7f17
103 Author: Jason Dillaman <dillaman@redhat.com>
104 Date: Tue Jan 17 08:39:14 2017 -0500
106 Merge pull request #12957 from SUSE/wip-18544-hammer
108 hammer: [teuthology] update Ubuntu image url after ceph.com refactor
110 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
112 commit 83e7f178c9a0b70305644ca30598c1b1ff4d0474
113 Author: Jason Dillaman <dillaman@redhat.com>
114 Date: Mon Jan 16 22:12:51 2017 -0500
116 qa/tasks/qemu: update default image url after ceph.com redesign
118 Fixes: http://tracker.ceph.com/issues/18542
119 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
120 (cherry picked from commit 6d17befb3bbc3d83c9d23d763ad95e1e7b2e4be0)
122 commit ef513a78062569de081311b50fffdf59d4031ea7
123 Author: Samuel Just <sjust@redhat.com>
124 Date: Mon Dec 12 10:35:38 2016 -0800
126 PG: fix cached_removed_snaps bug in PGPool::update after map gap
128 5798fb3bf6d726d14a9c5cb99dc5902eba5b878a actually made 15943 worse
129 by always creating an out-of-date cached_removed_snaps value after
130 a map gap rather than only in the case where the the first map after
131 the gap did not remove any snapshots.
133 Introduced: 5798fb3bf6d726d14a9c5cb99dc5902eba5b878a
134 Fixes: http://tracker.ceph.com/issues/15943
135 Signed-off-by: Samuel Just <sjust@redhat.com>
136 (cherry picked from commit 5642e7e1b3bb6ffceddacd2f4030eb13a17fcccc)
138 commit fa5c6250125a51e61e34aa9586cc917df7458138
139 Author: Nathan Cutler <ncutler@suse.com>
140 Date: Sat Jan 7 13:48:51 2017 +0100
142 tests: subst repo and branch in qemu test urls
144 References: http://tracker.ceph.com/issues/18440
145 Signed-off-by: Nathan Cutler <ncutler@suse.com>
146 (cherry picked from commit 2484a5546160560a4050d35400a6edce37ae48ad)
148 Conflicts: (hammer doesn't have these files)
149 qa/suites/rbd/maintenance/qemu/xfstests.yaml
150 qa/suites/rbd/qemu/workloads/#qemu_xfstests.yaml#
152 commit 572cd2660f5bf1cc7f980831d12bb3075816b96f
153 Author: Nathan Cutler <ncutler@suse.com>
154 Date: Sat Jan 7 13:45:10 2017 +0100
156 tests: subst branch and repo in qa/tasks/qemu.py
158 References: http://tracker.ceph.com/issues/18440
159 Signed-off-by: Nathan Cutler <ncutler@suse.com>
160 (cherry picked from commit 74689df754561e11a3377998840efcea9e780755)
162 commit 237fb80f2b2874329aed25ba655a6789e1707114
163 Author: Nathan Cutler <ncutler@suse.com>
164 Date: Fri Jan 6 21:06:11 2017 +0100
166 tests: subst repo name in qa/tasks/cram.py
168 Inspired by bcbe45d948f1c4da02e27b3be5f29a8b52745e28
170 Fixes: http://tracker.ceph.com/issues/18440
171 Signed-off-by: Nathan Cutler <ncutler@suse.com>
172 (cherry picked from commit 56e37e41f4dddd289dd3c1886b192cd328ed311b)
174 commit 6045a83a438918f445504224b80809dfe715c9b0
175 Author: Venky Shankar <vshankar@redhat.com>
176 Date: Fri Dec 9 15:11:49 2016 +0530
178 cram: support fetching from sha1 branch, tag, commit hash
180 Signed-off-by: Venky Shankar <vshankar@redhat.com>
181 (cherry picked from commit d2f0d745987a2e2eee4e1822146aad8da5d42708)
184 suites/krbd/unmap/tasks/unmap.yaml (hammer doesn't have this)
185 suites/rbd/singleton/all/formatted-output.yaml (moved to qa/,
188 commit 48687c79adf489b27af15bb44205913acc89af7a
189 Merge: 61917cb ac62d79
190 Author: Orit Wasserman <owasserm@redhat.com>
191 Date: Sun Jan 8 09:26:03 2017 +0200
193 Merge pull request #12227 from ceph/wip-orit-resharding-hammer
195 Wip orit resharding hammer
196 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
198 commit 8bab74537f5891f2b97f0fb6722e2e00416b723a
199 Author: Alfredo Deza <adeza@redhat.com>
200 Date: Wed Nov 2 12:28:49 2016 -0400
202 ceph-create-keys: wait 10 minutes to get or create the bootstrap key, not forever
204 Signed-off-by: Alfredo Deza <adeza@redhat.com>
205 (cherry picked from commit bea802bd13df883d06b7b67a83ac6540e44ab6c1)
207 commit a7d919100e9e78b7f821da76b338bca24f374a0a
208 Author: Alfredo Deza <adeza@redhat.com>
209 Date: Wed Nov 2 12:25:32 2016 -0400
211 ceph-create-keys: wait 10 minutes to get or create a key, not forever
213 Signed-off-by: Alfredo Deza <adeza@redhat.com>
214 (cherry picked from commit 8f84681a4d97a7ea6bc04e759eccfc40204a2fdb)
217 src/ceph-create-keys ( hammer does not have
218 52e978e4b3660baa9f50b1bb8247909b672142e7 )
220 commit 7b3bc5fbc55da3cb2ce036ef3df367832d7a59e2
221 Author: Alfredo Deza <adeza@redhat.com>
222 Date: Wed Nov 2 12:19:10 2016 -0400
224 ceph-create-keys: wait for quorum for ten minutes, not forever
226 Signed-off-by: Alfredo Deza <adeza@redhat.com>
227 (cherry picked from commit 32cedd2c18e48d5f9a1547e5fd69c24c7eac1638)
229 commit 61917cbcb7a4e35aa0ae8718377526ae55b5b7cf
230 Merge: 7b1f8fe 7106f42
231 Author: Samuel Just <sjust@redhat.com>
232 Date: Thu Jan 5 09:15:13 2017 -0800
234 Merge pull request #11615 from mslovy/wip-17610-hammer
236 hammer: osd: fix fiemap issue in xfs when #extents > 1364
238 Reviewed-by: Samuel Just <sjust@redhat.com>
240 commit 7b1f8fe4c97b6c8ef81d899f0a24235946cc585a
241 Merge: 5ba3c08 5f00e1d
242 Author: Samuel Just <sjust@redhat.com>
243 Date: Thu Jan 5 09:14:10 2017 -0800
245 Merge pull request #11936 from SUSE/wip-16432-hammer
247 hammer: librados: bad flags can crash the osd
249 Reviewed-by: Samuel Just <sjust@redhat.com>
251 commit 5ba3c0873d10b247a45bfbc1cb483cfc2189a9fd
252 Merge: b44e1db 8312dc6
253 Author: Samuel Just <sjust@redhat.com>
254 Date: Thu Jan 5 09:12:55 2017 -0800
256 Merge pull request #12121 from dzafman/wip-16225-min
258 hammer: common: SIGABRT in TrackedOp::dump() via dump_ops_in_flight()
260 Reviewed-by: Samuel Just <sjust@redhat.com>
262 commit b44e1db11b0d7310f2563fa7acfb1464db4b04fb
263 Merge: 7bfb05b 92de2fd
264 Author: Samuel Just <sjust@redhat.com>
265 Date: Thu Jan 5 09:11:57 2017 -0800
267 Merge pull request #12266 from SUSE/wip-18109-hammer
269 hammer: msgr: simple/Pipe: error decoding addr
271 Reviewed-by: Samuel Just <sjust@redhat.com>
273 commit 7bfb05b00157fa40c053eeefb59cd3bb211fc2b3
274 Merge: 715012b fe77c9a
275 Author: Samuel Just <sjust@redhat.com>
276 Date: Thu Jan 5 09:11:34 2017 -0800
278 Merge pull request #12417 from SUSE/wip-18132-hammer
280 hammer: osd: ReplicatedBackend::build_push_op: add a second config to limit omap entries/chunk independently of object data
282 Reviewed-by: Samuel Just <sjust@redhat.com>
284 commit 715012bebe6e7838c702aae0283f1c3d37428762
285 Merge: a20ad42 e9311dd
286 Author: Samuel Just <sjust@redhat.com>
287 Date: Thu Jan 5 09:11:13 2017 -0800
289 Merge pull request #12759 from SUSE/wip-18399-hammer
291 hammer: tests: objecter_requests workunit fails on wip branches
293 Reviewed-by: Samuel Just <sjust@redhat.com>
295 commit a20ad42ecab39541107e01ac4516a0a71e379846
296 Merge: 3e62a1d 67e2101
297 Author: Samuel Just <sjust@redhat.com>
298 Date: Thu Jan 5 09:10:54 2017 -0800
300 Merge pull request #12762 from SUSE/wip-18405-hammer
302 hammer: Cannot reserve CentOS 7.2 smithi machines
304 Reviewed-by: Samuel Just <sjust@redhat.com>
306 commit 3e62a1d5dbd2ee6672388121be26afd5d0374f5f
307 Merge: 77fa49f aa91bc7
308 Author: Samuel Just <sjust@redhat.com>
309 Date: Thu Jan 5 09:10:28 2017 -0800
311 Merge pull request #12685 from SUSE/wip-18273-hammer
313 hammer: tests: Workunits needlessly wget from git.ceph.com
315 Reviewed-by: Samuel Just <sjust@redhat.com>
317 commit 77fa49f67d1c8c59d9131e6f52e595661ceda8f2
318 Merge: 2c164b7 c28d5ea
319 Author: Samuel Just <sjust@redhat.com>
320 Date: Thu Jan 5 09:09:59 2017 -0800
322 Merge pull request #12687 from SUSE/wip-18281-hammer
324 hammer: mon: osd flag health message is misleading
326 Reviewed-by: Kefu Chai <kchai@redhat.com>
328 commit 2c164b73af9de4196821d9214fb7598ac88ef509
329 Merge: dfefeda 996fc25
330 Author: Nathan Cutler <presnypreklad@gmail.com>
331 Date: Thu Jan 5 15:20:28 2017 +0100
333 Merge pull request #12423 from SUSE/wip-18222-hammer
335 hammer: tests: qemu/tests/qemu-iotests/077 fails in dumpling, hammer, and jewel
337 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
339 commit dfefeda86e3e6761bc4a59cee960d807609344e4
340 Merge: b0648f8 0c5ebf4
341 Author: Nathan Cutler <presnypreklad@gmail.com>
342 Date: Wed Jan 4 20:15:21 2017 +0100
344 Merge pull request #12744 from SUSE/wip-18385-hammer
346 hammer: tests: Cannot clone ceph/s3-tests.git (missing branch)
348 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
350 commit b0648f85ee67da82ac8fb7e8f4c1546aa560bfda
351 Merge: c45896a e97ceb1
352 Author: Nathan Cutler <presnypreklad@gmail.com>
353 Date: Wed Jan 4 11:43:29 2017 +0100
355 Merge pull request #12418 from SUSE/wip-18218-hammer
357 hammer: rgw sends omap_getvals with (u64)-1 limit
359 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
361 commit c45896a86810f02b86b3c355855eb70a998a3c9a
362 Merge: 811213e db2d112
363 Author: Nathan Cutler <presnypreklad@gmail.com>
364 Date: Wed Jan 4 11:37:29 2017 +0100
366 Merge pull request #12619 from Werkov/wip-18317-hammer
368 hammer: rgw: TempURL in radosgw behaves now like its Swift's counterpart.
370 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
372 commit db2d112f22a525bfffb62e85747769a4b30f7375
373 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
374 Date: Fri Mar 4 16:30:50 2016 +0100
376 rgw: TempURL in radosgw behaves now like its Swift's counterpart.
378 Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
379 (cherry picked from commit a1ea7180969dcbaf88dfcc1bfafb17e82639df64)
383 - replace C++11 constructs,
384 - s->info.method is actually unconditional member of
385 allowed_methods, which was opaqued by C++11 ctors
386 - drop temp_url_make_content_disp() which has no use with
389 commit 811213ef9df188c8cf21dec5aeab08093af483d7
390 Merge: 9a8aaca 47e7202
391 Author: Nathan Cutler <presnypreklad@gmail.com>
392 Date: Tue Jan 3 15:31:27 2017 +0100
394 Merge pull request #12312 from YankunLi/fix_parameter_check
396 hammer: rbd: fix parameter check
398 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
400 commit 9a8aaca56e48aae78dff27a969e2398c332f2b09
401 Merge: 78e3451 c4f1b42
402 Author: Nathan Cutler <presnypreklad@gmail.com>
403 Date: Tue Jan 3 15:31:03 2017 +0100
405 Merge pull request #12446 from dillaman/wip-18111
407 hammer: librbd: diffs to clone's first snapshot should include parent diffs
409 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
411 commit 78e34519f9e3c72aa91587593dcb23dac4ade3a3
412 Merge: a9de35a 0f83bb7
413 Author: Nathan Cutler <presnypreklad@gmail.com>
414 Date: Tue Jan 3 15:23:07 2017 +0100
416 Merge pull request #12398 from linuxbox2/hammer
418 hammer: rgw: do not abort when accept a CORS request with short origin
420 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
422 commit a9de35a27cb7d57f8094de78f550291b1b45b944
423 Merge: 3ef8d8c a602e2b
424 Author: Jason Dillaman <dillaman@redhat.com>
425 Date: Tue Jan 3 09:17:35 2017 -0500
427 Merge pull request #12758 from SUSE/wip-18397-hammer
429 hammer: tests: OSDs commit suicide in rbd suite when testing on btrfs
431 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
433 commit 67e2101ffa2b4defe07dec30b12cc37c9f2ed488
434 Author: Nathan Cutler <ncutler@suse.com>
435 Date: Tue Jan 3 14:53:27 2017 +0100
437 qa/distros: add centos yaml; use that instead
439 Modeled after https://github.com/ceph/ceph/pull/12632
441 Fixes: http://tracker.ceph.com/issues/18405
442 Signed-off-by: Nathan Cutler <ncutler@suse.com>
444 commit e9311ddb60638c1dd39325e279b97c9a7d09b8a4
445 Author: Sage Weil <sage@redhat.com>
446 Date: Thu Dec 15 13:35:02 2016 -0500
448 qa/tasks/admin_socket: subst in repo name
450 It is either ceph.git or ceph-ci.git.
452 Signed-off-by: Sage Weil <sage@redhat.com>
453 (cherry picked from commit bcbe45d948f1c4da02e27b3be5f29a8b52745e28)
455 commit a602e2bf2e1cae8d21ae215c35a611cc99b6c7c9
456 Author: Nathan Cutler <ncutler@suse.com>
457 Date: Tue Jan 3 11:26:26 2017 +0100
459 rbd: only test on xfs
461 btrfs is not recommended for production
463 See 5864d56592ef3ffe765aa1ef0865610dbc7e8725 for precendent.
465 Signed-off-by: Nathan Cutler <ncutler@suse.com>
467 commit aa91bc7df963728e6a4d4db1086214e7873fc2e7
468 Author: Nathan Cutler <ncutler@suse.com>
469 Date: Mon Jan 2 22:49:13 2017 +0100
471 tests: rbd/test_lock_fence.sh: fix rbdrw.py relative path
473 This commit fixes a regression introduced by
474 cf294777ea92f0911813a7132068584d4f73a65a
476 Fixes: http://tracker.ceph.com/issues/18388
477 Signed-off-by: Nathan Cutler <ncutler@suse.com>
478 (cherry picked from commit 91231de16dbe4d0e493ec617165a2b38078d122b)
480 commit 0c5ebf4adf26274802ec4cff229b2272dc4a4266
481 Author: Orit Wasserman <owasserm@redhat.com>
482 Date: Mon Jan 4 10:03:08 2016 +0100
484 use ceph-master branch for s3tests
486 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
487 (cherry picked from commit 21160124028ab123b5c547499d911b0a1397214f)
489 Conflicts: (trivial resolution)
490 qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
491 qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
492 qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml
494 commit 3ef8d8c6f0ef712dcff207fb6ef17887bd8719d7
495 Merge: e038662 d18240f
496 Author: Nathan Cutler <presnypreklad@gmail.com>
497 Date: Mon Jan 2 20:34:42 2017 +0100
499 Merge pull request #12743 from SUSE/wip-18383
501 hammer: tests: populate mnt_point in qa/tasks/ceph.py
503 Reviewed-by: Loic Dachary <ldachary@redhat.com>
505 commit d18240f679840bdaeec1e3f7cdd9164b4406673c
506 Author: Nathan Cutler <ncutler@suse.com>
507 Date: Mon Jan 2 14:22:43 2017 +0100
509 qa/tasks/ceph.py: populate mnt_point in hammer
511 In hammer, there is no "mnt_point" variable, yet 53225d5 was cherry-picked to
512 hammer - see 87e0299448908775600c62130617bad503027768 and https://github.com/ceph/ceph/pull/12455
514 This caused lots of "NameError: global name 'mnt_point' is not defined" errors
515 in hammer integration testing.
517 This is not a cherry-pick, because the mnt_point variable was introduced by
518 a54ff597faa379c8fd369352fb924651be269f95 ("tasks/ceph: convert cluster creation
519 to work with multiple clusters") which was not backported to hammer.
521 Fixes: http://tracker.ceph.com/issues/18383
522 Signed-off-by: Nathan Cutler <ncutler@suse.com>
524 commit ac62d7996b95d8fdd5665e490fc09506c8fe9e68
525 Author: weiqiaomiao <wei.qiaomiao@zte.com.cn>
526 Date: Mon Oct 31 13:59:55 2016 +0800
528 rgw: fix osd crashes when execute "radosgw-admin bi list --max-entries=1" command
530 Fixes: http://tracker.ceph.com/issues/17745
531 Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
532 (cherry picked from commit 51a4405a1ef59671cbd51c530a84333359d3f3dd)
534 commit 530d1e22920bd843d34ceffccad346fd5003c075
535 Author: Orit Wasserman <owasserm@redhat.com>
536 Date: Tue Nov 29 13:36:37 2016 +0100
538 rgw: use hammer rgw_obj_key api
540 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
542 commit e396b37af147770434147c5bd0377e8624254cd9
543 Author: Orit Wasserman <owasserm@redhat.com>
544 Date: Tue Nov 29 13:15:05 2016 +0100
546 Revert "rgw: rgw_obj encoding fixes"
548 This reverts commit c1b64c8f9c23473b758300958a94a172f1d39b64.
549 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
551 commit a3e9865058e12fff18ee7674fcfd8435a1a37bf4
552 Author: Sage Weil <sage@redhat.com>
553 Date: Thu Dec 22 13:05:22 2016 -0500
555 qa/tasks/workunit: clear clone dir before retrying checkout
557 If we checkout ceph-ci.git, and don't find a branch,
558 we'll try again from ceph.git. But the checkout will
559 already exist and the clone will fail, so we'll still
560 fail to find the branch.
562 The same can happen if a previous workunit task already
563 checked out the repo.
565 Fix by removing the repo before checkout (the first and
566 second times). Note that this may break if there are
567 multiple workunit tasks running in parallel on the same
568 role. That is already racy, so if it's happening, we'll
569 want to switch to using a truly unique clonedir for each
572 Fixes: http://tracker.ceph.com/issues/18336
573 Signed-off-by: Sage Weil <sage@redhat.com>
574 (cherry picked from commit 2a7013cd5a033c5be43350505d75f088e831e201)
576 commit a70e0d58e10184b0903ba36c047a237be3c7cc19
577 Author: Sage Weil <sage@redhat.com>
578 Date: Fri Dec 16 15:06:16 2016 -0500
580 qa/tasks/workunit: retry on ceph.git if checkout fails
582 Signed-off-by: Sage Weil <sage@redhat.com>
583 (cherry picked from commit 72d73b8c8836ae35c518fa09f44805a74038f02a)
585 commit c28d5ea7107427175ef3f6089aaa36c97c2919bc
586 Author: Sage Weil <sage@redhat.com>
587 Date: Wed Dec 7 09:50:26 2016 -0500
589 mon/OSDMonitor: only show interesting flags in health warning
591 Also add PAUSEREC flag into the list.
593 Fixes: http://tracker.ceph.com/issues/18175
594 Signed-off-by: Sage Weil <sage@redhat.com>
595 (cherry picked from commit 26220f0608f5ed4a7d97fb8d10d0d12a0fcf5583)
598 src/mon/OSDMonitor.cc (hammer lacks CEPH_OSDMAP_FULL and order of flags
599 is slightly different)
601 commit d1c654ea3f3b8c194f3fdc7295cb379c6270d6b3
602 Author: Sage Weil <sage@redhat.com>
603 Date: Mon Dec 19 14:08:11 2016 -0500
605 qa/workunits: include extension for nose tests
607 When you have a relative path you have to include the extension.
610 Signed-off-by: Sage Weil <sage@redhat.com>
611 (cherry picked from commit 5666fd61d6dbd40be1d79354227cabd562e829ea)
614 qa/workunits/fs/test_python.sh (not in hammer)
615 qa/workunits/rbd/test_librbd_python.sh (no valgrind in hammer)
617 commit eaa51f6f907019727eb18fc4174fe4f2d04f396a
618 Author: Sage Weil <sage@redhat.com>
619 Date: Thu Dec 15 15:10:28 2016 -0500
621 qa/workunits: use relative path instead of wget from git
623 Signed-off-by: Sage Weil <sage@redhat.com>
624 (cherry picked from commit cf294777ea92f0911813a7132068584d4f73a65a)
626 Conflicts: (all trivial)
627 qa/workunits/fs/test_python.sh
628 qa/workunits/rados/test_python.sh
629 qa/workunits/rbd/rbd_mirror.sh
630 qa/workunits/rbd/rbd_mirror_stress.sh
631 qa/workunits/rbd/test_librbd_python.sh
632 qa/workunits/rbd/test_lock_fence.sh
634 commit 8eb4e8b6fd6c803fa9bea781db07c54d901e34cc
635 Author: Sage Weil <sage@redhat.com>
636 Date: Thu Dec 15 13:26:14 2016 -0500
638 qa/tasks/workunit.py: add CEPH_BASE env var
642 Signed-off-by: Sage Weil <sage@redhat.com>
643 (cherry picked from commit 27b8eac24922f8b4bd065e6e7f0bc8e2ba37b5d5)
645 commit dccf904241f2a00ba0317135bd3cbe56c6dfdb80
646 Author: Sage Weil <sage@redhat.com>
647 Date: Thu Dec 15 13:25:23 2016 -0500
649 qa/tasks/workunit: leave workunits inside git checkout
651 Signed-off-by: Sage Weil <sage@redhat.com>
652 (cherry picked from commit 4602884ab8f5a256d13091f7239d938990482d95)
654 commit e038662d80ec1c59edb3d6a1c63197ca387d26b2
655 Merge: 12d6781 59878b3
656 Author: Sage Weil <sage@redhat.com>
657 Date: Wed Dec 14 11:40:08 2016 -0600
659 Merge pull request #12455 from liewegas/qa-suite-hammer
661 hammer: merge ceph-qa-suite
663 commit 59878b3bf775fabf0f4c168e67d6f473e69c15a1
664 Merge: 12d6781 7ed0dce
665 Author: Sage Weil <sage@redhat.com>
666 Date: Wed Dec 14 11:30:00 2016 -0600
670 commit 7ed0dce3cf7ded278e59a9b36d3fd713e3c42b8d
671 Author: Sage Weil <sage@redhat.com>
672 Date: Wed Dec 14 11:29:55 2016 -0600
674 move ceph-qa-suite dirs into qa/
676 commit 08ce5441dbad8754205717a20d6273c0a099777a
677 Author: Sage Weil <sage@redhat.com>
678 Date: Wed Dec 14 12:27:47 2016 -0500
680 Revert "tasks/workunit.py: depth 1 clone"
682 This reverts commit 12a707cb0f7b162e15c31915eb677bbd49b5e2cf.
684 commit 12a707cb0f7b162e15c31915eb677bbd49b5e2cf
685 Author: Sage Weil <sage@redhat.com>
686 Date: Wed Dec 14 12:19:44 2016 -0500
688 tasks/workunit.py: depth 1 clone
690 Signed-off-by: Sage Weil <sage@redhat.com>
691 (cherry picked from commit 4faf77a649cb3f8ddf497ca81937b3dbf63a18dc)
693 commit 6bdc3bb6a00480b721b9795bd5e132b1dbf04ac0
694 Author: Sage Weil <sage@redhat.com>
695 Date: Wed Dec 14 12:18:29 2016 -0500
697 tasks/workunit: remove kludge to use git.ceph.com
699 This was hard-coded to ceph.git (almost) and breaks when
700 you specify --ceph-repo. Remove it entirely. We'll see if
701 github.com is better at handling our load than it used to
704 Signed-off-by: Sage Weil <sage@redhat.com>
705 (cherry picked from commit 159c455a0326eef2c017b3e3cf510f918b5ec76c)
707 commit 87e0299448908775600c62130617bad503027768
708 Author: Kefu Chai <kchai@redhat.com>
709 Date: Sat Dec 10 02:36:52 2016 +0800
711 tasks/ceph: restore context of osd mount path before mkfs
713 all newly created files and directories under the mount dir inherit the
714 SELinux type of their parent directory. so we need to set it before
717 Fixes: http://tracker.ceph.com/issues/16800
718 Signed-off-by: Kefu Chai <kchai@redhat.com>
719 (cherry picked from commit 53225d5272a1d35d4183fcfa55a139f55f77e122)
721 commit ca933160bec3532a5b2846fc7e684f11509c8298
722 Merge: bbb2615 107e9c3
723 Author: Sage Weil <sage@redhat.com>
724 Date: Mon Dec 12 16:42:55 2016 -0600
726 Merge pull request #1278 from ceph/wip-16225-min
728 hammer: SIGABRT in TrackedOp::dump() via dump_ops_in_flight()
730 commit c4f1b42810339b5b45b48f74c3ff0ae661a8807a
731 Author: Jason Dillaman <dillaman@redhat.com>
732 Date: Mon Dec 12 11:53:00 2016 -0500
734 librbd: diffs to clone's first snapshot should include parent diffs
736 If the clone has a backing object created after the snapshot that
737 overwrites an extent of the parent, the parent diffs within that
738 extent are not included in the result.
740 Hammer-specific implementation due to librbd refactoring during the
743 Fixes: http://tracker.ceph.com/issues/18111
744 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
746 commit 996fc2575ef988e6b20fda9ca771b2f6f141cbd3
747 Author: Jason Dillaman <dillaman@redhat.com>
748 Date: Wed Dec 7 09:59:39 2016 -0500
750 qa/workunits/rbd: removed qemu-iotest case 077
752 The test case is not stable due to racing console output. This
753 results in spurious failures.
755 Fixes: http://tracker.ceph.com/issues/10773
756 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
757 (cherry picked from commit 2c70df978d605a45ff81971b86f5afbefbdaabb6)
759 commit e97ceb13242fd73b05a20b60208fee7f032e3ef3
760 Author: Yehuda Sadeh <yehuda@redhat.com>
761 Date: Mon Nov 28 14:20:03 2016 -0800
763 rgw: omap_get_all() fixes
765 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
766 (cherry picked from commit 99e866feb3f8aa0ff768d6253979b6b4fc0fa452)
768 commit 38ab892201ce9ca95010e5f33277be2b0213e96d
769 Author: Sage Weil <sage@redhat.com>
770 Date: Mon Nov 21 18:37:39 2016 -0500
772 rgw/rgw_rados: do not omap_getvals with (u64)-1 max
774 Fixes: http://tracker.ceph.com/issues/17985
776 This will make the OSD fall over if the object is big
777 and the OSD doesn't impose it's own fail-safe limit.
779 Signed-off-by: Sage Weil <sage@redhat.com>
780 (cherry picked from commit 7cd123ec0dd5951628e4f8ddd4e044a0fbb82f2f)
782 commit fe77c9a906fb0fbd85762c8c079d85ca106613ce
783 Author: Wanlong Gao <wanlong.gao@easystack.cn>
784 Date: Thu Jun 23 20:04:25 2016 +0800
786 osd: limit omap data in push op
788 We already have the config osd_recovery_max_chunk to limit the total
789 size of omap entries and omap data. But we need an individual config
790 to limit the number of omap entries independently. We call this config
791 osd_recovery_max_omap_entries_per_chunk here with the default number
794 Signed-off-by: Wanlong Gao <wanlong.gao@easystack.cn>
795 (cherry picked from commit 56064c5cb645254574dbad00e6c16b783115bb93)
797 commit 0f83bb7dbc5f81ecef0108b746f5bca58e76ff31
798 Author: LiuYang <yippeetry@gmail.com>
799 Date: Thu Dec 8 14:21:43 2016 +0800
801 rgw: do not abort when accept a CORS request with short origin
805 when accept a CROS request, the request http origin shorter than the bucket's corsrule
806 (eg. origin: http://s.com corsrule: <AllowedOrigin>*.verylongdomain.com</AllowedOrigin>).
807 the rgw_cors.cc::is_string_in_set() will have a wrong index, the radosrgw server will
810 $ curl http://test.localhost:8000/app.data -H "Origin:http://s.com"
812 0> 2016-12-05 03:22:29.548138 7f6add05d700 -1 *** Caught signal (Aborted) **
813 in thread 7f6add05d700 thread_name:civetweb-worker
815 ceph version 11.0.2-2168-gd2f8fb4 (d2f8fb4a6ba75af7e6da0f5a7f1b49ec998b1631)
816 1: (()+0x50720a) [0x7f6b147c420a]
817 2: (()+0xf370) [0x7f6b09a33370]
818 3: (gsignal()+0x37) [0x7f6b081ca1d7]
819 4: (abort()+0x148) [0x7f6b081cb8c8]
820 5: (__gnu_cxx::__verbose_terminate_handler()+0x165) [0x7f6b08ace9d5]
821 6: (()+0x5e946) [0x7f6b08acc946]
822 7: (()+0x5e973) [0x7f6b08acc973]
823 8: (()+0x5eb93) [0x7f6b08accb93]
824 9: (std::__throw_out_of_range(char const*)+0x77) 0x7f6b08b21a17]
825 10: (()+0xbd97a) [0x7f6b08b2b97a]
826 11: (()+0x449c1e) [0x7f6b14706c1e]
827 12: (RGWCORSRule::is_origin_present(char const*)+0x48) [0x7f6b147073b8]
828 13: (RGWCORSConfiguration::host_name_rule(char const*)+0x37) [0x7f6b147074e7]
829 14: (RGWOp::generate_cors_headers(std::string&, std::string&, std::string&, std::string&, unsigned int*)+0xa3) [0x7f6b14593e63]
830 15: (dump_access_control(req_state*, RGWOp*)+0x61) [0x7f6b14653f91]
832 Signed-off-by: LiuYang <yippeetry@gmail.com>
833 (cherry picked from commit 67d4d9e64bc224e047cf333e673bb22cd6290789)
835 commit 47e72024e091a55a5fcd31853e143c94d850b00a
836 Author: YankunLi <lioveni99@gmail.com>
837 Date: Mon Dec 5 14:39:20 2016 +0800
839 rbd: fix parameter check
841 using import-diff command, the imagename must be specified.
843 Signed-off-by: Yankun Li <lioveni99@gmail.com>
845 commit bbb261533455d37b4ef1e5bfc3c8f7765ab74e5a
846 Merge: 8e5872b 4533623
847 Author: Sage Weil <sage@redhat.com>
848 Date: Fri Dec 2 15:09:32 2016 -0500
850 Merge pull request #1276 from ceph/no-btrfs-on-hammer
852 rados: remove btrfs tests; use xfs instead
854 commit 7106f426c96978a0a41e9d1482239a4da505157e
855 Author: Kefu Chai <kchai@redhat.com>
856 Date: Wed Nov 23 14:48:11 2016 +0800
858 FileStore::_do_fiemap: do not reference fiemap after it is freed
860 `last` points to fiemap::fm_extends[n], and if fiemap gets freed, we can
861 not reference any of its fieldis. so we could remember the check result before
864 Signed-off-by: Kefu Chai <kchai@redhat.com>
865 (cherry picked from commit c3748fa7737b6c43de2dae5d957fcff01322515c)
869 put the parameter is_last in the right place
871 commit 92de2fd9a8b19c3d83d2567720f4e7ad21e43a63
872 Author: Sage Weil <sage@redhat.com>
873 Date: Tue Nov 29 21:50:52 2016 -0500
875 msg/simple/Pipe: handle addr decode error
877 Fixes: http://tracker.ceph.com/issues/18072
878 Signed-off-by: Sage Weil <sage@redhat.com>
879 (cherry picked from commit 2f5cfbc0de5464ab80581c416413a86c3d38dfb7)
881 commit 12d67814912514bb34ba61ceb45a744299d65ff2
882 Merge: 8406ee5 e1694d6
883 Author: Nathan Cutler <presnypreklad@gmail.com>
884 Date: Tue Nov 29 22:16:34 2016 +0100
886 Merge pull request #11457 from tchaikov/wip-17558-hammer
888 hammer: mon: send updated monmap to its subscribers
890 Reviewed-by: Samuel Just <sjust@redhat.com>
891 Reviewed-by: Kefu Chai <kchai@redhat.com>
893 commit 8406ee58ca5c4abbe962ba5a4025aabe220e3981
894 Merge: bfda134 03af4aa
895 Author: Nathan Cutler <presnypreklad@gmail.com>
896 Date: Tue Nov 29 22:12:46 2016 +0100
898 Merge pull request #11628 from ceph/wip-hammer-11567
900 hammer: rgw: Don't loop forever when reading data from 0 sized segment.
902 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
904 commit 5f00e1d4c04698c68248844aad31f4b36eff5735
905 Author: Jianpeng Ma <jianpeng.ma@intel.com>
906 Date: Wed Feb 11 11:18:41 2015 +0800
908 osd: Add func has_flag in MOSDOp.
910 Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
911 (manually cherry picked just one line from d9a2ca5c5ae50dc34e184d577c7b24c56b6cc6ad)
913 commit be7184589de9208986a2054491b86782dac938e8
914 Author: Sage Weil <sage@redhat.com>
915 Date: Tue May 24 14:02:32 2016 -0400
917 osd: reject PARALLELEXEC ops with EINVAL
919 Errors are better than crashing.
921 Signed-off-by: Sage Weil <sage@redhat.com>
922 (cherry picked from commit 407495197dd878b62f1356f6d939e33ab50d78c6)
925 src/osd/ReplicatedPG.cc (trivial resolution)
927 commit 8d352358edc156f70b5eb68c37bb56cb2392fce2
928 Author: Sage Weil <sage@redhat.com>
929 Date: Tue May 24 14:02:14 2016 -0400
931 ceph_test_rados_api_misc: test rados op with bad flas
933 Pass the bad PARALLELEXEC flag to remove(), which takes a flags arg.
935 Signed-off-by: Sage Weil <sage@redhat.com>
936 (cherry picked from commit 1aa807f4f29b4b016cc737ffa443e8f30c3b7693)
939 src/test/librados/misc.cc (dropped ioctx.remove() test because there is no
940 remove() in hammer librados)
942 commit bfda134f6844d6e238052e4f1900f3d2e7497d5e
943 Merge: 9bf08dd 0d2f431
944 Author: Nathan Cutler <presnypreklad@gmail.com>
945 Date: Thu Nov 24 09:15:50 2016 +0100
947 Merge pull request #10437 from odivlad/fix-doc
949 hammer: docs: Bucket object versions
951 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
953 commit 03af4aae8103b52b19737c951e432efc7135b7ca
954 Author: Marcus Watts <mwatts@redhat.com>
955 Date: Thu Oct 13 21:12:36 2016 -0400
957 Don't loop forever when reading data from 0 sized segment.
959 The 0 sized segment can arise depending on how
960 the client uploads the object in the first place.
961 The cpu loop then happens during a swift `GET'.
963 Signed-off-by: Marcus Watts <mwatts@redhat.com>
964 (cherry picked from commit 46c5f9773246522e66bb2cca49345d0b62a16c42)
966 commit 8312dc61ceaa39dca675fda2cb7c88ec3c5ca9f7
967 Author: David Zafman <dzafman@redhat.com>
968 Date: Mon Mar 14 13:28:39 2016 -0700
970 common/TrackedOp: Move tracking_enabled check into register_inflight_op()
972 Make tracking_enabled (and the lock private.)*
974 Signed-off-by: David Zafman <dzafman@redhat.com>
975 (Partial cherry picked from commit 4e8e6172e8f6cc2adc63a429c32f5edd03982f5e)
977 * Backport: Exclude locking since tracking_enabled can't change after launch
979 commit c7220ccc0ec80bb6788befefe71f676c75457b70
980 Author: David Zafman <dzafman@redhat.com>
981 Date: Thu Mar 10 21:24:25 2016 -0800
983 common/TrackedOp: Handle dump racing with constructor
985 Use is_tracked to prevent TrackedOp::dump() from trying to call
986 virtual function while still in OpRequest constructor.
990 Signed-off-by: David Zafman <dzafman@redhat.com>
991 (cherry picked from commit ad13e05499669a79bde9a219ba1089f929e0388e)
994 src/common/TrackedOp.cc
995 src/common/TrackedOp.h
996 Hammer can't use atomic<bool> so use atomic_t instead
998 commit e8e7664247c7112f1ba03ce4cab915fe70ea5b8e
999 Author: David Zafman <dzafman@redhat.com>
1000 Date: Fri Mar 4 18:43:43 2016 -0800
1002 common/TrackedOp: Missed locking when examining "events"
1004 Another crash caused by a dump_ops_in_flight similar to #8885
1006 Signed-off-by: David Zafman <dzafman@redhat.com>
1007 (cherry picked from commit be098c83143226e502a0587c9215cff941dbace1)
1010 src/common/TrackedOp.h (trivial)
1012 commit ce58688537d41e0662949f34b3595459581e74fc
1013 Author: David Zafman <dzafman@redhat.com>
1014 Date: Mon Jul 11 17:58:22 2016 -0700
1016 CLEANUP: Move locking into dump_ops_in_flight()/dump_historic_ops()
1018 Signed-off-by: David Zafman <dzafman@redhat.com>
1019 (cherry picked from commit 17c645f70708134f50374cadb5505b0babe2265a)
1022 src/mds/MDSRank.cc (variation of code exists in mds/MDS.cc)
1023 src/mon/Monitor.cc (no equivalent code here)
1025 commit 5717eb001c6202837fe2e22039e3f855ea4aa065
1026 Author: David Zafman <dzafman@redhat.com>
1027 Date: Mon Mar 14 15:47:02 2016 -0700
1029 mds, osd: Fix missing locking for "dump_blocked_ops"
1031 Signed-off-by: David Zafman <dzafman@redhat.com>
1032 (cherry picked from commit be5bed840f21da998be3b8374a8e33f208258e1b)
1035 src/mds/MDSRank.cc (missing dump_blocked_ops in mds)
1037 commit 6a7fbf42fdb253b7143cb9b3933990145358e06c
1038 Author: David Zafman <dzafman@redhat.com>
1039 Date: Thu Mar 10 21:29:13 2016 -0800
1041 osd: cleanup: Specify both template types for create_request()
1045 Signed-off-by: David Zafman <dzafman@redhat.com>
1046 (cherry picked from commit cecdc49e6d2f38d5eb9f85218484f7a02bd2e1b7)
1048 commit 3e00ee5cfb0769e9b1c0e0a7540d0b14be880fed
1049 Author: Jianpeng Ma <jianpeng.ma@intel.com>
1050 Date: Fri Jul 17 10:44:06 2015 +0800
1052 osd: add dump_blocked_ops asok command.
1054 From ceph health we can see there are blocked ops and from 'ceph health
1055 detai' we can see which osd has blocked ops. Later we only in log of osd
1056 to see the detail message of blocked ops.
1057 Now via asok dump blocked ops.
1059 Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
1060 (cherry picked from commit cf4e8c655c4a0e6c367c88338cd6e51a3474fa2f)
1063 src/common/TrackedOp.h (trivial)
1065 commit 656d0c9f307c1b3db072282be46decd72bc88810
1066 Author: Jianpeng Ma <jianpeng.ma@intel.com>
1067 Date: Wed Jul 8 13:12:49 2015 +0800
1069 common/TrackedOp: Should lock ops_history_lock when access shutdown.
1071 Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
1072 (cherry picked from commit 7fe72a2e7d116093ccff6683666e6289f5f12421)
1074 commit 9bf08ddc9422484f5cf0f05c8ccdb4b440e9b641
1075 Merge: 9655228 2581953
1076 Author: Nathan Cutler <presnypreklad@gmail.com>
1077 Date: Wed Nov 23 22:50:58 2016 +0100
1079 Merge pull request #9873 from odivlad/fix-init-el7-hammer
1081 hammer: build/ops: remove SYSTEMD_RUN from initscript
1083 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1084 Reviewed-by: Nathan Cutler <ncutler@suse.com>
1086 commit 9655228d1900d56f4b439d41b2c4a532158f6c51
1087 Merge: e2c3e21 cb9cc4e
1088 Author: Nathan Cutler <presnypreklad@gmail.com>
1089 Date: Wed Nov 23 22:49:29 2016 +0100
1091 Merge pull request #10238 from aiicore/hammer
1093 hammer: mon: fix memory leak in prepare_beacon
1095 Reviewed-by: Kefu Chai <kchai@redhat.com>
1096 Reviewed-by: John Spray <john.spray@redhat.com>
1098 commit e2c3e21aa4cae160c0136d8d1652b7e4a2c000f0
1099 Merge: 637d348 c5639e4
1100 Author: Nathan Cutler <presnypreklad@gmail.com>
1101 Date: Wed Nov 23 22:44:19 2016 +0100
1103 Merge pull request #10569 from jschmid1/wip-16918-hammer
1105 hammer: build/ops: make stop.sh more portable
1107 Reviewed-by: Nathan Cutler <ncutler@suse.com>
1109 commit 637d348a98676cc9bf13346d96e7f83219e914c2
1110 Merge: 84df525 2b87a55
1111 Author: Nathan Cutler <presnypreklad@gmail.com>
1112 Date: Wed Nov 23 22:40:28 2016 +0100
1114 Merge pull request #10724 from Vicente-Cheng/wip-16584-hammer
1116 hammer: crush: reset bucket->h.items[i] when removing tree item
1118 Reviewed-by: Kefu Chai <kchai@redhat.com>
1120 commit 84df525e60ea66a4a1808641a12eccd95e16dd2d
1121 Merge: a7c8c51 8568e57
1122 Author: Nathan Cutler <presnypreklad@gmail.com>
1123 Date: Wed Nov 23 22:20:29 2016 +0100
1125 Merge pull request #10904 from tchaikov/wip-14470-hammer
1127 hammer: mon: return size_t from MonitorDBStore::Transaction::size()
1129 Reviewed-by: Joao Eduardo Luis <joao@suse.de>
1130 Reviewed-by: Kefu Chai <kchai@redhat.com>
1132 commit a7c8c511ed061102e1b91858ca9772743d7e094e
1133 Merge: c8f54c8 a3ba985
1134 Author: Nathan Cutler <presnypreklad@gmail.com>
1135 Date: Wed Nov 23 22:18:42 2016 +0100
1137 Merge pull request #10905 from SUSE/wip-11101-hammer
1139 hammer: build/ops: improve ceph.in error message
1141 Reviewed-by: Sage Weil <sage@redhat.com>
1143 commit c8f54c84c33354ca27d277a25a2193a3fbd80880
1144 Merge: 48b6054 6c0b2b4
1145 Author: Nathan Cutler <presnypreklad@gmail.com>
1146 Date: Wed Nov 23 22:16:48 2016 +0100
1148 Merge pull request #10987 from Vicente-Cheng/wip-16592-hammer
1150 hammer: librbd: ceph 10.2.2 rbd status on image format 2 returns "(2) No such file or directory"
1152 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1154 commit 48b6054adf4a2d0c58a87bb2a9e8e8719febdc10
1155 Merge: a97c81c 10472f0
1156 Author: Nathan Cutler <presnypreklad@gmail.com>
1157 Date: Wed Nov 23 22:13:05 2016 +0100
1159 Merge pull request #11125 from tchaikov/wip-17179-hammer
1161 hammer: tools: add a tool to rebuild mon store from OSD
1163 Reviewed-by: Nathan Cutler <ncutler@suse.com>
1165 commit a97c81c3f00abbb79cef0ae069a6f151a089e30e
1166 Merge: c4cee49 4a36933
1167 Author: Nathan Cutler <presnypreklad@gmail.com>
1168 Date: Wed Nov 23 22:10:54 2016 +0100
1170 Merge pull request #11273 from aiicore/wip-17403-hammer
1172 hammer: mon: OSDMonitor: Missing nearfull flag set
1174 Reviewed-by: Sage Weil <sage@redhat.com>
1176 commit c4cee499622c3c151dcb363193af21844a2f24f5
1177 Merge: 9495584 ece0ec6
1178 Author: Nathan Cutler <presnypreklad@gmail.com>
1179 Date: Wed Nov 23 22:06:32 2016 +0100
1181 Merge pull request #11618 from asheplyakov/hammer-16546
1183 hammer: rbd: fix possible rbd data corruption
1185 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1187 commit 949558462317e16e1f517bda3ce3465fe30b931b
1188 Merge: 1fda4a0 5fb8fb4
1189 Author: Nathan Cutler <presnypreklad@gmail.com>
1190 Date: Wed Nov 23 21:56:22 2016 +0100
1192 Merge pull request #11676 from asheplyakov/hammer-16151
1194 hammer: osd: update PGPool to detect map gaps and reset cached_removed_snaps
1196 Reviewed-by: Samuel Just <sjust@redhat.com>
1198 commit 1fda4a0fcfe6a9d8f96fe0e054c5b9e8a6e2ecd8
1199 Merge: 11886bd 31c2594
1200 Author: Nathan Cutler <presnypreklad@gmail.com>
1201 Date: Wed Nov 23 21:54:39 2016 +0100
1203 Merge pull request #11899 from SUSE/wip-17840-hammer
1205 hammer: rgw: the value of total_time is wrong in the result of 'radosgw-admin log show' opt
1207 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1209 commit 11886bd5d20c8b2bf09dbabda1e49f14d2283260
1210 Merge: 21dc0ec f99a1d3
1211 Author: Nathan Cutler <presnypreklad@gmail.com>
1212 Date: Wed Nov 23 21:53:40 2016 +0100
1214 Merge pull request #11927 from SUSE/wip-17764-hammer
1216 hammer: osd: fix collection_list shadow return value
1218 Reviewed-by: Haomai Wang <haomai@xsky.com>
1219 Reviewed-by: Samuel Just <sjust@redhat.com>
1221 commit 21dc0ec953adeeabe934cd1090f959db7d11cefc
1222 Merge: 8f19eca 5711e79
1223 Author: Nathan Cutler <presnypreklad@gmail.com>
1224 Date: Wed Nov 23 21:50:04 2016 +0100
1226 Merge pull request #12071 from SUSE/wip-17957-hammer
1228 hammer: RWLock.h: 124: FAILED assert(r == 0) in rados-jewel-distro-basic-smithi
1230 Reviewed-by: Samuel Just <sjust@redhat.com>
1232 commit 8f19eca51863ca1c1dfde068479bca5606e4550d
1233 Merge: af6e208 76eed80
1234 Author: Nathan Cutler <presnypreklad@gmail.com>
1235 Date: Wed Nov 23 21:47:24 2016 +0100
1237 Merge pull request #11929 from SUSE/wip-17359-hammer
1239 hammer: tools: ceph-objectstore-tool crashes if --journal-path <a-directory>
1241 Reviewed-by: Kefu Chai <kchai@redhat.com>
1243 commit af6e2080f1ca56f1715ccb76d2372f86bdc272e9
1244 Merge: 655e904 fbf51ba
1245 Author: Nathan Cutler <presnypreklad@gmail.com>
1246 Date: Wed Nov 23 21:46:08 2016 +0100
1248 Merge pull request #11930 from SUSE/wip-17346-hammer
1250 hammer: cephx: Fix multiple segfaults due to attempts to encrypt or decrypt
1252 Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
1253 Reviewed-by: Kefu Chai <kchai@redhat.com>
1255 commit 655e904142c295ef66c376a3aca148cf2bce60c0
1256 Merge: c118c0a 7ad7de6
1257 Author: Nathan Cutler <presnypreklad@gmail.com>
1258 Date: Wed Nov 23 21:44:39 2016 +0100
1260 Merge pull request #11931 from SUSE/wip-17333-hammer
1262 hammer: tools: crushtool --compile generates output despite missing item
1264 Reviewed-by: Kefu Chai <kchai@redhat.com>
1266 commit c118c0af9da259330f5e5c3f3babdfca647a566b
1267 Merge: e4ea945 ad42da4
1268 Author: Nathan Cutler <presnypreklad@gmail.com>
1269 Date: Wed Nov 23 21:43:19 2016 +0100
1271 Merge pull request #11932 from SUSE/wip-17146-hammer
1273 hammer: PG::choose_acting valgrind error or ./common/hobject.h: 182: FAILED assert(!max || (*this == hobject_t(hobject_t::get_max())))
1275 Reviewed-by: Samuel Just <sjust@redhat.com>
1277 commit e4ea9452cf78e01413714b597f49d32d1d11a6dd
1278 Merge: 92e0a47 e302e63
1279 Author: Nathan Cutler <presnypreklad@gmail.com>
1280 Date: Wed Nov 23 21:42:24 2016 +0100
1282 Merge pull request #11933 from SUSE/wip-17142-hammer
1284 hammer: osd: PG::_update_calc_stats wrong for CRUSH_ITEM_NONE up set items
1286 Reviewed-by: Samuel Just <sjust@redhat.com>
1288 commit 92e0a471adffff1fa2027714116b3d0b5120b6bb
1289 Merge: d7fc569 64eeb8d
1290 Author: Nathan Cutler <presnypreklad@gmail.com>
1291 Date: Wed Nov 23 21:40:47 2016 +0100
1293 Merge pull request #11934 from SUSE/wip-17120-hammer
1295 hammer: mon: %USED of ceph df is wrong
1297 Reviewed-by: Kefu Chai <kchai@redhat.com>
1299 commit d7fc569f70b98cf2fa5a842c753f43adc801cdf7
1300 Merge: 8a15ac7 fc46591
1301 Author: Nathan Cutler <presnypreklad@gmail.com>
1302 Date: Wed Nov 23 21:39:12 2016 +0100
1304 Merge pull request #11935 from SUSE/wip-16870-hammer
1306 hammer: osd: crash on EIO during deep-scrubbing
1308 Reviewed-by: Samuel Just <sjust@redhat.com>
1310 commit 8a15ac77c39cc3cc571c62bab68d327894f2db7a
1311 Merge: 44588f2 4c780bd
1312 Author: Nathan Cutler <presnypreklad@gmail.com>
1313 Date: Wed Nov 23 21:33:27 2016 +0100
1315 Merge pull request #11937 from SUSE/wip-16428-hammer
1317 hammer: mon: prepare_pgtemp needs to only update up_thru if newer than the existing one
1319 Reviewed-by: Samuel Just <sjust@redhat.com>
1321 commit 44588f2755429e65960eebf51b21ddb14f245bb8
1322 Merge: 8c90170 a56b93f
1323 Author: Nathan Cutler <presnypreklad@gmail.com>
1324 Date: Wed Nov 23 21:31:15 2016 +0100
1326 Merge pull request #11938 from SUSE/wip-14323-hammer
1328 hammer: msg: OpTracker needs to release the message throttle in _unregistered
1330 Reviewed-by: Samuel Just <sjust@redhat.com>
1332 commit 8c90170685fa74fa338b4f22b349e62a01920220
1333 Merge: 49964b0 2332cf2
1334 Author: Nathan Cutler <presnypreklad@gmail.com>
1335 Date: Wed Nov 23 21:29:45 2016 +0100
1337 Merge pull request #11939 from SUSE/wip-13927-hammer
1339 hammer: mds: fix cephfs-java ftruncate unit test failure
1341 Reviewed-by: John Spray <john.spray@redhat.com>
1343 commit 0d2f431b2ecad03a6cda6ffbc9f9cbaac0956af9
1344 Author: Yuan Zhou <yuan.zhou@intel.com>
1345 Date: Mon Jul 20 15:37:09 2015 +0800
1347 rgw: doc: Mark S3 object version API as supported
1349 S3 object version is already in since Hammer.
1350 Ref: http://marc.info/?l=ceph-devel&m=143715290627682
1352 Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
1353 (cherry picked from commit b62c3b9537e8ab33416a7fb0dd7b801a790d42ee)
1355 commit 8ca16052138bebe9f009104e62b147750dd6584d
1356 Author: shawn <chen.xiaowei@h3c.com>
1357 Date: Thu Jul 30 10:09:12 2015 +0800
1359 doc: add bucket object version description.
1360 bucket object version has been supported, but do not have description in the docs,
1363 Signed-off-by: shawn chen <cxwshawn@gmail.com>
1364 (cherry picked from commit 5c395ff85627f0f4154af27aff03dd0a9c409fb4)
1366 commit 49964b01508c5f2f9b5edd620051c18fbea7dfd7
1367 Merge: 6e1ae86 d91c62d
1368 Author: Nathan Cutler <presnypreklad@gmail.com>
1369 Date: Wed Nov 23 10:52:43 2016 +0100
1371 Merge pull request #11946 from SUSE/wip-17883-hammer
1373 hammer: mon: OSDs marked OUT wrongly after monitor failover
1375 Reviewed-by: Kefu Chai <kchai@redhat.com>
1377 commit 6e1ae86e88661ce9de5aefb38390b4bfbc677a0a
1378 Merge: 2f9869c ab0786d
1379 Author: Nathan Cutler <presnypreklad@gmail.com>
1380 Date: Wed Nov 23 10:51:51 2016 +0100
1382 Merge pull request #11948 from SUSE/wip-17671-hammer
1384 hammer: rbd: export diff should open image as read-only
1386 Reviewed-by: Mykola Golub <mgolub@mirantis.com>
1387 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1389 commit 2f9869c1be5e03ca1d9daac9c541cfb226b2ae77
1390 Merge: 2dac884 815541f
1391 Author: Nathan Cutler <presnypreklad@gmail.com>
1392 Date: Wed Nov 23 10:48:06 2016 +0100
1394 Merge pull request #11949 from SUSE/wip-17374-hammer
1396 hammer: librbd: image.stat() call in librbdpy fails sometimes
1398 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1400 commit 2dac8848e94b9dcf1a217c6c70164edf669a8eee
1401 Merge: 1503c2b da653fc
1402 Author: Nathan Cutler <presnypreklad@gmail.com>
1403 Date: Wed Nov 23 10:41:03 2016 +0100
1405 Merge pull request #11950 from SUSE/wip-17123-hammer
1407 hammer: rgw: COPY broke multipart files uploaded under dumpling
1409 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1411 commit 1503c2ba753b8ee31e7c632d0463691a83a22b8b
1412 Merge: 118beb9 009c844
1413 Author: Nathan Cutler <presnypreklad@gmail.com>
1414 Date: Wed Nov 23 10:39:46 2016 +0100
1416 Merge pull request #11951 from SUSE/wip-16594-hammer
1418 hammer: rgw: swift: ranged request on a DLO provides wrong values in Content-Range HTTP header
1420 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1422 commit 118beb9a390bf481e520d6888453eecc805bb0d7
1423 Merge: 3b226b8 3404da8
1424 Author: Nathan Cutler <presnypreklad@gmail.com>
1425 Date: Wed Nov 23 10:17:00 2016 +0100
1427 Merge pull request #11952 from SUSE/wip-16318-hammer
1429 hammer: rgw: fix inconsistent uid/email handling in radosgw-admin
1431 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1433 commit 3b226b8282f1c994cf3fbb747131121ec9b0c7a0
1434 Merge: 9ad7369 d89b1f8
1435 Author: Nathan Cutler <presnypreklad@gmail.com>
1436 Date: Wed Nov 23 10:14:10 2016 +0100
1438 Merge pull request #12018 from trociny/wip-17068-hammer
1440 hammer: librbd: request exclusive lock if current owner cannot execute op
1442 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1444 commit 9ad73698f57598ae1302aaf175cb96082eb64961
1445 Merge: 3ca7317 a7b182e
1446 Author: Nathan Cutler <presnypreklad@gmail.com>
1447 Date: Wed Nov 23 06:42:06 2016 +0100
1449 Merge pull request #11045 from SUSE/wip-17150-hammer
1451 hammer: rgw: Anonymous user is able to read bucket with authenticated read ACL
1453 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1455 commit 3ca73177fc28327960f0a8c1612de0358051d515
1456 Merge: 708c549 d50a501
1457 Author: Nathan Cutler <presnypreklad@gmail.com>
1458 Date: Wed Nov 23 06:32:09 2016 +0100
1460 Merge pull request #11809 from SUSE/wip-17631-hammer
1462 hammer: rgw: fix crash when client posts object with null condition
1464 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1466 commit 10472f0521f6aef516660a470be8c5fe453b1a76
1467 Author: Kefu Chai <kchai@redhat.com>
1468 Date: Tue Nov 22 11:53:57 2016 +0800
1470 PendingReleaseNotes: document the feature to rebuild monstore
1472 Signed-off-by: Kefu Chai <kchai@redhat.com>
1474 commit 9473135aa65282499f67847edb52b7dfd8b374fb
1475 Author: Kefu Chai <kchai@redhat.com>
1476 Date: Mon Oct 10 18:43:39 2016 +0800
1478 doc: fill keyring with caps before passing it to ceph-monstore-tool
1480 to make sure the recovered monitor store is ready for use.
1482 Signed-off-by: Kefu Chai <kchai@redhat.com>
1483 (cherry picked from commit af8e21163735377071b6832d8a81b035bb835257)
1485 commit 9c00ba17627c2b3526c558564954b8bb1d8472ef
1486 Author: Kefu Chai <kchai@redhat.com>
1487 Date: Mon Oct 10 16:32:27 2016 +0800
1489 tools/ceph_monstore_tool: bail out if no caps found for a key
1491 we take it as an error if no caps is granted to an entity in the
1492 specified keyring file when rebuilding the monitor db.
1494 Signed-off-by: Kefu Chai <kchai@redhat.com>
1495 (cherry picked from commit b4bd4004a836121c11b0bb97d8123df54c271f04)
1497 commit 48696e9d6d89f6b6e99fb76ffa61665c026d7a0e
1498 Author: Kefu Chai <kchai@redhat.com>
1499 Date: Fri Sep 30 17:58:14 2016 +0800
1501 tools/ceph_monstore_tool: update pgmap_meta also when rebuilding store.db
1503 we should rebuild pgmap_meta table from the collected osdmaps
1505 Fixes: http://tracker.ceph.com/issues/17400
1506 Signed-off-by: Kefu Chai <kchai@redhat.com>
1507 (cherry picked from commit cdfa7a69f63d047205dcfccd63b5d58ab0d4695b)
1509 src/tools/ceph_monstore_tool.cc: remove C++11-ism
1511 commit ca67e8e88c06a9a37e5dc9e8fe5a1dd1821f8452
1512 Author: xie xingguo <xie.xingguo@zte.com.cn>
1513 Date: Sun Sep 18 11:40:56 2016 +0800
1515 tools/rebuild_mondb: kill compiling warning
1519 [ 72%] Building CXX object src/tools/CMakeFiles/ceph-objectstore-tool.dir/RadosDump.cc.o
1520 /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc: In function ‘int update_mon_db(ObjectStore&, OSDSuperblock&, const string&, const string&)’:
1521 /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:289:22: warning: ‘crc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
1522 if (have_crc && osdmap.get_crc() != crc) {
1524 /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:238:14: note: ‘crc’ was declared here
1527 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
1528 (cherry picked from commit f16a31476a3f9b44a7c3dabf0dfd2a0d015b11b9)
1530 commit 94390a3296483323d1b2c57856ea2e8ecca99b64
1531 Author: xie xingguo <xie.xingguo@zte.com.cn>
1532 Date: Sun Sep 18 10:43:10 2016 +0800
1534 tools/rebuild_mondb: return error if ondisk version of pg_info is incompatible
1536 In this case "r" will be >= 0 and caller will be able to catch
1539 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
1540 (cherry picked from commit ac7c1dca0a4f6e92e50d362784122e2d3200e6b5)
1542 commit eaeb52057509b1fa45592ecc147ad694f57d33f3
1543 Author: xie xingguo <xie.xingguo@zte.com.cn>
1544 Date: Sun Sep 18 10:33:56 2016 +0800
1546 tools/rebuild_mondb: avoid unnecessary result code cast
1548 In general we return negative codes for error cases, so there is
1549 no need perform the cast here.
1551 Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
1552 (cherry picked from commit 6a1c01d334fe65124043aa68a6e0cfaea43836b5)
1554 commit 828a4d7a07d178f2dcde30dfe96ca9f054bc1c0d
1555 Author: Kefu Chai <kchai@redhat.com>
1556 Date: Wed Aug 31 00:59:58 2016 +0800
1558 doc: add rados/operations/disaster-recovery.rst
1560 document the process to recover from leveldb corruption.
1562 Fixes: http://tracker.ceph.com/issues/17179
1563 Signed-off-by: Kefu Chai <kchai@redhat.com>
1564 (cherry picked from commit 79a9f299253e24d20547131b3c9c9e0667e3b869)
1566 commit 3ef5dcd2b37055994794f9cf6139dc2d8807d637
1567 Author: Kefu Chai <kchai@redhat.com>
1568 Date: Mon Aug 29 19:53:11 2016 +0800
1570 tools/ceph_monstore_tool: add "rebuild" command
1572 Fixes: http://tracker.ceph.com/issues/17179
1573 Signed-off-by: Kefu Chai <kchai@redhat.com>
1574 (cherry picked from commit d909fa035c8fbbded786b2ca072acc10ea6b6052)
1577 ceph_monstore_tool.cc: remove C++11ish
1579 commit 6695d1792df9ca7cf5afd5a8c25a04f1eb9ff0fa
1580 Author: Kefu Chai <kchai@redhat.com>
1581 Date: Mon Aug 29 19:52:19 2016 +0800
1583 tools/ceph-objectstore-tool: add "update-mon-db" command
1585 Fixes: http://tracker.ceph.com/issues/17179
1586 Signed-off-by: Kefu Chai <kchai@redhat.com>
1587 (cherry picked from commit 24faea7ce446bbf09cbd4a9d3434dd5444a6c295)
1590 src/tools/Makefile-server.am: add rebuild_mondb.{cc,h}, as autotools
1591 support is dropped in master
1592 ceph_objectstore_tool.cc, rebuild_mondb.cc: remove C++11ish
1595 commit e7d9c15871efcd17b9b1064a5ee49edfe4a159e9
1596 Author: Kefu Chai <kchai@redhat.com>
1597 Date: Wed Aug 31 13:11:24 2016 +0800
1599 mon/AuthMonitor: make AuthMonitor::IncType public
1601 so ceph-objectstore-tool is able to use it when rebuilding monitor
1604 Fixes: http://tracker.ceph.com/issues/17179
1605 Signed-off-by: Kefu Chai <kchai@redhat.com>
1606 (cherry picked from commit 19ef4f16b3aba04119ac647cd6261c74a57ce829)
1608 commit 107e9c358acbc75f212f0bc6fcf83075933035b3
1609 Author: David Zafman <dzafman@redhat.com>
1610 Date: Tue Mar 15 11:29:17 2016 -0700
1612 thrasher: Add dump_ops_enable options
1614 Add dump_ops_enable which continuously dumps ops using 3 commands
1616 Signed-off-by: David Zafman <dzafman@redhat.com>
1617 (Partial cherry picked from commit 7a528763d126eaca90e40b02aad02ab9c3c92a32)
1619 Excluded dynamic optracker testing with optrack_toggle_delay option
1622 tasks/ceph_manager.py (trivial)
1623 tasks/thrashosds.py (trivial)
1625 commit b7c87ae74a7f3f3c0096fe6cfe36e1077f96ea1f
1626 Author: David Zafman <dzafman@redhat.com>
1627 Date: Tue Apr 12 09:27:33 2016 -0700
1629 ceph_manager: Add timeout to admin_socket/osd_admin_socket
1631 Signed-off-by: David Zafman <dzafman@redhat.com>
1632 (cherry picked from commit 4ad3b866041a3a5391f46cd3d96297834b95956b)
1634 commit f79027a229b2cbb16eaf877b06bf35ecff647bea
1635 Author: Kefu Chai <kchai@redhat.com>
1636 Date: Wed Feb 25 16:10:51 2015 +0800
1638 Thrasher: log backtrace of thrown exception
1640 * add a wrapper to log uncaught exception to self.logger, greenlet also
1641 prints the backtrace and exception to stderr, but teuthology.log does
1642 not capture stderr. so we need to catch them by ourselves to reveal
1643 more info to root-cause this issue.
1644 * log uncaught exception thrown by Thrasher.do_thrash() to self.log.
1647 Signed-off-by: Kefu Chai <kchai@redhat.com>
1648 (cherry picked from commit 64de3cd574b200d90cb3aea0d646a6236d8fec5e)
1650 commit 4533623b3df1e48b821a509013a91e8c3a7ec4a0
1651 Author: Sage Weil <sage@redhat.com>
1652 Date: Mon Nov 21 16:58:48 2016 -0500
1654 rados: remove btrfs tests; use xfs instead
1656 Signed-off-by: Sage Weil <sage@redhat.com>
1658 commit fb7f49658815d5427f6454b20560991a785a8399
1659 Author: Zhiqiang Wang <zhiqiang.wang@intel.com>
1660 Date: Mon Mar 30 15:25:34 2015 +0800
1662 common/TrackedOp: checking in flight ops fix
1664 Return earlier if tracking is not enabled when checking in flight ops.
1666 Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
1667 (cherry picked from commit 7509a6caa4964d71625c43f2ddc10e6274b6a21b)
1669 commit b58873efafabdc9791f500cff77be9a0a7002227
1670 Author: Zhiqiang Wang <zhiqiang.wang@intel.com>
1671 Date: Mon Mar 30 14:41:21 2015 +0800
1673 common/OpTracker: don't dump ops if tracking is not enabled
1675 If tracking is disabled, there is nothing to dump. No need to go through
1676 each sharded list. This is true for both in flight and historical ops.
1678 Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
1679 (cherry picked from commit ec3c40952bbc4b495875e08b57d764a7487c6c09)
1681 commit 24c92fea4bc68a27a240155f48ee5fa4ee3bbfa0
1682 Author: Jianpeng Ma <jianpeng.ma@intel.com>
1683 Date: Mon Jul 6 13:49:42 2015 +0800
1685 common/TrackedOp: check tracking_enabled for event "initiated/done".
1687 Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
1688 (cherry picked from commit d7585c020de41f25e6a598661844169f2bdbb2b4)
1690 commit 0f37a397e35f105b5ea57c7a1a0463c95a2384e1
1691 Author: Jianpeng Ma <jianpeng.ma@intel.com>
1692 Date: Mon Jul 6 10:48:36 2015 +0800
1694 common/TrackedOp: clean up code make look good.
1696 Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
1697 (cherry picked from commit edefd05edce6728774bb396ea4e6641ea53463cd)
1699 commit ece0ec60154d22bca7002cc308f3a0f4e36a053e
1700 Author: Greg Farnum <gfarnum@redhat.com>
1701 Date: Mon May 23 15:14:21 2016 -0700
1703 hammer: ObjectCacher: fix bh_read_finish offset logic
1705 If we have an incoming read split across multiple BufferHeads, we want to
1706 line up the BufferHead's bl with the incoming OSDOp's bl at the right offset. We
1707 were erroneously using this nonsense calculation (always equal to zero!) when
1708 a much simpler comparison of the BufferHead's logical object offset to the
1709 incoming OSDOp's logical offset will do the trick nicely.
1711 Fixes: http://tracker.ceph.com/issues/16002
1713 Signed-off-by: Greg Farnum <gfarnum@redhat.com>
1714 (cherry picked from commit 9ec6e7f608608088d51e449c9d375844631dcdde)
1716 commit 33f277e601199003fc226c84f67d1bbebb36ad2c
1717 Author: Greg Farnum <gfarnum@redhat.com>
1718 Date: Fri Jun 10 17:01:09 2016 -0700
1720 hammer: test: build a correctness test for the ObjectCacher
1722 For now it's very specifically designed to reproduce
1723 http://tracker.ceph.com/issues/16002, but it can
1724 be extended to other patterns in the future.
1726 Signed-off-by: Greg Farnum <gfarnum@redhat.com>
1727 (cherry picked from commit 0fd55a9886dd8da344c23a5e9898ee5c5061e8f9)
1729 Hammer specific changes:
1731 * use utime_t instead of ceph::real_time
1732 * ObjectCacher::prepare_write() has no journal_tid argument
1733 * rewrite the code in C++98
1735 commit 439ce945dde196a4439e4468681e35eadd4fca5f
1736 Author: Greg Farnum <gfarnum@redhat.com>
1737 Date: Tue May 31 16:18:19 2016 -0700
1739 hammer: test: split objectcacher test into 'stress' and 'correctness'
1741 Signed-off-by: Greg Farnum <gfarnum@redhat.com>
1742 (cherry picked from commit cc9aab1b0a22c3f7320046b97f75dccf2b86cc6d)
1744 commit ff3635a5457ac89ea0fb02f40f0ca723fe34e87c
1745 Author: Greg Farnum <gfarnum@redhat.com>
1746 Date: Thu Jun 23 13:41:46 2016 -0700
1748 hammer: test: add a data-storing MemWriteback for testing ObjectCacher
1750 Signed-off-by: Greg Farnum <gfarnum@redhat.com>
1751 (cherry picked from commit ed5801492bf2850e80a328ce5a61cb1ff2709215)
1753 Hammer specific changes:
1755 * use utime_t instead of ceph::real_time
1756 * ObjectCacher::prepare_write() has no journal_tid argument
1757 * rewrite code in C++98
1759 commit 7a2abfac759acaf668c6ace25df94619f27e829d
1760 Author: Yan, Zheng <zyan@redhat.com>
1761 Date: Wed Oct 28 17:06:59 2015 +0800
1763 hammer: objectcacher: introduce ObjectCacher::flush_all()
1765 Signed-off-by: Yan, Zheng <zyan@redhat.com>
1766 (cherry picked from commit bd86c301a54a6e23cf2ce257b8024b6b92dfbe11)
1769 src/osdc/ObjectCacher.h - whitespace only changes
1772 ObjectCacher::flush_all(): dirty_or_tx_bh is a set<BufferHead *>
1775 commit 9df96606edfb9ff9932297b8253a297cf75c02f6
1776 Author: Greg Farnum <gfarnum@redhat.com>
1777 Date: Thu Jun 23 14:23:51 2016 -0700
1779 hammer: osd: provide some contents on ObjectExtent usage in testing
1781 Signed-off-by: Greg Farnum <gfarnum@redhat.com>
1782 (cherry picked from commit a555d9a0c7d3b6c2206520cf78445234b0834639)
1784 commit c5639e4e276a8d5f6457ce9f63b3e77a230a669c
1785 Author: Mykola Golub <mgolub@mirantis.com>
1786 Date: Mon Dec 14 09:41:10 2015 +0000
1788 stop.sh: make more portable
1790 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1791 (cherry picked from commit 27f2d806f905df1a51b11bd79f1af4c26471407a)
1793 commit 708c549b8d77b9a9ea4d46640287848a74898a40
1794 Merge: f776699 0ac7f2f
1795 Author: Sage Weil <sage@redhat.com>
1796 Date: Mon Nov 21 09:03:44 2016 -0600
1798 Merge pull request #12006 from SUSE/wip-17905-hammer
1800 hammer: mon: MonmapMonitor should return success when MON will be removed
1802 Reviewed-by: Sage Weil <sage@redhat.com>
1804 commit d1e1207275eeaf2409b435236c579116900eb6b7
1805 Author: Ning Yao <yaoning@unitedstack.com>
1806 Date: Thu Oct 13 16:53:18 2016 +0800
1808 FileStore:: fix fiemap issue in xfs when #extents > 1364
1811 Backport: jewel, hammer
1812 Signed-off-by: Ning Yao <yaoning@unitedstack.com>
1813 (cherry picked from commit 1a1c126d80b427d5230347fbc71a4edea5c0b6c8)
1817 in hammer, there is no _do_seek_hole_data() function so remove it
1818 in hammer, the logic is in FileStore::fiemap not in _do_fiemap()
1819 so port the logic to the else branch in FileStore::fiemap
1821 commit a3ba985c38c07f85056f90d125e32ea277c65932
1822 Author: Kefu Chai <kchai@redhat.com>
1823 Date: Tue Jan 5 15:00:59 2016 +0800
1825 ceph.in: improve the error message
1828 Signed-off-by: Kefu Chai <kchai@redhat.com>
1829 (cherry picked from commit e19e8f1553fdf8b6b642d3222d28f242fab696f0)
1831 commit 5711e794218cc83db023e1d6600ed75ef3ac3fcc
1832 Author: Sage Weil <sage@redhat.com>
1833 Date: Tue Mar 29 15:24:34 2016 -0400
1835 os/ObjectStore: fix _update_op for split dest_cid
1837 Signed-off-by: Sage Weil <sage@redhat.com>
1838 (cherry picked from commit e3dc7c772f563f97bc68ebc6dc6e0d408e7c11f3)
1840 commit cb9cc4e57a2abd5c13f61599a7fe594c5f21c9c3
1841 Author: Igor Podoski <igor.podoski@ts.fujitsu.com>
1842 Date: Mon Jul 11 12:37:25 2016 +0200
1844 mon/MDSMonitor: fix memory leak in prepare_beacon
1846 prepare_beacon() case of prepare_update() should put()
1847 message in two more cases, because is the last step
1850 Fixes: http://tracker.ceph.com/issues/17285
1851 Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>
1853 commit 4a36933df8b9338c0a32d582e005894442092d0f
1854 Author: Igor Podoski <igor.podoski@ts.fujitsu.com>
1855 Date: Wed Sep 14 07:36:43 2016 -0400
1857 mon: OSDMonitor: Missing nearfull flag set
1859 Output from 'ceph -s -f json-pretty' wans't showing nearfull flag set.
1861 Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>
1862 (cherry picked from commit 754887b575795ef96cda095f7f0d8c898e20f00f)
1864 commit e1694d6e85694ee8750b2af211505b89b3d6f0c8
1865 Author: Kefu Chai <kchai@redhat.com>
1866 Date: Thu Oct 13 13:19:27 2016 +0800
1868 mon: send updated monmap to its subscribers
1870 prior to this change, we sends monmap when serving the subscription
1871 requests, but the updates are not sent to the subscribers anymore.
1872 so we need to send latest monmap to subscribes and update the
1873 subscription status accordingly when the monmap is updated.
1875 http://tracker.ceph.com/issues/17558
1876 Signed-off-by: Kefu Chai <kchai@redhat.com>
1877 (cherry picked from commit c2b348b12c47ba505f72228ae0ea9b1a1b674719)
1879 src/mon/Monitor.cc: resolve conflicts
1880 src/mon/MonmapMonitor.cc: remove C++11-ism
1882 commit ab0786d6a023e391e61119bd309985dcf6e05a4d
1883 Author: YankunLi <lioveni99@gmail.com>
1884 Date: Tue Sep 6 16:16:58 2016 +0800
1886 rbd: this command should be EXPORT_DIFF
1888 Fixes: http://tracker.ceph.com/issues/17671
1890 Signed-off-by: liyankun <lioveni99@gmail.com>
1892 commit d91c62dcf5b1c98b4cfed4eebf29ff9a9d64289b
1893 Author: Dong Wu <archer.wudong@gmail.com>
1894 Date: Thu Oct 27 11:02:36 2016 +0800
1896 mon: update mon(peon)'s down_pending_out when osd up
1898 Fixes: http://tracker.ceph.com/issues/17719
1899 Signed-off-by: Dong Wu <archer.wudong@gmail.com>
1900 (cherry picked from commit 664254a17afbad86983ea5b5b8d385662d89e65e)
1903 src/mon/OSDMonitor.cc (auto declaration for variable "found" is a C++11ism,
1904 replace with the full verbose C++98 type)
1906 commit d89b1f848b8c942d150076cef99491e4c5031bda
1907 Author: Mykola Golub <mgolub@mirantis.com>
1908 Date: Wed Nov 16 12:01:00 2016 +0200
1910 librbd: request exclusive lock if current owner cannot execute op
1912 This is a direct commit to hammer due to librbd code has evolved
1913 significantly in the master.
1915 Fixes: http://tracker.ceph.com/issues/17068
1916 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1918 commit 2b87a551c603291d6c018ed72b0c58e8e45bc334
1919 Author: Kefu Chai <kchai@redhat.com>
1920 Date: Fri Jul 1 20:44:35 2016 +0800
1922 crush: reset bucket->h.items[i] when removing tree item
1924 * crush: so we don't see the reference after the removing, this keeps
1925 check_item_loc() happy, and move_bucket() use check_item_loc() to see if
1926 the removed bucket disappears after the removal.
1927 * test: also add unittest_crush_wrapper::CrushWrapper.insert_item
1929 Fixes: http://tracker.ceph.com/issues/16525
1930 Signed-off-by: Kefu Chai <kchai@redhat.com>
1931 (cherry picked from commit a7069c7aab6b3f605f3d8f909af96f87977e8698)
1933 Backport change: modify some codes that only works on c++ 11
1935 commit 0ac7f2f6c87e0d454466927b8528b3f3dae812a2
1936 Author: Joao Eduardo Luis <joao@suse.de>
1937 Date: Wed Nov 2 15:33:52 2016 +0000
1939 mon: MonmapMonitor: return success when monitor will be removed
1941 Fixes: http://tracker.ceph.com/issues/17725
1943 Signed-off-by: Joao Eduardo Luis <joao@suse.de>
1944 (cherry picked from commit c9d46cfbf2512bc3495c6901de2b8f711bef9bae)
1947 src/mon/MonmapMonitor.cc (just inserted the "err = 0" assignment
1948 immediately after the error message line)
1950 commit 6c0b2b4ceba188397d5877a602b0e1996d29a4eb
1951 Author: Jason Dillaman <dillaman@redhat.com>
1952 Date: Thu Aug 4 20:40:10 2016 -0400
1954 librbd: prevent creation of v2 image ids that are too large
1956 The librbd API is capped at 24 characters for expressing the
1957 object prefix for data blocks (including trailing null byte).
1959 Fixes: http://tracker.ceph.com/issues/16887
1960 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1961 (cherry picked from commit 4de7c8d0a7222c83268d03b99015c6b9d25f124d)
1963 commit 5fb8fb4e450949ebc4c724c102a5b2ae6f1d06c8
1964 Author: Samuel Just <sjust@redhat.com>
1965 Date: Thu May 19 16:00:35 2016 -0700
1967 PG: update PGPool to detect map gaps and reset cached_removed_snaps
1969 Fixes: http://tracker.ceph.com/issues/15943
1970 Signed-off-by: Samuel Just <sjust@redhat.com>
1971 (cherry picked from commit 5798fb3bf6d726d14a9c5cb99dc5902eba5b878a)
1974 src/osd/OSD.cc: trivial, fuzz is too big so git prefers to be safe
1976 commit 3404da8f1e491df86c8a1f12606546cd5a7d952c
1977 Author: Matt Benjamin <mbenjamin@redhat.com>
1978 Date: Mon Jan 18 15:58:07 2016 -0500
1980 rgw-admin: return error on email address conflict (add user)
1982 Fixes the error return inconsistency documented in upstream
1985 Revised after upstream review, permits changing email address as
1986 originally (but use case-insensitive comp).
1988 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
1989 (cherry picked from commit 90c143efa2156e55dc017ebe81005315cacaf2c5)
1992 src/rgw/rgw_user.cc (there is no op_state.found_by_email
1993 conditional in hammer)
1995 commit f5bf5c0f9e9db788fd556f9e92f805fc215138f6
1996 Author: Matt Benjamin <mbenjamin@redhat.com>
1997 Date: Mon Jan 18 15:06:19 2016 -0500
1999 rgw-admin: convert user email addresses to lower case
2001 Fixes the email address inconsistency documented in upstream
2004 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2005 (cherry picked from commit 4c438dbbc0e6eda6b9a3018d60019a1a780d6f65)
2007 commit 009c844e34bcd3e4e34eace90f90a140484e2794
2008 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2009 Date: Mon Oct 12 18:43:27 2015 +0200
2011 rgw: fix wrong length in Content-Range HTTP header of Swift's DLO.
2014 Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2015 (cherry picked from commit b48f3d774129e0b37531fccda513626bd8ef07e5)
2017 commit 2175b688358455472ac6320bb82ac6bef7133e59
2018 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2019 Date: Mon Oct 12 17:32:21 2015 +0200
2021 rgw: fix wrong first byte pos in Content-Range HTTP header of Swift's DLO.
2024 Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2025 (cherry picked from commit 66f47f35bbb4966cb289811672938b90ae6d44ae)
2027 commit da653fc3594d49bdac5dc00129c8aa5fd227d6c0
2028 Author: Yehuda Sadeh <yehuda@redhat.com>
2029 Date: Thu Jul 7 18:01:54 2016 -0700
2031 rgw: adjust manifest head object
2033 adjust the manifest head object:
2034 - when reading manifest, set the head object to the object
2035 we read the manifest from (and its size). Some manifests are
2036 broken and point at a different object
2037 - when copying multipart object, set the manifest head object to
2038 point at the new head object
2040 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2041 (cherry picked from commit 419264586fc46337322f0d60b0ffcdcce3bb5c5a)
2043 commit 8f1c915fa47a889cb50cf84e2d1230df7443752c
2044 Author: Yehuda Sadeh <yehuda@redhat.com>
2045 Date: Thu Jul 7 15:49:07 2016 -0700
2047 rgw: adjust objs when copying obj with explicit_objs set
2049 If the head object contains data, need to set it in the list of
2050 objs (in addition to being pointed at by head_obj).
2052 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2053 (cherry picked from commit 1e012112b99004745952accc6fb11ada5e8e0045)
2055 commit 43a5d5eb2835e1750ef4fbe6d8d3d85af02c6b30
2056 Author: Yehuda Sadeh <yehuda@redhat.com>
2057 Date: Thu Jul 7 15:36:33 2016 -0700
2059 rgw: patch manifest to handle explicit objs copy issue
2061 Fixes: http://tracker.ceph.com/issues/16435
2063 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2064 (cherry picked from commit b51476466e5bb03bbaa6e428bb6bb189a259b9fd)
2066 commit 815541feb989442bdf4d30faf603ef2795bc1ade
2067 Author: Jason Dillaman <dillaman@redhat.com>
2068 Date: Tue Sep 20 07:25:36 2016 -0400
2070 librbd: block name prefix might overflow fixed size C-string
2072 The issue which resulted in too large v2 image ids was fixed
2075 Fixes: http://tracker.ceph.com/issues/17310
2076 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2077 (cherry picked from commit 61734d266c6ee476c2f5fcfbbaefc7d0c7939617)
2079 commit a56b93faf2ae8db2ebe55aaf6003a48ac2bfb8b2
2080 Author: Samuel Just <sjust@redhat.com>
2081 Date: Tue Jan 5 16:24:15 2016 -0800
2083 OpRequest: release the message throttle when unregistered
2085 We don't want messages in the OpTracker history hanging on to
2089 Backport: hammer, firefly
2090 Signed-off-by: Samuel Just <sjust@redhat.com>
2091 (cherry picked from commit 67be35cba7c384353b0b6d49284a4ead94c4152e)
2094 src/msg/Message.h (s/nullptr/0/ because C++98)
2096 commit 4c780bd7fc6e8a98334ddd049a4969d88a9de49f
2097 Author: Samuel Just <sjust@redhat.com>
2098 Date: Tue Jun 7 17:15:05 2016 -0700
2100 OSDMonitor::prepare_pgtemp: only update up_thru if newer
2102 Fixes: http://tracker.ceph.com/issues/16185
2103 Signed-off-by: Samuel Just <sjust@redhat.com>
2104 (cherry picked from commit 5f2bd7b6b28aad96d68444b22c04b8b24564616b)
2107 src/mon/OSDMonitor.cc (master uses C++11 "auto" for new_up_thru
2108 iterator, replace with explicit type)
2109 src/mon/OSDMonitor.h (trivial resolution)
2111 commit 7ad7de69631372ef364d19bf023e7dba3c88092c
2112 Author: Kefu Chai <kchai@redhat.com>
2113 Date: Tue Sep 20 14:10:16 2016 +0800
2115 crush/CrushCompiler: error out as long as parse fails
2117 do not output compiled crush map if anything goes wrong when parsing
2120 Fixes: http://tracker.ceph.com/issues/17306
2121 Signed-off-by: Kefu Chai <kchai@redhat.com>
2122 (cherry picked from commit b2c0a079dc074c907e1bc429861230096534f597)
2125 src/test/cli/crushtool/compile-decompile-recompile.t (hammer needs $TESTDIR/ prefix)
2127 commit 2332cf22d23fd40ae238b98798e3290094548914
2128 Author: Yan, Zheng <zyan@redhat.com>
2129 Date: Mon Mar 30 17:35:59 2015 +0800
2131 mds: fix out-of-order messages
2133 When MDS is no longer laggy, it should process deferred messages
2134 first, then process newly received messages.
2137 Signed-off-by: Yan, Zheng <zyan@redhat.com>
2138 (cherry picked from commit ccdeaf87df8b66e09f6b20950b57ac61bf213086)
2140 commit fc4659155406432404d6e7afb63de545e4abf1a6
2141 Author: Nathan Cutler <ncutler@suse.com>
2142 Date: Sat Nov 12 12:37:00 2016 +0100
2144 pg: restore correct behavior of read() callers
2146 This patch is inspired by fabd6357e42e526d2704d7cb80375c12d731df8d but is not a
2149 Fixes: http://tracker.ceph.com/issues/16870
2150 Signed-off-by: Nathan Cutler <ncutler@suse.com>
2152 commit 64eeb8d96cf295c8a3739d5d993b51f77c35e466
2153 Author: Kefu Chai <kchai@redhat.com>
2154 Date: Fri Aug 5 14:27:43 2016 +0800
2156 mon/PGMonitor: calc the %USED of pool using used/(used+avail)
2159 "the raw space used by this pool" / "the raw space of the whole cluster"
2160 as the %USED. but it's wrong:
2162 - there is chance that not all OSDs are assigned to the pool in question
2163 - we can not utilize all the raw space for the pool: there is overhead.
2164 and the size of available space for a pool is capped by the assigned
2165 OSD with minimal free space.
2168 USED / (USED + AVAIL)
2169 as the %USED. so once we have no AVAIL space left, %USED will be 100%.
2171 Fixes: http://tracker.ceph.com/issues/16933
2172 Signed-off-by: Kefu Chai <kchai@redhat.com>
2173 (cherry picked from commit 08532ea166dfd97c548d9f1fb478e163021cdda3)
2176 src/test/mon/CMakeLists.txt (file does not exist in hammer)
2178 commit d62258c03492fca5fca99650cc7514348251cb7b
2179 Author: Kefu Chai <kchai@redhat.com>
2180 Date: Sun Aug 7 00:58:04 2016 +0800
2182 mon/PGMonitor: mark dump_object_stat_sum() as static
2184 so we can test this method without create an instance of PGMonitor.
2186 Signed-off-by: Kefu Chai <kchai@redhat.com>
2187 (cherry picked from commit af3d3e25823ca9b40ddf09835edb82795ac68f33)
2190 src/mon/PGMonitor.cc ("const" suffix of function definition was removed
2191 in master, but in hammer it wasn't there, so no change necessary)
2192 src/mon/PGMonitor.h (added static prefix to function declaration; did
2193 not remove "const" suffix because it wasn't there in hammer)
2195 commit e302e636b8fd8f3106a3971dfc44f2c91995e3f5
2196 Author: Samuel Just <sjust@redhat.com>
2197 Date: Thu Aug 11 08:57:51 2016 -0700
2199 PG: use upset rather than up for _update_calc_stats
2201 Fixes: http://tracker.ceph.com/issues/16998
2202 Signed-off-by: Samuel Just <sjust@redhat.com>
2203 (cherry picked from commit 200cae8c9db99b3dede377f74413cc0b15033e1f)
2205 commit cfa2b2d3bcad8ebf0a94b89b3a27ce72445fc30a
2206 Author: Samuel Just <sjust@redhat.com>
2207 Date: Thu Aug 11 08:57:35 2016 -0700
2209 PG: introduce and maintain upset
2211 Signed-off-by: Samuel Just <sjust@redhat.com>
2212 (cherry picked from commit 80a5c21d97116e7a66351a0e1f5d9b561f8663ac)
2214 commit ad42da47909f2ce6902c9f34e2e9e0c445bb1cc7
2215 Author: Tao Chang <changtao@hihuron.com>
2216 Date: Mon May 9 09:50:17 2016 -0400
2218 Cleanup: delete find_best_info again
2220 After called find_best_info find a auth_pg_shard, it must be not incomplete,
2221 so it will not enter find_best_info again.
2223 Signed-off-by: Tao Chang <changtao@hihuron.com>
2224 (cherry picked from commit a25cfc4d46c03d8d78e0254c728ea5c29e2246e1)
2227 src/osd/PG.cc (trivial resolution)
2229 commit fbf51ba878c7a00c045fc97bf309c39b0d9c4fcc
2230 Author: Brad Hubbard <bhubbard@redhat.com>
2231 Date: Tue Jun 14 17:34:44 2016 +1000
2233 cephx: Fix multiple segfaults due to attempts to encrypt or decrypt
2234 an empty secret and a null CryptoKeyHandler
2236 Fixes: http://tracker.ceph.com/issues/16266
2237 Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2238 (cherry picked from commit 009e777fbd18602e5fd66f97bdad95e977e6fecc)
2240 commit 76eed80e6649fdd53a2a3ee3d7242a8e48e1168a
2241 Author: Kefu Chai <kchai@redhat.com>
2242 Date: Tue Sep 20 17:39:24 2016 +0800
2244 os/filestore/FileJournal: fail out if FileJournal is not block device or regular file
2246 otherwise JournalingFileStore will assert when deleting FileJournal
2247 which still has the non block/regular file opened.
2249 Fixes: http://tracker.ceph.com/issues/17307
2250 Signed-off-by: Kefu Chai <kchai@redhat.com>
2251 (cherry picked from commit 7431eec6fd24cd08ca6c76a9893e3f6e8c63a916)
2253 commit f99a1d364ae8ec0f7bad220fdd6d665ecdc8029c
2254 Author: Haomai Wang <haomai@xsky.com>
2255 Date: Sun Oct 9 18:31:54 2016 +0800
2257 osd/PGBackend: fix collection_list shadow return value
2259 Fixes: http://tracker.ceph.com/issues/17713
2260 Signed-off-by: Haomai Wang <haomai@xsky.com>
2261 (cherry picked from commit 8a53a604f375eb568a6fc88a402a6afd83fa151a)
2264 src/osd/PGBackend.cc (master is using store->collection_list and ch;
2265 hammer is using store->collection_list_partial and coll)
2267 commit a7b182e00639e635092fa40c39073859720215af
2268 Author: root <rahul.1aggarwal@gmail.com>
2269 Date: Thu Sep 24 00:21:13 2015 +0530
2271 13207: Rados Gateway: Anonymous user is able to read bucket with authenticated read ACL
2273 Signed-off-by: root <rahul.1aggarwal@gmail.com>
2274 (cherry picked from commit 99ba6610a8f437604cadf68cbe9969def893e870)
2276 commit 31c25941d551c61df4eabdb6c3e2226ef4b3cf02
2277 Author: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2278 Date: Tue Oct 11 19:32:43 2016 +0800
2280 rgw: fix the field 'total_time' of log entry in log show opt
2282 Fixes: http://tracker.ceph.com/issues/17598
2284 Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2285 (cherry picked from commit 8f4825c5f012c77a3a91e22706dcab9c6067d77e)
2287 commit d50a5018c43d200e4cd36daa7826b2b4c17434ed
2288 Author: Yehuda Sadeh <yehuda@redhat.com>
2289 Date: Thu Oct 20 10:17:36 2016 -0700
2291 rgw: handle empty POST condition
2293 Fixes: http://tracker.ceph.com/issues/17635
2295 Before accessing json entity, need to check that iterator is valid.
2296 If there is no entry return appropriate error code.
2298 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2299 (cherry picked from commit 23cb642243e09ca4a8e104f62a3bb7b2cbb6ea12)
2301 commit 258195373a6aaabe9a74805268d8094bf48fae0a
2302 Author: Vladislav Odintsov <odivlad@gmail.com>
2303 Date: Mon Jul 4 15:29:22 2016 +0300
2305 init-radosgw: do not use systemd-run in sysvinit
2307 `systemd-run` logic in initscripts was introduced because of ticket
2308 http://tracker.ceph.com/issues/7627.
2310 If we have systemd-based operating system, we should use systemd unit files
2311 from systemd directory to start/stop ceph daemons.
2312 Otherwise, `daemon()` from `/etc/init.d/functions` on systemd distro starts service
2313 in `system.slice` and everything works well.
2315 `systemd-run` can not be run on non-systemd distros, so it's not needed
2318 also, ceph-disk is now able to run the "systemctl"
2319 to enable and start the ceph-osd, and ceph-deploy is also now
2320 playing well with systemd when it comes to ceph-mon and ceph-mds
2322 Fixes: http://tracker.ceph.com/issues/16440
2324 Signed-off-by: Vladislav Odintsov <odivlad@gmail.com>
2325 (cherry picked from commit 1fd4f92a025e80092b8d08d9b7da2e0b73a52f0f)
2327 commit f776699fd00ff5f0deea15ec4f2efb991831b055
2328 Merge: 8e13e7c bfa7c14
2329 Author: Loic Dachary <loic@dachary.org>
2330 Date: Sat Oct 29 10:24:18 2016 +0200
2332 Merge pull request #11372 from ceph/wip-17386-hammer
2334 hammer: doc: add "Upgrading to Hammer" section
2336 Reviewed-by: Samuel Just <sjust@redhat.com>
2337 Reviewed-by: Kefu Chai <kchai@redhat.com>
2339 commit bfa7c14894ebab3ab58282782d8217438a3c4047
2340 Author: Kefu Chai <kchai@redhat.com>
2341 Date: Thu Oct 27 15:44:09 2016 +0800
2343 doc: add "to Hammer" upgrade section
2345 Fixes: http://tracker.ceph.com/issues/17534
2346 Signed-off-by: Kefu Chai <kchai@redhat.com>
2348 commit 8e5872bf6c18b410136fd76974ae11e645c09928
2349 Merge: 995d3a9 2c27626
2350 Author: Zack Cerza <zack@cerza.org>
2351 Date: Wed Oct 19 11:36:07 2016 -0600
2353 Merge pull request #1215 from jcsp/wip-generate-caps-hammer
2355 tasks/ceph: move generate_caps from teuthology
2357 commit 2c27626c1e5d9989ac6942a94b6d9198ccbd28fb
2358 Author: John Spray <john.spray@redhat.com>
2359 Date: Tue Sep 27 12:17:22 2016 +0100
2361 tasks/ceph: move generate_caps from teuthology
2363 This was only used in this task, and it is much too
2364 ceph-specific to belong in teuthology.
2366 Fixes: http://tracker.ceph.com/issues/17614
2367 Signed-off-by: John Spray <john.spray@redhat.com>
2368 (cherry picked from commit 298cc8f932a2a327e07f5b73708404588a611322)
2370 commit e7253b8ecb49bf894dbc21d260a767ecd8d3eb19
2371 Author: Yehuda Sadeh <yehuda@redhat.com>
2372 Date: Mon Oct 3 16:43:44 2016 -0700
2374 rgw_admin: add bi purge command
2376 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2379 src/rgw/rgw_admin.cc
2381 commit 4f605ebf3f415943e8c151364dadfdce3b69cde5
2382 Author: Yehuda Sadeh <yehuda@redhat.com>
2383 Date: Wed Sep 28 12:54:47 2016 -0700
2385 rgw: bucket resharding, adjust logging
2387 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2389 commit 6503430d1b47630b12164f46702bbb42dd7bb453
2390 Author: Yehuda Sadeh <yehuda@redhat.com>
2391 Date: Wed Sep 28 10:41:45 2016 -0700
2393 cls/rgw: bi_list() fix is_truncated returned param
2395 is_truncated was never set. Also, make sure that we don't return
2396 more entries than requested.
2398 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2400 commit f07e22ae7beab634068cc37a975356393c8b60bf
2401 Author: Yehuda Sadeh <yehuda@redhat.com>
2402 Date: Tue Sep 27 15:13:37 2016 -0700
2404 rgw_admin: require --yes-i-really-mean-it for bucket reshard
2406 in the case where num shards are less or equal to current bucket
2408 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2410 commit 55e3e7742b22fd0f015f7439e7aeabdce1845caa
2411 Author: Yehuda Sadeh <yehuda@redhat.com>
2412 Date: Tue Sep 27 14:35:31 2016 -0700
2414 rgw_admin: better bucket reshard logging
2416 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2419 src/rgw/rgw_admin.cc
2421 commit 75f69da3ecba55992453f0a901f997e8a1737884
2422 Author: Yehuda Sadeh <yehuda@redhat.com>
2423 Date: Tue Sep 27 14:11:41 2016 -0700
2425 rgw: limit bucket reshard num shards to max possible
2427 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2430 src/rgw/rgw_admin.cc
2433 commit b6a15514e7cad6c8fd84f589fd5e4c7b505045e7
2434 Author: Yehuda Sadeh <yehuda@redhat.com>
2435 Date: Tue Sep 27 11:55:32 2016 -0700
2437 rgw_admin: fix bi list command
2439 Changes scoping of json section, and push the --object param in so that
2440 an object can be specified as a filter.
2442 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2445 src/rgw/rgw_admin.cc
2447 commit 6e91760e045b61a144d669f1caa5a55e10b13e58
2448 Author: Yehuda Sadeh <yehuda@redhat.com>
2449 Date: Mon Sep 26 15:49:37 2016 -0700
2451 rgw_admin: use aio operations for bucket resharding
2453 also created shards manager to make things slightly cleaner
2455 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2458 src/rgw/rgw_admin.cc
2460 commit a68d56febde154b3b92d3178d2e877e86b3e2dd9
2461 Author: Yehuda Sadeh <yehuda@redhat.com>
2462 Date: Mon Sep 26 10:45:17 2016 -0700
2464 rgw: bucket reshard updates stats
2466 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2469 src/cls/rgw/cls_rgw_types.h
2470 src/rgw/rgw_admin.cc
2472 commit 858bcf189afb9fd042c370bb1f53864447dcdc96
2473 Author: Yehuda Sadeh <yehuda@redhat.com>
2474 Date: Mon Sep 26 09:52:29 2016 -0700
2476 cls/rgw: add bucket_update_stats method
2478 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2480 commit 37cda4ec1fee1d6e413d1ffe8c5f4f6558634740
2481 Author: Yehuda Sadeh <yehuda@redhat.com>
2482 Date: Sat Sep 24 10:46:36 2016 -0700
2484 rgw_admin: reshard also links to new bucket instance
2486 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2488 commit 6c3e734cd87138b55a8a65951d76f7f91c9f0d93
2489 Author: Yehuda Sadeh <yehuda@redhat.com>
2490 Date: Sat Sep 24 10:33:57 2016 -0700
2492 rgw: rgw_link_bucket, use correct bucket structure for entry point
2494 The bucket structure might be different than the one that we were using
2497 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2500 src/rgw/rgw_bucket.cc
2502 commit 7cc1de860dce16e3956fe604b3bcb8ed1a2fe9ea
2503 Author: Yehuda Sadeh <yehuda@redhat.com>
2504 Date: Sat Sep 24 10:01:00 2016 -0700
2506 radosgw-admin: bucket reshard needs --num-shards to be specified
2508 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2511 src/rgw/rgw_admin.cc
2513 commit b2cc000bbdb7e02e3fa9bdc7d7d71d3e979fee2b
2514 Author: Yehuda Sadeh <yehuda@redhat.com>
2515 Date: Sat Sep 24 05:49:37 2016 -0700
2517 cls/rgw: fix bi_list objclass command
2519 was filtering entries, even if filter was not specified, and need to
2520 set boundary for plain entries. Also, list_instance_entries() was not
2521 working correctly, and added list_olh_entries().
2523 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2525 commit 53982a2e61614398de2e37705da12aa6874360a0
2526 Author: Yehuda Sadeh <yehuda@redhat.com>
2527 Date: Mon Sep 26 16:09:34 2016 -0700
2529 rgw_admin: bucket rehsrading, initial work
2531 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2534 src/rgw/rgw_admin.cc
2536 commit 995d3a9c49c04d6ded62aa34cfaacc650b7d13a6
2537 Merge: c2a8f05 e4038a0
2538 Author: Josh Durgin <jdurgin@redhat.com>
2539 Date: Thu Sep 29 21:34:49 2016 -0700
2541 Merge pull request #1192 from ceph/wip-offline-split-hammer2
2543 ceph_manager: test offline split via ceph-objectstore-tool
2545 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2547 commit 8e13e7ce98e99d3ef1b2942f06b4c9ab35c12066
2548 Merge: e2d4f0a 99bb9f6
2549 Author: Josh Durgin <jdurgin@redhat.com>
2550 Date: Thu Sep 29 21:34:26 2016 -0700
2552 Merge pull request #11253 from ceph/wip-offline-split-hammer2
2554 ceph-objectstore-tool: add a way to split filestore directories offline
2556 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2558 commit e4038a0c0068569cc1c7bcaf1b590fba31291610
2559 Author: Josh Durgin <jdurgin@redhat.com>
2560 Date: Fri Aug 5 18:16:20 2016 -0700
2562 ceph_manager: test offline split via ceph-objectstore-tool
2564 When killing an osd, split all pools with a low threshold.
2565 This will slow down tests, but should not impact correctness.
2567 Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2568 (cherry picked from commit f28f881bda0ad426bfa9c0e22cc4658b2ce2ec5d)
2570 commit 99bb9f603f2123e81470a819c1cd64df13a22425
2571 Author: Josh Durgin <jdurgin@redhat.com>
2572 Date: Fri Aug 5 11:45:00 2016 -0700
2574 ceph-objectstore-tool: add a way to split filestore directories offline
2576 Use the usual split code, and split each dir that meets the
2577 usual split criteria.
2579 This can be run with lower than usual split settings, to avoid costly
2580 online splits. To make sure the directories are not merged again, use
2581 a load merge threshold (e.g. filestore merge threshold = 1), and
2582 adjust the split multiplier accordingly.
2584 Fixes: http://tracker.ceph.com/issues/17220
2585 Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2586 (cherry picked from commit e7b0428e0e8d8f5459311dc698d94a3ac4f04684)
2589 src/tools/ceph_objectstore_tool.cc
2590 * remove c++11 auto usage
2591 * change HashIndex::list_subdirs() call to use set instead of vector
2592 * adjust to hammer signature of coll_t::is_pg()
2594 commit c1b64c8f9c23473b758300958a94a172f1d39b64
2595 Author: Yehuda Sadeh <yehuda@redhat.com>
2596 Date: Thu Sep 10 12:52:43 2015 -0700
2598 rgw: rgw_obj encoding fixes
2601 - conversion to and from rgw_obj_key
2602 - strip_namespace_from_object() in the case where object starts
2604 - encoding if object has either namespace or instance and starts
2607 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2609 commit c381cc5d69ebec4370ee18e350b9d003e15b2770
2610 Author: Yehuda Sadeh <yehuda@redhat.com>
2611 Date: Mon Sep 26 16:09:15 2016 -0700
2613 rgw: utilities to support raw bucket index operations
2615 and other related changes.
2617 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2620 src/rgw/rgw_rados.cc
2623 commit d41cbb44c55cf2dca5ab25d5a1ec76e30db26150
2624 Author: Yehuda Sadeh <yehuda@redhat.com>
2625 Date: Mon Sep 26 16:06:17 2016 -0700
2627 rgw: use bucket_info.bucket_id instead of marker where needed
2629 We used to use these interchangeably, but they actually have diffent meaning.
2630 The marker is the prefix we assign to the objects in this bucket, whereas
2631 the bucket_id is the bucket instance's id. These used to hold the same
2632 value, but with bucket resharding it's not going to be true anymore.
2634 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2636 commit 228f52cca1866c40a3840e06bd260c1d92d59caa
2637 Author: Yehuda Sadeh <yehuda@redhat.com>
2638 Date: Mon Sep 26 16:01:39 2016 -0700
2640 cls/rgw: utilities to support raw bucket index operations
2642 New flavour of bi_put() call, and a function to extract key off
2645 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2647 commit e2d4f0af387869569a8c143fa2d2873e6788d2a2
2648 Merge: 8f66abd 0b42082
2649 Author: Casey Bodley <cbodley@users.noreply.github.com>
2650 Date: Tue Sep 20 10:33:02 2016 -0400
2652 Merge pull request #11140 from cbodley/wip-radosgw-admin-man-hammer
2654 hammer: add orphan options to radosgw-admin --help and man page
2656 Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2658 commit 0b420821fd3ed33d077ce76beef7a6f1a0e5edb7
2659 Author: Casey Bodley <cbodley@redhat.com>
2660 Date: Tue Sep 20 09:27:52 2016 -0400
2662 man: add orphan options to radosgw-admin.8
2664 Signed-off-by: Casey Bodley <cbodley@redhat.com>
2666 commit 054e0d45c351525454517472df2c0b1dcecb5c39
2667 Author: tserlin <tserlin@redhat.com>
2668 Date: Mon Sep 19 14:40:12 2016 -0400
2670 Add two options to radosgw-admin.rst manpage
2672 Add '--job-id' and '--max-concurrent-ios' to Orphan Search Options
2674 Fixes: http://tracker.ceph.com/issues/17281
2675 Signed-off-by: Thomas Serlin <tserlin@redhat.com>
2676 (cherry picked from commit 697f30d86f49b73c981c06375ab2937570b1db01)
2678 commit 2920334210376bb34e59d6ecf08557732bcc3861
2679 Author: Ken Dreyer <kdreyer@redhat.com>
2680 Date: Thu Sep 15 12:56:39 2016 -0600
2682 radosgw-admin: add "--orphan-stale-secs" to --help
2684 The radosgw-admin --help did not include the description of the
2685 `--orphan-stale-secs` option of the `orphans find` command. The option
2686 sets the number of seconds to wait before declaring an object to be an
2689 Fixes: http://tracker.ceph.com/issues/17280
2690 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2691 (cherry picked from commit 354059ae43b4f4cc797da1669715399cd96a4738)
2693 commit 34ecb3584230db8458f193ac01deff9264cd119a
2694 Author: Abhishek Lekshmanan <abhishek@suse.com>
2695 Date: Fri Apr 1 13:46:30 2016 +0200
2697 rgw_admin: improve the orphans find help
2699 Adding a few missing commandline switches and improve the help message
2701 Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2702 (cherry picked from commit 27e4c46f741a5f908d5c8ca1af227b3581c697f6)
2704 commit 3575fa8112ac39b1c6edf2aaee5b02aa67fa5766
2705 Author: Ken Dreyer <kdreyer@redhat.com>
2706 Date: Thu Sep 15 11:40:14 2016 -0600
2708 doc: add "--orphan-stale-secs" to radosgw-admin(8)
2710 The radosgw-admin(8) manual page did not include the description of the
2711 `--orphan-stale-secs` option of the `orphans find` command. The option sets
2712 the number of seconds to wait before declaring an object to be an
2715 Fixes: http://tracker.ceph.com/issues/17280
2716 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2717 (cherry picked from commit a676c516069cc448591018ecf4f7d1f7f7bc3bfd)
2719 commit 8f66abd02ed5f0bc697b80b3071f0c70886aab6e
2720 Merge: fe6d859 c7f6b47
2721 Author: Casey Bodley <cbodley@users.noreply.github.com>
2722 Date: Wed Sep 7 13:06:33 2016 -0400
2724 Merge pull request #10839 from oritwas/hammer-default-quota
2726 Hammer default quota
2728 Reviewed-by: Daniel Gryniewicz <dang@redhat.com>