1 commit 7440dcd135750839fa0f00263f80722ff6f51e90
2 Author: Gary Lowell <gary.lowell@inktank.com>
3 Date: Wed Oct 16 18:57:51 2013 +0000
7 commit fcf5f117a9111c2d88b8fa5d00c975a8e377df7e
8 Author: Yehuda Sadeh <yehuda@inktank.com>
9 Date: Tue Oct 15 10:20:48 2013 -0700
11 rgw: fix authenticated users acl group check
14 Backport: bobtail, cuttlefish, dumpling
15 Authenticated users group acl bit was not working correctly. Check to
16 test whether user is anonymous was wrong.
18 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
19 (cherry picked from commit bebbd6cb7b71697b34b8f27652cabdc40c97a33b)
21 commit 991ed515480114c476cd3c4d761f256d1708fb39
22 Author: Yehuda Sadeh <yehuda@inktank.com>
23 Date: Tue Oct 15 10:55:07 2013 -0700
25 rgw: change default log level
28 Backport: cuttlefish, dumpling
29 Default log level was just too high, bring it down a bit.
31 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
32 Reviewed-by: Sage Weil <sage@inktank.com>
33 (cherry picked from commit 8d7dbf85472cfca9268d81ecf057ea078cf345b3)
35 commit ebb9b0cb7e4ab60fdbbc410ecfb35e51cf11434d
36 Author: Sage Weil <sage@inktank.com>
37 Date: Sat Jul 6 09:21:47 2013 -0700
39 mds: do not allow GLAZYIO in mix->sync state
41 GLAZYIO is not allowed in SYNC, so we cannot allow it in the preceding
44 I verified the other GLAZYIO rules look ok. We should make a validater
45 to confirm that no gather state includes caps that its target state
46 does not... or at least assert as much in eval_gather().
49 Signed-off-by: Sage Weil <sage@inktank.com>
50 (cherry picked from commit b88938e5a646fbf175a7135e872bcb2d1afafbb8)
52 commit 33da08f683d40f33061cefa0cf145f3ff21ea089
53 Author: Yan, Zheng <zheng.z.yan@intel.com>
54 Date: Thu Sep 12 10:36:39 2013 +0800
56 osdc/ObjectCacher: finish contexts after dropping object reference
58 The context to finish can be class C_Client_PutInode, which may drop
59 inode's last reference. So we should first drop object's reference,
62 Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
63 (cherry picked from commit b66ac77fa7aa3ff37804918c4308a348f239af09)
65 commit 346b43d80f728e6b389208ccd8054d96b76b093c
66 Author: Sage Weil <sage@inktank.com>
67 Date: Fri Jun 7 22:04:09 2013 -0700
69 mds: fix filelock eval_gather
71 Broken by a08d62045657713bf0a5372bf14136082ec3b17e
73 Reported-by: Yan, Zheng <yan.zheng@intel.com>
74 Signed-off-by: Sage Weil <sage@inktank.com>
75 (cherry picked from commit e8300d0afb5154d4d13536abdcf47bd5cc8ce810)
76 Reviewed-by: Greg Farnum <greg@inktank.com>
78 commit ffdc7fce132b3b98463b4222d2c51ccef6b94d82
79 Author: Sage Weil <sage@inktank.com>
80 Date: Thu Jun 6 21:38:56 2013 -0700
82 mds: do not double-queue file recovery in eval_gather
84 This fixes a specific case of double-queuing seen in #4832:
86 - client goes stale, inode marked NEEDSRECOVER
87 - eval does sync, queued, -> RECOVERING
89 - client goes stale (again), inode marked NEEDSRECOVER
90 - eval_gather queues *again*
92 Note that a cursory look at the recovery code makes me think this needs
93 a much more serious overhaul. In particular, I don't think we should
94 be triggering recovery when transitioning *from* a stable state, but
95 explicitly when we are flagged, or when gathering. We should probably
96 also hold a wrlock over the recovery period and remove the force_wrlock
97 kludge from the final size check. Opened ticket #5268.
99 Signed-off-by: Sage Weil <sage@inktank.com>
100 (cherry picked from commit a08d62045657713bf0a5372bf14136082ec3b17e)
101 Reviewed-by: Greg Farnum <greg@inktank.com>
103 commit 60033c31381d36cbbc6c873d7055cbe735f5deb2
104 Author: Sandon Van Ness <sandon@inktank.com>
105 Date: Tue Oct 8 11:58:57 2013 -0700
107 Go back to $PWD in fsstress.sh if compiling from source.
109 Although fsstress was being called with a static path the directory
110 it was writing to was in the current directory so doing a cd to the
111 source directory that is made in /tmp and then removing it later
112 caused it to be unable to write the files in a non-existent dir.
114 This change gets the current path first and cd's back into it after
115 it is done compiling fsstress.
119 Signed-off-by: Sandon Van Ness <sandon@inktank.com>
120 Reviewed-by: Alfredo Deza <alfredo.deza@inktank.com>
122 commit eb06f3738851d27914704821897ed80104c4c29c
123 Author: Gary Lowell <gary.lowell@inktank.com>
124 Date: Tue Aug 27 09:53:12 2013 -0700
126 ceph.spec.in: radosgw package doesn't require mod_fcgi
130 Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
132 commit 5a426a1f1f34d3f5a510009cc3f3b219d3cbc74b
133 Author: Sage Weil <sage@inktank.com>
134 Date: Tue Oct 1 15:53:42 2013 -0700
136 crush: invalidate rmap on create (and thus decode)
138 If we have an existing CrushWrapper object and decode from a bufferlist,
139 reset build_rmaps so that they get rebuilt.
141 Remove the build_rmaps() all in decode that was useless on a redecode
142 (because have_rmaps == true in that case and it did nothing).
145 Backport: dumpling, maybe cuttlefish
146 Signed-off-by: Sage Weil <sage@inktank.com>
147 Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
148 (cherry picked from commit 9b7a2ae329b6a511064dd3d6e549ba61f52cfd21)
150 commit 6f342872cdd211e24deb19f5e00380494514c437
151 Author: Loic Dachary <loic@dachary.org>
152 Date: Tue Sep 24 19:04:23 2013 +0200
154 osd: change warn_interval_multiplier to uint32_t
156 to prevent overflow in OpTracker::check_ops_in_flight when
157 multiplying warn_interval_multiplier *= 2
159 Backport: cuttlefish, dumpling
161 http://tracker.ceph.com/issues/6370 fixes #6370
163 Signed-off-by: Loic Dachary <loic@dachary.org>
164 (cherry picked from commit 1bce1f009bffd3e28025a08775fec189907a81db)
166 commit be2907ef85a31c2be8be7446fe71f5d2e1410ec0
167 Author: Yehuda Sadeh <yehuda@inktank.com>
168 Date: Wed Sep 11 22:30:12 2013 -0700
170 rgw: don't call list::size() in ObjectCache
173 Use an external counter instead of calling list::size()
175 Reviewed-by: Sage Weil <sage@inktank.com>
176 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
177 (cherry picked from commit 31e3a51e933429d286104fe077e98ea883437ad6)
179 commit bbfbb097e2f9efbf4f7ec997c70befa20c79d27c
180 Author: Yehuda Sadeh <yehuda@inktank.com>
181 Date: Tue Sep 10 12:18:55 2013 -0700
183 rgw: drain pending requests before completing write
186 When doing aio write of objects (either regular or multipart parts) we
187 need to drain pending aio requests. Otherwise if gateway goes down then
188 object might end up corrupted.
190 Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
191 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
193 commit b16f812362ccb1d9bdd4900d155e248d695ef0d7
194 Merge: 97a97c3 5f16ea6
195 Author: Sage Weil <sage@inktank.com>
196 Date: Sat Sep 7 13:32:40 2013 -0700
198 Merge pull request #573 from dalgaaf/fix/da-cuttlefish-fixes-and-cherry-picks
200 Cherry-pick some smaller changes from master to cuttlefish
202 Reviewed-by: Sage Weil <sage@inktank.com>
204 commit 5f16ea62cee4fad9be6e44f3562da31908303ae5
205 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
206 Date: Sat Sep 7 20:32:40 2013 +0200
208 tools/ceph.cc: add missig 'ceph osd lspools' command to help
210 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
212 commit 59f02ecf0b91a2248d8b7b75dc27b517f04ac292
213 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
214 Date: Sat Sep 7 11:30:15 2013 +0200
216 init-radosgw*: fix status return value if radosgw isn't running
218 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
219 (cherry picked from commit b5137baf651eaaa9f67e3864509e437f9d5c3d5a)
221 commit c25770c39ae006ab4ad14a5d75bf7a2dffe0279e
222 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
223 Date: Thu Jun 6 15:34:54 2013 +0200
225 init-radosgw*: add all sections to usage output
227 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
228 (cherry picked from commit a0c5095be3640e98d5541920c19387bf3764a350)
230 commit 1a8347e0d1cafc38259adc1f1a6154fa0d48f1d2
231 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
232 Date: Thu Jun 6 15:33:23 2013 +0200
234 init-radosgw*: add status
236 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
237 (cherry picked from commit 385457f8d871238a896229d0c2cbb25646969f6a)
239 commit b1c2aa2c4a8c0266a01903eab5539e7929ea0431
240 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
241 Date: Thu Jun 6 15:21:30 2013 +0200
243 fix init-radosgw* to use the same indentation
245 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
246 (cherry picked from commit b4d4e92ed2deae435a24b36d086c1a73e5997855)
248 commit 794ed1faec7ced23b5b46d114f5320d718c9e9fb
249 Author: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
250 Date: Sun Jul 28 23:25:58 2013 +0200
252 ceph_authtool.cc: update help/usage text
254 Added implemented but not listed commands to the help/usage text:
255 * -g shortcut for --gen-key
256 * -a shortcut for --add-key
257 * -u/--set-uid to set auid
261 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
262 (cherry picked from commit 9a9a0ef3f9f39909eaeb95eb99db4711a2425af5)
264 commit 97a97c3c554f689dd3f987e63eaa2b9c5ec1dd0a
265 Author: Yehuda Sadeh <yehuda@inktank.com>
266 Date: Mon Aug 26 19:46:43 2013 -0700
268 rgw: check object name after rebuilding it in S3 POST
271 Backport: bobtail, cuttlefish, dumpling
273 When posting an object it is possible to provide a key
274 name that refers to the original filename, however we
275 need to verify that in the end we don't end up with an
278 Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
279 Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
280 (cherry picked from commit c8ec532fadc0df36e4b265fe20a2ff3e35319744)
282 commit 7a0bd5bc2c6e5464f70b19154834448ac1e4c369
283 Author: Gary Lowell <glowell@inktank.com>
284 Date: Thu Aug 22 13:29:32 2013 -0700
286 ceph.spec.in: remove trailing paren in previous commit
288 Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
290 commit f1507d23707e7929f7a55fe2ea9418dcc715d8b2
291 Author: Gary Lowell <glowell@inktank.com>
292 Date: Thu Aug 22 11:07:16 2013 -0700
294 ceph.spec.in: Don't invoke debug_package macro on centos.
296 If the redhat-rpm-config package is installed, the debuginfo rpms will
297 be built by default. The build will fail when the package installed
298 and the specfile also invokes the macro.
300 Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
302 commit 65a10862feec199d14f17627d0c42fa7c85766fa
303 Author: Sage Weil <sage@inktank.com>
304 Date: Sun Jul 28 08:59:21 2013 -0700
306 osd: get initial full map after a map gap
308 If there is a gap in our map history, get the full range of maps that
309 the mon has. Make sure the first one is a full map.
311 Signed-off-by: Sage Weil <sage@inktank.com>
312 Reviewed-by: Samuel Just <sam.just@inktank.com>
313 (cherry picked from commit a6cd9fea50a4bd7048a222617a2bfe0680f7a969)
315 commit aceef04f7fd56935e691c7deb05f25ace653bb76
316 Author: Sage Weil <sage@inktank.com>
317 Date: Sun Jul 28 08:55:38 2013 -0700
319 osd: fix off-by-one in map gap logic
321 If we have map 250, and monitor's first is 251, but sends 260, we can
322 request the intervening range.
325 Signed-off-by: Sage Weil <sage@inktank.com>
326 Reviewed-by: Samuel Just <sam.just@inktank.com>
327 (cherry picked from commit e24b50225c841a650d9303041bbe811e04bdd668)
329 commit cdbfd66249cdf91c02a88af5df5a6517688a78df
330 Author: Samuel Just <sam.just@inktank.com>
331 Date: Mon Jul 22 16:00:07 2013 -0700
333 OSD: tolerate holes in stored maps
335 We may have holes in stored maps during init_splits_between
336 and advance_pg. In either case, we should simply skip the
340 Signed-off-by: Samuel Just <sam.just@inktank.com>
341 Reviewed-by: Sage Weil <sage@inktank.com>
342 (cherry picked from commit 6951d2345a5d837c3b14103bd4d8f5ee4407c937)
348 commit 234d68c68028fcf9c2665cb9f45b9b76556241ba
349 Author: Sage Weil <sage@inktank.com>
350 Date: Tue Aug 20 22:39:09 2013 -0700
352 ceph-disk: partprobe after creating journal partition
354 At least one user reports that a partprobe is needed after creating the
355 journal partition. It is not clear why sgdisk is not doing it, but this
356 fixes ceph-disk for them, and should be harmless for other users.
359 Tested-by: lurbs in #ceph
360 Signed-off-by: Sage Weil <sage@inktank.com>
361 (cherry picked from commit 2af59d5e81c5e3e3d7cfc50d9330d7364659c5eb)
363 commit cf2f31ac23b6eb43a81a1c8157907b9cae4d58a7
364 Author: Sage Weil <sage@inktank.com>
365 Date: Thu Aug 15 21:48:06 2013 -0700
367 osdc/ObjectCacher: do not merge rx buffers
369 We do not try to merge rx buffers currently. Make that explicit and
370 documented in the code that it is not supported. (Otherwise the
371 last_read_tid values will get lost and read results won't get applied
372 to the cache properly.)
374 Signed-off-by: Sage Weil <sage@inktank.com>
375 (cherry picked from commit 1c50c446152ab0e571ae5508edb4ad7c7614c310)
377 commit 02da55757a9fb53df4746db5dd14724e77da95b6
378 Author: Sage Weil <sage@inktank.com>
379 Date: Thu Aug 15 21:47:18 2013 -0700
381 osdc/ObjectCacher: match reads with their original rx buffers
383 Consider a sequence like:
385 1- start read on 100~200
389 3- start read on 200~200
392 4- get 100~200 read result
394 Currently this makes us crash on
396 osdc/ObjectCacher.cc: 738: FAILED assert(bh->length() <= start+(loff_t)length-opos)
398 when processing the second 200~200 bufferhead (it is too big). The
399 larger issue, though, is that we should not be looking at this data at
400 all; it has been truncated away.
402 Fix this by marking each rx buffer with the read request that is sent to
403 fill it, and only fill it from that read request. Then the first reply
404 will fill the first 100~100 extend but not touch the other extent; the
405 second read will do that.
407 Signed-off-by: Sage Weil <sage@inktank.com>
408 (cherry picked from commit b59f930ae147767eb4c9ff18c3821f6936a83227)
410 commit 43e7ad989dcb4deb18b32ec31f76c8755354d2a6
411 Author: Sage Weil <sage@inktank.com>
412 Date: Thu Aug 22 15:54:48 2013 -0700
414 mon/Paxos: fix another uncommitted value corner case
416 It is possible that we begin the paxos recovery with an uncommitted
417 value for, say, commit 100. During last/collect we discover 100 has been
418 committed already. But also, another node provides an uncommitted value
419 for 101 with the same pn. Currently, we refuse to learn it, because the
420 pn is not strictly > than our current uncommitted pn... even though it is
421 the next last_committed+1 value that we need.
423 There are two possible fixes here:
425 - make this a >= as we can accept newer values from the same pn.
426 - discard our uncommitted value metadata when we commit the value.
431 Signed-off-by: Sage Weil <sage@inktank.com>
432 (cherry picked from commit fe5010380a3a18ca85f39403e8032de1dddbe905)
434 commit 2de1515289f49f2e388448506f4788db56d0e25a
435 Author: Sage Weil <sage@inktank.com>
436 Date: Fri Aug 23 11:45:35 2013 -0700
438 os: make readdir_r buffers larger
440 PATH_MAX isn't quite big enough.
442 Backport: dumpling, cuttlefish, bobtail
443 Signed-off-by: Sage Weil <sage@inktank.com>
444 (cherry picked from commit 99a2ff7da99f8cf70976f05d4fe7aa28dd7afae5)
446 commit af9818c486484c7617c07f26beaded8a3bc88043
447 Author: Sage Weil <sage@inktank.com>
448 Date: Fri Aug 23 11:45:08 2013 -0700
450 os: fix readdir_r buffer size
452 The buffer needs to be big or else we're walk all over the stack.
454 Backport: dumpling, cuttlefish, bobtail
455 Signed-off-by: Sage Weil <sage@inktank.com>
456 (cherry picked from commit 2df66d9fa214e90eb5141df4d5755b57e8ba9413)
460 src/os/BtrfsFileStoreBackend.cc
462 commit cce1d1f9cd8b034deee29d8566780763beb0155f
463 Author: Alfredo Deza <alfredo.deza@inktank.com>
464 Date: Fri Aug 23 08:56:07 2013 -0400
466 ceph-disk: specify the filetype when mounting
468 Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
469 Reviewed-by: Sage Weil <sage@inktank.com>
470 (cherry picked from commit f040020fb2a7801ebbed23439159755ff8a3edbd)
472 commit c25e7da57d704d4a8db59a2e97fb687968520c69
473 Author: Sandon Van Ness <sandon@inktank.com>
474 Date: Thu Aug 22 19:44:40 2013 -0700
476 QA: Compile fsstress if missing on machine.
478 Some distro's have a lack of ltp-kernel packages and all we need is
479 fstress. This just modified the shell script to download/compile
480 fstress from source and copy it to the right location if it doesn't
481 currently exist where it is expected. It is a very small/quick
482 compile and currently only SLES and debian do not have it already.
484 Reviewed-by: Sage Weil <sage@inktank.com>
485 Signed-off-by: Sandon Van Ness <sandon@inktank.com>
487 commit c807f27c391d336a7223fcfdd3daad9bb374a3dc
488 Author: Sage Weil <sage@inktank.com>
489 Date: Mon Aug 5 12:52:44 2013 -0700
491 mds: fix locking, use-after-free/race in handle_accept
493 We need to hold mds_lock here.
495 Normally the con also holds a reference, but an ill-timed connection reset
499 Backport: dumpling, cuttlefish
500 Signed-off-by: Sage Weil <sage@inktank.com>
501 (cherry picked from commit a0929955cb84fb8cfdeb551d6863e4955b8e2a71)
503 commit bd71192eaa6f884e879b1711e5937b1e3609d86d
504 Author: Sage Weil <sage@inktank.com>
505 Date: Thu Aug 22 10:14:59 2013 -0700
507 .gitignore: ignore test-driver
509 Signed-off-by: Sage Weil <sage@inktank.com>
510 (cherry picked from commit edf2c3449ec96d91d3d7ad01c50f7a79b7b2f7cc)
516 commit bc997ebea3263c2bc7df83661ae3a966470ba35e
517 Author: Sage Weil <sage@inktank.com>
518 Date: Fri Aug 9 12:42:49 2013 -0700
520 fuse: fix warning when compiled against old fuse versions
522 client/fuse_ll.cc: In function 'void invalidate_cb(void*, vinodeno_t, int64_t, int64_t)':
523 warning: client/fuse_ll.cc:540: unused variable 'fino'
525 Signed-off-by: Sage Weil <sage@inktank.com>
526 (cherry picked from commit 9833e9dabe010e538cb98c51d79b6df58ce28f9e)
528 commit 9cb2c2eb3627b52c3413b39b45e7fb7e0e9a074c
529 Author: Sage Weil <sage@inktank.com>
530 Date: Fri Aug 9 12:40:34 2013 -0700
532 json_spirit: remove unused typedef
534 In file included from json_spirit/json_spirit_writer.cpp:7:0:
535 json_spirit/json_spirit_writer_template.h: In function 'String_type json_spirit::non_printable_to_string(unsigned int)':
536 json_spirit/json_spirit_writer_template.h:37:50: warning: typedef 'Char_type' locally defined but not used [-Wunused-local-typedefs]
537 typedef typename String_type::value_type Char_type;
539 (Also, ha ha, this file uses \r\n.)
541 Signed-off-by: Sage Weil <sage@inktank.com>
542 (cherry picked from commit 6abae35a3952e5b513895267711fea63ff3bad09)
544 commit d774559f118d26cd15ecf1a49468ce1a3d260efc
545 Author: Sage Weil <sage@inktank.com>
546 Date: Fri Aug 9 12:31:41 2013 -0700
548 gtest: add build-aux/test-driver to .gitignore
550 Signed-off-by: Sage Weil <sage@inktank.com>
551 (cherry picked from commit c9cdd19d1cd88b84e8a867f5ab85cb51fdc6f8e4)
553 commit 1a2d9edde0311b51d3d68b87c20dea3061b2395b
554 Author: Josh Durgin <josh.durgin@inktank.com>
555 Date: Wed Aug 21 14:28:49 2013 -0700
557 objecter: resend unfinished lingers when osdmap is no longer paused
559 Plain Ops that haven't finished yet need to be resent if the osdmap
560 transitions from full or paused to unpaused. If these Ops are
561 triggered by LingerOps, they will be cancelled instead (since
562 should_resend = false), but the LingerOps that triggered them will not
565 Fix this by checking the registered flag for all linger ops, and
566 resending any of them that aren't paused anymore.
569 Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
570 Reviewed-by: Sage Weil <sage.weil@inktank.com>
571 (cherry picked from commit 38a0ca66a79af4b541e6322467ae3a8a4483cc72)