1 commit d56bdf93ced6b80b07397d57e3fa68fe68304432 (tag: refs/tags/v0.94.7)
2 Author: Jenkins Build Slave User <jenkins-build@trusty-small--296081f3-e7b1-46b1-96c2-d6b655cf71d3.localdomain>
3 Date: Tue May 10 14:47:39 2016 +0000
7 commit 6e6c85a0d71df7cd6207febc3e22d30617648abc
9 Author: Sage Weil <sage@redhat.com>
10 Date: Mon May 9 13:55:24 2016 -0400
12 Merge pull request #8979 from athanatos/wip-15655-hammer
14 OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1
16 Reviewed-by: Sage Weil <sage@redhat.com>
18 commit 934ad41dbf3f7004c93aa8f7660353329b7f3fad
19 Merge: e219e85 3c03eee
20 Author: Orit Wasserman <owasserm@redhat.com>
21 Date: Wed May 4 11:37:33 2016 +0200
23 Merge pull request #8583 from Vicente-Cheng/wip-15089-hammer
25 hammer: Bucket owner isn't changed after unlink/link
26 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
28 commit 76c33decdeba83d4d977a9556e76e68fa964465f (refs/remotes/athanatos/wip-15655-hammer)
29 Author: Samuel Just <sjust@redhat.com>
30 Date: Thu Apr 28 13:47:48 2016 -0700
32 OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1
34 Fixes: http://tracker.ceph.com/issues/15655
35 Signed-off-by: Samuel Just <sjust@redhat.com>
36 (cherry picked from commit c121bc51a5a877a49094cfbd3bd16af1f3ae5090)
38 commit 3c03eee07e02b6b4d31f6a58a03253eff2d41324
39 Author: Aran85 <zhangzengran@h3c.com>
40 Date: Mon Sep 28 08:23:22 2015 +0800
42 rgw:bucket link now set the bucket.instance acl
46 Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
47 (cherry picked from commit 4d59b1d36f8924290c3ecb5b7608747191470188)
52 1. Do not use the rgw_user structure and remove the tenant parameter that describes as below
53 2. user_id is not used so just remove the line
54 3. instead of system_obj_set_attr you can use the method set_attr
57 We do not use the rgw_user structure and remove the `tenant` parameter
58 because this feature is not introduced on hammer version.
59 The rgw multi-tenant feature is introduced on pr#6784 (https://github.com/ceph/ceph/pull/6784)
60 This feature is supported from v10.0.2 and later version.
62 commit e219e85be00088eecde7b1f29d7699493a79bc4d
63 Merge: eea2a77 f794ada
64 Author: Sage Weil <sage@redhat.com>
65 Date: Wed Apr 6 10:43:16 2016 -0400
67 Merge pull request #7922 from badone/wip-14961-hammer
69 hammer: PK11_DestroyContext() is called twice if PK11_DigestFinal() fails
71 commit eea2a77ef0b242c295f2480349d8608273dfb184
72 Merge: 815760d 38b9c0b
73 Author: Sage Weil <sage@redhat.com>
74 Date: Wed Apr 6 10:42:44 2016 -0400
76 Merge pull request #7992 from SUSE/wip-13807-hammer
78 hammer: segfault in Objecter::handle_watch_notify
80 commit 815760dde45574f931e316f47c5990129375e9f2
81 Merge: ba5c75a 01672b4
82 Author: Sage Weil <sage@redhat.com>
83 Date: Wed Apr 6 10:41:41 2016 -0400
85 Merge pull request #8051 from xiaoxichen/wip-15024-hammer
87 hammer: clock skew report is incorrect by ceph health detail command
89 commit ba5c75a33ba10bbe7796715f2d8500ec1fe209fd
90 Merge: dc09055 ac3569c
91 Author: Sage Weil <sage@redhat.com>
92 Date: Wed Apr 6 10:40:51 2016 -0400
94 Merge pull request #8398 from asheplyakov/hammer-wip-15336
96 hammer: monclient: avoid key renew storm on clock skew
98 commit dc090558a3306feb2c50994950756e5599a92eaf
99 Merge: 0f28a5b 744e9f8
100 Author: Loic Dachary <loic@dachary.org>
101 Date: Wed Apr 6 16:24:55 2016 +0200
103 Merge pull request #8272 from Yan-waller/yj-wip-fixbl
105 hammer: tests: bufferlist: do not expect !is_page_aligned() after unaligned rebuild
107 Reviewed-by: Kefu Chai <kchai@redhat.com>
109 commit 0f28a5b033b47479ae6f1958d2f079bd6c57f1b4
110 Merge: 374c3c1 f8d2abd
111 Author: Loic Dachary <loic@dachary.org>
112 Date: Wed Apr 6 16:20:15 2016 +0200
114 Merge pull request #7883 from tchaikov/wip-12848-hammer
116 hammer: osd: use GMT time for the object name of hitsets
118 Reviewed-by: Loic Dachary <ldachary@redhat.com>
120 commit 374c3c1d8cde50a4503cbd41ee2204aa6761557d
121 Merge: add1674 0830275
122 Author: Loic Dachary <loic@dachary.org>
123 Date: Wed Apr 6 16:18:11 2016 +0200
125 Merge pull request #7917 from ceph/wip-10794-hammer
127 hammer: ceph-objectstore-tool, osd: Fix import handling
129 Reviewed-by: Loic Dachary <ldachary@redhat.com>
131 commit add1674c759f946c7c456e96e52b7ca1a45829ec
132 Merge: d08bae2 be4a9fe
133 Author: Loic Dachary <loic@dachary.org>
134 Date: Wed Apr 6 16:13:32 2016 +0200
136 Merge pull request #8026 from liewegas/wip-reweight-hammer
138 hammer: mon: implement reweight-by-utilization feature
140 Reviewed-by: Loic Dachary <ldachary@redhat.com>
142 commit d08bae217e50dfa19dce3bb58349149c4210361e
143 Merge: f68697c d4cf190
144 Author: Loic Dachary <loic@dachary.org>
145 Date: Wed Apr 6 16:12:55 2016 +0200
147 Merge pull request #8049 from xiaoxichen/wip-15022-hammer
149 hammer: keyring permisions for mon deamon
151 Reviewed-by: Loic Dachary <ldachary@redhat.com>
153 commit f68697c71ad4b6f49dae12a50fad73cacbcaf6e1
154 Merge: e5beeef 57fd7f8
155 Author: Loic Dachary <loic@dachary.org>
156 Date: Wed Apr 6 16:09:42 2016 +0200
158 Merge pull request #8052 from xiaoxichen/wip-15051-hammer
160 hammer: test/librados/tier.cc doesn't completely clean up EC pools
162 Reviewed-by: Loic Dachary <ldachary@redhat.com>
164 commit e5beeef1b142a86140791470785c69f865e5df5a
165 Merge: 77fbf58 77a4ed0
166 Author: Loic Dachary <loic@dachary.org>
167 Date: Wed Apr 6 16:03:07 2016 +0200
169 Merge pull request #8440 from dachary/wip-15382-hammer
171 hammer: rpm package building fails if the build machine has lttng and babeltrace development packages installed locally
173 Reviewed-by: Kefu Chai <kchai@redhat.com>
175 commit 77fbf581cb2259146938a737c299d6cf762303d1
176 Merge: 92a96e1 97f474f
177 Author: Loic Dachary <loic@dachary.org>
178 Date: Wed Apr 6 15:05:11 2016 +0200
180 Merge pull request #8401 from Vicente-Cheng/wip-15129-hammer
182 hammer: Protect against excessively large object map sizes
184 Reviewed-by: Jason Dillaman <dillaman@redhat.com>
186 commit 92a96e1b16d9cadf182d200dfef0de6c2b388202
187 Merge: 7cfc739 281d63d
188 Author: Loic Dachary <loic@dachary.org>
189 Date: Wed Apr 6 13:44:09 2016 +0200
191 Merge pull request #8011 from dillaman/wip-15033-hammer
193 hammer: librbd: possible QEMU deadlock after creating image snapshots
195 Reviewed-by: Loic Dachary <ldachary@redhat.com>
197 commit 77a4ed0a8986b2529edd8059dd3efa38f778c6f2
198 Author: Loic Dachary <ldachary@redhat.com>
199 Date: Tue Apr 5 11:53:54 2016 +0200
201 ceph.spec.in: disable lttng and babeltrace explicitly
203 before this change, we do not pacakge tracepoint probe shared libraries
204 on rhel7. but "configure" script enables them if lttng is detected. and
205 rpm complains at seeing installed but not pacakged files. as EPEL-7 now
206 includes lttng-ust-devel and libbabeltrace-devel, we'd better
207 BuildRequire them, and build with them unless disabled otherwise. so in
209 * make "lttng" an rpm build option enabled by default
210 * BuildRequire lttng-ust-devel and libbabeltrace-devel if the "lttng"
211 "lttng" option is enabled
212 * --without-lttng --without-babeltrace if the "lttng" option is disabled
215 Signed-off-by: Kefu Chai <kchai@redhat.com>
216 (cherry picked from commit f1a44907a2f83cb8080cd8ab5980a30306a33fbd)
219 ceph.spec.in: trivial resolution, the context changed
220 (other packages, files etc.) but the semantic did not
222 commit 97f474fb6b26ae7b7e2fdd21de4f4bd98cdd56ab
223 Author: Jason Dillaman <dillaman@redhat.com>
224 Date: Mon Mar 14 13:57:28 2016 -0400
226 cls_rbd: protect against excessively large object maps
230 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
231 (cherry picked from commit 4aff4ea3290dc7fb62c639bfc74fcfdde5fe9542)
234 src/cls/rbd/cls_rbd.cc
235 `RBD_METADATA_KEY_PREFIX` is not introduced on hammer, so remove
238 commit ac3569cd8bbb4b2b9a0edf298ce0b83bc18f1fea
239 Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
240 Date: Mon Mar 21 18:20:18 2016 +0300
242 hammer: monclient: avoid key renew storm on clock skew
244 Refreshing rotating keys too often is a symptom of a clock skew, try to
245 detect it and don't cause extra problems:
247 * MonClient::_check_auth_rotating:
248 - detect and report premature keys expiration due to a time skew
249 - rate limit refreshing the keys to avoid excessive RAM and CPU usage
250 (both by OSD in question and monitors which have to process a lot
252 * MonClient::wait_auth_rotating: wait for valid (not expired) keys
253 * OSD::init(): bail out after 10 attempts to obtain the rotating keys
257 Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
258 (cherry picked from commit 918c12c2ab5d014d0623b1accf959b041aac5128)
262 no loadavg checks in Hammer, hence the conflict. Move the
263 counter and max_attempts initialization to a suitable place.
265 commit 7cfc739a513da84d76b959efc51dd21c1cc552d6
266 Merge: 0418943 7eae05e
267 Author: Loic Dachary <loic@dachary.org>
268 Date: Thu Mar 31 13:50:23 2016 +0200
270 Merge pull request #8187 from liewegas/wip-15171
272 hammer: osd/ReplicatedPG: do not proxy read *and* process op locally
274 Reviewed-by: Samuel Just <sjust@redhat.com>
275 Reviewed-by: David Zafman <dzafman@redhat.com>
276 Reviewed-by: David Disseldorp <ddiss@suse.de>
278 commit f8d2abd2e41c5dd04977f85cc1d6e65853c9a1b2
279 Author: Kefu Chai <kchai@redhat.com>
280 Date: Thu Mar 3 12:03:44 2016 +0800
282 osd/osd_types: encode pg_pool_t the old way
284 as a workaround of #12410
287 Signed-off-by: Kefu Chai <kchai@redhat.com>
289 commit 720a090eb67b3955b0cadb7633c5a28a934171a4
290 Author: Kefu Chai <kchai@redhat.com>
291 Date: Tue Sep 8 16:52:32 2015 +0800
293 mon: disable gmt_hitset if not supported
295 the gmt_hitset is enabled by default in the ctor of pg_pool_t, this
296 is intentional. because we want to remove this setting and make
297 gmt_hitset=true as a default in future. but this forces us to
298 disable it explicitly when preparing a new pool if any OSD does
299 not support gmt hitset.
302 Signed-off-by: Kefu Chai <kchai@redhat.com>
303 (cherry picked from commit e48cec3dc93b3988dcd8924933deb1b3a43e1d0f)
306 src/mon/OSDMonitor.cc
307 remove unrelated hunk
309 commit 7aec079f8a1bbe75625c438a17bb87e45398568e
310 Author: Kefu Chai <kchai@redhat.com>
311 Date: Fri Aug 28 00:32:38 2015 +0800
313 osd: do not let OSD_HITSET_GMT reuse the feature bit
315 * to ease the backport to hammer
317 Signed-off-by: Kefu Chai <kchai@redhat.com>
318 (cherry picked from commit 5a4f6a866bb675195ad83c38fd23238d078c78ed)
321 src/include/ceph_features.h
322 minor changes to resolve conflicts
324 commit 370434136ef076c350db3db4fca6489f88f70453
325 Author: David Zafman <dzafman@redhat.com>
326 Date: Thu Aug 27 11:24:25 2015 -0700
328 osd: Decode use_gmt_hitset with a unique version
330 Signed-off-by: David Zafman <dzafman@redhat.com>
331 (cherry picked from commit 2bc5a48f4c5d3667213be3a7b5a0e0f5ef9daf4f)
335 minor changes to resolve conflicts
337 commit 64bca2a43b34b265621bad2ec1fb980217223847
338 Author: Kefu Chai <kchai@redhat.com>
339 Date: Tue Aug 18 16:53:50 2015 +0800
341 mon: print use_gmt_hitset in "ceph osd pool get"
343 Signed-off-by: Kefu Chai <kchai@redhat.com>
344 (cherry picked from commit cc2bcf760f2d2f20fc4a2fa78ba52475a23e55bf)
347 src/mon/OSDMonitor.cc
348 use the old way to dump pool info
350 commit 87df212cfca33efbbee6376f528cb7d4895d1dc0
351 Author: Kefu Chai <kchai@redhat.com>
352 Date: Tue Aug 18 00:04:23 2015 +0800
354 mon: add "ceph osd pool set $pool use_gmt_hitset true" cmd
356 allow "ceph osd pool set $pool use_gmt_hitset <true|1>" as long as
357 the cluster supports gmt hitset.
360 Signed-off-by: Kefu Chai <kchai@redhat.com>
361 (cherry picked from commit 03a1a3cf023a9aeb2fa26820e49e5efe3f3b3789)
363 commit 039240418060c9a49298dacc0478772334526dce
364 Author: Kefu Chai <kchai@redhat.com>
365 Date: Fri Jun 5 21:06:48 2015 +0800
367 osd: use GMT time for the object name of hitsets
369 * bump the encoding version of pg_hit_set_info_t to 2, so we can
370 tell if the corresponding hit_set is named using localtime or
372 * bump the encoding version of pg_pool_t to 20, so we can know
373 if a pool is using GMT to name the hit_set archive or not. and
374 we can tell if current cluster allows OSDs not support GMT
376 * add an option named `osd_pool_use_gmt_hitset`. if enabled,
377 the cluster will try to use GMT mode when creating a new pool
378 if all the the up OSDs support GMT mode. if any of the
379 pools in the cluster is using GMT mode, then only OSDs
380 supporting GMT mode are allowed to join the cluster.
383 Signed-off-by: Kefu Chai <kchai@redhat.com>
384 (cherry picked from commit 42f8c5daad16aa849a0b99871d50161673c0c370)
387 src/include/ceph_features.h
388 src/osd/ReplicatedPG.cc
391 fill pg_pool_t with default settings in master branch.
393 commit 744e9f837a94f95c5e877f074fd1479f8da64e3c
394 Author: Kefu Chai <kchai@redhat.com>
395 Date: Fri Sep 4 01:23:31 2015 +0800
397 test/bufferlist: do not expect !is_page_aligned() after unaligned rebuild
399 if the size of a bufferlist is page aligned we allocate page aligned
400 memory chunk for it when rebuild() is called. otherwise we just call
401 the plain new() to allocate new memory chunk for holding the continuous
402 buffer. but we should not expect that `new` allocator always returns
403 unaligned memory chunks. instead, it *could* return page aligned
404 memory chunk as long as the allocator feels appropriate. so, the
405 `EXPECT_FALSE(bl.is_page_aligned())` after the `rebuild()` call is
408 Signed-off-by: Kefu Chai <kchai@redhat.com>
409 (cherry picked from commit 8ed724222651812c2ee8cc3804dc1f54c973897d)
411 commit 0830275b39afc408573c2c468fa3b0e7b1d5cc4e
412 Author: Sage Weil <sage@redhat.com>
413 Date: Tue Oct 6 14:35:35 2015 -0400
415 osd/PG: fix generate_past_intervals
417 We may be only calculating older past intervals and have a valid
418 history.same_interval_since value, in which case the local
419 same_interval_since value will end at the newest old interval we had to
422 This was introduced by 70316541bbb115d9a35954bfba373cf1dc084b7e.
424 Signed-off-by: Sage Weil <sage@redhat.com>
425 (cherry picked from commit 98cbf0380e9ee848725fc87d61c31a734305a84f)
427 commit 0418943c6ef8c9649a58003444daeb4b6224fbab
428 Merge: 35eae5f 2072a53
429 Author: Sage Weil <sage@redhat.com>
430 Date: Fri Mar 18 10:13:40 2016 -0400
432 Merge pull request #8123 from liewegas/wip-15136-hammer
434 qa/workunits: remove 'mds setmap' from workunits
436 commit 7eae05e14231cb3476d14bf74b15bf9646849d09 (refs/remotes/me/wip-15171)
437 Author: Sage Weil <sage@redhat.com>
438 Date: Thu Mar 17 13:28:40 2016 -0400
440 osd/ReplicatedPG: do not proxy read *and* process op locally
442 If we proxy the read, we cannot return false, even if we fail to also
446 Signed-off-by: Sage Weil <sage@redhat.com>
448 commit be4a9feae4c5f33685cceb386717a5733553df10 (refs/remotes/me/wip-reweight-hammer)
449 Author: Sage Weil <sage@redhat.com>
450 Date: Mon Mar 14 08:07:19 2016 -0400
452 osd/OSDMap: fix typo in summarize_mapping_stats
454 From ea9abe53d0e777b7dc3b22af71639f77c4de08c8
456 Signed-off-by: Sage Weil <sage@redhat.com>
457 (cherry picked from commit cc7e2329046ef7c528f321092a464f6db6e7edb9)
459 commit 2072a53dc920b79ed76265d6097e50d3d2994b1d
460 Author: Sage Weil <sage@redhat.com>
461 Date: Tue Mar 15 09:44:13 2016 -0400
463 qa/workunits: remove 'mds setmap' from workunits
465 Signed-off-by: Sage Weil <sage@redhat.com>
466 (cherry picked from commit 6a80e2df8b31802a39ef6f89136ed357dce50c20)
468 commit 01672b4afd6f886d6bb8527427663e062ab9d100
469 Author: Joao Eduardo Luis <joao@suse.de>
470 Date: Thu Jan 7 11:20:36 2016 +0000
472 mon: Monitor: get rid of weighted clock skew reports
474 By weighting the reports we were making it really hard to get rid of a
475 clock skew warning once the cause had been fixed.
477 Instead, as soon as we get a clean bill of health, let's run a new round
478 and soon as possible and ascertain whether that was a transient fix or
479 for realsies. That should be better than the alternative of waiting for
480 an hour or something (for a large enough skew) for the warning to go
481 away - and with it, the admin's sanity ("WHAT AM I DOING WRONG???").
485 Signed-off-by: Joao Eduardo Luis <joao@suse.de>
487 (cherry pick from commit 17d8ff429c7dca8fc1ada6e7cc8a7c4924a22e28)
489 commit f90b8bc1a2b3ffa5ba52c0992c1c5ff52e5ea104
490 Author: Joao Eduardo Luis <joao@suse.de>
491 Date: Thu Jan 7 11:05:44 2016 +0000
493 mon: Monitor: adaptative clock skew detection interval
495 When in the presence of a clock skew, adjust the checking interval
496 according to how many rounds have gone by since the last clean check.
498 If a skew is detected, instead of waiting an additional 300 seconds we
499 will perform the check more frequently, gradually backing off the
500 frequency if the skew is still in place (up to a maximum of
501 'mon_timecheck_interval', default: 300s). This will help with transient
504 Signed-off-by: Joao Eduardo Luis <joao@suse.de>
506 (cherry pick from commit 45e16d0d7407cf4e886dde9321bb91c1a087776d)
509 src/common/config_opts.h
510 Merge the change line.
512 handle_timecheck_leader(MonOpRequestRef op) was replaced with handle_timecheck_leader(MTimeCheck *m)
513 also for handle_timecheck_peon and handle_timecheck.
515 commit 57fd7f858c220af362b330d12db0e87de82b4346 (refs/remotes/gh/hammer-pr-8052)
516 Author: Dan Mick <dan.mick@redhat.com>
517 Date: Wed Nov 25 19:20:51 2015 -0800
519 test/librados/test.cc: clean up EC pools' crush rules too
521 SetUp was adding an erasure-coded pool, which automatically adds
522 a new crush rule named after the pool, but only removing the
523 pool. Remove the crush rule as well.
525 http://tracker.ceph.com/issues/13878 Fixes: #13878
527 Signed-off-by: Dan Mick <dan.mick@redhat.com>
528 Signed-off-by: Loic Dachary <loic@dachary.org>
529 (cherry picked from commit 04b4795f81c15bfcb62ba5807745470ce0e5e949)
531 commit d4cf19049349678065195659bb287b899f92a686
532 Author: Owen Synge <osynge@suse.com>
533 Date: Wed Mar 2 12:15:48 2016 +0100
535 keyring permissions for mon daemon
539 sudo ceph-mon --cluster ceph --mkfs -i $NODE_NAME --keyring $PATH_MON_KEYRING
541 Writes a new keyring with permissions set to "0644".
544 Signed-off-by: Owen Synge osynge@suse.com
545 (cherry picked from commit c2f91a8ce46974a72b960b7cb25af3d089fbb80d)
547 commit 35eae5fbddd2b271a10db9a69d4c4e34029bca06
548 Merge: c59b994 647723e
549 Author: Loic Dachary <loic@dachary.org>
550 Date: Fri Mar 11 10:05:42 2016 +0700
552 Merge pull request #7911 from dzafman/wip-meta-list-hammer
554 hammer: tools, test: Add ceph-objectstore-tool to operate on the meta collection
556 Reviewed-by: Loic Dachary <ldachary@redhat.com>
558 commit c59b9944a61174c7e29a26f4abfd7839020578af
559 Merge: dd66eb9 d875620
560 Author: Loic Dachary <loic@dachary.org>
561 Date: Fri Mar 11 10:03:43 2016 +0700
563 Merge pull request #7903 from branch-predictor/bp-hammer-force-bench-smoke
565 hammer: tools/rados: add bench smoke tests
567 Reviewed-by: Loic Dachary <ldachary@redhat.com>
569 commit dd66eb91d0129163ecfc8105f043fd0f6926dad5
570 Merge: de43aba 5726463
571 Author: Loic Dachary <loic@dachary.org>
572 Date: Fri Mar 11 10:02:18 2016 +0700
574 Merge pull request #7876 from SUSE/wip-14946-hammer
576 hammer: redhat-lsb-core dependency was dropped, but is still needed
578 Reviewed-by: Loic Dachary <ldachary@redhat.com>
580 commit de43aba0015927cec5ebd8f98ad26a801b1353ff
581 Merge: 48dfac6 6a6754f
582 Author: Loic Dachary <loic@dachary.org>
583 Date: Fri Mar 11 10:00:48 2016 +0700
585 Merge pull request #7817 from asheplyakov/hammer-bug-14873
587 hammer: tools: fix race condition in seq/rand bench (part 2)
589 Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
590 Reviewed-by: Loic Dachary <ldachary@redhat.com>
592 commit 48dfac64ba37e5d0ec262798fbec011c1016a4f0
593 Merge: 7083829 3a5b102
594 Author: Loic Dachary <loic@dachary.org>
595 Date: Fri Mar 11 10:00:18 2016 +0700
597 Merge pull request #7896 from asheplyakov/hammer-bug-14873-p1
599 hammer: tools: fix race condition in seq/rand bench (part 1)
601 Reviewed-by: Loic Dachary <ldachary@redhat.com>
602 Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
604 commit 1b922e5431339d12e661de9fd4b16e8cf2c08ad5
605 Author: Sage Weil <sage@redhat.com>
606 Date: Thu Mar 10 08:50:57 2016 -0500
608 test/pybind/test_ceph_argparse: fix reweight-by-utilization tests
610 Signed-off-by: Sage Weil <sage@redhat.com>
611 (cherry picked from commit d0f87131962b26cef9e31fa11651771856c41164)
613 commit 06a2a7596b876a5c2addb184a48222bcb6e23b9a
614 Author: Kefu Chai <kchai@redhat.com>
615 Date: Thu Mar 10 21:41:15 2016 +0800
617 man/8/ceph.rst: remove invalid option for reweight-by-*
619 --yes-i-really-mean-it is not valid option for reweight-by-*
621 Signed-off-by: Kefu Chai <kchai@redhat.com>
622 (cherry picked from commit 797f1d41d98738411079a7a16d8b1d5352359d33)
624 commit 241f76262273bafd72e91fee3d46c412f7418767
625 Author: Sage Weil <sage@redhat.com>
626 Date: Wed Mar 9 13:25:55 2016 -0500
628 mon: remove range=100 from reweight-by-* commands
630 Specifying the range makes it skip instead of error when you give
633 Signed-off-by: Sage Weil <sage@redhat.com>
634 (cherry picked from commit 661891aa28ca0600a62e25f6d10ce7fa94e32cce)
636 commit 55ad2c7724e114728bb327a97726a6c9b660bb1d
637 Author: Sage Weil <sage@redhat.com>
638 Date: Thu Mar 3 13:46:12 2016 -0500
640 mon: make max_osds an optional arg
642 We keep the config option with the default (4), but let you
643 specify the max # of osds to reweight as a third optional arg.
645 Signed-off-by: Sage Weil <sage@redhat.com>
646 (cherry picked from commit 651f05b6e6bec41b54c0a8f8ca6641ce3aa5dff3)
648 commit f13cdeaf6657577c21a5bb2985d46971aa084c3f
649 Author: Sage Weil <sage@redhat.com>
650 Date: Thu Mar 3 13:38:57 2016 -0500
652 mon: make reweight max_change default configurable
654 Signed-off-by: Sage Weil <sage@redhat.com>
655 (cherry picked from commit 8a9429d85bc99874dc9871b43b2d0c7ad1086803)
657 commit f4b4ef76295d40753c6acffa3d92128f7ebe8733
658 Author: Sage Weil <sage@redhat.com>
659 Date: Thu Mar 3 13:38:19 2016 -0500
661 mon/OSDMonitor: fix indentation
663 Signed-off-by: Sage Weil <sage@redhat.com>
664 (cherry picked from commit 47b650c1497b8eaf37cfcb7e3b9fda12d8cf2d7a)
666 commit 76eb3c8fbdb614a4cdde937a1dec680b4be82470
667 Author: Sage Weil <sage@redhat.com>
668 Date: Wed Mar 2 17:34:48 2016 -0500
670 qa/workunits/cephtool/test.sh: test reweight-by-x commands
672 Signed-off-by: Sage Weil <sage@redhat.com>
673 (cherry picked from commit 28b33a5b57e3f898808bd8ccc5e314667f84912a)
675 commit 9a9d147aa14a637bbf8edddf85f6c36a29874694
676 Author: Sage Weil <sage@redhat.com>
677 Date: Thu Mar 10 08:28:59 2016 -0500
679 osd/MonCommand: add/fix up 'osd [test-]reweight-by-{pg,utilization}'
681 - show before/after pg placement stats
682 - add test- variants that don't do anything
683 - only allow --no-increasing on the -utilization versions (where
684 it won't conflict with the optional pool list and confuse the
687 Signed-off-by: Sage Weil <sage@redhat.com>
688 (cherry picked from commit 1de7e47833f2d14c6915d7d071fe0005408c8da0)
693 # src/mon/OSDMonitor.cc
694 # src/mon/OSDMonitor.h
696 commit 6ec676df083ec3078f5efd8058d6fb6a491c9b04
697 Author: Sage Weil <sage@redhat.com>
698 Date: Wed Mar 2 14:00:15 2016 -0500
700 mon: add 'osd utilization' command
702 Signed-off-by: Sage Weil <sage@redhat.com>
703 (cherry picked from commit 5b757eff868dbce2393beadd9fe2522372288cc0)
705 commit 94134d9148edfcc41d2d239db69d0b299fbf427f
706 Author: Sage Weil <sage@redhat.com>
707 Date: Thu Mar 10 08:30:45 2016 -0500
709 osd/OSDMap: add summarize_mapping_stats
711 Calculate some basic stats about the PG distribution.
713 Signed-off-by: Sage Weil <sage@redhat.com>
714 (cherry picked from commit ea9abe53d0e777b7dc3b22af71639f77c4de08c8)
716 - remove c++11 auto and range-based for loops
718 commit 932f75d1f2105f296681b5fb02757087947e01f8
719 Author: Sage Weil <sage@redhat.com>
720 Date: Thu Mar 3 13:49:03 2016 -0500
722 mon: make reweight-by-* max_change an argument
724 Signed-off-by: Sage Weil <sage@redhat.com>
725 (cherry picked from commit a70eaabcfc1cc1dfb9b6ba2d7f71b3d76496eb55)
727 commit d8372cea0c51db89cc48e5592236d53f7b01b6b3
728 Author: Dan van der Ster <daniel.vanderster@cern.ch>
729 Date: Fri Feb 26 22:29:46 2016 +0100
731 osd: add mon_reweight_max_osds to limit reweight-by-* commands
733 Add configurable mon_reweight_max_osds which limits the number
734 of OSDs modified each time reweight-by-* is called (by default
737 Also change the order in which we look at OSDs to go from most
740 Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
741 (cherry picked from commit 3aa0ccefddc1790df5b808bfccd5da4857951220)
743 commit 6a422b2626d48098c5a2c13de677814429263cba
744 Author: Dan van der Ster <daniel.vanderster@cern.ch>
745 Date: Fri Feb 26 22:28:46 2016 +0100
747 osd: add mon_reweight_max_change option which limits reweight-by-*
749 Add a configurable mon_reweight_max_change which limits be default
750 the reweight-by-* commands to only change an OSDs weight by 0.05.
752 Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
753 (cherry picked from commit 6f0a1fb69da84ee18bdb9b151772cef8f32413c5)
755 commit d3635b796ae28e1bc6598daf4109bf371a1f4ed8
756 Author: Dan van der Ster <daniel.vanderster@cern.ch>
757 Date: Fri Feb 26 21:58:00 2016 +0100
759 test: add simple test for new reweight-by-* options
761 Test validity of --no-increasing and --yes-i-really-mean-it.
763 Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
764 (cherry picked from commit 1a6ad5053e7fc4f8942855a17ce4540e340e9d4f)
766 commit e993851b7abf80fd793aa5b7188f1af7dbe03041
767 Author: Dan van der Ster <daniel.vanderster@cern.ch>
768 Date: Fri Feb 26 21:52:41 2016 +0100
770 osd: add sure and no-increasing options to reweight-by-*
772 Add a --no-increasing option to reweight-by-* which can be used to only decrease
773 OSD weights without increasing any. This is useful for example if you need to
774 urgently lower the weight of nearly full OSDs.
776 Also add a --yes-i-really-mean-it confirmation to reweight-by-*.
778 Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
779 (cherry picked from commit ddf5c2b62316bb69839f220fe2527d1467863421)
781 commit 281d63df792c4cdf25cca5428969c65d2ae379e8
782 Author: Jason Dillaman <dillaman@redhat.com>
783 Date: Wed Mar 9 18:00:04 2016 -0500
785 librbd: complete cache reads on cache's dedicate thread
787 If a snapshot is created out-of-band, the next IO will result in the
788 cache being flushed. If pending writeback data performs a copy-on-write,
789 the read from the parent will be blocked.
793 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
794 (cherry picked from commit f9e5ae80e3b0799b5a7e1d3f93b2d85a4baff20f)
796 commit 621e3aef85e4b720232ca9ee89a4620d58362047
797 Author: Jason Dillaman <dillaman@redhat.com>
798 Date: Wed Mar 9 17:31:06 2016 -0500
800 test: reproducer for writeback CoW deadlock
804 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
805 (cherry picked from commit 16b6efdd24b25ba1f6bc658681afa3d0878eb397)
806 (cherry picked from commit 7ffbe4099c9367e7405e2196803a0d8b12253a06)
808 commit 38b9c0b2fbbb056c29cd0485a9831edce020eaa6
809 Author: Sage Weil <sage@redhat.com>
810 Date: Mon Nov 16 11:32:34 2015 -0500
812 osdc/Objecter: call notify completion only once
814 If we race with a reconnect we could get a second notify message
815 before the notify linger op is torn down. Ensure we only ever
816 call the notify completion once to prevent a segfault.
819 Signed-off-by: Sage Weil <sage@redhat.com>
820 (cherry picked from commit 987f68a8df292668ad241f4769d82792644454dd)
822 commit 7083829c227403a77fcf35a2376dc02e4c9693c8 (refs/remotes/markhpc/hammer)
823 Merge: 651e49e c4ba93a
824 Author: Loic Dachary <loic@dachary.org>
825 Date: Tue Mar 8 10:00:15 2016 +0700
827 Merge pull request #6604 from ukernel/hammer-13268
829 hammer: client: added permission check based on getgrouplist
831 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
833 commit 651e49ea2037834fbbf48e642a78075140e06782
834 Merge: 522e3e8 b2393dc
835 Author: Loic Dachary <loic@dachary.org>
836 Date: Tue Mar 8 09:58:30 2016 +0700
838 Merge pull request #6551 from ceph/hammer-client-inoderef
840 hammer: client inoderef
842 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
844 commit f794adadd126bd77ae138794119725a046642712
845 Author: Brad Hubbard <bhubbard@redhat.com>
846 Date: Fri Mar 4 13:06:47 2016 +1000
848 tests: Add TEST_no_segfault_for_bad_keyring to test/mon/misc.sh
850 94da46b6e31cac206cb32fc5bd3159209ee25e8c adds
851 TEST_no_segfault_for_bad_keyring which requires changes to run
852 in hammer since test/mon/misc.sh is not written to run multiple tests in
853 succession in the hammer version.
857 Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
859 commit 522e3e8d761a337796ed92868e00062b87e0f0a5
860 Merge: d314849 e014ea8
861 Author: Loic Dachary <loic@dachary.org>
862 Date: Fri Mar 4 10:25:00 2016 +0700
864 Merge pull request #7797 from SUSE/wip-14861-hammer
866 hammer: ceph init script unconditionally sources /lib/lsb/init-functions
868 Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
870 commit 94da46b6e31cac206cb32fc5bd3159209ee25e8c
871 Author: Dunrong Huang <riegamaths@gmail.com>
872 Date: Tue Dec 8 00:22:02 2015 +0800
874 tests: make sure no segfault occurs when using some bad keyring
876 Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
877 (cherry picked from commit 2eb0bf32244fc174d56cc42e2298c67d8b5299ac)
878 Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
880 commit a371c0f1d69fea131b56100492d3045c15ae072c
881 Author: Dunrong Huang <riegamaths@gmail.com>
882 Date: Wed Nov 25 19:03:03 2015 +0800
884 auth: fix a crash issue due to CryptoHandler::create() failed
886 In this case(e.g. user passes wrong key), attempts to call the CryptoKey.ckh will lead to a segfault.
888 This patch fixes crash issue like following:
890 Program received signal SIGSEGV, Segmentation fault.
891 [Switching to Thread 0x7fffed10e700 (LWP 25051)]
892 0x00007ffff59896c6 in CryptoKey::encrypt (this=0x7fffed10d4f0, cct=0x555555829c30, in=..., out=..., error=0x7fffed10d440) at auth/cephx/../Crypto.h:110
893 110 return ckh->encrypt(in, out, error);
895 at auth/cephx/../Crypto.h:110
896 at auth/cephx/CephxProtocol.h:464
898 Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
899 (cherry picked from commit a7f520caabf997b3753f1200f19f21830531b3f5)
900 Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
902 commit af5da4f24d7c2ea5a1322450180099278dd0da7c
903 Author: Dunrong Huang <riegamaths@gmail.com>
904 Date: Wed Nov 25 18:24:30 2015 +0800
906 auth: fix double PK11_DestroyContext() if PK11_DigestFinal() failed
908 Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
909 (cherry picked from commit e9e05333ac7c64758bf14d80f6179e001c0fdbfd)
910 Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
912 commit c3f031a32df5d434721a2b00f2c8961759b1a916 (refs/remotes/markhpc/wip-10794-hammer)
913 Author: David Zafman <dzafman@redhat.com>
914 Date: Wed May 20 14:09:02 2015 -0700
916 ceph-objectstore-tool, osd: Fix import handling
918 Use same_interval_since set to zero to communicate that an import has happened
919 and the correct value needs to be computed.
923 Signed-off-by: David Zafman <dzafman@redhat.com>
924 (cherry picked from commit 70316541bbb115d9a35954bfba373cf1dc084b7e)
927 src/osd/PG.cc (trivial)
929 commit 647723ecd283273657bdb8b35dbb904e55c37add
930 Author: David Zafman <dzafman@redhat.com>
931 Date: Thu Jun 4 10:37:42 2015 -0700
933 tools, test: Add ceph-objectstore-tool to operate on the meta collection
935 Signed-off-by: David Zafman <dzafman@redhat.com>
936 (cherry picked from commit 31fa89f24997c3e9b4f8795ea28938ab65493d10)
939 src/tools/ceph_objectstore_tool.cc
940 is_pg() still needs snap argument
942 commit d8756208a3213e099574e57e9b654feab84b0497
943 Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
944 Date: Thu Mar 3 11:30:53 2016 +0100
946 common/obj_bencher.cc: make verify error fatal
948 When run without "--no-verify", all verification errors are noted,
949 but they are not forwarded/reported anywhere else but to cerr, which
950 will cause automated testing to ignore them. Make seq_read_bench and
951 rand_read_bench return -EIO on any verification error which will,
952 in turn, return it back to caller.
955 Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
956 (cherry picked from commit 658bba85c488a38e25bc598637258c263f711631)
958 commit 04fe9517cd049e97b845cef848f19a8b8dc3976c
959 Author: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
960 Date: Thu Mar 3 14:40:44 2016 +0100
962 test/test_rados_tool.sh: force rados bench rand and seq
964 This forces rados bench rand and seq to execute, so if there's
965 a regression in any of above, it won't go unnoticed.
968 Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
970 commit d314849ab9b59ae55c6a86b878d123eb1c13d88a
971 Merge: 20b2a74 31a2fc4
972 Author: Sage Weil <sage@redhat.com>
973 Date: Thu Mar 3 08:35:37 2016 -0500
975 Merge pull request #7672 from dachary/wip-14783-hammer
977 hammer: test_bit_vector.cc uses magic numbers against #defines that vary
979 commit 6a6754f8dc834dbb13144cebdeeea2ff29e09127
980 Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
981 Date: Fri Feb 26 15:01:11 2016 +0300
983 hammer: tools: fix race condition in seq/rand bench (part 2)
985 Commit c2c6d02591519dfd15ddcb397ac440322a964deb which is intended to
986 cherry-pick 9bcf5f065c4ed4b10d8f98961d1f99493bcdc9b8 incorrectly resolved
987 a conflict by adding code where it should have been removed. The incorrect
988 conflict resolution can been displayed with
990 commit=c2c6d02591519dfd15ddcb397ac440322a964deb
991 picked_from=9bcf5f065c4ed4b10d8f98961d1f99493bcdc9b8
992 diff -u --ignore-matching-lines '^[^+-]' <(git show $picked_from) <(git show $commit)
994 --- /dev/fd/63 2016-03-03 14:09:51.354329129 +0700
995 +++ /dev/fd/62 2016-03-03 14:09:51.358329122 +0700
999 - snprintf(data.object_contents, data.object_size, "I'm the %16dth object!", current_index);
1002 - if (memcmp(data.object_contents, cur_contents->c_str(), data.object_size) != 0) {
1003 - cerr << name[slot] << " is not correct!" << std::endl;
1011 - name[slot] = newName;
1014 -@@ -789,11 +791,14 @@ int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurr
1015 ++ if (memcmp(data.object_contents, cur_contents->c_str(), data.object_size) != 0) {
1016 ++ cerr << name[slot] << " is not correct!" << std::endl;
1021 +@@ -776,11 +785,14 @@ int ObjBencher::rand_read_bench(int seconds_to_run, int num_objects, int concurr
1026 http://tracker.ceph.com/issues/14873 Fixes: #14873
1028 Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
1030 commit 3a5b1029f8f30bca569b12195329224208855096
1031 Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
1032 Date: Thu Mar 3 15:30:23 2016 +0300
1034 hammer: tools: fix race condition in seq/rand bench (part 1)
1036 src/common/obj_bencher.cc:601: the lock should be taken before calling completion_ret,
1037 not after. Also note that if r < 0 the lock will be unlocked twice in a row.
1038 As a result rados bench seq fails with assertion in Mutex::Unlock().
1040 Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
1041 Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
1042 (cherry picked from commit 0c8faf7c9982c564002771c3a41362a833ace9bb)
1045 src/common/obj_bencher.cc
1046 src/common/obj_bencher.h
1047 Pick only the lock related part to unbreak seq bench. The failure due
1048 to the missing (or wrong sized) objects can be easily worked around, and
1049 the changes required to fix this problem are way too intrusive for hammer.
1051 http://tracker.ceph.com/issues/14873 Related: #14873
1053 commit c4ba93a6529ab549d42b601432ec88d8243909bf
1054 Author: Yan, Zheng <zyan@redhat.com>
1055 Date: Tue Sep 29 15:24:41 2015 +0800
1057 client: use fuse_req_getgroups() to get group list
1059 Signed-off-by: Yan, Zheng <zyan@redhat.com>
1060 (cherry picked from commit 0eb6d0ba1b65ac0aaffc72a82f07857cc65a6b88)
1062 commit a84ed87082076e1990fb79703aa5ac8eea5d34ea
1063 Author: Yan, Zheng <zyan@redhat.com>
1064 Date: Tue Sep 29 15:11:24 2015 +0800
1066 client: use thread local data to track fuse request
1068 When handling an operation, libcephfs code may want to access fuse
1069 request for extra information. by tracking fuse request in thread
1070 local data, we can avoid adding extra parameter to Client::ll_foo
1073 Signed-off-by: Yan, Zheng <zyan@redhat.com>
1074 (cherry picked from commit a9f91d7d70893cdc5f832a26a5be298941d00315)
1076 commit e7f299ace762c7d02cad1f7253dba87404d944f5
1077 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
1078 Date: Tue Aug 18 12:34:01 2015 +0200
1080 client/Client.cc: remove only once used variable
1083 [src/client/Client.cc:4555]: (style) The scope of the variable
1084 'initial_group_count' can be reduced.
1086 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
1087 Signed-off-by: Yan, Zheng <zyan@redhat.com>
1088 (cherry picked from commit a29dd45dd89f59ff15018f541601ac5ede162174)
1090 commit 16e3e2f0a0dc465ed9079df051215f4758f0ee4d
1091 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
1092 Date: Wed Aug 12 18:38:38 2015 +0200
1094 client/Client.cc: fix realloc memory leak
1096 Fix handling of realloc. If realloc() fails it returns NULL, assigning
1097 the return value of realloc() directly to the pointer without checking
1098 for the result will lead to a memory leak.
1100 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
1101 Signed-off-by: Yan, Zheng <zyan@redhat.com>
1102 (cherry picked from commit 4f98dab99c35663de89a06e2dfdbd874f56aed41)
1104 commit b13ddc0690742b11802e59f34b539987d632ac58
1105 Author: blinke <Burkhard.Linke@computational.bio.uni-giessen.de>
1106 Date: Mon Aug 10 17:43:10 2015 +0200
1108 client: added permission check based on getgrouplist
1111 Signed-off-by: Yan, Zheng <zyan@redhat.com>
1112 (cherry picked from commit f04c8da5432174874ca97d11a5b2fef56f95d73d)
1114 commit 562c0a962b291b90112ccea7d8c6f7c92a14851f
1115 Author: blinke <Burkhard.Linke@computational.bio.uni-giessen.de>
1116 Date: Mon Aug 10 15:31:44 2015 +0200
1118 configure.ac: added autoconf check for getgrouplist
1120 Signed-off-by: Yan, Zheng <zyan@redhat.com>
1121 (cherry picked from commit 16b59c6cd68d532a47e8c0e7b1f088b41433f048)
1123 commit e014ea88861f4f27b4a5db14c32133a3b864411e
1124 Author: Yan, Zheng <zyan@redhat.com>
1125 Date: Thu Jul 23 15:07:45 2015 +0800
1127 init-ceph: check if /lib/lsb/init-functions exists
1129 On OSX/FreeBSD, /lib/lsb/init-functions does not exist
1131 Signed-off-by: Yan, Zheng <zyan@redhat.com>
1132 (cherry picked from commit bb1fa7f3993dfcd1243b2a9a0bb432c269df215f)
1134 commit 20b2a7413e8f7538ff0683313e7b19c41aaf69ad
1135 Merge: c1bc048 c63baeb
1136 Author: Loic Dachary <loic@dachary.org>
1137 Date: Thu Mar 3 12:05:58 2016 +0700
1139 Merge pull request #7671 from tchaikov/wip-14583-hammer
1141 hammer: global/pidfile: do not start two daemons with a single pid-file
1143 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1145 commit c1bc048dd708a729137e1d28e0ccfedfe5d90933
1146 Merge: 546a7b9 28d42dc
1147 Author: Loic Dachary <loic@dachary.org>
1148 Date: Thu Mar 3 11:51:33 2016 +0700
1150 Merge pull request #7702 from ceph/wip-14077-hammer
1152 hammer: scrub bogus results when missing a clone
1154 Reviewed-by: Martin Palma <martin@palma.bz>
1155 Reviewed-by: Wei-Chung Cheng <freeze.vicente.cheng@gmail.com>
1156 Reviewed-by: Loic Dachary <ldachary@redhat.com>
1158 commit 5726463368ddcc688e6308d22992568ba4c0da32
1159 Author: Nathan Cutler <ncutler@suse.com>
1160 Date: Fri Feb 26 18:30:49 2016 +0100
1162 packaging: lsb_release build and runtime dependency
1164 The lsb_release executable is being run in multiple places, not least in
1165 src/common/util.cc, which calls it via shell in the collect_sys_info() code
1168 This patch addresses this issue on SUSE- and Debian-derivatives, as well
1169 as reinstating the dependency for RHEL/Fedora after it was dropped in
1170 15600572265bed397fbd80bdd2b7d83a0e9bd918.
1172 http://tracker.ceph.com/issues/14906 Fixes: #14906
1174 Signed-off-by: Nathan Cutler <ncutler@suse.com>
1175 (cherry picked from commit b87f4efb5689a8db77e06baf4f469afcd9df3677)
1179 The jewel specfile has diverged considerably from hammer:
1180 systemd, package split, etc. This is more of a hand backport
1183 commit c63baebbb9bb5e6564955e920d0f658e5a3092af
1184 Author: Loic Dachary <ldachary@redhat.com>
1185 Date: Mon Feb 1 19:32:13 2016 +0700
1187 global: do not start two daemons with a single pid-file (part 2)
1189 Fixes the following bugs:
1191 * the fd is open(O_WRONLY) and cannot be read from, safe_read
1192 always fails and never removes the pid file.
1194 * pidfile_open(g_conf) is close(STDOUT_FILENO) and there is a risk that
1195 pidfile_open gets STDOUT_FILENO only to have it closed and redirected
1198 * Before writing the file, ftruncate it so that overriding a file
1199 containing the pid 1234 with the pid 89 does not end up being
1202 * Before reading the file, lseek back to offset 0 otherwise it
1205 * tests_pidfile was missing an argument when failing
1206 TEST_without_pidfile and killed all process with ceph in their name,
1207 leading to chaos and no useful error message.
1209 * lstat(fd) cannot possibly return a result different from the one
1210 obtained right after the file was open, stat(path) must be used
1213 In addition to fixing the bugs above, refactor the pidfile.cc
1216 * be systematic about error reporting (using cerr for when removing
1217 the pidfile because derr is not available at this point and derr
1218 when creating the pidfile).
1220 * replace pidfile_open / pidfile_write with just pidfile_write since
1221 there never is a case when they are not used together.
1223 More test cases are added to test_pidfile to verify the bugs above are
1226 http://tracker.ceph.com/issues/13422 Fixes: #13422
1228 Signed-off-by: Loic Dachary <loic@dachary.org>
1229 (cherry picked from commit 9828d49d6f3ccfc78d496153d263ea39b1722d4b)
1232 src/global/global_init.cc
1233 - the `flag` argument of `global_init_prefork()` is not used, so
1234 it was removed in master. but the cleanup commit was not
1235 cherry-picked to hammer, thus the conflict. we can just keep it
1236 around in hammer to minimize the code churn, although it may
1237 stand in the way of future backports.)
1238 - s/nullptr/NULL/ as hammer does not support c++11.
1240 commit 28d42dc8e0a0dd71d03c1b69fb7464b753bd4cc0
1241 Merge: 9144c38 9282c1d
1242 Author: David Zafman <dzafman@redhat.com>
1243 Date: Thu Feb 25 14:25:48 2016 -0800
1245 Merge backport pull request #6545 into wip-14077-hammer
1247 A commit skipped because remove_coll() still needed in Hammer
1249 commit 9144c3837f284ac2c922d2438b0e0f0cc7304d7a
1250 Merge: fd74fbf 3226615
1251 Author: David Zafman <dzafman@redhat.com>
1252 Date: Thu Feb 25 14:25:35 2016 -0800
1254 Merge backport pull request #5783 into wip-14077-hammer
1256 commit fd74fbf04a965ca93dc9602f99e3cb7a3577340a
1257 Merge: 4309fa8 0fe3dfe
1258 Author: David Zafman <dzafman@redhat.com>
1259 Date: Thu Feb 25 14:25:17 2016 -0800
1261 Merge backport pull request #5031 into wip-14077-hammer
1263 commit 4309fa87e13a20368ca34f7699436b628c9d7876
1264 Merge: de5e11e 1bc8882
1265 Author: David Zafman <dzafman@redhat.com>
1266 Date: Thu Feb 25 14:24:58 2016 -0800
1268 Merge backport pull request #5842 into wip-14077-hammer
1270 commit de5e11ec69e7388a1a9c28614759b2e2d8b70ad8
1271 Merge: 7698e6c 6ff4217
1272 Author: David Zafman <dzafman@redhat.com>
1273 Date: Thu Feb 25 14:24:31 2016 -0800
1275 Merge backport pull request #5127 into wip-14077-hammer
1277 commit 7698e6c54aae1d06664d8e8324595400e6087f24
1278 Merge: c8057c6 de80bbf
1279 Author: David Zafman <dzafman@redhat.com>
1280 Date: Thu Feb 25 14:23:14 2016 -0800
1282 Merge backport 6 commits from pull request #5197 into wip-14077-hammer
1284 Excludes the ceph-objectstore-tool meta-list op
1286 commit c8057c693bf0ae7bb01ef238f4ef9f23454a2e33
1287 Merge: ecbf6d2 df0e11e
1288 Author: David Zafman <dzafman@redhat.com>
1289 Date: Thu Feb 25 14:22:26 2016 -0800
1291 Merge backport branch 'wip-temp' into wip-14077-hammer
1293 commit ecbf6d2882073363ca1ddc5209e1e9537f51fa77
1294 Merge: 3415312 6c8884b
1295 Author: David Zafman <dzafman@redhat.com>
1296 Date: Thu Feb 25 14:21:20 2016 -0800
1298 Merge backport pull request #4932 into wip-14077-hammer
1300 commit 34153127963b5baec0c2b84f7aa19b29fc81d4fa
1301 Merge: e022b5b 87a7f99
1302 Author: David Zafman <dzafman@redhat.com>
1303 Date: Thu Feb 25 14:20:41 2016 -0800
1305 Merge backport pull request #4915 into wip-14077-hammer
1307 commit e022b5b55facb359f6fd27884e2408fda70db30a
1308 Merge: 4ed44e1 9ca2f35
1309 Author: David Zafman <dzafman@redhat.com>
1310 Date: Thu Feb 25 14:20:00 2016 -0800
1312 Merge backport 1 commit from pull request #4863 into wip-14077-hammer
1314 commit 4ed44e1e33df986468585d00a6dc401025263217
1315 Merge: 3f0fc84 78a59f8
1316 Author: David Zafman <dzafman@redhat.com>
1317 Date: Thu Feb 25 14:18:38 2016 -0800
1319 Merge backport 8 commits from pull request #4784 into wip-14077-hammer
1321 Only excludes actual fix for #10794
1323 commit 3f0fc84c4180473a87db01cb40d0488bcaa2c202
1324 Merge: db68c6c eab0f24
1325 Author: David Zafman <dzafman@redhat.com>
1326 Date: Thu Feb 25 14:15:05 2016 -0800
1328 Merge backport 41 commits from pull request #4473 into wip-14077-hammer
1330 commit db68c6cb683870e68bf6143c6902b8ac89ecdc3a
1331 Merge: c3d938d 18c49b6
1332 Author: David Zafman <dzafman@redhat.com>
1333 Date: Thu Feb 25 14:13:37 2016 -0800
1335 Merge backport branch 'wip-journal-header' of git://github.com/XinzeChi/ceph into wip-14077-hammer
1337 Includes a change to the code in the original merge commit itself
1339 commit c3d938d81020072c2d2eecf58f4639e773181b1a
1340 Merge: 7abb6ae a1fc101
1341 Author: David Zafman <dzafman@redhat.com>
1342 Date: Thu Feb 25 14:13:02 2016 -0800
1344 Merge backport 1 commit of pull request #3686 into wip-14077-hammer
1346 commit 9282c1d01c4f2d99fb3832a3cf495f99fdc6487e
1347 Author: David Zafman <dzafman@redhat.com>
1348 Date: Thu Nov 5 19:06:17 2015 -0800
1350 ceph-objectstore-tool: Add dry-run checking to ops missing it
1352 Update test to check most operations
1354 Signed-off-by: David Zafman <dzafman@redhat.com>
1355 (cherry picked from commit e89f0e1c5e8a378809bec7c705ea2c23235d4b28)
1358 src/tools/ceph_objectstore_tool.cc (trivial)
1360 commit efc2183bafacfcd29fbb1b42231d4c147199e528
1361 Author: David Zafman <dzafman@redhat.com>
1362 Date: Wed Nov 11 15:26:52 2015 -0800
1364 test: Remove redundant test output
1366 Signed-off-by: David Zafman <dzafman@redhat.com>
1367 (cherry picked from commit e6f1bdcd310bd6417f0f695fba3430fd0edba43d)
1369 commit 322661547ec437a9cdb893fcd280a48cd60ec990
1370 Author: David Zafman <dzafman@redhat.com>
1371 Date: Wed Oct 28 21:34:44 2015 -0700
1373 test: osd-scrub-snaps.sh uses ceph-helpers.sh and added to make check
1375 Signed-off-by: David Zafman <dzafman@redhat.com>
1376 (cherry picked from commit d712737be1aadb38ecc3882200999d79d748cdb8)
1378 ceph-helpers.sh in different location in Hammer
1380 commit 995a0042a1b8ed04b77e6bc4757a10552450dc7f
1381 Author: David Zafman <dzafman@redhat.com>
1382 Date: Tue Nov 10 18:20:46 2015 -0800
1384 test: Verify replicated PG beyond just data after vstart
1386 Signed-off-by: David Zafman <dzafman@redhat.com>
1387 (cherry picked from commit 9a29c5983cd392e4b479b6b685fb0c3797c10cd2)
1389 commit 6afb5d3be26931c670f22c892c925e2556c8e562
1390 Author: David Zafman <dzafman@redhat.com>
1391 Date: Mon Oct 26 11:36:43 2015 -0700
1393 osd: Use boost::optional instead of snap 0 for "all_clones"
1395 Signed-off-by: David Zafman <dzafman@redhat.com>
1396 (cherry picked from commit 310bf784b7cd8d75f2ab7ee431bc764f5b312aa2)
1398 commit 750f81732bc803128a8a25c07e10e9f709dc2a1a
1399 Author: David Zafman <dzafman@redhat.com>
1400 Date: Tue Nov 10 17:57:59 2015 -0800
1402 test: Fix verify() used after import to also check xattr and omap
1404 Signed-off-by: David Zafman <dzafman@redhat.com>
1405 (cherry picked from commit 92d00f22805599c519806c6ff6164847b5c33931)
1407 commit b8c9507f632510d7da8545d7afc49b618435ef3c
1408 Author: David Zafman <dzafman@redhat.com>
1409 Date: Sun Oct 25 18:57:18 2015 -0700
1411 osd, test: When head missing a snapset, clones not an error
1413 Fix log message for this case and make into "info"
1415 Signed-off-by: David Zafman <dzafman@redhat.com>
1416 (cherry picked from commit f508ddc6e9b40fe5c1c54e5faa569f2bc7b78c4b)
1418 commit 59fee8a65c1a39d7e3806852aabbf68d7ca37feb
1419 Author: David Zafman <dzafman@redhat.com>
1420 Date: Mon Nov 9 20:02:21 2015 -0800
1422 test: Add test cases for xattr and omap ceph-objectstore-tool operations
1424 Signed-off-by: David Zafman <dzafman@redhat.com>
1425 (cherry picked from commit cbaed6a8c737f77e68a0eb7f1fca32ec4155f045)
1427 commit 0988b1238d43630ff0b05d321952021ede73c2ae
1428 Author: David Zafman <dzafman@redhat.com>
1429 Date: Sat Oct 24 16:23:13 2015 -0700
1431 osd, test: Keep missing count and log number of missing clones
1433 Signed-off-by: David Zafman <dzafman@redhat.com>
1434 (cherry picked from commit 2e0bb0ae9498fd9a0c49f1b81bf0c86f7a7cac42)
1437 src/osd/ReplicatedPG.h (trivial)
1439 commit 37be95996494f72d4fa3ecc62b54ee9478903c6e
1440 Author: David Zafman <dzafman@redhat.com>
1441 Date: Wed Nov 11 08:28:01 2015 -0800
1443 rados: Minor output changes for consistency across operations
1445 Signed-off-by: David Zafman <dzafman@redhat.com>
1446 (cherry picked from commit 016ed34ce85fa111f54857a8ca1002ae32b52b8e)
1448 commit 6c51e4831f34a67308e3f8190d9aad2c3d029bf7
1449 Author: David Zafman <dzafman@redhat.com>
1450 Date: Tue Oct 20 11:14:42 2015 -0700
1452 test: Eliminate check for bogus "obj13/head snaps empty" error
1454 Signed-off-by: David Zafman <dzafman@redhat.com>
1455 (cherry picked from commit 8227b4b75c24b632e637decbe4b818606e8589ee)
1457 commit e92505bec093cb3070e4962bc86b82a257c64171
1458 Author: David Zafman <dzafman@redhat.com>
1459 Date: Wed Oct 14 20:34:28 2015 -0700
1461 ceph-objectstore-tool: Add new remove-clone-metadata object op
1465 Signed-off-by: David Zafman <dzafman@redhat.com>
1466 (cherry picked from commit c6d283f0f16347a13418d8a0ed136913e1161893)
1468 No Sequencer in transactions in Hammer
1470 commit 8f88b442a26603cc321fccc7047cb8639b2a0f65
1471 Author: David Zafman <dzafman@redhat.com>
1472 Date: Wed Oct 14 20:42:48 2015 -0700
1474 osd: Fix trim_object() to not crash on corrupt snapset
1476 Add test case to check for trim_object() osd crash
1478 Signed-off-by: David Zafman <dzafman@redhat.com>
1479 (cherry picked from commit eb0ca424815e94c78a2d09dbf787d102172f4ddf)
1482 src/osd/ReplicatedPG.cc (trivial)
1484 commit 78b13f5d591d9d9676939abc4febeb7d2eebb1a3
1485 Author: David Zafman <dzafman@redhat.com>
1486 Date: Wed Oct 14 13:12:17 2015 -0700
1488 ceph-objectstore-tool: Improve object spec error handling
1492 Signed-off-by: David Zafman <dzafman@redhat.com>
1493 (cherry picked from commit caf2d5970b0a3e3ce4ef941d1955b7821a0fc916)
1496 src/test/ceph_objectstore_tool.py (trivial)
1498 commit 7b800b7c3efb5403d03fc0c4386821b433b85268
1499 Author: David Zafman <dzafman@redhat.com>
1500 Date: Wed Oct 7 17:25:44 2015 -0700
1502 ceph-objectstore-tool: Add undocumented clear-snapset command for testing
1504 Add test cases using new feature to corrupt SnapSet
1506 Signed-off-by: David Zafman <dzafman@redhat.com>
1507 (cherry picked from commit b6302acdd344997aabdb426104de9f24e9990437)
1509 No Sequencer in transactions in Hammer
1511 commit 7f398bd2a3264d1ac5bf40a5470c43454dbad571
1512 Author: David Zafman <dzafman@redhat.com>
1513 Date: Wed Oct 14 21:59:50 2015 -0700
1515 ceph-objectstore-tool: Add set-size command for objects
1517 Signed-off-by: David Zafman <dzafman@redhat.com>
1518 (cherry picked from commit 138a33b8946e6fea1e09527b8bc45b7aa4bee1d6)
1520 No Sequencer in transactions in Hammer
1522 commit 53dc87f82642de769a7ea11554552e6db06a3e65
1523 Author: David Zafman <dzafman@redhat.com>
1524 Date: Wed Oct 14 22:04:05 2015 -0700
1526 ceph-objectstore-tool: Enhanced dump command replaces dump-info
1528 Show object stat information from objectstore
1529 Show SnapSet if present
1530 Add --head for search by object name
1532 Signed-off-by: David Zafman <dzafman@redhat.com>
1533 (cherry picked from commit 1688debf7892d36c773c12d7d0b1b9b4cddc5f98)
1535 commit a46fc6613e1f1f6709184d68f23bccab0fd03bd6
1536 Author: David Zafman <dzafman@redhat.com>
1537 Date: Fri Oct 2 13:39:29 2015 -0700
1539 test: Add some clones to ceph-objectstore-tool test
1541 Signed-off-by: David Zafman <dzafman@redhat.com>
1542 (cherry picked from commit b4ba3e66548a5dee58553df071b916c85d701caf)
1544 commit fd518e704e0e5c01f3b7efa8905ddde1e64cc842
1545 Author: David Zafman <dzafman@redhat.com>
1546 Date: Thu Oct 1 19:28:54 2015 -0700
1548 ceph-objectstore-tool: For corrupt objectstores, don't abort listing on errors
1550 Signed-off-by: David Zafman <dzafman@redhat.com>
1551 (cherry picked from commit d276d3286504ea702ae561b91dff4121c99feb9a)
1554 src/tools/ceph_objectstore_tool.cc (trivial)
1556 commit ad7825a4beba879f6a38ef3eda0648f11f8783bd
1557 Author: David Zafman <dzafman@redhat.com>
1558 Date: Tue Oct 13 13:02:40 2015 -0700
1560 ceph-objectstore-tool: Improve some error messages
1562 Signed-off-by: David Zafman <dzafman@redhat.com>
1563 (cherry picked from commit b0c884ba8b51eedf9def093c61f0f06398101ecc)
1565 commit 26cbf14ef1e44936f48fdb2be40b59ae2117666f
1566 Author: David Zafman <dzafman@redhat.com>
1567 Date: Thu Sep 3 14:22:20 2015 -0700
1569 ceph-objectstore-tool: White space fixes
1571 Signed-off-by: David Zafman <dzafman@redhat.com>
1572 (cherry picked from commit 0564f398269d920d90f6d6ecb008ebcd6609d611)
1574 commit 0f785646d2f52522706835a2f1c8e0101db9a622
1575 Author: David Zafman <dzafman@redhat.com>
1576 Date: Tue Oct 13 15:33:26 2015 -0700
1578 tools/rados: Improve xattr import handling so future internal xattrs ignored
1580 Signed-off-by: David Zafman <dzafman@redhat.com>
1581 (cherry picked from commit 9222f56403cf52ec161a38fc437a3f04c24d1625)
1584 src/tools/rados/RadosImport.cc (Code in ceph_objectstore_tool.cc in Hammer)
1586 commit c8e27725249cf587e65af323e3ae0ba43c740c10
1587 Author: David Zafman <dzafman@redhat.com>
1588 Date: Tue Sep 29 19:57:43 2015 -0700
1590 test: Test scrubbing of snapshot problems
1592 Signed-off-by: David Zafman <dzafman@redhat.com>
1593 (cherry picked from commit e5ad33ec07ee9fffe862d84955a566261d101713)
1595 commit 113d5c75a5bd33b1b5fe399d83d94a671eb40658
1596 Author: David Zafman <dzafman@redhat.com>
1597 Date: Mon Sep 28 10:59:42 2015 -0700
1599 osd: Don't crash if OI_ATTR attribute is missing or corrupt
1601 Signed-off-by: David Zafman <dzafman@redhat.com>
1602 (cherry picked from commit e0b39650028205e9d9e314b75c444cc8cf055a31)
1604 commit 3af8f9e8044fb1e126f208903c41cde065db304e
1605 Author: David Zafman <dzafman@redhat.com>
1606 Date: Tue Oct 13 18:02:32 2015 -0700
1608 osd: Additional _scrub() check for snapset inconsistency
1610 Signed-off-by: David Zafman <dzafman@redhat.com>
1611 (cherry picked from commit 9e48e1801ea1a10ce495b3947da06676c2f5f72f)
1613 commit 7103e74e335652f2a28b1dad0a2f2028398a600d
1614 Author: David Zafman <dzafman@redhat.com>
1615 Date: Thu Sep 3 19:43:35 2015 -0700
1617 osd: Better SnapSet scrub checking (find issues instead of asserting)
1619 Signed-off-by: David Zafman <dzafman@redhat.com>
1620 (cherry picked from commit 3b381caaad20c683a330e8b7a4e1c017abcb60df)
1622 commit 18af852a2c71b733ec5c6bd397b2e712b676c693
1623 Author: David Zafman <dzafman@redhat.com>
1624 Date: Wed Aug 26 13:58:09 2015 -0700
1626 osd: Make the _scrub routine produce good output and detect errors properly
1628 Catch decode errors so osd doesn't crash on corrupt OI_ATTR or SS_ATTR
1629 Use boost::optional<> to make current state clearer
1630 Create next_clone as needed using head/curclone
1631 Add equivalent logic after getting to end of scrubmap.objects
1635 Signed-off-by: David Zafman <dzafman@redhat.com>
1636 (cherry picked from commit a23036c6fd7de5d1dbc2bd30c967c0be51d94ca5)
1639 src/osd/ReplicatedPG.cc (no num_objects_pinned in hammer)
1640 src/osd/ReplicatedPG.h (no get_temp_recovery_object() in hammer)
1642 commit 3a1b58838dba6bd482aa5786dc44962c4a977c17
1643 Author: David Zafman <dzafman@redhat.com>
1644 Date: Wed Sep 30 17:17:15 2015 -0700
1646 osd: Fix log message name of ceph-objectstore-tool
1648 Signed-off-by: David Zafman <dzafman@redhat.com>
1649 (cherry picked from commit 545e4b2c582625f8b93502266ca59ee40e0d0e5f)
1651 commit 0fe3dfe8768b27743189add73cde9a44095f2a62
1652 Author: Mykola Golub <mgolub@mirantis.com>
1653 Date: Tue Jun 16 11:57:08 2015 +0300
1655 ceph-objectstore-tool: add mark-complete operation
1657 It is supposed to be used as a last resort to fix a cluster that has
1658 PGs in 'incomplete' state, using the following procedure:
1660 1) stop the osd that is primary for the incomplete PG;
1662 ceph-objectstore-tool --data-path ... --journal-path ... --pgid $PGID --op mark-complete
1666 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
1667 (cherry picked from commit 6907778d767ba08bb80c495785056ed122b023fe)
1670 src/test/ceph_objectstore_tool.py (trivial)
1671 src/tools/ceph_objectstore_tool.cc (trivial)
1673 commit 1bc88827fc40f124f570dd8b7865c687f1b1f5a8
1674 Author: David Zafman <dzafman@redhat.com>
1675 Date: Tue Sep 8 12:33:44 2015 -0700
1677 test: Fix failure test to find message anywhere in stderr
1679 Consolidate test_failure() and test_failure_tty()
1681 Signed-off-by: David Zafman <dzafman@redhat.com>
1682 (cherry picked from commit 95bd3c2c54312417b132ddb91c89fdbe63b01fd0)
1684 commit 6ff421738c93ff37521ccf67caf3d09d284e339c
1685 Author: Kefu Chai <kchai@redhat.com>
1686 Date: Fri Jul 17 14:46:16 2015 +0800
1688 test: add test for {get,set}-inc-osdmap commands.
1690 Signed-off-by: Kefu Chai <kchai@redhat.com>
1691 (cherry picked from commit 818de1a2c89272d98610328a958fea06d1cc41cc)
1694 src/test/ceph_objectstore_tool.py (trivial)
1696 commit de80bbf4d7c1b78017cf447a7f511ceefac39e50
1697 Author: David Zafman <dzafman@redhat.com>
1698 Date: Tue Jun 23 16:51:27 2015 -0700
1700 test: Add debug argument to the ceph-objectstore-tool test
1702 Signed-off-by: David Zafman <dzafman@redhat.com>
1703 (cherry picked from commit a3b14ede9e829ec85c49980ecbff11f584ca70ae)
1705 commit 0643797cb7a37b5601a7dd8da9a81f8194b8f25d
1706 Author: David Zafman <dzafman@redhat.com>
1707 Date: Tue Sep 8 13:41:31 2015 -0700
1709 rados: Fix usage for "notify" command
1711 Signed-off-by: David Zafman <dzafman@redhat.com>
1712 (cherry picked from commit b968fb3bcefb0cdafb1e84d7c679b61a201a940f)
1714 commit 5ba8649423fd5a2d5c212273c901f9ddd5f44632
1715 Author: Kefu Chai <kchai@redhat.com>
1716 Date: Wed Jul 8 15:51:55 2015 +0800
1718 test: add test for {get,set}-osdmap commands
1720 Signed-off-by: Kefu Chai <kchai@redhat.com>
1721 (cherry picked from commit 0257c150fe552300c0d9f5a22a27aaa49fb6cc64)
1724 src/test/ceph_objectstore_tool.py (trivial)
1726 commit 3276258b1a9123caec8d635aa1a2de3ef02201e6
1727 Author: David Zafman <dzafman@redhat.com>
1728 Date: Thu Jun 25 17:15:39 2015 -0700
1730 tools, test: Some ceph-objectstore-tool error handling fixes
1732 Improve various error messages generated with invalid syntax
1733 Add test cases for most of these error messages
1735 Signed-off-by: David Zafman <dzafman@redhat.com>
1736 (cherry picked from commit 127a5f191d3d2442edd3a3fa820006bca3a08c93)
1739 src/test/ceph_objectstore_tool.py (trivial)
1741 commit cfabcc1066a06644b619fa027e27d338411120c9
1742 Author: Kefu Chai <kchai@redhat.com>
1743 Date: Tue Jul 14 10:33:47 2015 +0800
1745 tools/ceph-objectstore-tool: add get-inc-osdmap command
1747 Signed-off-by: Kefu Chai <kchai@redhat.com>
1748 (cherry picked from commit 7801bb20d23ce83fc4093c23331bcb75e43c878f)
1751 src/tools/ceph_objectstore_tool.cc (trivial)
1753 commit c7d0fda01efc29d81723d4edfba2bfbbe6765760
1754 Author: David Zafman <dzafman@redhat.com>
1755 Date: Mon Jun 22 20:11:10 2015 -0700
1757 tools: Check for valid --op earlier so we can get a better error message
1759 Signed-off-by: David Zafman <dzafman@redhat.com>
1760 (cherry picked from commit d8460714fab61d0a3092b3e7b290c0c19ad58beb)
1763 src/test/ceph_objectstore_tool.py (trivial)
1764 src/tools/ceph_objectstore_tool.cc (meta-list op not in Hammer)
1766 commit be24c50bb74aa6cd7bb08519cdaf267d4107eef3
1767 Author: Kefu Chai <kchai@redhat.com>
1768 Date: Sat Jul 11 16:27:47 2015 +0800
1770 tools/ceph-objectstore-tool: add set-inc-osdmap command
1772 Signed-off-by: Kefu Chai <kchai@redhat.com>
1773 (cherry picked from commit 95344d07c3a1a9a6b1246e5eca3f7daeb062dd06)
1776 src/tools/ceph_objectstore_tool.cc (trivial)
1778 commit 06dcf74374f57224536522ef46dba8a53a0d755d
1779 Author: David Zafman <dzafman@redhat.com>
1780 Date: Wed Jun 10 17:04:57 2015 -0700
1782 tools: Fix newlines in output of --op list
1784 Signed-off-by: David Zafman <dzafman@redhat.com>
1785 (cherry picked from commit 6aec38b51f0c14684912b5ee28fb5b1375cb8f8a)
1787 commit e44c042c3dffc4ca396dbdfac24fa65914c0b73b
1788 Author: Kefu Chai <kchai@redhat.com>
1789 Date: Fri Jul 3 23:09:54 2015 +0800
1791 tools/ceph-objectstore-tool: add "get-osdmap" command
1793 Signed-off-by: Kefu Chai <kchai@redhat.com>
1794 (cherry picked from commit f0c130d6b1bc2a8a0cce6d78a6e69995fe00a427)
1797 src/tools/ceph_objectstore_tool.cc (trivial)
1799 commit 3f9e46779addaa07d04d501113eb95cea95b802b
1800 Author: David Zafman <dzafman@redhat.com>
1801 Date: Mon Jun 22 18:38:01 2015 -0700
1803 tools: Fix dump-super which doesn't require pgid
1805 A valid pgid had to be specified in order for superblock to be displayed,
1806 but it was otherwise ignored.
1807 Fix message that didn't include dump-super
1809 Signed-off-by: David Zafman <dzafman@redhat.com>
1810 (cherry picked from commit fd1772e0ac4cb801d6f3b056645eeb4d3d6ef001)
1812 commit c60eee1dcd64d4452e96ed937f94a3ec41faf9fe
1813 Author: Kefu Chai <kchai@redhat.com>
1814 Date: Thu Jul 2 19:14:55 2015 +0800
1816 tools/ceph-objectstore-tool: add "set-osdmap" command
1819 Signed-off-by: Kefu Chai <kchai@redhat.com>
1820 (cherry picked from commit 3e30c1746fb8d90b04e4776849069db0b7737c87)
1823 src/tools/ceph_objectstore_tool.cc (trivial)
1825 commit cfe7d47d38fd103601c09eceb98b9c7365869fba
1826 Author: David Zafman <dzafman@redhat.com>
1827 Date: Mon Jun 22 19:16:22 2015 -0700
1829 tools: Check and specify commands that require the pgid specification
1831 Signed-off-by: David Zafman <dzafman@redhat.com>
1832 (cherry picked from commit 5534bc864813d96a0d20791d79151c4f6695a013)
1834 commit df0e11e7783e239ae7be992b342df980d399ab95
1835 Author: Sage Weil <sage@redhat.com>
1836 Date: Thu Dec 11 16:25:49 2014 -0800
1838 hobject_t: modify operator<<
1840 Put the most significant fields to the left so that it matches the sort
1841 order. Also use unambiguous separator when the nspace is present
1842 (like we do with the key).
1844 Signed-off-by: Sage Weil <sage@redhat.com>
1845 (cherry picked from commit ecdc8f697acf1627b35a83663c219a3bb0ada453)
1847 commit 6c8884b11b8211642662bfd7d612872621ffd8ff
1848 Author: David Zafman <dzafman@redhat.com>
1849 Date: Thu Jun 11 12:57:10 2015 -0700
1851 test, tools: Improve ceph-objectstore-tool import error handling and add tests
1853 Signed-off-by: David Zafman <dzafman@redhat.com>
1854 (cherry picked from commit ddc4d52782a04d99a4293c9fc278894dfe328515)
1856 commit 87a7f991d1f2f1a05fff18accc7e31ff393083f1
1857 Author: David Zafman <dzafman@redhat.com>
1858 Date: Tue Jun 9 18:14:09 2015 -0700
1860 tools: For ec pools list objects in all shards if the pgid doesn't specify
1862 Signed-off-by: David Zafman <dzafman@redhat.com>
1863 (cherry picked from commit 1aa9655f10b0fcc42cb5114681b8b24a2ccb68f4)
1865 commit 9ca2f35d02169e6f82e3d45e00fe880c02cbd8ce
1866 Author: John Spray <john.spray@redhat.com>
1867 Date: Mon Apr 20 17:28:15 2015 +0100
1869 tools: clean up errors in ceph-objectstore-tool
1871 We use negative error codes everywhere else, should
1872 use them here too. Also add a couple of strategically
1875 Signed-off-by: John Spray <john.spray@redhat.com>
1876 (cherry picked from commit 8e5594da29e782b6efd046ed03f313599dafa1c5)
1879 src/tools/RadosDump.cc (Excluded, not in Hammer)
1881 commit 78a59f8b0c43adbd9a7a1db68dafcbf7bd2ad74d
1882 Author: David Zafman <dzafman@redhat.com>
1883 Date: Mon Jun 1 17:22:18 2015 -0700
1885 test/ceph-objectstore-tool: Don't need stderr noise
1887 Signed-off-by: David Zafman <dzafman@redhat.com>
1888 (cherry picked from commit d7858c66454093dd6f2fab60e33e5b2472bcd80a)
1890 commit eab0f2403ea025f4e659dc055323b227023448ab
1891 Author: David Zafman <dzafman@redhat.com>
1892 Date: Thu Apr 9 16:26:07 2015 -0700
1894 osd: Show number of divergent_priors in log message
1896 Report dirty_divergent_priors as true or false
1897 Use dout(5) so tests can verify divergent_priors created
1899 Signed-off-by: David Zafman <dzafman@redhat.com>
1900 (cherry picked from commit 67da8feb0ff8659f1ff812be5a866ef5e97facf2)
1902 commit d58793d10d682fba2ceafa4d6a1668c4917be77f
1903 Author: David Zafman <dzafman@redhat.com>
1904 Date: Mon Jul 6 18:14:06 2015 -0700
1906 osd, tools: Always filter temp objects since not being exported
1908 Can't use object_locator_to_pg() directly with a temp object
1909 because the pool is negative.
1911 Signed-off-by: David Zafman <dzafman@redhat.com>
1912 (cherry picked from commit 557c6530a515cffacbaec439cabff8a079edbf5b)
1914 commit efc402ea9846d3995bf3d4c98188842cb69870cf
1915 Author: David Zafman <dzafman@redhat.com>
1916 Date: Mon Jun 1 17:15:21 2015 -0700
1918 test/ceph-objectstore-tool: Show command that should have failed
1920 Signed-off-by: David Zafman <dzafman@redhat.com>
1921 (cherry picked from commit 23551deea66673c35d7183d18b63b5a8438ebf00)
1923 commit 88ac5198f542cdea87d0f600a2201132c47f158d
1924 Author: David Zafman <dzafman@redhat.com>
1925 Date: Tue May 12 15:28:07 2015 -0700
1927 test: Add config changes to all tests to avoid order dependency
1929 ReplayCorrupt was crashing because journal_ignore_corruption wasn't set true
1930 Improve ReplayCorrupt by checking setting of bool corrupt and use ASSERT_FALSE()
1932 Signed-off-by: David Zafman <dzafman@redhat.com>
1933 (cherry picked from commit 9016269a1c248da69a0e85df4ca3ba95011710c5)
1935 commit 3d99ecd6131f41ebe60c352266dca9193d61bbc9
1936 Author: David Zafman <dzafman@redhat.com>
1937 Date: Mon Jun 22 11:15:58 2015 -0700
1939 tools: Don't export temporary objects until we have persistent-temp objects
1941 Signed-off-by: David Zafman <dzafman@redhat.com>
1942 (cherry picked from commit 4fcf5dd370e8cfac75fadbf709a785053eb26ad9)
1944 Remove "assert(!i->hobj.is_meta());" since is_meta() is not in Hammer
1946 commit 13360d3a55818fc5b63a2bb9889a67f3fc98d286
1947 Author: David Zafman <dzafman@redhat.com>
1948 Date: Fri May 22 17:41:40 2015 -0700
1950 test/ceph_objectstore_tool: Improve dump-journal testing
1952 Fix false failure when journal has no entries
1953 Test dump-journal on all osds in 2 places
1955 Signed-off-by: David Zafman <dzafman@redhat.com>
1956 (cherry picked from commit ce76f88777ec026521cce465095d6376efd460a8)
1958 commit 444ce0ac718e903b39c25cf58d0a503ead491790
1959 Author: David Zafman <dzafman@redhat.com>
1960 Date: Fri May 22 11:52:00 2015 -0700
1962 ceph-objectstore-tool: Allow --pgid specified on import (for post split)
1964 Revamp split import testing to use --pgid option post split
1966 Signed-off-by: David Zafman <dzafman@redhat.com>
1967 (cherry picked from commit 90202a70f8c32120625c99ef5131778b3c9f6303)
1969 commit aed1c49e7d3631d797776be1020f6df0f77ea1f3
1970 Author: David Zafman <dzafman@redhat.com>
1971 Date: Fri May 22 10:53:48 2015 -0700
1973 ceph-objectstore-tool: Invalidate pg stats when objects were skipped during pg import
1975 Signed-off-by: David Zafman <dzafman@redhat.com>
1976 (cherry picked from commit 51e27984ec131fd21bbc26411ae1540b9047eb37)
1978 commit af3f8ae1d9e210499fd0165e473f9b5d87666f75
1979 Author: David Zafman <dzafman@redhat.com>
1980 Date: Mon May 18 20:22:03 2015 -0700
1982 ceph-objectstore-tool: Add dump-super to show OSDSuperblock in format specified
1984 Signed-off-by: David Zafman <dzafman@redhat.com>
1985 (cherry picked from commit 99d7663f870abfa82711dbf0451334f7d6c883d8)
1987 commit 4dcf15bc71c815cfdb0f6bc6f90c9b603d18b37f
1988 Author: David Zafman <dzafman@redhat.com>
1989 Date: Mon May 18 20:25:23 2015 -0700
1991 mds, include: Fix dump() numeric char array to include additional alpha chars
1993 Caused by: c87f55b5a8b3e003726e1be22b9cb6894ef2f37d
1995 Signed-off-by: David Zafman <dzafman@redhat.com>
1996 (cherry picked from commit f1520061bba1e052a9be3ae11161122c1f6c3425)
1998 commit feecacfb34dfd831291fc736ea39dbcf69e7d765
1999 Author: David Zafman <dzafman@redhat.com>
2000 Date: Mon May 18 20:08:14 2015 -0700
2002 ceph-objectstore-tool: Add dump-journal as not requiring --pgid in usage
2004 Additional comment describes --pgid requirement checking
2006 Signed-off-by: David Zafman <dzafman@redhat.com>
2007 (cherry picked from commit bd2f62445be7153a9600bcf4399e8fc56f1efd3f)
2009 commit 5e8fbb1858f7a8dd65d1b9f873aaca05f3ddb1eb
2010 Author: David Zafman <dzafman@redhat.com>
2011 Date: Thu Mar 5 16:37:46 2015 -0800
2013 test: ceph_test_filejournal: Conform to test infrastructure requirements
2015 Only call RUN_ALL_TESTS() once
2017 Signed-off-by: David Zafman <dzafman@redhat.com>
2018 (cherry picked from commit e30efe6c15780a6239b9970297df1f2c1918c9b1)
2020 commit c161cbf81a29e523bb4ffb897f6d02112eb49b09
2021 Author: David Zafman <dzafman@redhat.com>
2022 Date: Thu Mar 5 16:13:50 2015 -0800
2024 test: ceph_test_filejournal need to force aio because testing with a file
2026 Signed-off-by: David Zafman <dzafman@redhat.com>
2027 (cherry picked from commit d540dde1faee47d01ee358ae384fa301fa59f00f)
2029 commit 06d3f512149dc9aa38d959ac31891b81634d0ea4
2030 Author: David Zafman <dzafman@redhat.com>
2031 Date: Thu Mar 5 16:04:36 2015 -0800
2033 test: ceph_test_filejournal fix missing argument to FileJournal constructor
2035 Signed-off-by: David Zafman <dzafman@redhat.com>
2036 (cherry picked from commit c94fe8db36e7d54227edde94a99bc1aa236b8ec8)
2038 commit 2078f639d91fbaa9b89832811315c7c41da25a4b
2039 Author: David Zafman <dzafman@redhat.com>
2040 Date: Thu Feb 19 19:48:11 2015 -0800
2042 test: ceph_test_filejournal Add check of journalq in WriteTrim test
2044 Commit all journal entries and check for empty journalq
2046 Signed-off-by: David Zafman <dzafman@redhat.com>
2047 (cherry picked from commit 8da4d9f6330c57d6b437ea44f54f147075e24195)
2049 commit ab893d769d2728368f94b035edde750a3fa5e617
2050 Author: David Zafman <dzafman@redhat.com>
2051 Date: Thu Jan 29 17:14:39 2015 -0800
2053 test: Fix ceph-objectstore-tool test missing fd.close()
2055 Signed-off-by: David Zafman <dzafman@redhat.com>
2056 (cherry picked from commit ece630d5a741ba8c82f55f964f1887cb7fcaa493)
2058 commit b5f2ccd5bd77c7a473f38fdab183fd52577b7331
2059 Author: David Zafman <dzafman@redhat.com>
2060 Date: Thu Jan 29 17:13:41 2015 -0800
2062 test: Fix ceph-objectstore-tool test error message
2064 Signed-off-by: David Zafman <dzafman@redhat.com>
2065 (cherry picked from commit 11c13eb7c182870727fbcb25a83f3348ac0bad13)
2067 commit 848822db38e000a7e7bfe49ae0fe03996bb7e8c1
2068 Author: David Zafman <dzafman@redhat.com>
2069 Date: Wed Apr 1 10:32:32 2015 -0700
2071 test: ceph-objectstore-tool: Remove duplicate debug messages, keep cmd/log/call together
2073 Signed-off-by: David Zafman <dzafman@redhat.com>
2074 (cherry picked from commit 94b3d7632f2548c19beca5a2e024c95f601b61f3)
2076 commit 771dcd945281a091b165c0b1a90c1f6058dbf923
2077 Author: David Zafman <dzafman@redhat.com>
2078 Date: Fri Mar 27 19:47:01 2015 -0700
2080 test: ceph-objectstore-tool import after split testing
2082 Signed-off-by: David Zafman <dzafman@redhat.com>
2083 (cherry picked from commit d80ce6668c1aa3c9898ab49e847c4dadafe256f0)
2085 commit 4f387b1e1c8dbfe9ed2a70fc02ff5ccf93ffb905
2086 Author: David Zafman <dzafman@redhat.com>
2087 Date: Tue Mar 31 08:16:03 2015 -0700
2089 test: Use CEPH_DIR where appropriate
2091 Signed-off-by: David Zafman <dzafman@redhat.com>
2092 (cherry picked from commit 1e18e8a88f88809081684b09f36691cd724720b5)
2094 commit b337d677daf5b6098a2dbcf2d8966703cf8db449
2095 Author: David Zafman <dzafman@redhat.com>
2096 Date: Mon Mar 30 17:35:07 2015 -0700
2098 test: Limit how long ceph-objectstore-tool test will wait for health
2100 Signed-off-by: David Zafman <dzafman@redhat.com>
2101 (cherry picked from commit 868cf457a3990ba9989aef55823630e3189acf4a)
2103 commit 09cb8a41ed6a9642978e399b426b21704c704f46
2104 Author: David Zafman <dzafman@redhat.com>
2105 Date: Mon Mar 30 17:33:46 2015 -0700
2107 test: Add optional arg to vstart() to provide additional args to vstart
2109 Signed-off-by: David Zafman <dzafman@redhat.com>
2110 (cherry picked from commit dff17a800c9cc1cf0cc23d70479c031aa8e9cbfc)
2112 commit b4ac42be79bb11cb27282d97aec9e6ca8f658e5c
2113 Author: David Zafman <dzafman@redhat.com>
2114 Date: Thu Mar 5 19:35:27 2015 -0800
2116 test: Test ceph-objectstore-tool --op dump-journal output
2118 Signed-off-by: David Zafman <dzafman@redhat.com>
2119 (cherry picked from commit 9b08bcf95caf77fb7f9bd293559534ed8ff3eded)
2122 src/test/ceph_objectstore_tool.py (trivial)
2124 commit 729abf5a83a656ac2a95ad147909bf7c8fa18999
2125 Author: David Zafman <dzafman@redhat.com>
2126 Date: Tue Mar 17 14:56:06 2015 -0700
2128 test: Pep8 fixes for ceph-objectstore-tool test
2130 Signed-off-by: David Zafman <dzafman@redhat.com>
2131 (cherry picked from commit b0141108c0596b535d25792a9102787b1cd3eca3)
2133 commit 33813b66fa4402fe0d66d95d6f9b790b11c9f1f1
2134 Author: David Zafman <dzafman@redhat.com>
2135 Date: Thu Mar 5 18:37:44 2015 -0800
2137 test: Fix ceph-objectstore-tool test, overwrite OTHERFILE so second check is meaningful
2139 Signed-off-by: David Zafman <dzafman@redhat.com>
2140 (cherry picked from commit 1b9f85befa1efff3b05b2af0e62d568eea37d790)
2142 commit f7ab316be9ce3592e0bc1c3a1012b0a83dfea2b4
2143 Author: David Zafman <dzafman@redhat.com>
2144 Date: Thu Mar 5 19:16:45 2015 -0800
2146 osd: FileJournal: Add _fdump() that takes Formatter instead of ostream
2148 Signed-off-by: David Zafman <dzafman@redhat.com>
2149 (cherry picked from commit 130eba48495d0e6acd8a472cbf0c47ebbc7a038c)
2151 commit 99d3e17fe8c03eb30b18dee185623a9c16553d9e
2152 Author: David Zafman <dzafman@redhat.com>
2153 Date: Wed Feb 18 12:34:35 2015 -0800
2155 osd: Add simple_dump() to FileJournal for unit testing
2157 Allow a dump when entries aren't ObjectStore::Transaction's
2159 Signed-off-by: David Zafman <dzafman@redhat.com>
2160 (cherry picked from commit 8d5464c0f81aa9bb3be233a03bce64b505a265f4)
2162 commit 80fc57f79a9bd23e119be73fe01063e85c60ca83
2163 Author: David Zafman <dzafman@redhat.com>
2164 Date: Wed Feb 18 12:29:38 2015 -0800
2166 osd: FileJournal clean-up
2168 Move aio / directio adjustments to constructor
2169 Indicate functions which only operate before journal is active
2170 Make functions const when possible
2171 Move push_back() of journalq to read_entry()
2172 Change dump() to use do_read_entry() to minimize side effects
2174 Signed-off-by: David Zafman <dzafman@redhat.com>
2175 (cherry picked from commit 12fdf4ced0b2c17770c21204c8eccca8e4d0d2c9)
2178 src/os/FileJournal.cc (trivial)
2180 commit b8f4ea17274f9094efa169a28440701319c14516
2181 Author: David Zafman <dzafman@redhat.com>
2182 Date: Thu Feb 5 18:48:22 2015 -0800
2184 osd: Dump header in FileJournal::dump()
2186 Signed-off-by: David Zafman <dzafman@redhat.com>
2187 (cherry picked from commit 3c97b32131e83c934b3d340eeb75284e898380c4)
2189 commit 21c3c18c7b25ddea664179797527ea9854c3f450
2190 Author: David Zafman <dzafman@redhat.com>
2191 Date: Thu Feb 5 18:40:25 2015 -0800
2193 osd: FileJournal::read_entry() can't use a zero seq to check for corruption
2195 Seen when using dump() on a journal which has all entries committed
2197 Signed-off-by: David Zafman <dzafman@redhat.com>
2198 (cherry picked from commit a7cda53d20eb6d35203fce6ec9f7ea1df432bf53)
2200 commit 288902fecd78b1926aa4a1d53587828fda63845d
2201 Author: David Zafman <dzafman@redhat.com>
2202 Date: Thu Feb 5 18:36:01 2015 -0800
2204 osd: Fix flushing in FileJournal::dump()
2206 Use ostream arg since caller is specifying
2207 Move flush after last section close
2209 Signed-off-by: David Zafman <dzafman@redhat.com>
2210 (cherry picked from commit f2d83520f67fdc1b5a89b4ea742493a3df392989)
2212 commit a935ce501692f51be004f8cb20da29f18e649d44
2213 Author: David Zafman <dzafman@redhat.com>
2214 Date: Thu Apr 30 10:20:24 2015 -0700
2216 osd: Add admin socket feature set_recovery_delay
2218 Set the value of osd_recovery_delay_start to specified seconds
2220 Signed-off-by: David Zafman <dzafman@redhat.com>
2221 (cherry picked from commit 73b17319379d904ffdf9479ca476da8e8e34e935)
2224 src/osd/OSD.cc (trivial)
2226 commit 4ae3f88cc4493413c4aab54e21759507b0d572b0
2227 Author: David Zafman <dzafman@redhat.com>
2228 Date: Mon Apr 27 15:37:14 2015 -0700
2230 ceph-objectstore-tool: For import/export --debug dump the log
2232 Move log dumping code to common function dump_log()
2234 Signed-off-by: David Zafman <dzafman@redhat.com>
2235 (cherry picked from commit 545c78c65f33fcac60b5aa7ee2b574ceb0211fd5)
2237 commit cc5fa68c184f66d3ca6ff736eb308cba0a0d10b0
2238 Author: David Zafman <dzafman@redhat.com>
2239 Date: Fri Jan 30 16:56:10 2015 -0800
2241 ceph-objectstore-tool: If object re-appears after removal, just skip it
2243 Signed-off-by: David Zafman <dzafman@redhat.com>
2244 (cherry picked from commit c6e41663e7434b4dcbb1abbe62ac008388da268a)
2246 commit d8ae1a9b842b6871225f0cc2d8a8dbdcf01238e4
2247 Author: David Zafman <dzafman@redhat.com>
2248 Date: Fri Jan 30 16:11:13 2015 -0800
2250 ceph-objectstore-tool: Add --no-overwrite flag for import-rados
2252 Signed-off-by: David Zafman <dzafman@redhat.com>
2253 (cherry picked from commit 35cdcabbdad7dc7249029630c64022c822c67ddc)
2255 commit 2dbf843560de2b9b74d9b0d0baf2a303e6c4e86b
2256 Author: David Zafman <dzafman@redhat.com>
2257 Date: Mon Feb 2 16:23:18 2015 -0800
2259 ceph-objectstore-tool: Remove list-lost because now we have --dry-run flag
2261 Signed-off-by: David Zafman <dzafman@redhat.com>
2262 (cherry picked from commit 3e7fe7e85716f80e055ffbc5305f406b3e020608)
2264 commit 35991747c4cf5c4f9c150aae128f63c7b8c8a5cd
2265 Author: David Zafman <dzafman@redhat.com>
2266 Date: Fri Jan 23 07:34:11 2015 -0800
2268 ceph-objectstore-tool: Add --dry-run option
2272 Signed-off-by: David Zafman <dzafman@redhat.com>
2273 (cherry picked from commit 2795161f470ab87cf4a82f455773c9b1b82946ef)
2275 commit 05d3b73ac6ef841af5037336996d1ed6bfdac4b5
2276 Author: David Zafman <dzafman@redhat.com>
2277 Date: Thu Jan 22 10:07:09 2015 -0800
2279 ceph-objectstore-tool: Add dump-info command to show object info
2281 Signed-off-by: David Zafman <dzafman@redhat.com>
2282 (cherry picked from commit 244092d034781d2e980f9de7c6f9eea227967c5a)
2284 commit 2d764c54d4b028455be8b592712c6424f5f9f19e
2285 Author: David Zafman <dzafman@redhat.com>
2286 Date: Tue Jan 27 14:32:42 2015 -0800
2288 ceph-objectstore-tool: Use empty string for <object> to specify pgmeta object
2290 Signed-off-by: David Zafman <dzafman@redhat.com>
2291 (cherry picked from commit c00290b836adba12212e8a57f13b0c9193ac0ef8)
2293 commit 3a533d767bafc466e653bdd89d064b5f2b9aa257
2294 Author: John Spray <john.spray@redhat.com>
2295 Date: Mon Apr 20 17:28:15 2015 +0100
2297 ceph-objectstore-tool: Add a couple of strategically placed prints
2299 Signed-off-by: John Spray <john.spray@redhat.com>
2300 (cherry picked from commit fdb1a4b676765c5d3ca5d436f34230dd6996d7a7)
2302 commit 7947f4f72f4bb6441ea5c353757d9ea3f464cff4
2303 Author: David Zafman <dzafman@redhat.com>
2304 Date: Mon Apr 20 16:10:18 2015 -0700
2306 ceph-objectstore-tool: Clean up error handling
2308 Use negative errors throughout and positive error to specify exit status
2309 cpp_strerror() handles negative errors
2310 Clean up main() code to use local "ret"
2311 Let end of main() decide how to treat the final value of "ret"
2313 Signed-off-by: David Zafman <dzafman@redhat.com>
2314 (cherry picked from commit a50679a1a3313e4090bf24f6e4dda28e7d67d731)
2316 Adjust back cherry-pick f237ed97228839a1b412ad213945f0343df05bf5
2317 Switched to use ret as in the original change from master
2319 commit 83de86e4e9dedc05fd65201715dadbd46074b7e0
2320 Author: David Zafman <dzafman@redhat.com>
2321 Date: Wed Apr 15 15:40:41 2015 -0700
2323 ceph-objectstore-tool: Create section around log/missing/divergent_priors of --op log
2325 Remove extra new lines in the output
2327 Signed-off-by: David Zafman <dzafman@redhat.com>
2328 (cherry picked from commit 548147b412eebe57861768e5fd66360c2582d2c6)
2330 commit ddfaa70ade3b6d7ff061083fcd610b588fbd4dd7
2331 Author: David Zafman <dzafman@redhat.com>
2332 Date: Tue Apr 14 13:49:26 2015 -0700
2334 ceph-objectstore-tool: Add divergent_priors handling
2336 Add to --op log output
2337 Add to metadata_section for export
2338 Add filtering of divergent_priors in case of splits
2342 Signed-off-by: David Zafman <dzafman@redhat.com>
2343 (cherry picked from commit 6ad7e9b362f437fe028fe59639489efe87b3525f)
2345 commit add937c437a4bd86c932ef49525aff039d9bee90
2346 Author: David Zafman <dzafman@redhat.com>
2347 Date: Wed Mar 18 10:05:24 2015 -0700
2349 ceph-objectstore-tool: Add --force option which is used for import only
2351 Signed-off-by: David Zafman <dzafman@redhat.com>
2352 (cherry picked from commit 2f4090daaea715b896e49f678933abb8a13b5c98)
2354 commit f33274894a83072a483b0646a91b5182a72c7c90
2355 Author: David Zafman <dzafman@redhat.com>
2356 Date: Fri Mar 13 00:41:39 2015 -0700
2358 ceph-objectstore-tool: Fix pgid scan to skip snapdirs
2360 Long standing bug where it wasn't skipping snapdirs if !debug
2361 For debug output use stderr like all other cases
2363 Signed-off-by: David Zafman <dzafman@redhat.com>
2364 (cherry picked from commit 24f06598966319a62fa58a5831d9741fac1d471b)
2366 commit 3e68825e60a2e69a20198439347aadf8742d4ea6
2367 Author: David Zafman <dzafman@redhat.com>
2368 Date: Mon Feb 9 12:24:19 2015 -0800
2370 ceph-objectstore-tool: Add dump-journal op
2372 Have dump-journal op directly dump a filestore journal without
2373 mounting or try to dump after mounting.
2377 Signed-off-by: David Zafman <dzafman@redhat.com>
2378 (cherry picked from commit 381605e34a44edb9acfcfb5a56bd598b020e022f)
2380 commit aaff4d7bcbc3e48aa6c0342d66a9c30c93744064
2381 Author: David Zafman <dzafman@redhat.com>
2382 Date: Mon Feb 9 12:46:20 2015 -0800
2384 ceph-objectstore-tool: On any exit release CephContext so logging can flush
2386 Add myexit() which will put() the g_ceph_context if present before exit
2387 Must umount() once the objectstore has been mounted
2391 Signed-off-by: David Zafman <dzafman@redhat.com>
2392 (cherry picked from commit 409328bace0ffb3a457c0d384377bbbf37a2962d)
2394 commit 7445cf5a04d396dbc36e21aecd44bc4aadaff397
2395 Author: David Zafman <dzafman@redhat.com>
2396 Date: Mon Feb 9 17:28:04 2015 -0800
2398 ceph-objectstore-tool: Check for keyvaluestore experimental feature
2400 Don't list keyvaluestore as a valid type if feature not enabled
2402 Signed-off-by: David Zafman <dzafman@redhat.com>
2403 (cherry picked from commit fb2f9d500e52aa0834666550a684fe991701c9dd)
2405 commit 9da6c01b5e59e59a80d00e3d17cf5da05dd84f72
2406 Author: David Zafman <dzafman@redhat.com>
2407 Date: Mon Feb 9 17:14:50 2015 -0800
2409 ceph-objectstore-tool: Eliminate obscure "Invalid params" error
2411 Will fail later with "No such file or directory" for an empty data-path
2412 because we've already checked for vm.count("data-path")
2414 Signed-off-by: David Zafman <dzafman@redhat.com>
2415 (cherry picked from commit cfca6835bd53d535bde2793551211845b0facebd)
2417 commit c5ac7ce09bc5b96722738a1884c6046aba6518f2
2418 Author: David Zafman <dzafman@redhat.com>
2419 Date: Mon Feb 9 15:37:57 2015 -0800
2421 ceph-objectstore-tool: Check pgid validity earlier like we did before
2423 This code was not doing the umount() even though it was moved after mount()
2425 Signed-off-by: David Zafman <dzafman@redhat.com>
2426 (cherry picked from commit 565b413df9c562a4071b9372d6362a9105c3538e)
2428 commit 18c49b6474a563b5f7f7cef671050d46ac4c3c4f
2429 Author: Sage Weil <sage@redhat.com>
2430 Date: Fri May 1 09:22:01 2015 -0700
2432 Backport the merge commit of branch 'wip-journal-header' of git://github.com/XinzeChi/ceph
2434 (cherry picked from commit 8d596bfa24c9c3e2aadbb87494284cb5fd824e55)
2437 src/os/FileJournal.cc (trivial)
2438 src/os/FileJournal.h (trivial)
2440 Renamed write_header() to write_header_sync() in a merge
2441 Signed-off-by: David Zafman <dzafman@redhat.com>
2443 commit 546a7b988dac56770730ddc9395ee0d52a666fa3
2444 Merge: 6b7660c 3352b14
2445 Author: Loic Dachary <loic@dachary.org>
2446 Date: Thu Feb 25 22:39:06 2016 +0700
2448 Merge pull request #7656 from dzafman/wip-14769-hammer
2450 ceph.in: Notify user that 'tell' can't be used in interactive mode
2452 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2453 Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2455 commit 6b7660c91d1837b585b365068da835127752ebfc
2456 Merge: e34c209 14b5fea
2457 Author: Loic Dachary <loic@dachary.org>
2458 Date: Thu Feb 25 22:37:58 2016 +0700
2460 Merge pull request #7648 from tchaikov/wip-13783-hammer
2462 mon/LogMonitor: use the configured facility if log to syslog
2464 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2466 commit cf433bac5b7bc6bdbb6fac56c420288544c79ef5
2467 Author: shun-s <songshun134@126.com>
2468 Date: Wed Dec 2 10:36:35 2015 +0800
2470 global/pidfile: do not start two daemons with a single pid-file
2472 add functions named pidfile_open and pidfile_verify to avoid starting two daemons by a single pid-file
2475 Signed-off-by: shun song <song.shun3@zte.com.cn>
2476 (cherry picked from commit f2c0ef40fd674fecc6e3e97cd6155b976e6759b4)
2478 commit e34c2094ef44e6e52896820f4dd90a1c5d5bbfe8
2479 Merge: ec33aec b43c5b2
2480 Author: Loic Dachary <loic@dachary.org>
2481 Date: Thu Feb 25 19:39:49 2016 +0700
2483 Merge pull request #7801 from dachary/wip-14863-hammer
2485 hammer: unittest_crypto: benchmark 100,000 CryptoKey::encrypt() calls
2487 Reviewed-by: Nathan Cutler <ncutler@suse.cz>
2489 commit b43c5b205f26198c79e21af3a6935a76f560a7fc
2490 Author: Sage Weil <sage@redhat.com>
2491 Date: Mon Jan 26 15:57:33 2015 -0800
2493 unittest_crypto: benchmark 100,000 CryptoKey::encrypt() calls
2495 Signed-off-by: Sage Weil <sage@redhat.com>
2496 (cherry picked from commit fb4b6c52d8e31e8dedfa8aecc16c389f0e7d86cf)
2499 src/test/crypto.cc : complements the incorrect cherry-pick
2500 df3f971eafda9c54881c13dcf47f996f18e17028 see
2501 http://tracker.ceph.com/issues/14863 for more information
2503 commit ec33aec31fcac3b09bf06256b95c841a8c20d56f
2504 Merge: 4b46182 17d1b0d
2505 Author: Loic Dachary <loic@dachary.org>
2506 Date: Thu Feb 25 11:09:54 2016 +0700
2508 Merge pull request #7185 from dachary/wip-14325-hammer
2510 hammer: rgw: radosgw-admin bucket check --fix not work
2512 Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
2514 commit 4b461829c24cd35656e86f507a78b0fff860c0b5
2515 Merge: 722ca62 5c92d1d
2516 Author: Loic Dachary <loic@dachary.org>
2517 Date: Thu Feb 25 11:09:28 2016 +0700
2519 Merge pull request #7188 from dachary/wip-13799-hammer
2521 hammer: rgw: default quota params
2523 Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
2525 commit 722ca62e12ac977961d895dceaeb55f31d7b00ca
2526 Merge: 3c1e2d4 ad4df3b
2527 Author: Loic Dachary <loic@dachary.org>
2528 Date: Thu Feb 25 11:04:02 2016 +0700
2530 Merge pull request #7414 from dachary/wip-14493-hammer
2532 hammer: make rgw_fronends more forgiving of whitespace
2534 Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
2536 commit 3c1e2d4216353c848f76b52d9c187e83574267a7
2537 Merge: b73a93d 3d84420
2538 Author: Sage Weil <sage@redhat.com>
2539 Date: Wed Feb 24 10:15:27 2016 -0800
2541 Merge pull request #7415 from dachary/wip-14554-hammer
2543 hammer: Unable to bring up OSD's after dealing with FULL cluster (OSD assert with /include/interval_set.h: 386: FAILED assert(_size >= 0))
2545 commit b73a93d8cd8bc8757a7a8960b2a9d448c7041515
2546 Merge: b3eac8e 5a450e6
2547 Author: Sage Weil <sage@redhat.com>
2548 Date: Wed Feb 24 10:15:03 2016 -0800
2550 Merge pull request #7576 from dachary/wip-14579-hammer
2552 hammer: mon sync does not copy config-key
2554 commit b3eac8e3dbb74ebcfdd22d10d6a6f2916d2bf127
2555 Merge: bf6dcc7 9e0a165
2556 Author: Sage Weil <sage@redhat.com>
2557 Date: Wed Feb 24 10:14:37 2016 -0800
2559 Merge pull request #7577 from dachary/wip-14689-hammer
2561 hammer: consume_maps clearing of waiting_for_pg needs to check the spg_t shard for acting set membership
2563 commit bf6dcc7c6da5d06b21e4a4fad3f7a65e8ca84f50
2564 Merge: 293e8c7 d5ba063
2565 Author: Sage Weil <sage@redhat.com>
2566 Date: Wed Feb 24 10:03:55 2016 -0800
2568 Merge pull request #7590 from SUSE/wip-14720-hammer
2570 hammer: OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from
2572 commit 293e8c7b038a22e2135e7bf288a8ff4b8ce32a14
2573 Merge: 5b724fc 10d29da
2574 Author: Sage Weil <sage@redhat.com>
2575 Date: Wed Feb 24 10:03:18 2016 -0800
2577 Merge pull request #7645 from dachary/wip-14760-hammer
2579 hammer: OSD coredumps with leveldb compact on mount = true
2581 commit 5b724fcce0e260a04bd6889c3d4c6d9bf44971cf
2582 Merge: bb84692 1c8c708
2583 Author: Loic Dachary <loic@dachary.org>
2584 Date: Wed Feb 24 12:56:13 2016 +0700
2586 Merge pull request #7485 from dillaman/wip-14611-hammer
2588 librbd: flattening an rbd image with active IO can lead to hang
2590 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2592 commit bb84692e96569823e23fdd02356446577959f438
2593 Merge: ee014d8 df3f971
2594 Author: Loic Dachary <loic@dachary.org>
2595 Date: Wed Feb 24 12:55:18 2016 +0700
2597 Merge pull request #7488 from ceph/wip-auth-hammer
2599 hammer: auth: use libnss more safely
2601 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2603 commit ee014d8084c05ec3c876a9e46dcb6e558918a0e4
2604 Merge: 576225d 88ffcc2
2605 Author: Loic Dachary <loic@dachary.org>
2606 Date: Wed Feb 24 12:48:05 2016 +0700
2608 Merge pull request #7475 from dachary/wip-14602-hammer
2610 hammer: ceph-disk: use blkid instead of sgdisk -i
2612 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2614 commit 576225d6d5a64f0f43971ccca4d74b5dc44c5c63
2615 Merge: a6f7a2f eb048a3
2616 Author: Loic Dachary <loic@dachary.org>
2617 Date: Wed Feb 24 12:47:07 2016 +0700
2619 Merge pull request #7456 from dachary/wip-14587-hammer
2621 hammer: qa/workunits/post-file.sh: sudo
2623 Reviewed-by: Loic Dachary <ldachary@redhat.com>
2625 commit a6f7a2f1347393c1cf7564a2ba8d1ba6aff2122c
2626 Merge: 74cfe5c f04e007
2627 Author: Loic Dachary <loic@dachary.org>
2628 Date: Wed Feb 24 12:38:47 2016 +0700
2630 Merge pull request #6946 from dachary/wip-14087-shard-size
2632 osd: log inconsistent shard sizes
2634 Reviewed-by: David Zafman <dzafman@redhat.com>
2636 commit 74cfe5c5f49cb566224a3ff0ef8ab515eadc78ac
2637 Merge: e832001 f209819
2638 Author: Loic Dachary <loic@dachary.org>
2639 Date: Wed Feb 24 12:37:55 2016 +0700
2641 Merge pull request #7110 from david-z/wip-hammer-fix-logrotate-ceph-fuse
2643 [ceph-fuse] fix ceph-fuse writing to stale log file after log rotation
2645 Reviewed-by: Sage Weil <sage@redhat.com>
2646 Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2648 commit a1fc101084c5aefeb64da344158783a186a28a93
2649 Author: Sage Weil <sage@redhat.com>
2650 Date: Sun Feb 8 07:47:23 2015 -0800
2652 crushtool: send --tree to stdout
2654 Signed-off-by: Sage Weil <sage@redhat.com>
2655 (cherry picked from commit dca345280e4f6124a8b5aea73e6219488111c356)
2658 src/tools/crushtool.cc (trivial)
2660 commit 4fb688d15c40a9b9d5a54700b3c7695a97ffd03b
2661 Author: Xinze Chi <xmdxcxz@gmail.com>
2662 Date: Tue Mar 3 11:24:50 2015 +0000
2664 osd: write journal header by force when journal write close
2666 osd update the journal header when ceph call FileStore::sync_entry(
2667 ApplyManager::commit_finish -> FileJournal::committed_thru).
2668 But, it doesnot write the journal head until the next transaction
2669 (calling do_write or do_aio_write).
2671 So write jouranl header when journal write close, so that
2672 committed_up_to in journal header is new enough. ceph may
2673 not replay some transaction which has been writen to filestore.
2675 Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2676 (cherry picked from commit 8f80ae3fbaba7b0e64b6e4df6c2dddd10ac50e5a)
2678 commit 31a2fc475a2de8a656048c85595049ec4548ec6a
2679 Author: Jason Dillaman <dillaman@redhat.com>
2680 Date: Thu Feb 11 10:33:40 2016 -0500
2682 common/bit_vector: use hard-coded value for block size
2684 The CEPH_PAGE_SIZE is not actually a constant. On aarch64 platforms
2685 the page size is 64K instead of the assumed 4K. The CRC block
2686 computations require a true constant.
2689 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2690 (cherry picked from commit ba2e6ce46fb5f781ffaf6483db8ebd99238419c6)
2692 commit 3352b144e0b1500651d8a194c3ebe2aae2f078d0
2693 Author: David Zafman <dzafman@redhat.com>
2694 Date: Tue Oct 20 18:10:39 2015 -0700
2696 ceph.in: Notify user that 'tell' can't be used in interactive mode
2698 Signed-off-by: David Zafman <dzafman@redhat.com>
2699 (cherry picked from commit a341d977d42a3010267b64e15cebae3085507297)
2702 src/ceph.in (trivial resolution)
2704 commit 14b5feab80f07b4ed2b8f6d77ea1fa920e98be05
2705 Author: Kefu Chai <kchai@redhat.com>
2706 Date: Mon Jul 6 12:17:21 2015 +0800
2708 mon/LogMonitor: use the configured facility if log to syslog
2711 Signed-off-by: Kefu Chai <kchai@redhat.com>
2712 (cherry picked from commit 4d2ca37d3b8f067d0cf0f7cfea24964ac181115d)
2714 commit 10d29dab3176ec945dc7272323df0028ef7f0274
2715 Author: Xiaoxi Chen <xiaoxi.chen@intel.com>
2716 Date: Thu Apr 16 13:42:42 2015 +0800
2718 os/LevelDBStore:fix bug when compact_on_mount
2720 Initialize the performance counter(l_rocksdb_compact)
2721 before use it in compact().
2723 Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
2724 (cherry picked from commit 932d59d084090297c89cfa3ff7df0a952f807bab)
2726 commit d5ba063cdf3a8b92862ef6657001725d6192fe86
2727 Author: Xinze Chi <xinze@xsky.com>
2728 Date: Sun Feb 7 18:50:29 2016 +0800
2730 OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from
2732 Base on current logic, OSDMonitor may call create_pending and
2733 encode_pending twice for the some epoch.
2737 tmp.deepish_copy_from(osdmap);
2738 tmp.apply_incremental(pending_inc);
2740 This Op would change the tmp osd_primary_affinity, but the osd_primary_affinity
2741 is declared as ceph::shared_ptr, so this would change the osdmap too. When this
2742 round encode_pending is proposed fail. We may call encode_pending again, but the
2743 osdmap is changed last round, so the pending_inc would be wrong.
2746 Signed-off-by: Xinze Chi <xinze@xsky.com>
2747 (cherry picked from commit 990b437f4e616a87f4f7438e51945d531170ca83)
2749 commit 9e0a1656200c2f91386215924304b495dd705dae
2750 Author: Samuel Just <sjust@redhat.com>
2751 Date: Thu Jan 7 08:09:46 2016 -0800
2753 OSD::consume_map: correctly remove pg shards which are no longer acting
2755 A particular shard may be non-active even if the osd is in the acting
2760 Signed-off-by: Samuel Just <sjust@redhat.com>
2761 (cherry picked from commit bd2fdf8c56c1aeed6cea3eb59046dbb6af470111)
2763 commit 5a450e6734b4ff9e5e483c74b67df385b9a3d640
2764 Author: shawn <cxwshawn@gmail.com>
2765 Date: Tue Jan 26 05:56:12 2016 -0500
2767 mon: add mon_config_key prefix when sync full
2769 Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
2770 (cherry picked from commit b77cd31b161e78467bbb6476776c0f1d43e615cf)
2772 commit eb048a393e7b54dcf5f2245e34a1aa0de281424d
2773 Author: Sage Weil <sage@redhat.com>
2774 Date: Sat Sep 5 09:28:17 2015 -0400
2776 qa/workunits/post-file.sh: sudo
2778 Only root can read the key in /usr/share/...
2780 Signed-off-by: Sage Weil <sage@redhat.com>
2781 (cherry picked from commit 82b0243ec318457e376288a6b32487fbea059705)
2783 commit e9039f4fd3dfe9a3083fcfe64d8012568e8db96f
2784 Author: Sage Weil <sage@redhat.com>
2785 Date: Tue Apr 28 17:40:20 2015 -0700
2787 qa/workunits/post-file: pick a dir that's readable by world
2789 Signed-off-by: Sage Weil <sage@redhat.com>
2790 (cherry picked from commit 04b00029e16971abf1937facbbff8da00d6a3452)
2792 commit 902abe7373c150000d3fc4d66d9c989ed208d0bf
2793 Author: Sage Weil <sage@redhat.com>
2794 Date: Thu Apr 9 09:58:39 2015 -0700
2796 qa/workunits/post-file.sh: use /etc/default
2798 base-files doesn't existing on rhel. /etc/default is everywhere and it's
2801 Signed-off-by: Sage Weil <sage@redhat.com>
2802 (cherry picked from commit 52235e32561ef3e91f07c59c8fd89c4df244f461)
2804 commit 1c8c708e43e4c97af17932027ae6b5d26c124c43
2805 Author: Jason Dillaman <dillaman@redhat.com>
2806 Date: Wed Dec 23 12:06:50 2015 -0500
2808 librbd: ensure librados callbacks are flushed prior to destroying image
2811 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2812 (cherry picked from commit 98157ab3274bd960e4487e34f5a83e9c921a6ac8)
2814 commit f892566fc9b78ab38702b75422321a6d0a5bbb7b
2815 Author: Jason Dillaman <dillaman@redhat.com>
2816 Date: Thu Jul 30 22:31:55 2015 -0400
2818 librbd: simplify IO flush handling
2820 Add a new convenience method to ImageCtx for handling flush
2821 requests and cleanup flush handling with dealing with the cache.
2823 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2824 (cherry picked from commit e8d8096babaf15fe8af717297d512f580aff6c18)
2826 commit e5dfd3dd7a53bf79f1bfc17b8a4a720aba08d7c3
2827 Author: Jason Dillaman <dillaman@redhat.com>
2828 Date: Fri Aug 14 13:28:13 2015 -0400
2830 WorkQueue: PointerWQ drain no longer waits for other queues
2832 If another (independent) queue was processing, drain could
2833 block waiting. Instead, allow drain to exit quickly if
2834 no items are being processed and the queue is empty for
2837 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2838 (cherry picked from commit b118d7df1e34387b6e5649a5b205cf061598d0d4)
2840 commit edf60b452de3c6eb22c75be2547f51812e6eaf1e
2841 Author: Jason Dillaman <dillaman@redhat.com>
2842 Date: Tue Feb 2 10:54:53 2016 -0500
2844 test: new librbd flatten test case
2846 AIO operations after a flatten operation were previously
2847 hanging during the close of the parent image.
2849 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2850 (cherry picked from commit b59158d9f0c3dbe4b47be1dfd27aaa5ad92e6063)
2852 commit 88ffcc2cbd73602819ad653695de7e8718f6707d
2853 Author: Loic Dachary <ldachary@redhat.com>
2854 Date: Fri Dec 18 17:03:21 2015 +0100
2856 ceph-disk: use blkid instead of sgdisk -i
2858 sgdisk -i 1 /dev/vdb opens /dev/vdb in write mode which indirectly
2859 triggers a BLKRRPART ioctl from udev (starting version 214 and up) when
2860 the device is closed (see below for the udev release note). The
2861 implementation of this ioctl by the kernel (even old kernels) removes
2862 all partitions and adds them again (similar to what partprobe does
2865 The side effects of partitions disappearing while ceph-disk is running
2868 sgdisk is replaced by blkid which only opens the device in read mode and
2869 will not trigger this unexpected behavior.
2871 The problem does not show on Ubuntu 14.04 because it is running udev <
2872 214 but shows on CentOS 7 which is running udev > 214.
2874 git clone git://anonscm.debian.org/pkg-systemd/systemd.git
2878 * As an experimental feature, udev now tries to lock the
2879 disk device node (flock(LOCK_SH|LOCK_NB)) while it
2880 executes events for the disk or any of its partitions.
2881 Applications like partitioning programs can lock the
2882 disk device node (flock(LOCK_EX)) and claim temporary
2883 device ownership that way; udev will entirely skip all event
2884 handling for this disk and its partitions. If the disk
2885 was opened for writing, the close will trigger a partition
2886 table rescan in udev's "watch" facility, and if needed
2887 synthesize "change" events for the disk and all its partitions.
2888 This is now unconditionally enabled, and if it turns out to
2889 cause major problems, we might turn it on only for specific
2890 devices, or might need to disable it entirely. Device Mapper
2891 devices are excluded from this logic.
2893 http://tracker.ceph.com/issues/14094 Fixes: #14094
2895 Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
2896 Signed-off-by: Loic Dachary <loic@dachary.org>
2897 (cherry picked from commit 9dce05a8cdfc564c5162885bbb67a04ad7b95c5a)
2900 src/ceph-disk: keep get_partition_type as it is because
2901 some hammer users may rely on the fact that it is able
2902 to fallback to sgdisk if blkid is old. Chances are an
2903 old blkid also means an old udev that does not have the
2904 problem this fix is adressing. The get_partition_uuid
2905 is modified to try blkid first, with the same rationale.
2907 commit f209819fb676eadf099cc764e3ed3b20fd17b688
2908 Author: Zhi Zhang <willzzhang@tencent.com>
2909 Date: Mon Feb 1 11:03:30 2016 +0800
2911 [ceph-fuse] fix ceph-fuse writing to stale log file after log rotation
2913 This fix should be applied to hammer branch. It can't be directly applied to master branch, because logrotate.conf is changed on matser since ceph-osd, ceph-mon, etc, is controlled by systemd with user/group as 'ceph' by default, while ceph-fuse might be started as root privilege by external users.
2915 Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
2917 commit 3d84420847642e1cb4212f943ecf3ed479112d96
2918 Author: Alexey Sheplyakov <asheplyakov@mirantis.com>
2919 Date: Thu Jan 21 09:42:09 2016 +0300
2921 PG::activate(): handle unexpected cached_removed_snaps more gracefully
2923 PGPool::update(): ditto
2926 Backport: infernalis, hammer, firefly
2928 Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
2929 (cherry picked from commit aba6746b850e9397ff25570f08d0af8847a7162c)
2931 commit ad4df3be0f4adba5e8e14829be724fa3a92263c8
2932 Author: Matt Benjamin <mbenjamin@redhat.com>
2933 Date: Tue Dec 15 11:28:44 2015 -0500
2935 rgw: warn on suspicious civetweb frontend parameters
2937 Warns about incorrect spacing near 'port' (e.g., 'port = 80').
2941 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2942 (cherry picked from commit 93497e576a946ed7e59f4a4299e447b65aa1774b)
2944 commit 5c92d1d2f11d59651eaa9c4ba6476b9f71990f1c
2945 Author: Daniel Gryniewicz <dang@redhat.com>
2946 Date: Fri Sep 25 11:02:20 2015 -0400
2948 rgw: Add default quota config
2950 Add a default quota config that is applied when no specific quota is
2951 enabled. There are both per-bucket and per-user defaults. Defaults are
2952 enabled if either max count or max size is enabled.
2954 This fixes issues 12912 and 12997.
2956 Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2957 (cherry picked from commit 3047b5690eebb7fcd2d7a26acd20105e016a44c4)
2959 commit 17d1b0d859112dc9fb5b7a6e2140124790c5f260
2960 Author: Weijun Duan <duanweijun@h3c.com>
2961 Date: Sun Jan 3 20:12:04 2016 -0500
2963 rgw: radosgw-admin bucket check --fix not work
2967 Signed-off-by: Weijun Duan <duanweijun@h3c.com>
2968 (cherry picked from commit a17f4e27d608ef29cf499fe76246929ec7962783)
2970 commit df3f971eafda9c54881c13dcf47f996f18e17028 (refs/remotes/markhpc/wip-auth-hammer, refs/remotes/gh/wip-auth-hammer)
2971 Author: Sage Weil <sage@redhat.com>
2972 Date: Mon Feb 23 14:58:19 2015 -0800
2974 auth: return error code from encrypt/decrypt; make error string optional
2976 This is simpler for a lot of callers.
2978 Signed-off-by: Sage Weil <sage@redhat.com>
2979 (cherry picked from commit 40203f711dd59c7f61f5f8eb56a97842c3206494)
2982 src/test/crypto.cc (trivial)
2984 commit 224bb3928de048b13a96ee0377b6d279ce84ac0a
2985 Author: Sage Weil <sage@redhat.com>
2986 Date: Tue Jan 27 09:17:28 2015 -0800
2988 auth: optimize crypto++ key context
2990 The cbc appears to be stateful, but the key is not.
2992 Signed-off-by: Sage Weil <sage@redhat.com>
2993 (cherry picked from commit 7762f1886cab7f7b941851b0be4ec904723cb0e3)
2995 commit f11718de7873fe1fad1649358f208a4910837a7e
2996 Author: Sage Weil <sage@redhat.com>
2997 Date: Sun Feb 1 15:07:35 2015 -0800
2999 auth/Crypto: optimize libnss key
3001 Allocate the key and slot once per key instead of once per encrypt/
3002 decrypt operation. This improves things by a factor of almost 4x
3003 for my microbenchmark.
3005 Signed-off-by: Sage Weil <sage@redhat.com>
3006 (cherry picked from commit 973cd1c00a7811e95ff0406a90386f6ead5491c4)
3008 commit d1b6096c79164f8a5830dee6b5f186c405cf73ab
3009 Author: Sage Weil <sage@redhat.com>
3010 Date: Sun Feb 1 15:05:54 2015 -0800
3012 auth: refactor crypto key context
3014 Cache all of the crypto key context in a new CryptoKeyHandler struct that
3015 is attached to CryptoKey.
3017 Signed-off-by: Sage Weil <sage@redhat.com>
3018 (cherry picked from commit 16b3515af3df439fba7d545587285b50e9814165)
3020 commit 3249f48a07391c98634aebd87f18fc2edbe95ca2
3021 Author: Sage Weil <sage@redhat.com>
3022 Date: Thu Jan 22 15:49:25 2015 -0800
3024 auth/cephx: optimize signature check
3026 The encode_encrypt() helper will generate a bufferlist with a simple
3027 structure. Profiles seem to indicate this is taking a large amount of time
3028 in the message receive path.
3030 Avoid the encode overhead since we have a tiny buffer with a fixed and
3033 Reported-by: Andreas Bluemle <andreas.bluemle@itxperts.de>
3034 Signed-off-by: Sage Weil <sage@redhat.com>
3035 (cherry picked from commit 8d16d4ce14a82356007c14fb7535170933eb7812)
3037 commit 51eaf98e25287705c9c25d2d3a5df248ba066f2d
3038 Author: Sage Weil <sage@redhat.com>
3039 Date: Thu Jan 22 15:40:23 2015 -0800
3041 auth/cephx: move signature calc into helper
3043 Signed-off-by: Sage Weil <sage@redhat.com>
3044 (cherry picked from commit 4e14a5fedbfacd164639f6a59a4d152404f3f9d1)
3047 src/auth/cephx/CephxSessionHandler.cc (trivial, const changes)
3049 commit c240da9e0693dc627162a0c70569dda519ec25e8
3050 Author: Sage Weil <sage@redhat.com>
3051 Date: Mon Jan 26 15:56:39 2015 -0800
3053 auth/Crypto: avoid memcpy on libnss crypto operation
3055 Signed-off-by: Sage Weil <sage@redhat.com>
3056 (cherry picked from commit e972a6951142cbea3fe7c2e08933c808693d60c4)
3058 commit 86cc0f0c5e10262bb494ecee415789fd6815b1ff
3059 Author: Sage Weil <sage@redhat.com>
3060 Date: Mon Jan 26 15:49:10 2015 -0800
3062 auth: make CryptoHandler implementations totally private
3064 There is no need to expose these implementations outside Crypto.cc.
3066 Signed-off-by: Sage Weil <sage@redhat.com>
3067 (cherry picked from commit ad5a1549f401af3eae38f5c4de24e7b952e40f7f)
3069 commit f04e0075eabfb1b9d19c75761c321098546c4044
3070 Author: Loic Dachary <ldachary@redhat.com>
3071 Date: Tue Dec 15 18:28:29 2015 +0100
3073 osd: log inconsistent shard sizes
3075 When an OSD asserts because it cannot recover from an unexpected erasure
3076 coded shard size, the object needs to be manually fixed (i.e. the shard
3077 must be removed so it can be reconstructed). Unfortunately the assert
3078 does not display the name of the object and it is not displayed unless
3079 the OSD logs are >= 10, which is uncommon on an actual cluster because
3080 it creates log files that are too big.
3082 The problem has been fixed in infernalis as part of
3083 https://github.com/ceph/ceph/pull/5173 and backporting it is non
3086 The error condition is modified to make it easy for the system
3087 administrator to identify which object is causing the crash and what
3088 steps must be taken to fix the issue.
3090 http://tracker.ceph.com/issues/14009 Refs: #14009
3092 Signed-off-by: Loic Dachary <loic@dachary.org>
3094 commit b2393dcea4ca02fe093481d6a2815b0c857fddc9 (refs/remotes/markhpc/hammer-client-inoderef)
3095 Author: Yan, Zheng <zyan@redhat.com>
3096 Date: Fri Nov 20 15:42:05 2015 +0800
3098 client: add InodeRef.h to make dist
3100 Signed-off-by: Yan, Zheng <zyan@redhat.com>
3102 commit fa79bd978f646001365b14009efe9fa5c562f681
3103 Author: Yan, Zheng <zyan@redhat.com>
3104 Date: Wed Jun 24 15:54:31 2015 +0800
3106 client: use smart pointer to track 'cwd' and 'root_parents'
3108 Signed-off-by: Yan, Zheng <zyan@redhat.com>
3109 (cherry picked from commit 8c45ae1239c934b6727071398a1cfccb6277069e)
3111 commit fcafc65e042c0ed913b5b564812180cd29eefb43
3112 Author: Yan, Zheng <zyan@redhat.com>
3113 Date: Wed Jun 24 15:52:10 2015 +0800
3115 client: convert Inode::snapdir_parent to smart pointer
3117 Signed-off-by: Yan, Zheng <zyan@redhat.com>
3118 (cherry picked from commit 89648e7ed56a1299a096b16080e4a52724893bdd)
3120 commit 78cca4e3b21308cc0a3f4838828a465482f619c7
3121 Author: Yan, Zheng <zyan@redhat.com>
3122 Date: Wed Jun 24 15:39:31 2015 +0800
3124 client: use smart pointer to track temporary inode reference
3126 Signed-off-by: Yan, Zheng <zyan@redhat.com>
3127 (cherry picked from commit 217837b89f6adabcf686377a9b3d33d5008b1097)
3129 commit bad6f335ccd8d277f31a27f04d10683c73d0037a
3130 Author: Yan, Zheng <zyan@redhat.com>
3131 Date: Wed Jun 24 15:24:41 2015 +0800
3133 client: convert CapSnap::in to smart pointer
3135 Signed-off-by: Yan, Zheng <zyan@redhat.com>
3137 commit 4bb48ee4ae49355e3a4bcd7424545c04ce284f89
3138 Author: Yan, Zheng <zyan@redhat.com>
3139 Date: Wed Jun 24 15:50:10 2015 +0800
3141 client: convert Fh::inode to smart pointer
3143 Signed-off-by: Yan, Zheng <zyan@redhat.com>
3144 (cherry picked from commit dac11e6b4b1e8766ee5165366cf021d9ee91d3ae)
3146 commit 5bebb3acf1fa85ab301aa8ca4e99542c9d34d173
3147 Author: Yan, Zheng <zyan@redhat.com>
3148 Date: Wed Jun 24 15:00:50 2015 +0800
3150 client: use smart pointers in MetaRequest
3152 Signed-off-by: Yan, Zheng <zyan@redhat.com>
3153 (cherry picked from commit fd02f0f245ccdc1d33c6d24f57267c8fb102618b)
3155 commit e18f1aec94ec021a687317bab00c59d3d223c2bc
3156 Author: Yan, Zheng <zyan@redhat.com>
3157 Date: Wed Jun 24 11:21:23 2015 +0800
3159 client: convert Dentry::inode to smart pointer
3161 Signed-off-by: Yan, Zheng <zyan@redhat.com>
3162 (cherry picked from commit 07f580977319110cbdd60c78fff892c85711ef3e)
3164 commit a7f6d2ffb84dee5bec4e373c1db723805e39a1bb
3165 Author: Yan, Zheng <zyan@redhat.com>
3166 Date: Sat May 23 20:01:46 2015 +0800
3168 client: hold reference for returned inode
3170 CLient::make_request() returns pointer of target inode, but it does not
3171 increase reference count of the returned inode. The inode may get freed
3172 when CLient::make_request() releases MetaRequest.
3174 he fix is hold a reference for the returned inode. Since there are many
3175 of places use CLient::make_request() directly or indirectly, it's easy
3176 to leak reference. This patch uses intrusive_ptr to track the reference.
3178 Signed-off-by: Yan, Zheng <zyan@redhat.com>
3179 (cherry picked from commit ad9c22a4ca56d7ad3c1666795bd8c9785eaccf70)