1 commit ea6c958c38df1216bf95c927f143d8b13c4a9e70 (tag: refs/tags/v0.80.10)
2 Author: Jenkins <jenkins@inktank.com>
3 Date: Thu Jun 18 09:48:56 2015 -0700
7 commit 9b7f09e280b4610b9f85ac34ec014018f0e2e1d3
8 Author: Sage Weil <sage@redhat.com>
9 Date: Wed Jun 17 09:35:28 2015 -0700
11 qa/workunits/rados/test-upgarde-v9.0.1: fix exclude syntax
13 It's -, then a list of all exclusions separated by :. There are just 2.
15 Signed-off-by: Sage Weil <sage@redhat.com>
16 (cherry picked from commit 78d894a634d727a9367f809a1f57234e5e6935be)
18 commit 4e28fbc52db7d808aeaede884f342beafb7fc581
19 Author: Sage Weil <sage@redhat.com>
20 Date: Tue Jun 16 21:05:29 2015 -0700
22 qa/workunits/rados/test-upgrade-v9.0.1: skip one more evict test
24 Signed-off-by: Sage Weil <sage@redhat.com>
25 (cherry picked from commit 3e8d60a80ce31860eac76a1f6489a35e1795a0c0)
27 commit 34ba3719997fed6d0b8148f21e59b446bdf42962
28 Author: Josh Durgin <jdurgin@redhat.com>
29 Date: Mon Jun 15 15:12:43 2015 -0700
31 qa: add compatibility filtered rados api tests for upgrades
33 Post-9.0.1, the evict op returns success when an object doesn't exist
34 in the cache tier. Skip the tests that are incompatible across
38 Signed-off-by: Josh Durgin <jdurgin@redhat.com>
39 (cherry picked from commit 348a3d3c9880e7d022e71a2faafe51c8f771406e)
41 commit d1f478200342f422ee6e563bf7aad54ba38b3ed3
42 Merge: d0f9c5f 7f1abd9
43 Author: Sage Weil <sage@redhat.com>
44 Date: Wed Jun 10 15:03:48 2015 -0700
46 Merge pull request #4924 from ceph/wip-11955-firefly
48 11955: ceph.spec.in: package mkcephfs on EL6
50 Reviewed-by: Sage Weil <sage@redhat.com>
52 commit 7f1abd9053088ded6613aeca4e7c9489c44910e4
53 Author: Ken Dreyer <kdreyer@redhat.com>
54 Date: Wed Jun 10 15:43:41 2015 -0600
56 ceph.spec.in: package mkcephfs on EL6
58 Commit efbca0465c2946e113771966df08cf7cf37b1196 added mkcephfs to the
59 RPM %files listing, but this /usr/sbin path is only correct for CentOS
60 7. In CentOS 6, the utility is present at /sbin/mkcephfs instead. This
61 causes rpmbuild to fail to build the tip of the firefly branch on EL6.
63 Adjust the RPM %files list so we properly package mkcephfs on both EL7
66 http://tracker.ceph.com/issues/11955 Refs: #11955
68 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
70 commit d0f9c5f47024f53b4eccea2e0fde9b7844746362
71 Merge: efbca04 9930138
72 Author: Orit Wasserman <owasserm@redhat.com>
73 Date: Thu Jun 4 19:07:03 2015 +0200
75 Merge pull request #4851 from ceph/wip-10873-firefly
77 rgw: generate the "Date" HTTP header for civetweb.
79 commit 99301384be96997203682679c0430ca0a53be5d3 (refs/remotes/gh/wip-10873-firefly)
80 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
81 Date: Wed Feb 18 15:48:43 2015 +0100
83 rgw: generate the "Date" HTTP header for civetweb.
87 Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
88 (cherry picked from commit ea384f83b601f60e135c3d3f960fdb75a919dd84)
90 commit efbca0465c2946e113771966df08cf7cf37b1196
91 Author: Sage Weil <sage@redhat.com>
92 Date: Wed Jun 3 13:03:50 2015 -0400
94 ceph.spec: add mkcephfs to ceph.rpm
96 Signed-off-by: Sage Weil <sage@redhat.com>
98 commit e785f1a2bb4cd77b0aaaccd78060183157ad842e
99 Author: Ken Dreyer <kdreyer@redhat.com>
100 Date: Tue Dec 2 13:58:10 2014 -0700
102 packaging: package ceph-disk(8)
104 The ceph-disk man page was added in
105 a450cab2b8148cb8a9b043d629feccf89e5aabac, but this was not added to the
106 RPM or DEB packaging. Add it here.
108 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
109 (cherry picked from commit b743a951114b00bbb6e14fb88f1928b504bc0f8b)
111 commit 819cf6ddb986b37c5d1229c4ea330010e88bb615
112 Merge: e93711a 665a857
113 Author: Yehuda Sadeh <yehuda@redhat.com>
114 Date: Tue Jun 2 19:53:03 2015 +0300
116 Merge pull request #4780 from oritwas/wip-10295-firefly
118 rgw: civetweb should use unique request id
120 Reviewd-by: Yehuda Sadeh <yehuda@rehat.com>
122 commit e93711a40d680230b03fe722a4da49a6f9a9b667
123 Merge: 071c943 50e8579
124 Author: Yehuda Sadeh <yehuda@redhat.com>
125 Date: Tue Jun 2 19:02:07 2015 +0300
127 Merge pull request #4829 from oritwas/wip-negative_content_length-firefly
129 rgw: don't allow negative / invalid content length
131 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
133 commit 50e85797507a3ba13193f368cff461c08e44a9b3
134 Author: Yehuda Sadeh <yehuda@redhat.com>
135 Date: Fri Aug 1 16:15:36 2014 -0700
137 rgw: don't allow negative / invalid content length
139 Certain frontends (e.g., civetweb) don't filter such requests.
141 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
142 (cherry picked from commit 0e74b7a1d56733358e2f1d3df4386125a94c2966)
144 commit 071c94385ee71b86c5ed8363d56cf299da1aa7b3
145 Merge: 68211f6 c632ef1
146 Author: Sage Weil <sage@redhat.com>
147 Date: Wed May 27 15:36:15 2015 -0700
149 Merge pull request #4766 from SUSE/wip-11673-firefly
151 Debian: ceph-test and rest-bench debug packages should require their respective binary packages
153 Reviewed-by: Sage Weil <sage@redhat.com>
155 commit 665a85701177230365e43a351d7722cb2adbde93
156 Author: Orit Wasserman <owasserm@redhat.com>
157 Date: Thu Apr 23 17:36:47 2015 +0200
159 rgw: civetweb should use unique request id
161 max_req_id was moved to RGWRados and changed to atomic64_t.
163 The same request id resulted in gc giving the same idtag to all objects
164 resulting in a leakage of rados objects. It only kept the last deleted object in
165 it's queue, the previous objects were never freed.
168 Backport: Hammer, Firefly
170 Signed-off-by: Orit Wasserman <owasserm@redhat.com>
171 (cherry picked from commit c262259)
177 commit c632ef13e05654d0e5ddc79fc7e9553cad8cbed0
178 Author: Ken Dreyer <kdreyer@redhat.com>
179 Date: Mon May 18 10:50:58 2015 -0600
181 debian: set rest-bench-dbg ceph-test-dbg dependencies
183 Debian's debug packages ought to depend on their respective binary
184 packages. This was the case for many of our ceph packages, but it was
185 not the case for ceph-test-dbg or rest-bench-dbg.
187 Add the dependencies on the relevant binary packages, pinned to
188 "= ${binary:Version}" per convention.
190 http://tracker.ceph.com/issues/11673 Fixes: #11673
192 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
193 (cherry picked from commit f898ec1e4e3472b0202280f09653a769fc62c8d3)
195 commit 68211f695941ee128eb9a7fd0d80b615c0ded6cf
196 Merge: 7d11b19 cd8f183
197 Author: Loic Dachary <loic@dachary.org>
198 Date: Mon May 18 14:25:59 2015 +0200
200 Merge pull request #4697 from ceph/wip-11622-firefly
204 Reviewed-by: Loic Dachary <ldachary@redhat.com>
206 commit cd8f1830eb5d7ff75b17d7f0915ee4b3b834b149 (refs/remotes/gh/wip-11622-firefly)
207 Author: Yehuda Sadeh <yehuda@redhat.com>
208 Date: Wed May 13 17:05:22 2015 -0700
210 rgw: merge manifests correctly when there's prefix override
213 Backport: hammer, firefly
215 Prefix override happens in a manifest when a rados object does not
216 conform to the generic prefix set on the manifest. When merging
217 manifests (specifically being used in multipart objects upload), we need
218 to check if the rule that we try to merge has a prefix that is the same
219 as the previous rule. Beforehand we checked if both had the same
220 override_prefix setting, but that might not apply as both manifests
221 might have different prefixes.
223 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
224 (cherry picked from commit 389ae6739ddc6239a4dd7c5f7f9bfc9b645b8577)
226 commit eef3d2f1c400573db90936fd417769183950b6ee
227 Author: Yehuda Sadeh <yehuda@redhat.com>
228 Date: Tue May 12 16:40:10 2015 -0700
230 rgw: restore buffer of multipart upload after EEXIST
233 Backport: hammer, firefly
235 When we need to restart a write of part data, we need to revert to
236 buffer to before the write, otherwise we're going to skip some data.
238 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
239 (cherry picked from commit 580ccaec12daae64c38a1616d0be907bdd70a888)
241 commit 7d11b19003503a9db1572d01f7a170e35b29017d
242 Merge: 114f2e9 9b33965
243 Author: Yehuda Sadeh <yehuda@redhat.com>
244 Date: Fri May 15 10:27:42 2015 -0700
246 Merge pull request #4414 from xinxinsh/wip-11125-firefly
248 rgw: keystone token cache does not work correctly
250 commit 114f2e9bb5665760a5be9816785508f1c97662d5
251 Merge: ac7d28a f33effc
252 Author: Loic Dachary <loic@dachary.org>
253 Date: Fri May 15 17:03:04 2015 +0200
255 Merge pull request #4415 from xinxinsh/wip-11244-firefly
257 cancel_pull: requeue waiters
259 Reviewed-by: Samuel Just <sjust@redhat.com>
261 commit ac7d28a6977084da0b70a3f2d0a54c8fa55b16fa
262 Merge: f273792 1f6b1bb
263 Author: Loic Dachary <loic@dachary.org>
264 Date: Fri May 15 17:02:27 2015 +0200
266 Merge pull request #4416 from xinxinsh/wip-10976-firefly
268 fix PG::all_unfound_are_queried_or_lost for non-existent osds
270 Reviewed-by: Samuel Just <sjust@redhat.com>
272 commit f273792c675aca95694cd36794d8a854731bf308
273 Merge: 8a6632b 019b28b
274 Author: Loic Dachary <loic@dachary.org>
275 Date: Fri May 15 17:02:05 2015 +0200
277 Merge pull request #4556 from xinxinsh/wip-11429-firefly
279 OSD::load_pgs: we need to handle the case where an upgrade from earlier versions which ignored non-existent pgs resurrects a pg with a prehistoric osdmap
281 Reviewed-by: Samuel Just <sjust@redhat.com>
283 commit 8a6632b4e5ffad305f92c89656b161a521529e45
284 Merge: 156c385 a71f309
285 Author: Sage Weil <sage@redhat.com>
286 Date: Thu May 14 09:50:28 2015 -0700
288 Merge pull request #4638 from SUSE/wip-11453-firefly
292 Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
293 Reviewed-by: Sage Weil <sage@redhat.com>
295 commit 019b28b6397dbc3111faa6a8eb57349a48f408d8
296 Author: Samuel Just <sjust@redhat.com>
297 Date: Mon Apr 20 23:45:57 2015 -0700
299 OSD: handle the case where we resurrected an old, deleted pg
301 Prior to giant, we would skip pgs in load_pgs which were not present in
302 the current osdmap. Those pgs would eventually refer to very old
303 osdmaps, which we no longer have causing the assertion failure in 11429
304 once the osd is finally upgraded to a version which does not skip the
305 pgs. Instead, if we do not have the map for the pg epoch, complain to
306 the osd log and skip the pg.
309 Signed-off-by: Samuel Just <sjust@redhat.com>
310 (cherry picked from commit fbfd50de5b9b40d71d2e768418a8eca28b1afaca)
314 resolved by add a new comment line
316 commit 156c385ef726e56d219c3383a4015c50aec2758a
317 Merge: fcd0ea3 8cc4bc1
318 Author: Loic Dachary <loic@dachary.org>
319 Date: Tue May 12 13:57:36 2015 +0200
321 Merge pull request #4379 from ceph/wip-11416
323 rgw: use correct objv_tracker for bucket instance
325 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
326 Reviewed-by: Loic Dachary <ldachary@redhat.com>
328 commit a71f3091a4ea810c02517642fb4ab9ce5516b452
329 Author: Ken Dreyer <kdreyer@redhat.com>
330 Date: Wed Apr 22 16:36:42 2015 -0600
332 init-radosgw: run RGW as root
334 The ceph-radosgw service fails to start if the httpd package is not
335 installed. This is because the init.d file attempts to start the RGW
336 process with the "apache" UID. If a user is running civetweb, there is
337 no reason for the httpd or apache2 package to be present on the system.
339 Switch the init scripts to use "root" as is done on Ubuntu.
341 http://tracker.ceph.com/issues/11453 Refs: #11453
343 Reported-by: Vickey Singh <vickey.singh22693@gmail.com>
344 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
345 (cherry picked from commit 47339c5ac352d305e68a58f3d744c3ce0fd3a2ac)
347 commit fcd0ea3383582e7a1dc8091e7a48e1d4bbaa76ee
348 Author: Greg Farnum <gfarnum@redhat.com>
349 Date: Fri May 8 11:29:44 2015 -0700
351 workunits: remove defunct cephfs set_layout test
353 Signed-off-by: Greg Farnum <gfarnum@redhat.com>
355 commit df053b86a89edf8f390400dad8c5e654e14df327
356 Merge: aef0272 62645d3
357 Author: Yehuda Sadeh <yehuda@redhat.com>
358 Date: Wed May 6 13:07:11 2015 -0700
360 Merge pull request #4571 from ceph/wip-11256-firefly
364 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
366 commit aef0272d72afaef849b5d4acbf55626033369ee8
367 Author: Noah Watkins <noahwatkins@gmail.com>
368 Date: Fri Mar 27 19:34:12 2015 -0700
370 java: libcephfs_jni.so is in /usr/lib64 on rhel
372 Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
373 (cherry picked from commit aed3434dc7c5161c72c7d5655faa3bc693fc9777)
375 commit a551a23d36e3f30ff5b0679a98ee760166ae47ae
376 Author: Yan, Zheng <zyan@redhat.com>
377 Date: Mon Mar 2 21:04:25 2015 +0800
379 qa/workunits/fs/misc: fix filelock_interrupt.py
381 Handle the case that kernel does not support fcntl.F_OFD_SETLK.
382 Also fix the code that checks if fnctl fails with errno == EINTR.
384 Signed-off-by: Yan, Zheng <zyan@redhat.com>
385 (cherry picked from commit 4ececa3dc4a21b98f61a592da9e2be60a0d71625)
386 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
388 commit 07031b151b4ac6677b1f663ac200d09088deff64
389 Merge: 83f8d43 3fb97e2
390 Author: Loic Dachary <loic@dachary.org>
391 Date: Thu Apr 30 00:32:21 2015 +0200
393 Merge pull request #4385 from xinxinsh/wip-11199-firefly
397 Reviewed-by: Samuel Just <sjust@redhat.com>
399 commit 83f8d434a5c245711922ea43a962160177aa5a40
400 Merge: f1425e0 29bc9e5
401 Author: Loic Dachary <loic@dachary.org>
402 Date: Thu Apr 30 00:31:48 2015 +0200
404 Merge pull request #4384 from xinxinsh/wip-11197-firefly
406 pg stuck stale after create with activation delay
408 Reviewed-by: Samuel Just <sjust@redhat.com>
410 commit f1425e093e00343a5ae4b9ff56911bf654a5c152
411 Merge: e980e00 69d9339
412 Author: Loic Dachary <loic@dachary.org>
413 Date: Thu Apr 30 00:31:32 2015 +0200
415 Merge pull request #4382 from xinxinsh/wip-10718-firefly
417 osd/PGLog.h: 279: FAILED assert(log.log.size() == log_keys_debug.size())
419 Reviewed-by: Samuel Just <sjust@redhat.com>
421 commit e980e0036909afc392f9bdf5532ce500af602c2f
422 Merge: b36229b 110c354
423 Author: Loic Dachary <loic@dachary.org>
424 Date: Thu Apr 30 00:23:04 2015 +0200
426 Merge pull request #4185 from ldachary/wip-11156-firefly
428 FAILED assert(soid < scrubber.start || soid >= scrubber.end)
430 Reviewed-by: Samuel Just <sjust@redhat.com>
432 commit b36229b5aeec669cd1494f47120ae207a393846f
433 Merge: da75978 20c2175
434 Author: Sage Weil <sage@redhat.com>
435 Date: Tue Apr 28 08:11:18 2015 -0700
437 Merge pull request #4475 from ceph/wip-9538.firefly
439 mon: OSDMonitor: fallback to json-pretty in case of invalid formatter
441 Reviewed-by: Loic Dachary <ldachary@redhat.com>
443 commit 20c2175352c9d4e4d0e709d294fe6fe0695761cc
444 Author: Loic Dachary <loic-201408@dachary.org>
445 Date: Fri Sep 19 15:28:36 2014 +0200
447 mon: osd find / metadata --format plain fallback
449 ceph --format plain osd find 1 (and metadata) are not implemented and
450 must fallback to the default (json-pretty).
452 http://tracker.ceph.com/issues/9538 Fixes: #9538
454 Signed-off-by: Loic Dachary <loic-201408@dachary.org>
455 (cherry picked from commit 13780d755115387591888f94ea6c58ac0db3ecc4)
457 commit da759784ebda11275106c3b280f1d32b64ade00a
458 Merge: 1a10a7e e1d5773
459 Author: David Zafman <dzafman@redhat.com>
460 Date: Mon Apr 27 10:30:49 2015 -0700
462 Merge pull request #4453 from ceph/wip-11454
464 PG::actingset should be used when checking the number of acting OSDs for...
466 Reviewed-by: Sage Weil <sage@redhat.com>
468 commit 1a10a7eac190249a41b5200f0cc5e3863e76c31d
469 Merge: a860e2b b9da6f1
470 Author: Loic Dachary <loic@dachary.org>
471 Date: Mon Apr 27 10:14:00 2015 +0200
473 Merge pull request #4245 from ceph/wip-11113-firefly
475 librbd: snap_remove should ignore -ENOENT errors
477 Reviewed-by: Shu, Xinxin <xinxin.shu@intel.com>
478 Reviewed-by: Loic Dachary <ldachary@redhat.com>
480 commit a860e2b3c02ef4f1402b54b08a6bacd4b02cc07f
481 Merge: dd15e54 364563a
482 Author: Loic Dachary <loic@dachary.org>
483 Date: Mon Apr 27 10:12:40 2015 +0200
485 Merge pull request #4206 from ceph/wip-5488-firefly
487 librbd: acquire cache_lock before refreshing parent
489 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
491 commit dd15e54b2fae134126e9795a8a973e391c628eb7
492 Merge: 51ff2b6 5404fbf
493 Author: Loic Dachary <loic@dachary.org>
494 Date: Mon Apr 27 10:09:23 2015 +0200
496 Merge pull request #3963 from dachary/wip-10153-firefly
498 Rados.shutdown() dies with Illegal instruction (core dumped)
500 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
502 commit 51ff2b60dc576fb444bcfea8f6cd3e12043ed5b8
503 Merge: 12143ff c0cfd6e
504 Author: Loic Dachary <loic@dachary.org>
505 Date: Mon Apr 27 10:08:15 2015 +0200
507 Merge pull request #4383 from xinxinsh/wip-11144-firefly
509 erasure-code-profile set races with erasure-code-profile rm
511 Reviewed-by: Loic Dachary <ldachary@redhat.com>
513 commit 1f6b1bb51d0b40899155313165ac5e3a21dde11a
514 Author: Mykola Golub <mgolub@mirantis.com>
515 Date: Tue Mar 3 08:45:58 2015 +0200
517 osd: fix PG::all_unfound_are_queried_or_lost for non-existent osds
519 A common mistake upon osd loss is to remove the osd from the crush map
520 before marking the osd lost. This tends to make it so that the user
521 can no longer mark the osd lost to satisfy all_unfound_are_queried_or_lost.
523 The simple solution is for all_unfound_are_queried_or_lost to ignore
524 the osd if it does not exist.
527 Backports: firefly,giant
529 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
530 (cherry picked from commit 5bb51320138ff714806d24312149f6275d546608)
532 commit e1d57730ddfc92b17562080b10bc22fceb86539a
533 Author: Guang Yang <yguang@yahoo-inc.com>
534 Date: Mon Sep 29 08:21:10 2014 +0000
536 PG::actingset should be used when checking the number of acting OSDs for a given PG.
537 Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
539 (cherry picked from commit 19be358322be48fafa17b28054619a8b5e7d403b)
542 src/osd/PG.cc PG::get_backfill_priority() doesn't exist in firefly
543 Variation in code related to no "undersized" state in firefly
547 commit f33effccc0592fddfcd9c5c2f5c3385462aa9b84
548 Author: Samuel Just <sjust@redhat.com>
549 Date: Thu Mar 26 10:26:48 2015 -0700
551 ReplicatedPG::cancel_pull: requeue waiters as well
553 If we are in recovery_wait, we might not recover that object as part of
554 recover_primary for some time. Worse, if we are waiting on a backfill
555 which is blocked waiting on a copy_from on the missing object in
556 question, it can become a dead lock.
560 Signed-off-by: Samuel Just <sjust@redhat.com>
561 (cherry picked from commit 0b2e272430dd7433e6763be99b8a4cb127d9be19)
563 commit 9b3396516c00ef931bab2d4aa6288ad974ec579d
564 Author: Yehuda Sadeh <yehuda@redhat.com>
565 Date: Tue Mar 3 11:03:35 2015 -0800
567 rgw: update keystone cache with token info
570 Backport: hammer, firefly
572 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
573 (cherry picked from commit 6616294aa140ceb83cc61c6ab6f9947636f5e67d)
575 commit 8cc4bc162c8c1c240e62840d968b967f5f47b682 (refs/remotes/gh/wip-11416)
576 Author: Yehuda Sadeh <yehuda@redhat.com>
577 Date: Wed Dec 17 17:12:43 2014 -0800
579 rgw: use correct objv_tracker for bucket instance
581 When trying to create a bucket that already existed, use the
582 objv_tracker of the newly created instance, and not of the original
585 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
586 (cherry picked from commit fe158ecc25feefcea8aea4133118e4a84900a8ec)
588 commit c0cfd6e56ca9d17241da159295bcee7cf44c9ba3
589 Author: Loic Dachary <ldachary@redhat.com>
590 Date: Wed Mar 18 14:17:00 2015 +0100
592 osd: erasure-code-profile incremental rm before set
594 It is possible for an incremental change to have both a rm and a set for
595 a given erasure code profile. It only happens when a rm is followed by a
596 set. When a set is followed by a rm, the rm will remove the pending set
597 in the incremental change.
599 The logic is the same for pool create and pool delete.
601 We must apply the incremental erasure-code-profile removal before the
602 creation otherwise rm and set in the same proposal will ignore the set.
604 This fix is minimal. A better change would be that erasure-code-profile
605 set checks if there is a pending removal and wait_for_finished_proposal
608 http://tracker.ceph.com/issues/11144 Fixes: #11144
610 Signed-off-by: Loic Dachary <ldachary@redhat.com>
611 (cherry picked from commit 0d52aca0d0c302983d03b0f5213ffed187e4ed63)
615 resolved by replacing i++ with ++i
617 commit 3fb97e25b194e92112077385b10381801e02ddb9
618 Author: Samuel Just <sjust@redhat.com>
619 Date: Tue Mar 24 15:14:34 2015 -0700
621 ReplicatedPG: trim backfill intervals based on peer's last_backfill_started
623 Otherwise, we fail to trim the peer's last_backfill_started and get bug 11199.
625 1) osd 4 backfills up to 31bccdb2/mira01213209-286/head (henceforth: foo)
627 2) Interval change happens
629 3) osd 0 now finds itself backfilling to 4 (lb=foo) and osd.5
630 (lb=b6670ba2/mira01213209-160/snapdir//1, henceforth: bar)
632 4) recover_backfill causes both 4 and 5 to scan forward, so 4 has an interval
633 starting at foo, 5 has an interval starting at bar.
635 5) Once those have come back, recover_backfill attempts to trim off the
636 last_backfill_started, but 4's interval starts after that, so foo remains in
637 osd 4's interval (this is the bug)
639 7) We serve a copyfrom on foo (sent to 4 as well).
641 8) We eventually get to foo in the backfilling. Normally, they would have the
642 same version, but of course we don't update osd.4's interval from the log since
643 it should not have received writes in that interval. Thus, we end up trying to
644 recover foo on osd.4 anyway.
646 9) But, an interval change happens between removing foo from osd.4 and
647 completing the recovery, leaving osd.4 without foo, but with lb >= foo
651 Signed-off-by: Samuel Just <sjust@redhat.com>
652 (cherry picked from commit 1388d6bd949a18e8ac0aecb0eb79ffb93d316879)
654 commit 29bc9e56a978d4e18a507e71858baa21037964c4
655 Author: Samuel Just <sjust@redhat.com>
656 Date: Tue Mar 24 10:48:02 2015 -0700
658 PG: set/clear CREATING in Primary state entry/exit
660 Previously, we did not actually set it when we got a pg creation message from
661 the mon. It would actually get set on the first start_peering_interval after
662 that point. If we don't get that far, but do send a stat update to the mon, we
663 can end up with 11197. Instead, let's just set it and clear it upon entry into
664 and exit from the Primary state.
667 Signed-off-by: Samuel Just <sjust@redhat.com>
668 (cherry picked from commit ddf0292250dfb1040d3cad96fa2cf886fd65933c)
670 commit 12143ff9b25fdd96f8d1a9cecb1329c7f354d414
671 Merge: 53eff01 bf1d8e8
672 Author: Yehuda Sadeh <yehuda@redhat.com>
673 Date: Mon Apr 6 10:24:06 2015 -0700
675 Merge pull request #4275 from jeanchlopez/wip-11160-firefly
677 rgw: shouldn't need to disable rgw_socket_path if frontend is configured
679 commit bf1d8e888439df75feadde76bafe7d07d0e8481a
680 Author: Yehuda Sadeh <yehuda@redhat.com>
681 Date: Wed Mar 18 20:49:13 2015 -0700
683 rgw: don't use rgw_socket_path if frontend is configured
686 Backport: hammer, firefly
688 Previously if we wanted to use the tcp fcgi socket, we needed to clear
691 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
693 commit 53eff01f1e7ecd3783bb05c47588a134d4fededc
694 Merge: 899738e 80afc5e
695 Author: Josh Durgin <jdurgin@redhat.com>
696 Date: Wed Apr 1 16:30:23 2015 -0700
698 Merge pull request #4247 from ceph/wip-11303
700 Fix do_autogen.sh so that -L is allowed
702 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
704 commit 80afc5eca293e5e2f168f219931a2f554040cdd8
705 Author: Alfredo Deza <adeza@redhat.com>
706 Date: Wed Apr 1 19:10:33 2015 -0400
708 Fix do_autogen.sh so that -L is allowed
710 Signed-off-by: Alfredo Deza <adeza@redhat.com>
712 commit b9da6f1025683d240baa73a9fcccbf2780035231
713 Author: Jason Dillaman <dillaman@redhat.com>
714 Date: Mon Mar 16 18:40:49 2015 -0400
716 librbd: snap_remove should ignore -ENOENT errors
718 If the attempt to deregister the snapshot from the parent
719 image fails with -ENOENT, ignore the error as it is safe
720 to assume that the child is not associated with the parent.
723 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
724 (cherry picked from commit cf8094942ccdba831e03e5a79451cfa5d78a135f)
726 commit b250b3cfae69f4e8354027fae26fd85a792da0df
727 Author: Jason Dillaman <dillaman@redhat.com>
728 Date: Mon Mar 16 18:35:07 2015 -0400
730 librbd: get_parent_info should protect against invalid parent
732 get_parent_info should return -ENOENT if the image does not
733 have an associated parent image.
735 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
736 (cherry picked from commit 21afd0ef8e1fb81c5ace5fd403513c542e2413e3)
738 commit 69d9339fb352342a87e1148e9b5161246b27776a
739 Author: Samuel Just <sjust@redhat.com>
740 Date: Mon Feb 2 09:07:27 2015 -0800
742 PGLog: improve PGLog::check() debugging
745 Signed-off-by: Samuel Just <sjust@redhat.com>
746 (cherry picked from commit c656bcec2441c90b084ca50a17c37625d69942a1)
748 commit 73cbb6f34a5a556dbbd4db2e6f81391d83447efd
749 Author: Samuel Just <sjust@redhat.com>
750 Date: Tue Mar 17 10:07:03 2015 -0700
752 PGLog::merge_log: in tail extend case, log.log might be empty
754 Even if the tail != last_update, the log might be empty due to split
755 moving all entries into other logs.
758 Signed-off-by: Samuel Just <sjust@redhat.com>
759 (cherry picked from commit f5a2aef3db29b99634250fd388a0c2d9b9a23d38)
761 commit 62645d30b0ceee075a56bc692fd65cee85b09aa5 (refs/remotes/gh/wip-11256-firefly)
762 Author: Yehuda Sadeh <yehuda@redhat.com>
763 Date: Mon Mar 30 17:34:57 2015 -0700
765 cls_rgw: use multimap to keep pending operations in bucket index
768 Multiple concurrent requests might be sent using the same tag, need the
769 entry map to be able to hold multiple entries.
771 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
773 commit 7538319dd7aa80a3318c108d345dee8044cf20a8
774 Author: Yehuda Sadeh <yehuda@redhat.com>
775 Date: Fri Mar 27 16:32:48 2015 -0700
777 rgw: generate new tag for object when setting object attrs
780 Backport: firefly, hammer
782 Beforehand we were reusing the object's tag, which is problematic as
783 this tag is used for bucket index updates, and we might be clobbering a
784 racing update (like object removal).
786 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
788 commit 364563aac979fdf5ccbb6c588051d097a26bc594
789 Author: Jason Dillaman <dillaman@redhat.com>
790 Date: Mon Mar 16 11:04:22 2015 -0400
792 librbd: acquire cache_lock before refreshing parent
794 cache_lock needs to be acquired before snap_lock to avoid
795 the potential for deadlock.
798 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
800 commit 110c35498942ea0feec395b6e7992f802dd740ce
801 Author: Samuel Just <sjust@redhat.com>
802 Date: Fri Mar 20 15:28:15 2015 -0700
804 ReplicatedPG::promote_object: check scrubber and block if necessary
806 Otherwise, we might attempt to promote into an in-progress scrub
807 interval causing 11156. I would have added a return value to
808 promote_object(), but could not find an existing user which
809 cared to distinguish the cases, even with a null op passed.
810 All existing users are in maybe_handle_cache. The ones which
811 pass a null op are for promoting the object in parallel
812 with a proxy -- a case where not actually performing the promote
813 does not really matter.
816 Signed-off-by: Samuel Just <sjust@redhat.com>
817 (cherry picked from commit 65bb4df599541cd2e0f195b905f24f529e255c00)
819 commit 899738e10e82b50dcf7dfffe5cc83937179bf323
820 Merge: 15acfe7 9437cb1
821 Author: Loic Dachary <ldachary@redhat.com>
822 Date: Mon Mar 23 20:38:43 2015 +0100
824 Merge pull request #4126 from dzafman/wip-11176-firefly
826 ceph-objectstore-tool: Output only unsupported features when incomatible
828 Reviewed-by: Loic Dachary <ldachary@redhat.com>
830 commit 15acfe7f226ca7bc2c942d5fbcd3a40bd41e5930
831 Merge: 6c95cd2 cddbff9
832 Author: Loic Dachary <ldachary@redhat.com>
833 Date: Sat Mar 21 11:38:28 2015 +0100
835 Merge pull request #4079 from dachary/wip-11157-firefly
837 doc,tests: force checkout of submodules
839 Reviewed-by: David Zafman <dzafman@redhat.com>
841 commit 6c95cd24f6f4a1a933f8799754831e7a5c0a725d
842 Merge: ea79a3b 43053fc
843 Author: Yuri Weinstein <yuri.weinstein@gmail.com>
844 Date: Fri Mar 20 21:06:17 2015 -0700
846 Merge pull request #4129 from dzafman/wip-11139-firefly
848 ceph-objectstore-tool: Use exit status 11 for incompatible import attemp...
850 commit 43053fcd8969c406969fef67613aa37ad1cc86bf
851 Author: David Zafman <dzafman@redhat.com>
852 Date: Fri Mar 20 17:48:01 2015 -0700
854 ceph-objectstore-tool: Use exit status 11 for incompatible import attempt
856 This is used so upgrade testing doesn't generate false failure.
859 Signed-off-by: David Zafman <dzafman@redhat.com>
860 (cherry picked from commit 175aff8afe8215547ab57f8d8017ce8fdc0ff543)
862 commit 9437cb1b284ec9366b51d660396c2c8a9366b31f
863 Author: David Zafman <dzafman@redhat.com>
864 Date: Fri Mar 20 16:57:40 2015 -0700
866 ceph-objectstore-tool: Output only unsupported features when incomatible
869 Backport: firefly, giant
871 Signed-off-by: David Zafman <dzafman@redhat.com>
872 (cherry picked from commit 5b23f5b5892b36fb7d06efc0d77e64a24ef6e8c9)
874 commit ea79a3b122917ddf5dc1972bb9dc5b20f78e2f18
875 Merge: c1c20d8 07fc9f6
876 Author: Loic Dachary <ldachary@redhat.com>
877 Date: Fri Mar 20 08:44:39 2015 +0100
879 Merge pull request #3970 from ceph/firefly-11053
881 mds: fix assertion caused by system clock backwards
883 Reviewed-by: John Spray <john.spray@redhat.com>
885 commit c1c20d89d511499d678fdba0667581e88b9b5d95
886 Merge: 2fbb9a6 63b39db
887 Author: Loic Dachary <ldachary@redhat.com>
888 Date: Fri Mar 20 08:42:58 2015 +0100
890 Merge pull request #4021 from ceph/wip-7737-firefly
892 osd: fix negative degraded objects during backfilling
894 Reviewed-by: Sage Weil <sage@redhat.com>
896 commit 2fbb9a63a82ac5136b033799aec303fc151b25e5
897 Merge: 3160e8d 2c7eda6
898 Author: Loic Dachary <ldachary@redhat.com>
899 Date: Fri Mar 20 08:38:26 2015 +0100
901 Merge pull request #3952 from dachary/wip-9986-firefly
903 objecter: fix map skipping
905 Reviewed-by: Sage Weil <sage@redhat.com>
907 commit 3160e8d6918a04d1fec9fdccbc30bf007c7940c6
908 Author: Yehuda Sadeh <yehuda@redhat.com>
909 Date: Wed Mar 18 20:55:24 2015 -0700
911 init-radosgw*: don't require rgw_socket_path to be defined
914 Backport: hammer, firefly
916 Scripts required rgw_socket_path to exist in order to start radosgw.
919 Reported-by: Dan Mick <dmick@redhat.com>
920 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
921 (cherry picked from commit 6823bcdcd0ce72cd223e809291f46d82da76115c)
923 commit cddbff9a3653d6257d13e0ac411cd6e4cd71feef
924 Author: Loic Dachary <ldachary@redhat.com>
925 Date: Thu Mar 19 00:32:39 2015 +0100
927 doc,tests: force checkout of submodules
929 When updating submodules, always checkout even if the HEAD is the
930 desired commit hash (update --force) to avoid the following:
932 * a directory gmock exists in hammer
933 * a submodule gmock replaces the directory gmock in master
934 * checkout master + submodule update : gmock/.git is created
935 * checkout hammer : the gmock directory still contains the .git from
936 master because it did not exist at the time and checkout won't
937 remove untracked directories
938 * checkout master + submodule update : git rev-parse HEAD is
939 at the desired commit although the content of the gmock directory
942 http://tracker.ceph.com/issues/11157 Fixes: #11157
944 Signed-off-by: Loic Dachary <ldachary@redhat.com>
946 commit 63b39dbd529936e60d0fd08dffd35f82b3d1729c (refs/remotes/gh/wip-7737-firefly)
947 Author: Guang Yang <yguang@yahoo-inc.com>
948 Date: Thu Feb 26 08:13:12 2015 +0000
950 osd: fix negative degraded objects during backfilling
952 When there is deleting requests during backfilling, the reported number of degraded
953 objects could be negative, as the primary's num_objects is the latest (locally) but
954 the number for replicas might not reflect the deletings. A simple fix is to ignore
955 the negative subtracted value.
957 Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
958 (cherry picked from commit 14d7e36d3c978844da73d0e1c8a3a1ec863bac15)
963 commit 493d285508914769cba3639b601ae6c20303af0d
964 Merge: 9839726 8a25a51
965 Author: Loic Dachary <ldachary@redhat.com>
966 Date: Mon Mar 16 23:20:36 2015 +0100
968 Merge pull request #3966 from theanalyst/wip-10698-backport
970 rgw: fail s3 POST auth if keystone not configured
972 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
974 commit 9839726f009a3189013a23e8226d2f7618f1d56b
975 Merge: dab85cb 651dc55
976 Author: Loic Dachary <ldachary@redhat.com>
977 Date: Mon Mar 16 23:19:22 2015 +0100
979 Merge pull request #3934 from dachary/wip-10665-firefly
981 rgw: Swift API. Dump container's custom metadata.
983 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
985 commit dab85cb7fcc5770fe4d6f075cf583a33ea335aa3
986 Merge: 0e55046 d0fd417
987 Author: Loic Dachary <ldachary@redhat.com>
988 Date: Mon Mar 16 23:18:59 2015 +0100
990 Merge pull request #3929 from dachary/wip-10475-firefly
992 rgw: Swift API. Support for X-Remove-Container-Meta-{key} header.
994 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
996 commit 0e550461666d6e3d32981f99c8327931a6bd6d62
997 Merge: 1ca6dd9 963439f
998 Author: Loic Dachary <ldachary@redhat.com>
999 Date: Mon Mar 16 23:18:24 2015 +0100
1001 Merge pull request #3938 from dachary/wip-10770-firefly
1003 rgw: send appropriate op to cancel bucket index pending operation
1005 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1007 commit 1ca6dd9676014a81983bd397e3154bf53243c7f2
1008 Merge: 66327d6 34d19e1
1009 Author: Loic Dachary <ldachary@redhat.com>
1010 Date: Mon Mar 16 23:17:56 2015 +0100
1012 Merge pull request #3961 from dachary/wip-10106-firefly
1014 rgw: flush xml header on get acl request
1016 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1018 commit 66327d69a9bfa875d58b063c180a11b2769a093e
1019 Merge: de45d9e 9074eb7
1020 Author: Loic Dachary <ldachary@redhat.com>
1021 Date: Mon Mar 16 23:16:53 2015 +0100
1023 Merge pull request #3958 from dachary/wip-10062-firefly
1025 rgw: check for timestamp for s3 keystone auth
1028 Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1029 Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
1030 Reviewed-by: Valery Tschopp <valery.tschopp@switch.ch>
1032 commit de45d9e2606d8fb6ea5533521163669e748e7d01
1033 Merge: 308f758 8ef14fc
1034 Author: Loic Dachary <ldachary@redhat.com>
1035 Date: Mon Mar 16 17:00:27 2015 +0100
1037 Merge pull request #3942 from dachary/wip-10844-firefly
1039 mon: MonCap: take EntityName instead when expanding profiles
1041 Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
1043 commit 308f758f49d28c012f3ba765519144e5ea5794e6
1044 Merge: c59a081 ca42905
1045 Author: Loic Dachary <ldachary@redhat.com>
1046 Date: Mon Mar 16 16:53:48 2015 +0100
1048 Merge pull request #3936 from dachary/wip-10724-firefly
1050 backport ceph-disk man page to Firefly
1052 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1054 commit c59a08135c35072fa05104e26b500553e800cdd1
1055 Merge: 331acae 8ec8f11
1056 Author: Loic Dachary <ldachary@redhat.com>
1057 Date: Mon Mar 16 16:50:39 2015 +0100
1059 Merge pull request #3940 from dachary/wip-8753-firefly
1061 ReplicatedPG::on_change: clean up callbacks_for_degraded_object
1063 Reviewed-by: Samuel Just <sjust@redhat.com>
1065 commit 331acae4d6b34bb047c914945a2d9c0d9c7b9562
1066 Merge: fc364a7 4e32ff2
1067 Author: Loic Dachary <ldachary@redhat.com>
1068 Date: Mon Mar 16 16:49:56 2015 +0100
1070 Merge pull request #3827 from dachary/wip-10259-firefly
1072 osd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::o...
1074 Reviewed-by: Samuel Just <sjust@redhat.com>
1076 commit fc364a76f85eb5016ea460e5fd9c1603df374bcf
1077 Merge: 31d99d2 b0d0d44
1078 Author: Loic Dachary <ldachary@redhat.com>
1079 Date: Mon Mar 16 16:48:02 2015 +0100
1081 Merge pull request #3962 from dachary/wip-10150-firefly
1083 ReplicatedPG::scan_range: an object can disappear between the list and t...
1085 Reviewed-by: Samuel Just <sjust@redhat.com>
1087 commit 31d99d2de714eb4a8eeb4a431cbc0d40ca749f15
1088 Merge: 45f0870 5865411
1089 Author: Loic Dachary <ldachary@redhat.com>
1090 Date: Mon Mar 16 16:45:32 2015 +0100
1092 Merge pull request #3948 from dachary/wip-9891-firefly
1094 DBObjectMap: lock header_lock on sync()
1096 Reviewed-by: Samuel Just <sjust@redhat.com>
1098 commit 45f087032e27c63dc459318717b05fe5f9888664
1099 Merge: 3050262 6207333
1100 Author: Loic Dachary <ldachary@redhat.com>
1101 Date: Mon Mar 16 16:43:48 2015 +0100
1103 Merge pull request #3949 from dachary/wip-9915-firefly
1105 osd: cache tiering: fix the atime logic of the eviction
1107 Reviewed-by: Samuel Just <sjust@redhat.com>
1109 commit 3050262d7dcb8ac20b9f86544461bb59f4b87cf5
1110 Merge: c0abc4d 0f31388
1111 Author: Loic Dachary <ldachary@redhat.com>
1112 Date: Mon Mar 16 16:40:12 2015 +0100
1114 Merge pull request #3944 from dachary/wip-9193-firefly
1116 messages/MWatchNotify: include an error code in the message
1118 Reviewed-by: Samuel Just <sjust@redhat.com>
1120 commit c0abc4d769afd00773a9f466ffd3feced9cdb17d
1121 Merge: f9acd3a f856739
1122 Author: Loic Dachary <ldachary@redhat.com>
1123 Date: Mon Mar 16 16:39:41 2015 +0100
1125 Merge pull request #3943 from dachary/wip-8011-firefly
1127 ReplicatedPG: fail a non-blocking flush if the object is being scrubbed
1129 Reviewed-by: Samuel Just <sjust@redhat.com>
1131 commit f9acd3ad7397ac1e745beeeaf21b55ecd95484a1
1132 Merge: f95d327 ca96b59
1133 Author: Loic Dachary <ldachary@redhat.com>
1134 Date: Mon Mar 16 16:39:16 2015 +0100
1136 Merge pull request #3941 from dachary/wip-10817-firefly
1138 WorkQueue: make wait timeout on empty queue configurable
1140 Reviewed-by: Samuel Just <sjust@redhat.com>
1142 commit f95d327cbc0750cfb77114c66082ddd5fc458b94
1143 Merge: 32de8ab 3782b8b
1144 Author: Loic Dachary <ldachary@redhat.com>
1145 Date: Mon Mar 16 16:38:42 2015 +0100
1147 Merge pull request #3937 from dachary/wip-10762-firefly
1149 mon: ignore osd failures from before up_from
1151 Reviewed-by: Samuel Just <sjust@redhat.com>
1153 commit 32de8ab146f242f7b73aca211f059bc39d38f85c
1154 Merge: 24a8c10 6fd3dfa
1155 Author: Loic Dachary <ldachary@redhat.com>
1156 Date: Mon Mar 16 16:38:22 2015 +0100
1158 Merge pull request #3933 from dachary/wip-10617-firefly
1160 osd: do not ignore deleted pgs on startup
1162 Reviewed-by: Samuel Just <sjust@redhat.com>
1164 commit 24a8c10a5a215c60b525f4170e45565390e02231
1165 Merge: f4e76c3 368a5a8
1166 Author: Loic Dachary <ldachary@redhat.com>
1167 Date: Mon Mar 16 16:38:01 2015 +0100
1169 Merge pull request #3932 from dachary/wip-10546-firefly
1171 mon: Monitor: fix timecheck rounds period
1173 Reviewed-by: Samuel Just <sjust@redhat.com>
1175 commit f4e76c3db90bf383c02cdb8cca19a37cd187095b
1176 Merge: fa518ff 66b13f2
1177 Author: Loic Dachary <ldachary@redhat.com>
1178 Date: Mon Mar 16 16:37:36 2015 +0100
1180 Merge pull request #3931 from dachary/wip-10512-firefly
1182 osd: requeue blocked op before flush it was blocked on
1184 Reviewed-by: Samuel Just <sjust@redhat.com>
1186 commit fa518ffc5961785f01f0f91980c38a7e02686901
1187 Merge: ac9980e a22aa8f
1188 Author: Loic Dachary <ldachary@redhat.com>
1189 Date: Mon Mar 16 16:37:05 2015 +0100
1191 Merge pull request #3930 from dachary/wip-10497-firefly
1193 librados: Translate operation flags from C APIs
1195 Reviewed-by: Samuel Just <sjust@redhat.com>
1196 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1198 commit ac9980e074adf587b8b16af0bd08b3fc3233804d
1199 Merge: ccebb5f d3de8a5
1200 Author: Loic Dachary <ldachary@redhat.com>
1201 Date: Mon Mar 16 16:31:40 2015 +0100
1203 Merge pull request #3955 from dachary/wip-10059-firefly
1205 PG: always clear_primary_state
1207 Reviewed-by: Samuel Just <sjust@redhat.com>
1209 commit ccebb5f90bea0fd3bac1bd7ab93e5e07700f1301
1210 Merge: a30379d f4bab86
1211 Author: Loic Dachary <ldachary@redhat.com>
1212 Date: Mon Mar 16 16:31:16 2015 +0100
1214 Merge pull request #3954 from dachary/wip-10014-firefly
1216 ObjectStore: Don't use largest_data_off to calc data_align.
1218 Reviewed-by: Samuel Just <sjust@redhat.com>
1220 commit a30379d9af89cffa4b3083ae14a94e3758c2b01c
1221 Merge: e575ca8 eb03e79
1222 Author: Loic Dachary <ldachary@redhat.com>
1223 Date: Mon Mar 16 16:25:59 2015 +0100
1225 Merge pull request #3947 from dachary/wip-9555-firefly
1227 osd: check that source OSD is valid for MOSDRepScrub
1229 Reviewed-by: Samuel Just <sjust@redhat.com>
1231 commit e575ca84419f8be5c7fae7e2ffac549956a74f82
1232 Merge: cd675bb c60da2f
1233 Author: Loic Dachary <ldachary@redhat.com>
1234 Date: Mon Mar 16 16:25:30 2015 +0100
1236 Merge pull request #3964 from dachary/wip-10157-firefly
1238 PGLog: include rollback_info_trimmed_to in (read|write)_log
1240 Reviewed-by: Samuel Just <sjust@redhat.com>
1242 commit cd675bba5fdfb85689880ca7ecbd284181984a63
1243 Merge: 2b8e476 1a0f770
1244 Author: Loic Dachary <ldachary@redhat.com>
1245 Date: Mon Mar 16 16:24:55 2015 +0100
1247 Merge pull request #3960 from dachary/wip-6003-firefly
1249 FileJournal: fix journalq population in do_read_entry()
1251 Reviewed-by: Samuel Just <sjust@redhat.com>
1253 commit 2b8e4762edb7c35950f7e0d69bba2b5e1d83133a
1254 Merge: d434ead a746f7e
1255 Author: Loic Dachary <ldachary@redhat.com>
1256 Date: Mon Mar 16 16:24:03 2015 +0100
1258 Merge pull request #3950 from dachary/wip-9985-firefly
1260 Get the currently atime of the object in cache pool for eviction
1262 Reviewed-by: Samuel Just <sjust@redhat.com>
1263 Reviewed-by: Xinze Chi <xmdxcxz@gmail.com>
1265 commit d434eadadd1df6e4df18a6914015736bc09722d1
1266 Merge: e79e5f8 5f1245e
1267 Author: Loic Dachary <ldachary@redhat.com>
1268 Date: Mon Mar 16 16:20:12 2015 +0100
1270 Merge pull request #3935 from dachary/wip-10723-firefly
1272 Fix memory leak in python rados bindings
1274 Reviewed-by: Samuel Just <sjust@redhat.com>
1275 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1277 commit e79e5f8fbbfba6984cf21784e20d1c46cb60a397
1278 Merge: a9a36de 91b2aca
1279 Author: Loic Dachary <ldachary@redhat.com>
1280 Date: Mon Mar 16 15:02:37 2015 +0100
1282 Merge pull request #3866 from ceph/wip-cot-firefly
1284 Backport ceph-objectstore-tool changes to firefly
1286 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1288 commit a9a36deb89ac5719787e905469fe0b1bde5d58ca
1289 Merge: 83c571e 7e85722
1290 Author: Loic Dachary <ldachary@redhat.com>
1291 Date: Mon Mar 16 15:00:56 2015 +0100
1293 Merge pull request #3996 from dzafman/wip-10676
1295 Fix ceph command manpage to match ceph -h
1297 Reviewed-by: Xinxin Shu <xinxin.shu5040@gmail.com>
1299 commit 83c571e3067b4cad3e4567522c797d09a82d87db
1300 Merge: baa74b8 d5c3a14
1301 Author: Loic Dachary <ldachary@redhat.com>
1302 Date: Mon Mar 16 14:55:37 2015 +0100
1304 Merge pull request #3927 from dachary/wip-10351-firefly
1306 mount.ceph: avoid spurious error message
1308 Reviewed-by: Yan, Zheng <zyan@redhat.com>
1310 commit 7e85722fd4c89715fc2ed79697c82d65d7ebf287
1311 Author: David Zafman <dzafman@redhat.com>
1312 Date: Fri Mar 13 16:50:13 2015 -0700
1314 doc: Minor fixes to ceph command manpage
1318 Signed-off-by: David Zafman <dzafman@redhat.com>
1320 commit 9ac488c1eb0e30511079ba05aaf11c79615b3940
1321 Author: David Zafman <dzafman@redhat.com>
1322 Date: Thu Mar 12 11:39:52 2015 -0700
1324 doc: Fix ceph command manpage to match ceph -h (firefly)
1326 Improve synopsis section
1329 Signed-off-by: David Zafman <dzafman@redhat.com>
1331 commit 5f1245e131e33a98572408c8223deed2c7cf7b75
1332 Author: Josh Durgin <jdurgin@redhat.com>
1333 Date: Mon Feb 9 20:50:23 2015 -0800
1335 rados.py: keep reference to python callbacks
1337 If we don't keep a reference to these, the librados aio calls will
1338 segfault since the python-level callbacks will have been garbage
1339 collected. Passing them to aio_create_completion() does not take a
1340 reference to them. Keep a reference in the python Completion object
1341 associated with the request, since they need the same lifetime.
1343 This fixes a regression from 60b019f69aa0e39d276c669698c92fc890599f50.
1346 Backport: dumpling, firefly, giant
1347 Signed-off-by: Josh Durgin <jdurgin@redhat.com>
1348 (cherry picked from commit 36d37aadbbbece28d70e827511f1a473d851463d)
1350 commit cf366fc3b21ff6f98530dbadb75a430c25672d56
1351 Author: Nilamdyuti Goswami <ngoswami@redhat.com>
1352 Date: Thu Dec 18 17:11:22 2014 +0530
1354 doc: Changes format style in ceph to improve readability as html.
1356 Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
1357 (cherry picked from commit 8b796173063ac9af8c21364521fc5ee23d901196)
1359 commit 07fc9f66a69aa31d2cf8bf7a277d3e14ad6209be
1360 Author: Yan, Zheng <zyan@redhat.com>
1361 Date: Thu Mar 12 11:01:46 2015 +0800
1363 mds: fix assertion caused by system clock backwards
1366 Signed-off-by: Yan, Zheng <zyan@redhat.com>
1368 commit 8a25a51e42cdaed2c66dc25a6c6d0245441123a3
1369 Author: Yehuda Sadeh <yehuda@redhat.com>
1370 Date: Fri Jan 30 07:03:30 2015 -0800
1372 rgw: fail s3 POST auth if keystone not configured
1375 This fixes issue introduced in 8b3dfc9472022ea45ad24e02e0aa21dfdad798f8,
1376 where if user does not exist, we try keystone authentication. However,
1377 if keystone is not configured we justt fall through without failing.
1378 This would have failed later on due to bucket permissions, unless bucket
1379 had a public write permissions.
1382 Reported-by: Valery Tschopp <valery.tschopp@switch.ch>
1383 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1386 src/rgw/rgw_rest_s3.cc
1388 commit eb03e792040bd22c1ae8b7dd73d94fbfd6208eec
1389 Author: Sage Weil <sage@redhat.com>
1390 Date: Sat Dec 13 08:06:31 2014 -0800
1392 osd: check that source OSD is valid for MOSDRepScrub
1394 Make sure the message we got from the peer OSD is valid. Specifically,
1395 this avoids a race like this:
1398 - B sends MOSDRepScrub
1399 - A accepts connection from B as new
1400 - A replies to scrub
1401 - B crashes because msgr seq 1 < expected seq 1000+
1403 See #8880 for the most recent fix for requests.
1406 Backport: giant, firefly
1407 Signed-off-by: Sage Weil <sage@redhat.com>
1408 (cherry picked from commit 847e5e102522d651aa9687a54aaafcebf3afc596)
1411 src/osd/OSD.cc: require functions first argument is now a reference
1413 commit ae18707b3caa115dc510aff38b77f8afe8555c61
1414 Author: Sage Weil <sage@redhat.com>
1415 Date: Sat Dec 13 07:56:39 2014 -0800
1417 osd: pass Message* to most require_* helpers
1419 These do nothing but op->get_req(); pass the Message* explicitly so that
1420 non-OpRequest callers can use them.
1422 Signed-off-by: Sage Weil <sage@redhat.com>
1423 (cherry picked from commit 707a111d53efb09b3471dd3788b86d2bfee4e96f)
1428 significantly changes had to be made but in a simple way and
1429 stays within the scope of the original commit
1431 commit c60da2f3c34e7325c748d2d6e55140a0a30013fd
1432 Author: Samuel Just <sjust@redhat.com>
1433 Date: Thu Nov 20 15:15:08 2014 -0800
1435 PGLog: include rollback_info_trimmed_to in (read|write)_log
1438 Backport: firefly, giant
1439 Signed-off-by: Samuel Just <sjust@redhat.com>
1440 (cherry picked from commit 1fe8b846641486cc294fe7e1d2450132c38d2dba)
1444 in the context coll_t::META_COLL was replaced with META_COLL
1446 commit 1a0f770eea18af6b276a31157f201a93166eb038
1447 Author: Samuel Just <sjust@redhat.com>
1448 Date: Fri Feb 6 09:52:29 2015 -0800
1450 FileJournal: fix journalq population in do_read_entry()
1453 Backport: dumpling, firefly, giant
1454 Signed-off-by: Samuel Just <sjust@redhat.com>
1455 (cherry picked from commit bae1f3eaa09c4747b8bfc6fb5dc673aa6989b695)
1458 src/os/FileJournal.cc
1459 because reinterpret_cast was added near two hunks after firefly
1461 commit a746f7e5985198024067cb6e123569c09169b356
1462 Author: Sage Weil <sage@redhat.com>
1463 Date: Fri Oct 31 19:33:59 2014 -0700
1465 osd/ReplicatedPG: fix compile error
1467 From 1fef4c3d541cba360738437420ebfa2447d5802e.
1469 Signed-off-by: Sage Weil <sage@redhat.com>
1470 (cherry picked from commit 4a9ad7dc2da6f4fa6a64235776a3f1d2799aef60)
1472 commit 5404fbfdd9b18cdb3fe5bed67146c769ec3acfa0
1473 Author: Federico Simoncelli <fsimonce@redhat.com>
1474 Date: Sat Nov 15 14:14:04 2014 +0000
1476 common: do not unlock rwlock on destruction
1478 According to pthread_rwlock_unlock(3p):
1480 Results are undefined if the read-write lock rwlock is not held
1481 by the calling thread.
1485 https://sourceware.org/bugzilla/show_bug.cgi?id=17561
1487 Calling pthread_rwlock_unlock on an rwlock which is not locked
1490 calling pthread_rwlock_unlock on RWLock destruction could cause
1491 an unknown behavior for two reasons:
1493 - the lock is acquired by another thread (undefined)
1494 - the lock is not acquired (undefined)
1496 Moreover since glibc-2.20 calling pthread_rwlock_unlock on a
1497 rwlock that is not locked results in a SIGILL that kills the
1500 This patch removes the pthread_rwlock_unlock call on destruction
1501 and replaces it with an assertion to check that the RWLock is
1504 Any code that relied on the implicit release is now going to
1505 break the assertion, e.g.:
1510 } // implicit release, wrong.
1512 Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
1513 (cherry picked from commit cf2104d4d991361c53f6e2fea93b69de10cd654b)
1515 commit a73a4cb3889a6da21c3cfa4ddfa16d1a7059d20c
1516 Author: Yehuda Sadeh <yehuda@inktank.com>
1517 Date: Sat May 3 08:32:19 2014 -0700
1519 common/RWLock: track read/write locks via atomics for assertion checks
1521 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
1522 (cherry picked from commit 92615ea95a31d9fd22c3d11c860e0f502dc52c26)
1524 commit b0d0d44018de6289b64b6334edd4959ca4a0cc48
1525 Author: Samuel Just <sjust@redhat.com>
1526 Date: Thu Dec 11 13:05:54 2014 -0800
1528 ReplicatedPG::scan_range: an object can disappear between the list and the attr get
1530 The first item in the range is often last_backfill, upon which writes
1531 can be occuring. It's trimmed off on the primary side anyway.
1534 Backport: dumpling, firefly, giant
1535 Signed-off-by: Samuel Just <sjust@redhat.com>
1536 (cherry picked from commit dce6f288ad541fe7f0ef8374301cd712dd3bfa39)
1538 commit 34d19e1501b242fd8fc7cc95656592b5982f29a6
1539 Author: Yehuda Sadeh <yehuda@redhat.com>
1540 Date: Fri Jan 30 18:42:40 2015 -0800
1542 rgw: flush xml header on get acl request
1545 Backport: firefly, giant
1547 dump_start() updates the formatter with the appropriate prefix, however,
1548 we never flushed the formatter.
1550 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1551 (cherry picked from commit eb45f861343162e018968b8c56693a8c6f5b2cab)
1553 commit 9074eb7c46589aa1e5d10a2b9a8534f22dff2154
1554 Author: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
1555 Date: Mon Nov 17 17:37:00 2014 +0530
1557 rgw: check for timestamp for s3 keystone auth
1559 This commit ensures that we check for timestamp of s3 request is within
1560 acceptable grace time of radosgw
1561 Addresses some failures in #10062
1563 Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
1565 (cherry picked from commit 4b35ae067fef9f97b886afe112d662c61c564365)
1567 commit d3de8a5722a68d69023cf60c9076c2fb19058bf9
1568 Author: Samuel Just <sjust@redhat.com>
1569 Date: Wed Nov 19 08:20:16 2014 -0800
1571 PG: always clear_primary_state on new interval, but only clear pg temp if not primary
1573 Signed-off-by: Samuel Just <sjust@redhat.com>
1574 (cherry picked from commit f692bfe076b8ddb679c6d1a6ea78cc47f0876326)
1576 commit 8b07236cd799b4752cbe620b737343a02a703a17
1577 Author: Samuel Just <sjust@redhat.com>
1578 Date: Fri Nov 14 15:44:20 2014 -0800
1580 PG: always clear_primary_state when leaving Primary
1582 Otherwise, entries from the log collection process might leak into the next
1583 epoch, where we might end up choosing a different authoritative log. In this
1584 case, it resulted in us not rolling back to log entries on one of the replicas
1585 prior to trying to recover from an affected object due to the peer_missing not
1589 Backport: giant, firefly, dumpling
1590 Signed-off-by: Samuel Just <sjust@redhat.com>
1591 (cherry picked from commit c87bde64dfccb5d6ee2877cc74c66fc064b1bcd7)
1593 commit f4bab86fe3b218d66c14d06883c297836d9ca19d
1594 Author: Jianpeng Ma <jianpeng.ma@intel.com>
1595 Date: Mon Oct 27 11:22:13 2014 +0800
1597 ObjectStore: Don't use largest_data_off to calc data_align.
1599 If largest_data_off % CEPH_PAGE_SIZE != 0, the get_data_aligment return
1600 a erro value. This make the FileJouranl::align_bl to memcopy much data.
1602 Tested-by: Sage Weil <sage@redhat.com>
1603 Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
1604 (cherry picked from commit a1aa70f2f21339feabfe9c1b3c9c9f97fbd53c9d)
1606 commit 2c7eda690ae2f71c8e8e189b8f7330196c1f385f
1607 Author: Ding Dinghua <dingdinghua85@gmail.com>
1608 Date: Thu Oct 30 14:58:42 2014 +0800
1610 osdc/Objecter: Fix a bug of dead looping in Objecter::handle_osd_map
1612 If current map epoch is less than oldest epoch, current map epoch
1613 should step up to oldest epoch.
1616 Signed-off-by: Ding Dinghua <dingdinghua85@gmail.com>
1617 (cherry picked from commit e0166a23c2cf655bfb4cf873be021a14d9b9be27)
1620 src/osdc/Objecter.cc
1621 the debug line that follows was re-indented
1623 commit 11f8017cbdf94d4a8083412b96c251ee39286541
1624 Author: Ding Dinghua <dingdinghua85@gmail.com>
1625 Date: Thu Oct 30 14:58:05 2014 +0800
1627 osdc/Objecter: e shouldn't be zero in Objecter::handle_osd_map
1629 Signed-off-by: Ding Dinghua <dingdinghua85@gmail.com>
1630 (cherry picked from commit 31c584c8ba022cd44fe2872d221f3026618cefab)
1633 src/osdc/Objecter.cc
1634 the debug line that follows was re-indented
1636 commit 7831582026441abbd6066dd951db4b63ffb45402
1637 Author: Xinze Chi <xmdxcxz@gmail.com>
1638 Date: Wed Oct 29 07:11:11 2014 +0000
1640 Get the currently atime of the object in cache pool for eviction
1642 Because if there are mutiple atime in agent_state for the same object, we should use the recently one.
1644 Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
1645 (cherry picked from commit 1fef4c3d541cba360738437420ebfa2447d5802e)
1647 commit 620733386bd0694960cecac8f32bd1538382d5bb
1648 Author: Zhiqiang Wang <zhiqiang.wang@intel.com>
1649 Date: Tue Oct 28 09:37:11 2014 +0800
1651 osd: cache tiering: fix the atime logic of the eviction
1653 Reported-by: Xinze Chi <xmdxcxz@gmail.com>
1654 Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
1655 (cherry picked from commit 622c5ac41707069ef8db92cb67c9185acf125d40)
1657 commit 5865411360f722ec511f2df6656d4ba975bef8eb
1658 Author: Samuel Just <sjust@redhat.com>
1659 Date: Fri Feb 20 13:43:46 2015 -0800
1661 DBObjectMap: lock header_lock on sync()
1663 Otherwise, we can race with another thread updating state.seq
1664 resulting in the old, smaller value getting persisted. If there
1665 is a crash at that time, we will reuse a sequence number, resulting
1666 in an inconsistent node tree and bug #9891.
1669 Backport: giant, firefly, dumpling
1670 Signed-off-by: Samuel Just <sjust@redhat.com>
1671 (cherry picked from commit 2b63dd25fc1c73fa42e52e9ea4ab5a45dd9422a0)
1674 src/os/DBObjectMap.cc
1675 because we have state.v = 1; instead of state.v = 2;
1677 commit baa74b88a4f4b6073b99b7a9774692b37405b59e
1678 Merge: be6559a 420ea03
1679 Author: Loic Dachary <ldachary@redhat.com>
1680 Date: Wed Mar 11 09:09:23 2015 +0100
1682 Merge pull request #3828 from dachary/wip-10425-firefly
1684 librados: fix resources leakage in RadosClient::connect()
1686 Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
1688 commit be6559a423badde3b573b0c9055056999baae104
1689 Merge: f91d355 6e58732
1690 Author: Loic Dachary <ldachary@redhat.com>
1691 Date: Wed Mar 11 09:06:27 2015 +0100
1693 Merge pull request #3826 from dachary/wip-10257-firefly
1695 mon: PGMonitor: several stats output error fixes
1697 Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
1699 commit f91d355306620cc543113ed21fddf84f4c170d6e
1700 Merge: f5525a1 1e58bb4
1701 Author: Loic Dachary <ldachary@redhat.com>
1702 Date: Wed Mar 11 09:05:13 2015 +0100
1704 Merge pull request #3824 from dachary/wip-10353-firefly
1706 crush: set_choose_tries = 100 for erasure code rulesets
1708 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1710 commit f5525a1f41c9154b48f3ad0ccd899b5203c897bd
1711 Merge: b7e3614 27dbbb3
1712 Author: Loic Dachary <ldachary@redhat.com>
1713 Date: Wed Mar 11 09:04:33 2015 +0100
1715 Merge pull request #3823 from dachary/wip-10787-firefly
1717 mon/OSDMonitor: do not trust small values in osd epoch cache
1719 Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
1721 commit b7e3614ff38379aeea66ba00c64bc88ffa080963
1722 Merge: b5a67f0 7ed92f7
1723 Author: Loic Dachary <ldachary@redhat.com>
1724 Date: Wed Mar 11 09:02:16 2015 +0100
1726 Merge pull request #3915 from dachary/wip-10080-firefly
1728 SimpleMessenger: allow RESETSESSION whenever we forget an endpoint
1730 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1732 commit 8ef14fcca715a33be8c611a37628c90d7fafca43
1733 Author: Joao Eduardo Luis <joao@redhat.com>
1734 Date: Wed Feb 11 23:36:01 2015 +0000
1736 mon: MonCap: take EntityName instead when expanding profiles
1738 entity_name_t is tightly coupled to the messenger, while EntityName is
1739 tied to auth. When expanding profiles we want to tie the profile
1740 expansion to the entity that was authenticated. Otherwise we may incur
1741 in weird behavior such as having caps validation failing because a given
1742 client messenger inst does not match the auth entity it used.
1746 ceph --name osd.0 config-key exists foo daemon-private/osd.X/foo
1748 has entity_name_t 'client.12345' and EntityName 'osd.0'. Using
1749 entity_name_t during profile expansion would not allow the client access
1750 to daemon-private/osd.X/foo (client.12345 != osd.X).
1753 Backport: firefly,giant
1755 Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
1756 (cherry picked from commit 87544f68b88fb3dd17c519de3119a9ad9ab21dfb)
1758 commit 370f37f452aff3b48f9ae8a33b7ef26b572b41c8
1759 Author: Joao Eduardo Luis <joao@redhat.com>
1760 Date: Fri Nov 14 21:03:54 2014 +0000
1762 mon: Monitor: stash auth entity name in session
1766 Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
1767 (cherry picked from commit ca8e1efc0be9bffcfbdce5593526d257aa498062)
1769 commit 0f31388eb2bb68c09ab270f871b421a9c368af97
1770 Author: Sage Weil <sage@redhat.com>
1771 Date: Sun Aug 10 17:51:08 2014 -0700
1773 messages/MWatchNotify: include an error code in the message
1775 Document the fields, while we are here.
1777 Signed-off-by: Sage Weil <sage@redhat.com>
1778 (cherry picked from commit 7c7bf5fee7be397ef141b947f532a2a0b3567b42)
1780 commit f856739824bc271405a6fa35bdefc2bdc42c2f02
1781 Author: Samuel Just <sjust@redhat.com>
1782 Date: Thu Nov 20 14:27:39 2014 -0800
1784 ReplicatedPG: fail a non-blocking flush if the object is being scrubbed
1787 Backport: firefly, giant
1788 Signed-off-by: Samuel Just <sjust@redhat.com>
1789 (cherry picked from commit 9b26de3f3653d38dcdfc5b97874089f19d2a59d7)
1791 commit ca96b59db529ffbba0c834795800b6e90a7e4fce
1792 Author: Samuel Just <sjust@redhat.com>
1793 Date: Mon Feb 9 17:11:38 2015 -0800
1795 WorkQueue: make wait timeout on empty queue configurable
1798 Backport: giant, firefly, dumpling
1799 Signed-off-by: Samuel Just <sjust@redhat.com>
1800 (cherry picked from commit 5aa6f910843e98a05bfcabe6f29d612cf335edbf)
1802 commit 8ec8f1175a129624dffb511782664d74966d3c42
1803 Author: Samuel Just <sjust@redhat.com>
1804 Date: Mon Feb 9 10:37:15 2015 -0800
1806 ReplicatedPG::on_change: clean up callbacks_for_degraded_object
1808 Backport: dumpling, firefly, giant
1810 Signed-off-by: Samuel Just <sjust@redhat.com>
1811 (cherry picked from commit a5ecaa189d47a69466a6cd55fa4180e5c3092dc2)
1813 commit 963439f1038000c3f28c728350a2e9d351341e0b
1814 Author: Yehuda Sadeh <yehuda@redhat.com>
1815 Date: Thu Feb 5 09:33:26 2015 -0800
1817 rgw: send appropriate op to cancel bucket index pending operation
1820 Backport: firefly, giant
1822 Reported-by: baijiaruo <baijiaruo@126.com>
1823 Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1824 (cherry picked from commit dfee96e3aebcaeef18c721ab73f0460eba69f1c7)
1827 src/rgw/rgw_rados.cc
1829 commit 3782b8b3652c0eb3fb8f65193ecfe09e92925170
1830 Author: Sage Weil <sage@redhat.com>
1831 Date: Thu Feb 5 03:07:50 2015 -0800
1833 mon: ignore osd failures from before up_from
1835 If the failure was generated for an instance of the OSD prior to when
1836 it came up, ignore it.
1838 This probably causes a fair bit of unnecessary flapping in the wild...
1840 Backport: giant, firefly
1842 Reported-by: Dan van der Ster <dan@vanderster.com>
1843 Signed-off-by: Sage Weil <sage@redhat.com>
1844 (cherry picked from commit 400ac237d35d0d1d53f240fea87e8483c0e2a7f5)
1846 commit ca42905a6fca8b2b404500a6f74951ae20c8a488
1847 Author: Nilamdyuti Goswami <ngoswami@redhat.com>
1848 Date: Wed Nov 26 22:21:32 2014 +0530
1850 doc: Adds the updated man page for ceph-disk utility.
1852 Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
1853 (cherry picked from commit 016080d2c39919d73956e5e138ba5f079327aa44)
1855 commit 6602ab4581f27e066484b4c419d8206fcc20e045
1856 Author: Nilamdyuti Goswami <ngoswami@redhat.com>
1857 Date: Wed Nov 26 22:19:01 2014 +0530
1859 doc: Updates the man page for ceph-disk utility with some changes.
1861 Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
1862 (cherry picked from commit 8a48847cd46d4807ca1dbd13d3a561a693cdc877)
1864 commit 459807021dd3bf86ce31d30a3b576e783da67e3f
1865 Author: Nilamdyuti Goswami <ngoswami@redhat.com>
1866 Date: Tue Nov 25 21:23:08 2014 +0530
1868 doc: Adds man page for ceph-disk utility.
1870 Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
1871 (cherry picked from commit 9a118d56d4a5b0a0456e9f092f5ae9293f7bf3f3)
1873 commit 430d821b7592148ad9b2656bb3031a0484763f33
1874 Author: Nilamdyuti Goswami <ngoswami@redhat.com>
1875 Date: Tue Nov 25 21:16:16 2014 +0530
1877 doc: Removes ceph-deploy usage instances from ceph-disk man page.
1879 Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
1880 (cherry picked from commit 242dd1c0bbb728475a94f47740790b8a196d9804)
1882 commit 21c3256c851065521e34a179dc05d48fcc0a6e0f
1883 Author: Nilamdyuti Goswami <ngoswami@redhat.com>
1884 Date: Tue Nov 25 02:06:39 2014 +0530
1886 doc: Updates man page for ceph-disk utility.
1888 Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
1889 (cherry picked from commit 7dcc85042b0c0a26e495f7574ce144d1083d15f8)
1891 commit 1a6490e38d7f5fd3ff640a810c3b911699cd4884
1892 Author: Nilamdyuti Goswami <ngoswami@redhat.com>
1893 Date: Mon Nov 24 22:05:11 2014 +0530
1895 doc: Adds man page for ceph-disk utility.
1897 Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
1898 (cherry picked from commit a450cab2b8148cb8a9b043d629feccf89e5aabac)
1900 commit 3bab47054dc77b9a00d3f47fa73f458ede7d4ab4
1901 Author: Billy Olsen <billy.olsen@gmail.com>
1902 Date: Mon Feb 2 16:24:59 2015 -0700
1904 Fix memory leak in python rados bindings
1906 A circular reference was inadvertently created when using the
1907 CFUNCTYPE binding for callbacks for the asynchronous i/o callbacks.
1908 This commit refactors the usage of the callbacks such that the
1909 Ioctx object does not have a class reference to the callbacks.
1912 Backport: giant, firefly, dumpling
1913 Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
1914 Reviewed-by: Dan Mick <dmick@redhat.com>
1915 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1916 (cherry picked from commit 60b019f69aa0e39d276c669698c92fc890599f50)
1918 commit d0fd417e872a73033903fb36144fe7a39e90fc9a
1919 Author: Dmytro Iurchenko <diurchenko@mirantis.com>
1920 Date: Tue Feb 3 17:54:38 2015 +0200
1922 rgw: Swift API. Support for X-Remove-Container-Meta-{key} header.
1925 Backport: hammer, firefly
1926 Reported-by: Josh Durgin <jdurgin@redhat.com>
1927 Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
1928 (cherry picked from commit f67bfa24fd6f69c2fcc0987eba8b6b426dd78320)
1932 trivial merge: prototype of an unrelated function changed
1933 s/is_object_op/!(s->object == NULL)/
1935 commit 651dc556047aa4ee9e95fe9fc7bcd11488973872
1936 Author: Dmytro Iurchenko <diurchenko@mirantis.com>
1937 Date: Mon Feb 2 11:27:00 2015 +0200
1939 rgw: Swift API. Dump container's custom metadata.
1942 Backport: hammer, firefly
1943 Reported-by: Ahmad Faheem <ahmad.faheem@ril.com>
1944 Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
1945 (cherry picked from commit 2f8d31e9b1c4b09506bd1b0dad635c6e820783b2)
1948 src/rgw/rgw_rest_swift.cc
1949 The first hunk conflicts because X-Storage-Policy was added
1950 after firefly. The second hunk conflicts because the type of the
1951 s->object data member changed after firefly but it is irrelevant
1952 because the patch does not need to access s->object anymore.
1954 commit 6fd3dfa7224f0af3101fd1614506e8cb2fc7f6a0
1955 Author: Sage Weil <sage@redhat.com>
1956 Date: Fri Jan 23 10:47:44 2015 -0800
1958 osd: do not ignore deleted pgs on startup
1960 These need to get instantiated so that we can complete the removal process.
1963 Signed-off-by: Sage Weil <sage@redhat.com>
1964 (cherry picked from commit 879fd0c192f5d3c6afd36c2df359806ea95827b8)
1966 commit 368a5a8a8739e98ffdb8ac1210d111092e31be9e
1967 Author: Joao Eduardo Luis <joao@redhat.com>
1968 Date: Fri Jan 30 11:37:28 2015 +0000
1970 mon: Monitor: fix timecheck rounds period
1973 Backports: dumpling?,firefly,giant
1975 Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
1976 (cherry picked from commit 2e749599ac6e1060cf553b521761a93fafbf65bb)
1978 commit 66b13f2beff702c3b0bcb0aaa8da4e12d594eddf
1979 Author: Sage Weil <sage@redhat.com>
1980 Date: Sun Jan 11 17:28:04 2015 -0800
1982 osd: requeue blocked op before flush it was blocked on
1984 If we have request A (say, cache-flush) that blocks things, and then
1985 request B that gets blocked on it, and we have an interval change, then we
1986 need to requeue B first, then A, so that the resulting queue will keep
1987 A before B and preserve the order.
1989 This was observed on this firefly run:
1991 ubuntu@teuthology:/a/sage-2015-01-09_21:43:43-rados-firefly-distro-basic-multi/694675
1993 Backport: giant, firefly
1995 Signed-off-by: Sage Weil <sage@redhat.com>
1996 (cherry picked from commit 11bdfb4131ecac16d4a364d651c6cf5d1d28c702)
1998 commit a22aa8f3228e0baf2ba08d9e79ee4924cd341a07
1999 Author: Matt Richards <mattjrichards@gmail.com>
2000 Date: Thu Jan 8 13:16:17 2015 -0800
2002 librados: Translate operation flags from C APIs
2004 The operation flags in the public C API are a distinct enum
2005 and need to be translated to Ceph OSD flags, like as happens in
2006 the C++ API. It seems like the C enum and the C++ enum consciously
2007 use the same values, so I reused the C++ translation function.
2009 Signed-off-by: Matthew Richards <mattjrichards@gmail.com>
2010 (cherry picked from commit 49d114f1fff90e5c0f206725a5eb82c0ba329376)
2013 src/librados/librados.cc
2014 comes from lttng tracepoints introduced after firefly
2016 commit d5c3a14390f6bb2af45a1a4ad842777302dd0553
2017 Author: Yan, Zheng <zyan@redhat.com>
2018 Date: Sat Jan 3 15:29:29 2015 +0800
2020 mount.ceph: avoid spurious error message
2022 /etc/mtab in most modern distributions is a symbol link to
2026 Signed-off-by: Yan, Zheng <zyan@redhat.com>
2027 (cherry picked from commit bdd0e3c4bda97fe18487a58dd173a7dff752e1a2)
2029 commit 7ed92f7dc5f0f327b77b6f3835e3f821fc810708
2030 Author: Greg Farnum <gfarnum@redhat.com>
2031 Date: Tue Dec 2 15:17:57 2014 -0800
2033 SimpleMessenger: allow RESETSESSION whenever we forget an endpoint
2035 In the past (e229f8451d37913225c49481b2ce2896ca6788a2) we decided to disable
2036 reset of lossless Pipes, because lossless peers resetting caused trouble and
2037 they can't forget about each other. But they actually can: if mark_down()
2040 I can't figure out how else we could forget about a remote endpoint, so I think
2041 it's okay if we tell them we reset in order to clean up state. That's desirable
2042 so that we don't get into strange situations with out-of-whack counters.
2045 Backport: giant, firefly, dumpling
2047 Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2048 (cherry picked from commit 8cd1fdd7a778eb84cb4d7161f73bc621cc394261)
2050 commit 91b2acaadee1b62c1fcac73147908ec4477840f3
2051 Author: David Zafman <dzafman@redhat.com>
2052 Date: Thu Oct 9 11:20:13 2014 -0700
2054 osd: Get pgid ancestor from last_map when building past intervals
2056 Fixed OSD::build_past_intervals_parallel() and PG::generate_past_intervals()
2060 Signed-off-by: David Zafman <dzafman@redhat.com>
2061 (cherry picked from commit 0c5b66da7a9ba516340d06d9e806beb9d1040d0e)
2066 commit c09b6d9d64fdcdc3842c4f89acf10080125a4adc
2067 Author: David Zafman <dzafman@redhat.com>
2068 Date: Tue Dec 23 12:04:26 2014 -0800
2070 osd: Pass oldest_map when generating past intervals
2072 From load_pgs() the superblock hasn't been published yet
2073 so we need to retrieve the value of oldest_map depending on the context.
2077 Signed-off-by: David Zafman <dzafman@redhat.com>
2078 (cherry picked from commit 7fb721c1ceb39b38ca2e653299bcf51e109411d7)
2083 commit 9235d781bf860c1ecef5af600431f1619b56fbc1
2084 Author: David Zafman <dzafman@redhat.com>
2085 Date: Wed Dec 17 16:59:09 2014 -0800
2087 osd: build_push_op() handle short reads so recipient doesn't crash
2091 Signed-off-by: David Zafman <dzafman@redhat.com>
2092 (cherry picked from commit b9a04846d18e1c6621d7f2794ec1fae02875bed2)
2094 commit 7ce0cb8e33a281d5f675273d7bcbc570a32e5497
2095 Author: Kefu Chai <kchai@redhat.com>
2096 Date: Thu Feb 5 16:33:08 2015 +0800
2098 ceph_objectstore_tool: fix check_output on python2.6
2100 * backported the subprocess.check_output from python2.7
2104 Signed-off-by: Kefu Chai <kchai@redhat.com>
2105 (cherry picked from commit 15350a088d84bc6fc664f0d3f5d09b35f58b2144)
2108 src/test/ceph_objectstore_tool.py
2110 commit d5d34ddd1eac688d9422ca02c859d61be8e3e56e
2111 Author: David Zafman <dzafman@redhat.com>
2112 Date: Tue Jan 6 15:49:50 2015 -0800
2114 ceph_objectstore_tool: For import get object_info_t available for each object
2116 Add object_info_t to object_begin so we have at object create time
2117 This will be useful for importing from multiple erasure coded exports
2119 Signed-off-by: David Zafman <dzafman@redhat.com>
2120 (cherry picked from commit 05d916ed12f361da48ef73953bcc0cef465fcc2a)
2122 commit f70590b211ba28f350921b2f0c92712ed779858e
2123 Author: David Zafman <dzafman@redhat.com>
2124 Date: Fri Dec 12 15:16:03 2014 -0800
2126 ceph_objectstore_tool: Handle import of pg which OSD has split
2128 Fail import if import data doesn't include OSDMap and can't find it locally
2129 See if local map can be read for import's epoch
2130 Jump to current epoch like a split would if local map not present
2134 Signed-off-by: David Zafman <dzafman@redhat.com>
2135 (cherry picked from commit afda6e4f3b98cc1773fd014583dfb5e1f214a939)
2138 src/tools/ceph_objectstore_tool.cc
2140 commit aedd324f8fbb031d5126ae158f03066c7342f4b0
2141 Author: David Zafman <dzafman@redhat.com>
2142 Date: Fri Dec 12 15:38:33 2014 -0800
2144 ceph_objectstore_tool: On import following a split skip objects no longer in pg
2146 Signed-off-by: David Zafman <dzafman@redhat.com>
2147 (cherry picked from commit 68b27e25a3729566c3a22c0b71f70f7f3aca29a3)
2150 src/tools/ceph_objectstore_tool.cc
2152 commit c3de607c2ce16a26af7a78a4e557f321ffbcb44d
2153 Author: David Zafman <dzafman@redhat.com>
2154 Date: Fri Dec 5 15:12:21 2014 -0800
2156 ceph_objectstore_tool: Verify that object pool and pgid pool match
2158 Also, earlier check for invalid --pgid with import op
2160 Signed-off-by: David Zafman <dzafman@redhat.com>
2161 (cherry picked from commit da3be80497a1b1878ee5d2015f8840d202a83aa2)
2163 commit 5ec38e54f40431a5303cafe202c5097cc400fdb6
2164 Author: David Zafman <dzafman@redhat.com>
2165 Date: Wed Nov 19 11:47:36 2014 -0800
2167 ceph_objectstore_tool: Check for splits and fail import if there were splits
2169 Add osdmap into metadata_section
2170 On export put metadata_section before file data
2174 Signed-off-by: David Zafman <dzafman@redhat.com>
2175 (cherry picked from commit 19fdeea8b67091ed044ebce25799d3237b4d734a)
2177 commit aa472fa4df19d826a5af72e286365fa5ce4c71fb
2178 Author: David Zafman <dzafman@redhat.com>
2179 Date: Mon Dec 15 10:03:53 2014 -0800
2181 ceph_objectstore_tool: Add special exit code for test infrastructure
2183 Signed-off-by: David Zafman <dzafman@redhat.com>
2184 (cherry picked from commit b1f12f09c0211b608178f5ca2e292ab1765ce620)
2186 commit 22b7c2faee8cfad1b40cef019984f4a2d112b268
2187 Author: David Zafman <dzafman@redhat.com>
2188 Date: Wed Nov 19 11:41:39 2014 -0800
2190 ceph_objectstore_tool: Check that pool exists before allowing import
2192 Signed-off-by: David Zafman <dzafman@redhat.com>
2193 (cherry picked from commit f24f646d870703b7b79563cdbc20920248be6142)
2196 src/tools/ceph_objectstore_tool.cc
2198 commit f65db436f6eb83d7c59fdddced4d35dd9eeeb078
2199 Author: David Zafman <dzafman@redhat.com>
2200 Date: Wed Oct 15 15:21:11 2014 -0700
2202 ceph_objectstore_tool: Check cluster_fsid before allowing an import
2204 Signed-off-by: David Zafman <dzafman@redhat.com>
2205 (cherry picked from commit 196c8112dc9a6e8780b05d6c579cd7fbd5b07589)
2207 commit 360f68ec69b36b172d15c6206698340a5c00aafa
2208 Author: David Zafman <dzafman@redhat.com>
2209 Date: Thu Oct 16 12:27:56 2014 -0700
2211 ceph_objectstore_tool: Allow the metadata_section to be anywhere in the export
2213 Signed-off-by: David Zafman <dzafman@redhat.com>
2214 (cherry picked from commit 62dd912f1192b28700a15b02507a8c9efd710cb5)
2217 src/tools/ceph_objectstore_tool.cc
2219 commit c3fcbe636ae1a936b9180628cff939b2b5dddf7c
2220 Author: David Zafman <dzafman@redhat.com>
2221 Date: Fri Dec 12 15:01:24 2014 -0800
2223 ceph_objectstore_tool: import-rados shouldn't import internal namespace objects
2225 Signed-off-by: David Zafman <dzafman@redhat.com>
2226 (cherry picked from commit f727d2eaf50b0351feb9f12dcd65d50fb6eff7e9)
2228 commit 2d69076943b9724ce1d5c9f03f2f7594a77b92d2
2229 Author: David Zafman <dzafman@redhat.com>
2230 Date: Fri Dec 12 14:58:54 2014 -0800
2232 ceph_objectstore_tool: Get g_ceph_context available to import-rados
2234 Signed-off-by: David Zafman <dzafman@redhat.com>
2235 (cherry picked from commit ddc4613ec71752e5dccbbfe6dc078b86f0f186a9)
2238 src/tools/ceph_objectstore_tool.cc
2240 commit bbed3a728471292de625d922abeae8b39d290045
2241 Author: David Zafman <dzafman@redhat.com>
2242 Date: Tue Dec 9 18:09:04 2014 -0800
2244 ceph_objectstore_tool: Fix import-rados skipping of snapshots
2246 Signed-off-by: David Zafman <dzafman@redhat.com>
2247 (cherry picked from commit fe936026ed87c9f95f3b7ad235b24c22e8de5f55)
2249 commit d962c79dc1f0f2189e25743c6d253fac412c004d
2250 Author: David Zafman <dzafman@redhat.com>
2251 Date: Thu Nov 20 13:00:10 2014 -0800
2253 ceph_objectstore_tool: read_fd() doesn't handle ^D from tty stdin, don't allow
2255 Signed-off-by: David Zafman <dzafman@redhat.com>
2256 (cherry picked from commit 5cb692528e3ac0ebea3f1714b3ac43f69d176888)
2258 commit 8b7f4cb232c2f1bde6f50c1f092cb622fe2c41f1
2259 Author: David Zafman <dzafman@redhat.com>
2260 Date: Fri Dec 19 13:47:32 2014 -0800
2262 ceph-objectstore-tool: Remove --pretty-format and use new --format options
2264 Call new_formatter() with --format specified argument
2266 Signed-off-by: David Zafman <dzafman@redhat.com>
2267 (cherry picked from commit 22b71744bb0cb56434d5f6214ccea7d81f771860)
2270 src/tools/ceph_objectstore_tool.cc
2272 commit ee183b8e56c6f8a88ac781cf1fedb6a7a93f1005
2273 Author: David Zafman <dzafman@redhat.com>
2274 Date: Wed Oct 15 15:20:03 2014 -0700
2276 ceph_objectstore_tool: Describe super_ver values
2278 Signed-off-by: David Zafman <dzafman@redhat.com>
2279 (cherry picked from commit 0aeba0f216a54390288b5e3d6147deb31877f744)
2281 commit 5f82f824c7b1bb246bdb54b11a694133a49da70a
2282 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2283 Date: Fri Jan 2 18:36:54 2015 +0100
2285 ceph_objectstore_tool.cc: reduce scope of variable
2287 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2288 (cherry picked from commit 78542f9a901c05e627b53b5306ea604be3bc82e8)
2290 commit 2f97c51b5ee5de7c1657bc8fee6ccaa474f6f478
2291 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2292 Date: Fri Jan 2 15:48:08 2015 +0100
2294 ceph_objectstore_tool.cc: prefer ++operator for non-primitive iterators
2296 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2297 (cherry picked from commit 252fc03ba21c7b09922598a8d40997fc639bb994)
2299 commit 2a22bfedc4fa9f461dc8cfd42c659b9c55ddafca
2300 Author: David Zafman <dzafman@redhat.com>
2301 Date: Tue Nov 25 16:56:19 2014 -0800
2303 ceph_objectstore_tool: Prevent tool from transitioning struct_v on rm-past-intervals
2305 Signed-off-by: David Zafman <dzafman@redhat.com>
2306 (cherry picked from commit f056bdf93980a0a8e6157dbb124a79389a8f1a3c)
2308 commit 53aa04f95c43795da81a7d9f3117d7e5816aedcb
2309 Author: David Zafman <dzafman@redhat.com>
2310 Date: Thu Dec 4 18:53:08 2014 -0800
2312 ceph_objectstore_tool: Accept json object with --pgid instead of array
2314 It isn't anticipated that anyone would use this but keeps backward compatible
2316 Signed-off-by: David Zafman <dzafman@redhat.com>
2317 (cherry picked from commit 59b423e2e8846b098326fdec440de46b8e3d2769)
2319 commit 60e9a8120b292628ee4e5ef33fe933222609b861
2320 Author: David Zafman <dzafman@redhat.com>
2321 Date: Thu Dec 4 18:27:50 2014 -0800
2323 ceph_objectstore_tool: Improve object spec parsing error messages
2325 Signed-off-by: David Zafman <dzafman@redhat.com>
2326 (cherry picked from commit de6384fda183801c16af1b61ed36eaed289bb4f6)
2328 commit 4f95409c0dadeed18334c00630ddc6d7c99d2819
2329 Author: David Zafman <dzafman@redhat.com>
2330 Date: Thu Dec 4 17:48:28 2014 -0800
2332 ceph_objectstore_tool: Fix errors messages in newer code
2334 Signed-off-by: David Zafman <dzafman@redhat.com>
2335 (cherry picked from commit eae7c02fded460f6c8aaf18aa83d2730b89e0eb1)
2337 commit 1703867735c8f8ab1c83aa526c84b278436f38d5
2338 Author: David Zafman <dzafman@redhat.com>
2339 Date: Thu Dec 4 16:00:40 2014 -0800
2341 ceph_objectstore_tool: Remove extraneous endl on error throw messages
2343 Signed-off-by: David Zafman <dzafman@redhat.com>
2344 (cherry picked from commit 32c832f0c62259a492d1c934c56ac165496763a0)
2346 commit f2d2110a8cb1a1b1216c1083b54ea6212138dc93
2347 Author: David Zafman <dzafman@redhat.com>
2348 Date: Thu Dec 4 14:01:39 2014 -0800
2350 ceph_objectstore_tool: Add --format and --pretty-format support
2352 --pretty-format defaults true
2353 Add --format so xml output can be requested
2354 --op list defaults to single line of json per object
2355 To override this more human readable output use --pretty-format=false
2356 Add testing of --op list special handling
2358 Signed-off-by: David Zafman <dzafman@redhat.com>
2359 (cherry picked from commit cca85a534fe488ae314400e8faad55a758609467)
2361 commit a5544c12c3e982edf66f55a8edfb7fc69300520b
2362 Author: David Zafman <dzafman@redhat.com>
2363 Date: Wed Dec 3 17:53:11 2014 -0800
2365 ceph_objectstore_tool: Strip _* (always _head) from pgid in list entry output
2367 Signed-off-by: David Zafman <dzafman@redhat.com>
2368 (cherry picked from commit 5eacd3c5f39766cb8be6b3251d139d16431cf6b6)
2370 commit 4a0a42f3e6b9a1b7ed4df3d4b6c417acfc00050a
2371 Author: David Zafman <dzafman@redhat.com>
2372 Date: Wed Dec 3 16:39:04 2014 -0800
2374 ceph_objectstore_tool: BUG: --op list wasn't including snapshots
2376 Signed-off-by: David Zafman <dzafman@redhat.com>
2377 (cherry picked from commit b617ee2d45886ec6b3dc0db0edbf814ea5748083)
2379 commit 06579b9f269dc9864e920368c5bea9bcb9dd8be9
2380 Author: David Zafman <dzafman@redhat.com>
2381 Date: Wed Dec 3 16:38:22 2014 -0800
2383 ceph_objectstore_tool: For terminal output of list one object per line
2385 Instead of a parsable array make it easier to cut and paste listed objects
2387 Signed-off-by: David Zafman <dzafman@redhat.com>
2388 (cherry picked from commit 5a66db9418aeed31fec98999c5053dab357d9c1e)
2390 commit 22c6bf410de1b0c81f131aa4d5682f5162dd1a56
2391 Author: David Zafman <dzafman@redhat.com>
2392 Date: Wed Dec 3 16:35:09 2014 -0800
2394 ceph_objectstore_tool: In error case umount objectstore
2396 Signed-off-by: David Zafman <dzafman@redhat.com>
2397 (cherry picked from commit bc6ea9cb8a2b86c73f7f15bc46145177ccf91f4b)
2399 commit d802ab69a4a0f37ed9328ec385746f59643e1420
2400 Author: Loic Dachary <ldachary@redhat.com>
2401 Date: Thu Nov 27 01:24:03 2014 +0100
2403 objectstore_tool: test --op list variants
2405 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2406 (cherry picked from commit ddba2676c4c48c2a556f5d4ffd817bfe134a9153)
2408 commit f30e053fe7b3e5efc679b20cf1b3e2f7f8ed7e54
2409 Author: Loic Dachary <ldachary@redhat.com>
2410 Date: Thu Nov 27 00:11:45 2014 +0100
2412 objectstore_tool: parse new object description format
2414 The object format changed from
2420 [pgid,{json object}]
2422 The parser is updated accordingly. If the --pgid is present, check that
2423 it equals the pgid from the object description.
2425 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2426 (cherry picked from commit df9d5c5cfd8b0ff793647a592c7661965cef5c92)
2428 commit fce87c9d7dbb51989826d068d6b6657a2f3d129d
2429 Author: Loic Dachary <ldachary@redhat.com>
2430 Date: Wed Nov 26 23:35:21 2014 +0100
2432 objectstore_tool: filter --op list and explore all PGs
2434 The positional object name is used to filter the output of --op list and
2435 only show the objects with a matching name. If both the object name and
2436 the pgid are omitted, all objects from all PGs are displayed.
2438 The output format is changed from
2440 {"oid":"GROUP","key":"","snapid":-2,
2441 "hash":2659194943,"max":0,"pool":0,"namespace":""}
2445 [["0.7_head",{"oid":"GROUP","key":"","snapid":-2,
2446 "hash":2659194943,"max":0,"pool":0,
2449 where the first member is the pgid where the object is found.
2451 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2452 (cherry picked from commit c69aaceac7f370e5369d511bf17898adc338ae43)
2454 commit 2f874fd3715d216a68658e94a5c741e665c76632
2455 Author: Loic Dachary <ldachary@redhat.com>
2456 Date: Wed Nov 26 23:34:22 2014 +0100
2458 objectstore_tool: lookup objects by name
2460 If the object is not a parsable JSON string, assume an object name and
2461 look it up in all the PGs. If multiple objects have the same name, only
2462 apply the command to one of them. It is primarily useful in a test
2463 environment where the names of the tests objects are known and only a
2464 small number of objects exists. It replaces the following:
2466 path='--data-path dev/osd0 --journal-path dev/osd0.journal'
2467 for pgid in $(./ceph_objectstore_tool $path --op list-pgs) ; do
2468 object=$(./ceph_objectstore_tool $path --pgid $pgid --op list |
2469 grep '"oid":"NAME"')
2470 test -n "$object" && break
2472 ./ceph_objectstore_tool $path --pgid $pgid "$object" remove
2476 ./ceph_objectstore_tool $path NAME remove
2478 http://tracker.ceph.com/issues/10192 Fixes: #10192
2480 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2481 (cherry picked from commit 7c1165f96391821c00cca1ac04b3433dbec6bb6e)
2484 src/tools/ceph_objectstore_tool.cc
2486 commit eb48aba2119959c53ea8a103b53f0c2e07c52acb
2487 Author: Loic Dachary <ldachary@redhat.com>
2488 Date: Wed Nov 26 17:30:30 2014 +0100
2490 objectstore_tool: refactor list-lost and fix-lost
2492 Abstract out the PG exploration loops and encapsulate the list-lost and
2493 fix-lost semantic in a callable object.
2495 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2496 (cherry picked from commit d9e747b1bdb53d1fe543ef311e3db35fb78d8051)
2498 commit eab3226edc8ecc6d2d93f463e019ef4eacb9f468
2499 Author: Loic Dachary <ldachary@redhat.com>
2500 Date: Wed Nov 26 17:26:54 2014 +0100
2502 objectstore_tool: update usage strings
2504 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2505 (cherry picked from commit a90233c8b79ae6c035b5169c7f8809f853631689)
2508 src/tools/ceph_objectstore_tool.cc
2510 commit 5bbe41cb1e7faf40a9c53a9bdc01db8c35670a36
2511 Author: David Zafman <dzafman@redhat.com>
2512 Date: Tue Nov 18 13:00:15 2014 -0800
2514 ceph_objectstore_tool: Add feature called set-allow-sharded-objects
2516 Uses --op set-allow-sharded-objects option
2517 This operation will be rejected if on the target OSD's osdmap there is
2518 at least one OSD which does not support ERASURE CODES.
2519 Prompt the user that they could import if sharded state allowed
2520 Prompt the user to use new feature if sharded state found inconsistent
2524 Signed-off-by: David Zafman <dzafman@redhat.com>
2525 (cherry picked from commit f3dab446fc8e58b3b3d9334b8c38722e73881b9e)
2528 src/tools/ceph_objectstore_tool.cc
2530 commit 4e30d8c53c0a4952f81cc3b5680c7e92fffb1355
2531 Author: David Zafman <dzafman@redhat.com>
2532 Date: Tue Nov 18 11:59:18 2014 -0800
2534 ceph_objectstore_tool: Add utility routine get_osdmap()
2536 Signed-off-by: David Zafman <dzafman@redhat.com>
2537 (cherry picked from commit b3021b0d3362000b5938d406ed2e032a8eb38405)
2540 src/tools/ceph_objectstore_tool.cc
2542 commit f997b126afaeadebe6b6d76954fbe2008bd2a7d8
2543 Author: David Zafman <dzafman@redhat.com>
2544 Date: Wed Nov 12 21:14:11 2014 -0800
2546 ceph_objectstore_tool: Clear ...INCOMPAT_SHARDS from feature if exporting replicated pg
2548 Don't require importing OSD to have shards feature for replicated pg
2550 http://tracker.ceph.com/issues/10077 Fixes: #10077
2552 Signed-off-by: David Zafman <dzafman@redhat.com>
2553 (cherry picked from commit 86baf2d38170ef19de2dd5e9ce3f280237d8474d)
2555 commit 3f862da57945f821ed459f5a77f8032331c9cb20
2556 Author: David Zafman <dzafman@redhat.com>
2557 Date: Tue Nov 18 00:10:41 2014 -0800
2559 tests: ceph_objectstore_tool.py test all variants of export/import
2561 Handle change of error message text
2563 Signed-off-by: David Zafman <dzafman@redhat.com>
2564 (cherry picked from commit 9e53c3554c71121f2e2dd0234b5232da37ad5a1b)
2566 commit 2a58bdee19eb8f02a2800d728d402e76566d7f58
2567 Author: David Zafman <dzafman@redhat.com>
2568 Date: Mon Nov 17 23:23:40 2014 -0800
2570 ceph_objectstore_tool: Make --file option consistent by treating "-" as stdout/stdin
2572 Signed-off-by: David Zafman <dzafman@redhat.com>
2573 (cherry picked from commit 8c87f3284f87d1121218cb7f41edc81b74c9df29)
2575 commit 70329be7be5d80e52d5424958cecd7f4d939add6
2576 Author: David Zafman <dzafman@redhat.com>
2577 Date: Sat Nov 15 11:43:10 2014 -0800
2579 tests: ceph_objectstore_tool.py fix list-attr for erasure code
2581 Adding testing of xattr for erasure coded shards
2582 Fix error message when finding an unexpected xattr key
2584 Signed-off-by: David Zafman <dzafman@redhat.com>
2585 (cherry picked from commit cbecab477a70782f2f69258f035e78fb5c829810)
2588 src/test/ceph_objectstore_tool.py
2590 commit bc921c7ecbc061ccef4847d967986c9fa902111f
2591 Author: David Zafman <dzafman@redhat.com>
2592 Date: Sat Nov 15 11:46:15 2014 -0800
2594 tests: ceph_objectstore_tool.py check for malformed JSON for erasure code objs
2596 Signed-off-by: David Zafman <dzafman@redhat.com>
2597 (cherry picked from commit 40717aa4c399e87d2c3e32038f78788eb213f87d)
2599 commit 99ffd137f17c438e3ee9dbbc0ab73cdcd3a45a5c
2600 Author: David Zafman <dzafman@redhat.com>
2601 Date: Sat Nov 15 11:44:54 2014 -0800
2603 tests: ceph_objectstore_tool.py fix off by 1 ATTR_OBJS handling
2605 Signed-off-by: David Zafman <dzafman@redhat.com>
2606 (cherry picked from commit eaf1d1e35243566c46b478788e79e0ebf7583015)
2608 commit 951c951a0f164271c5e9b96ecbd510cf5c6663b6
2609 Author: Loic Dachary <ldachary@redhat.com>
2610 Date: Fri Nov 14 11:00:17 2014 +0100
2612 tests: ceph_objectstore_tool.py skip if /dev/tty fails
2614 Some environments do not have a /dev/tty. When opening /dev/tty fails,
2615 skip the test instead of returning an error.
2617 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2618 (cherry picked from commit 4c94f1778fdf483e9e0b62f89f7e46e78aeeebf3)
2620 commit 8dc263555d7aca2befa912c78c585a43c8e7592c
2621 Author: Loic Dachary <ldachary@redhat.com>
2622 Date: Thu Nov 13 19:15:50 2014 +0100
2624 tests: ceph_objectstore_tool.py encapsulate init-ceph stop
2626 Call init-ceph in kill_daemons and add a call to kill_daemon when main
2627 returns on error so that it never leaves daemons hanging.
2629 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2630 (cherry picked from commit fc435ff3623d196dd7cc375302acd8dfc9eb59fd)
2632 commit b78d802f3e082b0762203ae37b3c3a44b7608907
2633 Author: Loic Dachary <ldachary@redhat.com>
2634 Date: Thu Nov 13 19:14:49 2014 +0100
2636 tests: ceph_objectstore_tool.py main returns
2638 Instead of calling sys.exit() the main function returns the desired exit
2641 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2642 (cherry picked from commit 0f3d7b1315f2b5595047d8bd13949ed0d9194bfa)
2644 commit 04e480b09b59f5318e9b206e6c3e529d8bb22328
2645 Author: Loic Dachary <ldachary@redhat.com>
2646 Date: Thu Nov 13 17:32:14 2014 +0100
2648 tests: ceph_objectstore_tool.py replace stop.sh with init-ceph
2650 The stop.sh will stop all ceph-* processes. Use the init-ceph script
2651 instead to selectively kill the daemons run by the vstart.sh cluster
2652 used for ceph_objectstore_tool.
2654 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2655 (cherry picked from commit e8f34bd62bf282144b8851fb9764cf4429a49c25)
2657 commit 51855584eb970b28dfa266ee3653963fb77a2b1e
2658 Author: Loic Dachary <ldachary@redhat.com>
2659 Date: Thu Nov 13 17:30:29 2014 +0100
2661 tests: ceph_objectstore_tool.py use a dedicated directory
2663 Set CEPH_DIR to a directory that is specific to ceph_objectstore_tool so
2664 that it can run in parallel with other vstart.sh clusters.
2666 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2667 (cherry picked from commit e303d1afde58e68c1f587962010da9e1f1278bc3)
2670 src/test/ceph_objectstore_tool.py
2672 commit 454ec85ae449cb20c2ddecade421262d9d9de615
2673 Author: Loic Dachary <ldachary@redhat.com>
2674 Date: Thu Nov 13 17:27:01 2014 +0100
2676 tests: ceph_objectstore_tool.py run faster by default
2678 By default use only a small number of objects to speed up the tests. If
2679 the argument "big" is given, use a large number of objects as it may
2680 help find some problems.
2682 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2683 (cherry picked from commit 235257c257aea98b770d9637957818c8aeb6c745)
2685 commit 427fe9177f90db091685b937839dcc4dfe4c8a01
2686 Author: Loic Dachary <ldachary@redhat.com>
2687 Date: Thu Nov 13 17:21:48 2014 +0100
2689 tests: ceph_objectstore_tool.py run mon and osd on specific port
2691 By default vstart.sh runs MDS but they are not needed for the tests,
2692 only run mon and osd instead. Instead of using the default vstart.sh
2693 port which may conflict with a already running vstart.sh, set the
2694 CEPH_PORT=7400 which is not used by any other test run with make check.
2696 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2697 (cherry picked from commit f04d4e7539bc8c1b6cf94db815f9dcdecc52faa2)
2699 commit 28ed34a7dc32033be61cd61178eb59471de45aac
2700 Author: Loic Dachary <ldachary@redhat.com>
2701 Date: Thu Nov 13 17:16:41 2014 +0100
2703 tests: ceph_objectstore_tool.py can use a WARN cluster
2705 The tests do not need HEALTH_OK exclusively, a HEALTH_WARN cluster can
2706 also run them successfully.
2708 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2709 (cherry picked from commit 783378c019aaac36d542e1b12c0d64196ea21012)
2711 commit 8548d7c65e8743d4e743c77981acd702efab3fb2
2712 Author: Loic Dachary <ldachary@redhat.com>
2713 Date: Thu Nov 13 17:12:35 2014 +0100
2715 tests: ceph_objectstore_tool.py use env python
2717 Using #/usr/bin/env python instead of a hard coded path is more flexible
2718 and can also be used to run from virtualenv.
2720 Signed-off-by: Loic Dachary <ldachary@redhat.com>
2721 (cherry picked from commit 74506d2506d03d05935cbe342fef9dc1d9022a13)
2723 commit 5b4c2ee0902d94e6fa5bee67188fddcf0e0c38a2
2724 Author: David Zafman <dzafman@redhat.com>
2725 Date: Wed Nov 12 15:22:04 2014 -0800
2727 ceph_objectstore_tool: Fixes to make import work again
2729 The is_pg() call is now true even for pgs pending removal, fix broken
2730 finish_remove_pgs() by removing is_pg() check.
2731 Need to add create_collection() to the initial transaction on import
2735 Signed-off-by: David Zafman <dzafman@redhat.com>
2736 Reviewed-by: Sage Weil <sage@redhat.com>
2737 (cherry picked from commit 5ce09198bf475e5c3a2df26232fa04ba9912b103)
2740 src/tools/ceph_objectstore_tool.cc
2742 commit e0dab883d29bd3a54b5707f8d3ea830f8a1ce516
2743 Author: David Zafman <dzafman@redhat.com>
2744 Date: Mon Oct 6 18:26:44 2014 -0700
2746 ceph_objectstore_tool: Accept CEPH_ARGS environment arguments
2748 Signed-off-by: David Zafman <dzafman@redhat.com>
2749 (cherry picked from commit 10fe7cfe561f91717f2ac2e13aeecc06a903704e)
2751 commit 5f788eaa61054c6cb27960b5544b321078706343
2752 Author: David Zafman <dzafman@redhat.com>
2753 Date: Fri Oct 3 15:12:28 2014 -0700
2755 ceph_objectstore_tool: MemStore needs a CephContext
2757 Pass g_ceph_context to ObjectStore::create() needed by MemStore
2761 Signed-off-by: David Zafman <dzafman@redhat.com>
2762 (cherry picked from commit 0b155d00c542f0d8b8b5b0324dac4b3cf7ff37b5)
2764 commit 7470c7ca02ef6313b925be3ce4b27437a0c2e1e0
2765 Author: David Zafman <dzafman@redhat.com>
2766 Date: Tue Mar 3 10:41:28 2015 -0800
2768 ceph_objectstore_tool: Rename generated binary to ceph-objectstore-tool
2770 Signed-off-by: David Zafman <dzafman@redhat.com>
2771 (cherry picked from commit 4f72ba545e204a24a55adead43c61cb1d4394381)
2774 debian/ceph-test.install
2776 src/test/ceph-helpers.sh (doesn't exist in firefly)
2777 src/test/ceph_objectstore_tool.py
2778 src/tools/ceph_objectstore_tool.cc
2780 commit 4b51645fdfe8a761f7ebc0faee1a87187d498fee
2781 Author: Sage Weil <sage@redhat.com>
2782 Date: Wed Nov 12 13:35:43 2014 -0800
2784 vstart.sh: warn less
2786 Signed-off-by: Sage Weil <sage@redhat.com>
2787 (cherry picked from commit a69b8450f642af91a352d0de4378d93828291933)
2789 commit 3075919c0dcee1f33a0beb299e98d8a88836c5f8
2790 Author: David Zafman <dzafman@redhat.com>
2791 Date: Mon Nov 17 23:02:50 2014 -0800
2793 ceph_objectstore_tool: When exporting to stdout, don't cout messages
2798 Signed-off-by: David Zafman <dzafman@redhat.com>
2799 (cherry picked from commit 0d5262ac2f69ed3996af76a72894b1722a27b37d)
2800 (cherry picked from commit 6cb9a2499cac2645e2cc6903ab29dfd95aac26c7)
2802 commit ca9df2803f3200431f5f7ea99a713005f15b7f5a
2803 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2804 Date: Tue Sep 2 14:56:10 2014 +0200
2806 ceph_objectstore_tool.cc: prefer ++operator for non-primitive iterators
2808 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2809 (cherry picked from commit a5468abe4459159e8a9f7a4f21d082bb414e1cdd)
2811 commit ac396f5df3c51d09b9dbf7e6be7bed1d755d2317
2812 Author: Zhiqiang Wang <wonzhq@hotmail.com>
2813 Date: Fri Aug 29 16:39:40 2014 +0800
2815 Test: fixing a compile warning in ceph_objectstore_tool.cc
2817 For the compiler's sake:
2818 tools/ceph_objectstore_tool.cc:2547:15: warning: ‘r’ may be used
2819 uninitialized in this function [-Wmaybe-uninitialized]
2821 Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
2822 (cherry picked from commit c3e1466b46076f133b62f98e2c0b712bdde0e119)
2824 commit b863970110e7f8e835e77864ea59b81f0b026158
2825 Author: David Zafman <dzafman@redhat.com>
2826 Date: Wed Aug 20 01:33:45 2014 -0700
2828 ceph_objectstore_tool: Bug fixes and test improvements
2830 ceph_objectgstore_tool:
2831 Fix bugs in the way collection_list_partial() was being called
2832 which caused objects to be seen over and over again.
2835 Fix get_objs() to walk pg tree for pg with sub-directories
2836 Create more objects to test object listing code
2837 Limit number of larger objects
2838 Limit number of objects which get attributes and omaps
2840 Signed-off-by: David Zafman <dzafman@redhat.com>
2841 (cherry picked from commit a03f719eb3a46f410550afce313e6720e0c27946)
2843 commit 4f83005bb8a615df370de7b6dfe5d926c7cfef7f
2844 Author: David Zafman <david.zafman@inktank.com>
2845 Date: Tue Aug 5 18:26:11 2014 -0700
2847 ceph_objectstore_tool, test: Implement import-rados feature and unit test code
2851 Signed-off-by: David Zafman <david.zafman@inktank.com>
2852 (cherry picked from commit 23ec93a86140c4b271b45d87c62682288079cbba)
2854 commit df334617705fe862b820ef5de674ae54efad0cea
2855 Author: David Zafman <david.zafman@inktank.com>
2856 Date: Wed Aug 6 19:53:43 2014 -0700
2858 test: ceph_objectstore_tool unit test improvements
2860 Add namespaces to testing
2861 Increase filesize so export will have multiple chunks
2862 Put json for each object into the db dict
2864 Signed-off-by: David Zafman <david.zafman@inktank.com>
2866 commit ecd25cf6ce1a1a34e536c7fd313225b3bdedd2e0
2867 Author: David Zafman <david.zafman@inktank.com>
2868 Date: Thu Aug 7 13:31:48 2014 -0700
2870 ceph_objectstore_tool: Add operation "rm-past-intervals" for testing purposes
2872 Signed-off-by: David Zafman <david.zafman@inktank.com>
2873 (cherry picked from commit 3694068b67fd625495c4511390bc5bcbfbbd28f5)
2875 commit 6b50b384efc1f0735f8635a59663b50e3155de1a
2876 Author: David Zafman <david.zafman@inktank.com>
2877 Date: Thu Aug 7 11:46:08 2014 -0700
2879 ceph_objectstore_tool: Add past_intervals to export/import code
2881 Signed-off-by: David Zafman <david.zafman@inktank.com>
2882 (cherry picked from commit 9325ec15d4b89c5537cbcbda4c7594e25dc6e7df)
2884 commit 63529079b97c99cbaa863e1be865e2693e90c556
2885 Author: David Zafman <david.zafman@inktank.com>
2886 Date: Thu Aug 7 14:11:21 2014 -0700
2888 ceph_objectstore_tool: Minor improvements
2890 Make all non-error non-debug output to stdout
2893 Signed-off-by: David Zafman <david.zafman@inktank.com>
2894 (cherry picked from commit a2bd2aa7babb4ad45ba21c70f9d179fda27742aa)
2896 commit 5e3f89ece7bdd09ed06ca4208cfa0a0b3104f109
2897 Author: David Zafman <david.zafman@inktank.com>
2898 Date: Tue Aug 5 12:26:42 2014 -0700
2900 ceph_objectstore_tool, test: Add list-pgs operations and unit test case
2902 Signed-off-by: David Zafman <david.zafman@inktank.com>
2903 (cherry picked from commit f01e334c697057158354f0ce5ecff6d6ba8e2704)
2905 commit edc9f71efeebe5241004c669cc58089905907634
2906 Author: David Zafman <david.zafman@inktank.com>
2907 Date: Wed Jul 30 12:39:49 2014 -0700
2909 Complete replacement of ceph_filestore_tool and ceph_filestore_dump
2910 with unified ceph_objectstore_tool
2912 Move list-lost-objects and fix-lost-objects features from
2913 ceph_filestore_tool to ceph_objectstore_tool as list-lost, fix-lost
2914 Change --type to --op for info, log, export...operations
2915 Add --type for the ObjectStore type (defaults to filestore)
2916 Change --filestore-path to --data-path
2917 Update installation, Makefile.am, and .gitignore
2918 Fix and rename test case to match
2919 Add some additional invalid option checks
2921 Signed-off-by: David Zafman <david.zafman@inktank.com>
2922 (cherry picked from commit 83fbc91e5c4e52cc1513f34908f99d2ac3b930df)
2924 commit a42273ecd955470105cba1cc4ac7eb782ac46833
2925 Author: David Zafman <david.zafman@inktank.com>
2926 Date: Wed Jul 30 11:22:29 2014 -0700
2928 Renames and removal towards a unified ceph_objectstore_tool
2930 Rename ceph_filestore_dump.cc and ceph_filestore_dump.py
2931 Remove ceph_filestore_tool.cc
2933 Signed-off-by: David Zafman <david.zafman@inktank.com>
2934 (cherry picked from commit 77864193a1162393ade783480aee39a232934377)
2936 commit 9ee2c27096784efceb02b06a0df4325979385f44
2937 Author: David Zafman <david.zafman@inktank.com>
2938 Date: Tue May 20 11:19:19 2014 -0700
2940 ceph_filestore_dump: Add set-omaphdr object command
2942 Signed-off-by: David Zafman <david.zafman@inktank.com>
2943 (cherry picked from commit b4d95cc85af9af64d33d541cd69c5f28fd45423b)
2945 commit c7d261d40367ab01a577bf255da776a622f8984a
2946 Author: David Zafman <david.zafman@inktank.com>
2947 Date: Tue May 20 10:44:37 2014 -0700
2949 ceph_filestore_dump: Add get-omaphdr object command
2951 Signed-off-by: David Zafman <david.zafman@inktank.com>
2952 (cherry picked from commit 30c0f3114e665acdd99e64bf0d2a7399b33e8d61)
2954 commit 271e3ca19b9e878c6c3c26a9ec461faf06e7a19d
2955 Author: David Zafman <david.zafman@inktank.com>
2956 Date: Mon May 19 20:55:47 2014 -0700
2958 ceph_filestore_dump: Add rm-omap object command
2960 Signed-off-by: David Zafman <david.zafman@inktank.com>
2961 (cherry picked from commit 0fc6bd2777edf24a044f454beacf1647cc52f9fe)
2963 commit 20165d101a30c6beb591ca56b56bdf5505f70cf3
2964 Author: David Zafman <david.zafman@inktank.com>
2965 Date: Mon May 19 20:47:14 2014 -0700
2967 ceph_filestore_dump: Add set-omap object command
2969 Signed-off-by: David Zafman <david.zafman@inktank.com>
2970 (cherry picked from commit 50cd57e902fe508f98f63fea30626780b07561d9)
2972 commit 7547f3d17bc89437c529aa96413b0bebb808da5e
2973 Author: David Zafman <david.zafman@inktank.com>
2974 Date: Mon May 19 20:37:01 2014 -0700
2976 ceph_filestore_dump: Add get-omap object command
2978 Signed-off-by: David Zafman <david.zafman@inktank.com>
2979 (cherry picked from commit b50c43ce5e52f5bbcb3684f6793d50f34ed741d1)
2981 commit f391feb1f50632adbe94c3e8cdc4b75091d6b8e1
2982 Author: David Zafman <david.zafman@inktank.com>
2983 Date: Mon May 19 18:33:24 2014 -0700
2985 ceph_filestore_dump: Add rm-attr object command
2987 Signed-off-by: David Zafman <david.zafman@inktank.com>
2988 (cherry picked from commit 465d77733c7499fbd65bebe7141895714c625e0d)
2990 commit 7bd2dd3a1d022df6d3f886ad12a191d0cfcef1d6
2991 Author: David Zafman <david.zafman@inktank.com>
2992 Date: Mon May 19 18:17:27 2014 -0700
2994 ceph_filestore_dump: Add set-attr object command
2996 Signed-off-by: David Zafman <david.zafman@inktank.com>
2997 (cherry picked from commit 95554e03dcb74b6d74b2f1b2891b3570abb187b8)
2999 commit 6724da821158ddee6ef6ee7b5bac9e97dcfc2292
3000 Author: David Zafman <david.zafman@inktank.com>
3001 Date: Thu May 15 15:50:48 2014 -0700
3003 ceph_filestore_dump: Add get-attr object command
3005 Signed-off-by: David Zafman <david.zafman@inktank.com>
3006 (cherry picked from commit 55d43c0e20fc853daec134449b9954248fd7ef31)
3008 commit 55c21b898834d77234227d3fc14c8580ef698663
3009 Author: David Zafman <david.zafman@inktank.com>
3010 Date: Wed May 14 17:52:09 2014 -0700
3012 ceph_filestore_dump: Add set-bytes object command
3014 Signed-off-by: David Zafman <david.zafman@inktank.com>
3015 (cherry picked from commit 3c24d1f46a624d0a053ad234997a1f8c8b036db5)
3017 commit 2f1926d2f57082666350d8223b09f61da5f95b6f
3018 Author: David Zafman <david.zafman@inktank.com>
3019 Date: Wed May 14 17:51:29 2014 -0700
3021 ceph_filestore_dump: Add get-bytes object command
3023 Signed-off-by: David Zafman <david.zafman@inktank.com>
3024 (cherry picked from commit 869dd92cc8ec29a3a684f88c335d359f225bba24)
3026 commit fcabb8133af3b90d5d9e976ce658ceccfc5b89c5
3027 Author: David Zafman <david.zafman@inktank.com>
3028 Date: Wed May 14 17:50:16 2014 -0700
3030 ceph_filestore_dump: Add list-omap object command
3032 Signed-off-by: David Zafman <david.zafman@inktank.com>
3033 (cherry picked from commit 48890c7741d76cf92b5f589f49378ca57292e88b)
3035 commit 303e4cedd91ca3553e956eec495a05e3136b3c56
3036 Author: David Zafman <david.zafman@inktank.com>
3037 Date: Wed May 14 18:32:42 2014 -0700
3039 ceph_filestore_dump: Add list-attrs object command
3041 Signed-off-by: David Zafman <david.zafman@inktank.com>
3042 (cherry picked from commit 00c6b0673288ca76fe144575b7af76eaa36f5857)
3044 commit aff2c995f67bdde1a592a9b24e4e96e85735d500
3045 Author: David Zafman <david.zafman@inktank.com>
3046 Date: Wed May 14 17:39:17 2014 -0700
3048 ceph_filestore_dump: Add --type list to output objects in a pg in json
3050 Signed-off-by: David Zafman <david.zafman@inktank.com>
3051 (cherry picked from commit 844dabb7f311e68eba0293ae9ca4c68521745877)
3053 commit 7cda8b7a0b43d709b73d875088ecd169f47d59ab
3054 Author: David Zafman <david.zafman@inktank.com>
3055 Date: Wed May 14 17:44:31 2014 -0700
3057 ceph_filestore_dump: Add remove object command and usage for new commands
3059 Signed-off-by: David Zafman <david.zafman@inktank.com>
3060 (cherry picked from commit 605caec64b036f8ab5ae451d7e9e7515d414f28e)
3062 commit a4694643ae4503746d3fac8a0feac706ddc13a16
3063 Author: David Zafman <david.zafman@inktank.com>
3064 Date: Fri Jun 6 17:05:53 2014 -0700
3066 ceph_filestore_dump: Add utility function get_fd_data()
3068 Signed-off-by: David Zafman <david.zafman@inktank.com>
3069 (cherry picked from commit d4a9dafe442f139562497d746f80ba49faa954e8)
3071 commit 62dc823fb3b969c0ad52594419e8a86a3ff1e6ef
3072 Author: David Zafman <david.zafman@inktank.com>
3073 Date: Mon May 19 18:16:52 2014 -0700
3075 ceph_filestore_dump: Fail import/export with a tty for stdin/stdout
3077 Signed-off-by: David Zafman <david.zafman@inktank.com>
3078 (cherry picked from commit 7520e504cf2cdd3de2f236acb2cbf8a5016e6698)
3080 commit 9816f872ad59bcaa1a125b297f3991b333aad39c
3081 Author: David Zafman <david.zafman@inktank.com>
3082 Date: Tue May 20 11:56:20 2014 -0700
3084 ceph_filstore_dump: Save if stdout is a tty and add routine to clean binary strings
3086 Signed-off-by: David Zafman <david.zafman@inktank.com>
3087 (cherry picked from commit 3a574cc78b0e3ec6d8dd0c39ee20e7a54ad64056)
3089 commit d4aedeb833f23bf4ce6187cb82910ab2e71d48e5
3090 Author: David Zafman <david.zafman@inktank.com>
3091 Date: Wed May 14 15:30:11 2014 -0700
3093 common: Add missing ghobject_t::decode() for json
3095 Signed-off-by: David Zafman <david.zafman@inktank.com>
3096 (cherry picked from commit c05f895d15a1d0e78ff5e9ae1a83f0a5424103d0)
3099 Adjusted for older shard_t
3101 commit dadecb1e05e528093642ba356fa7a70a0b546727
3102 Author: David Zafman <david.zafman@inktank.com>
3103 Date: Wed May 14 15:37:17 2014 -0700
3105 ceph_filestore_dump: Add --skip-journal-replay and --skip-mount-omap
3107 Signed-off-by: David Zafman <david.zafman@inktank.com>
3108 (cherry picked from commit 2e9dcb256509e7c921556202052f0cc1dcd91398)
3110 commit c6369987b1e1e55a9d0ab0bc328f61f52fc608d0
3111 Author: David Zafman <david.zafman@inktank.com>
3112 Date: Wed May 14 15:41:15 2014 -0700
3114 os: Add optional flags to generic ObjectStore creation (SKIP_JOURNAL_REPLAY
3115 and SKIP_MOUNT_OMAP)
3117 Only FileStore cares about these flags, so passed on during create()
3119 Signed-off-by: David Zafman <david.zafman@inktank.com>
3120 (cherry picked from commit 3d9fde9d92322cd8ac3e3d8bcbf5b0a01ef0528b)
3125 commit 3381aebb113d14249f6998a86ebf6b4ec6adc42d
3126 Author: David Zafman <david.zafman@inktank.com>
3127 Date: Fri May 16 18:20:11 2014 -0700
3129 ceph_filestore_dump: Improve debug output by showing actual offset
3131 Signed-off-by: David Zafman <david.zafman@inktank.com>
3132 (cherry picked from commit 44b261d5d1b36528bfbcb37dbd866b615e14be99)
3134 commit 1164b2e1610028a40cddbed09f9da5649bd2023a
3135 Author: David Zafman <david.zafman@inktank.com>
3136 Date: Wed May 14 12:36:37 2014 -0700
3138 ceph_filestore_dump: Use cerr now that we aren't closing stderr
3140 Signed-off-by: David Zafman <david.zafman@inktank.com>
3141 (cherry picked from commit 087c0f9d31e0f3d5bae7eac6231978105a71677e)
3143 commit f224429aa4fcba897be5e438bbb49d1025e2c482
3144 Author: David Zafman <david.zafman@inktank.com>
3145 Date: Wed May 14 12:42:21 2014 -0700
3147 common,ceph_filestore_dump: Add ability for utilities to suppress library dout output
3149 Suppress dout output with CODE_ENVIRONMENT_UTILITY_NODOUT
3150 ceph_filestore_dump turns on dout output if --debug specified
3151 When used it can still be enable with --log-to-stderr --err-to-stderr
3153 Signed-off-by: David Zafman <david.zafman@inktank.com>
3154 (cherry picked from commit f7f9b251fc377651d8da4cbfd1942c3b86f3247e)
3156 commit 3f4cabdb84e58fcec0c3f508f980881c59fba948
3157 Author: David Zafman <david.zafman@inktank.com>
3158 Date: Tue May 13 18:27:30 2014 -0700
3160 ceph_filestore_dump: Export omap in batches for large omap case
3162 New function get_omap_batch()
3163 Create a TYPE_OMAP section for each batch
3165 Signed-off-by: David Zafman <david.zafman@inktank.com>
3166 (cherry picked from commit 501dd3c05b8983159a289b021943cb828b908f53)
3168 commit 0b757af5be338b65fd9124ac5158bfe02ad5f899
3169 Author: David Zafman <david.zafman@inktank.com>
3170 Date: Mon May 12 15:50:34 2014 -0700
3172 ceph_filestore_dump: Remove unused bufferlist databl
3174 Signed-off-by: David Zafman <david.zafman@inktank.com>
3175 (cherry picked from commit 398b418e2b9f8260bcfacac8bcebea5beffcceca)
3177 commit 4a742fe29b6d959912a38d132344c695f89dd34f
3178 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
3179 Date: Wed May 7 14:12:15 2014 +0200
3181 ceph_filestore_dump.cc: cleanup includes
3183 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
3184 (cherry picked from commit 8620609884243596d35b69c571d2da751e63cf2b)
3186 commit 420ea03aa3cd52bd035d31ba111c3d6d0745352d
3187 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
3188 Date: Thu Jan 29 18:19:16 2015 +0100
3190 librados: rectify the guard in RadosClient::wait_for_osdmap().
3192 RadosClient::wait_for_osdmap() did not signalize lack of connection
3193 via -ENOTCONN error code when the Objecter instance was allocated.
3194 The proper way is to check the connection state explicitly.
3196 Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
3197 (cherry picked from commit 34473f78f101d87d2606e0e7112682a47ff24830)
3200 src/librados/RadosClient.cc
3201 the modified guard was not present: add the new guard instead
3204 commit 1b2667211f90a1b630d2ddffe99b0fb00bb3c07c
3205 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
3206 Date: Mon Jan 19 15:07:21 2015 +0100
3208 librados: fix resources leakage in RadosClient::connect().
3210 If RadosClient::connect was called a second time (which could
3211 happen as a part of recovery from failure), the instances
3212 of Objecter and Messenger allocated by the first call were leaked.
3214 Additionally, the implementation of the method wrongly reported
3215 memory allocation problems -- it throwed std::bad_alloc exception
3216 instead of returning -ENOMEM error code.
3219 Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
3220 (cherry picked from commit 624c056da093c8741242892413438a291c03c7d5)
3223 src/librados/RadosClient.cc
3224 resolve adding (std::nothrow) that failed because the
3225 prototype of the constructor is not the same
3227 commit 4e32ff2b60549742d01b18429810c89f5f707548
3228 Author: Samuel Just <sjust@redhat.com>
3229 Date: Fri Dec 5 15:29:52 2014 -0800
3231 osd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::operator==
3234 Backport: giant, firefly, dumpling
3235 Signed-off-by: Samuel Just <sjust@redhat.com>
3236 (cherry picked from commit 1ac17c0a662e6079c2c57edde2b4dc947f547f57)
3238 commit 6e58732f546ec6241b198d2473902d66327cdc36
3239 Author: Joao Eduardo Luis <joao@redhat.com>
3240 Date: Mon Jan 19 18:49:15 2015 +0000
3242 mon: PGMonitor: skip zeroed osd stats on get_rule_avail()
3246 Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
3247 (cherry picked from commit b311e7c36273efae39aa2602c1f8bd90d39e5975)
3250 src/mon/PGMonitor.cc
3251 ceph::unordered_map changed the context, simple resolution
3253 commit bcc8cfb24a96a7874a24760771755088a231a8d7
3254 Author: Joao Eduardo Luis <joao@redhat.com>
3255 Date: Fri Jan 16 18:13:05 2015 +0000
3257 mon: PGMonitor: available size 0 if no osds on pool's ruleset
3259 get_rule_avail() may return < 0, which we were using blindly assuming it
3260 would always return an unsigned value. We would end up with weird
3261 values if the ruleset had no osds.
3263 Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
3264 (cherry picked from commit 8be6a6ab2aa5a000a39c73a98b11a0ab32fffa1c)
3266 commit 894c8ad26fd2da203dcbf8eb0ad5e2af0223d5a9
3267 Author: Joao Eduardo Luis <joao@redhat.com>
3268 Date: Fri Jan 16 18:12:42 2015 +0000
3270 mon: PGMonitor: fix division by zero on stats dump
3272 Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
3273 (cherry picked from commit 50547dc3c00b7556e26b9a44ec68640c5c3a2384)
3275 commit 1e58bb49b99118d064c1ca92e42cbfb2786fdaff
3276 Author: Loic Dachary <ldachary@redhat.com>
3277 Date: Wed Dec 17 16:06:55 2014 +0100
3279 crush: set_choose_tries = 100 for erasure code rulesets
3281 It is common for people to try to map 9 OSDs out of a 9 OSDs total ceph
3282 cluster. The default tries (50) will frequently lead to bad mappings for
3283 this use case. Changing it to 100 makes no significant CPU performance
3284 difference, as tested manually by running crushtool on one million
3287 http://tracker.ceph.com/issues/10353 Fixes: #10353
3289 Signed-off-by: Loic Dachary <ldachary@redhat.com>
3290 (cherry picked from commit 2f87ac807f3cc7ac55d9677d2051645bf5396a62)
3293 src/erasure-code/lrc/ErasureCodeLrc.cc
3294 safely ignored because the file does not exist
3296 commit 27dbbb3c312ea68a96b011ccb12394c75c0fb0f3
3297 Author: Sage Weil <sage@redhat.com>
3298 Date: Thu Feb 12 13:49:50 2015 -0800
3300 mon/OSDMonitor: do not trust small values in osd epoch cache
3302 If the epoch cache says the osd has epoch 100 and the osd is asking for
3303 epoch 200+, do not send it 100+.
3306 Backport: giant, firefly
3307 Signed-off-by: Sage Weil <sage@redhat.com>
3308 (cherry picked from commit a5759e9b97107488a8508f36adf9ca1aba3fae07)