-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathv0.80.10.txt
3308 lines (2235 loc) · 113 KB
/
v0.80.10.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
commit ea6c958c38df1216bf95c927f143d8b13c4a9e70 (tag: refs/tags/v0.80.10)
Author: Jenkins <[email protected]>
Date: Thu Jun 18 09:48:56 2015 -0700
0.80.10
commit 9b7f09e280b4610b9f85ac34ec014018f0e2e1d3
Author: Sage Weil <[email protected]>
Date: Wed Jun 17 09:35:28 2015 -0700
qa/workunits/rados/test-upgarde-v9.0.1: fix exclude syntax
It's -, then a list of all exclusions separated by :. There are just 2.
Signed-off-by: Sage Weil <[email protected]>
(cherry picked from commit 78d894a634d727a9367f809a1f57234e5e6935be)
commit 4e28fbc52db7d808aeaede884f342beafb7fc581
Author: Sage Weil <[email protected]>
Date: Tue Jun 16 21:05:29 2015 -0700
qa/workunits/rados/test-upgrade-v9.0.1: skip one more evict test
Signed-off-by: Sage Weil <[email protected]>
(cherry picked from commit 3e8d60a80ce31860eac76a1f6489a35e1795a0c0)
commit 34ba3719997fed6d0b8148f21e59b446bdf42962
Author: Josh Durgin <[email protected]>
Date: Mon Jun 15 15:12:43 2015 -0700
qa: add compatibility filtered rados api tests for upgrades
Post-9.0.1, the evict op returns success when an object doesn't exist
in the cache tier. Skip the tests that are incompatible across
versions.
Fixes: #11548
Signed-off-by: Josh Durgin <[email protected]>
(cherry picked from commit 348a3d3c9880e7d022e71a2faafe51c8f771406e)
commit d1f478200342f422ee6e563bf7aad54ba38b3ed3
Merge: d0f9c5f 7f1abd9
Author: Sage Weil <[email protected]>
Date: Wed Jun 10 15:03:48 2015 -0700
Merge pull request #4924 from ceph/wip-11955-firefly
11955: ceph.spec.in: package mkcephfs on EL6
Reviewed-by: Sage Weil <[email protected]>
commit 7f1abd9053088ded6613aeca4e7c9489c44910e4
Author: Ken Dreyer <[email protected]>
Date: Wed Jun 10 15:43:41 2015 -0600
ceph.spec.in: package mkcephfs on EL6
Commit efbca0465c2946e113771966df08cf7cf37b1196 added mkcephfs to the
RPM %files listing, but this /usr/sbin path is only correct for CentOS
7. In CentOS 6, the utility is present at /sbin/mkcephfs instead. This
causes rpmbuild to fail to build the tip of the firefly branch on EL6.
Adjust the RPM %files list so we properly package mkcephfs on both EL7
and EL6.
http://tracker.ceph.com/issues/11955 Refs: #11955
Signed-off-by: Ken Dreyer <[email protected]>
commit d0f9c5f47024f53b4eccea2e0fde9b7844746362
Merge: efbca04 9930138
Author: Orit Wasserman <[email protected]>
Date: Thu Jun 4 19:07:03 2015 +0200
Merge pull request #4851 from ceph/wip-10873-firefly
rgw: generate the "Date" HTTP header for civetweb.
commit 99301384be96997203682679c0430ca0a53be5d3 (refs/remotes/gh/wip-10873-firefly)
Author: Radoslaw Zarzynski <[email protected]>
Date: Wed Feb 18 15:48:43 2015 +0100
rgw: generate the "Date" HTTP header for civetweb.
Fixes: #10873
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <[email protected]>
(cherry picked from commit ea384f83b601f60e135c3d3f960fdb75a919dd84)
commit efbca0465c2946e113771966df08cf7cf37b1196
Author: Sage Weil <[email protected]>
Date: Wed Jun 3 13:03:50 2015 -0400
ceph.spec: add mkcephfs to ceph.rpm
Signed-off-by: Sage Weil <[email protected]>
commit e785f1a2bb4cd77b0aaaccd78060183157ad842e
Author: Ken Dreyer <[email protected]>
Date: Tue Dec 2 13:58:10 2014 -0700
packaging: package ceph-disk(8)
The ceph-disk man page was added in
a450cab2b8148cb8a9b043d629feccf89e5aabac, but this was not added to the
RPM or DEB packaging. Add it here.
Signed-off-by: Ken Dreyer <[email protected]>
(cherry picked from commit b743a951114b00bbb6e14fb88f1928b504bc0f8b)
commit 819cf6ddb986b37c5d1229c4ea330010e88bb615
Merge: e93711a 665a857
Author: Yehuda Sadeh <[email protected]>
Date: Tue Jun 2 19:53:03 2015 +0300
Merge pull request #4780 from oritwas/wip-10295-firefly
rgw: civetweb should use unique request id
Reviewd-by: Yehuda Sadeh <[email protected]>
commit e93711a40d680230b03fe722a4da49a6f9a9b667
Merge: 071c943 50e8579
Author: Yehuda Sadeh <[email protected]>
Date: Tue Jun 2 19:02:07 2015 +0300
Merge pull request #4829 from oritwas/wip-negative_content_length-firefly
rgw: don't allow negative / invalid content length
Reviewed-by: Yehuda Sadeh <[email protected]>
commit 50e85797507a3ba13193f368cff461c08e44a9b3
Author: Yehuda Sadeh <[email protected]>
Date: Fri Aug 1 16:15:36 2014 -0700
rgw: don't allow negative / invalid content length
Certain frontends (e.g., civetweb) don't filter such requests.
Signed-off-by: Yehuda Sadeh <[email protected]>
(cherry picked from commit 0e74b7a1d56733358e2f1d3df4386125a94c2966)
commit 071c94385ee71b86c5ed8363d56cf299da1aa7b3
Merge: 68211f6 c632ef1
Author: Sage Weil <[email protected]>
Date: Wed May 27 15:36:15 2015 -0700
Merge pull request #4766 from SUSE/wip-11673-firefly
Debian: ceph-test and rest-bench debug packages should require their respective binary packages
Reviewed-by: Sage Weil <[email protected]>
commit 665a85701177230365e43a351d7722cb2adbde93
Author: Orit Wasserman <[email protected]>
Date: Thu Apr 23 17:36:47 2015 +0200
rgw: civetweb should use unique request id
max_req_id was moved to RGWRados and changed to atomic64_t.
The same request id resulted in gc giving the same idtag to all objects
resulting in a leakage of rados objects. It only kept the last deleted object in
it's queue, the previous objects were never freed.
Fixes: 10295
Backport: Hammer, Firefly
Signed-off-by: Orit Wasserman <[email protected]>
(cherry picked from commit c262259)
Conflicts:
src/rgw/rgw_main.cc
src/rgw/rgw_rados.h
commit c632ef13e05654d0e5ddc79fc7e9553cad8cbed0
Author: Ken Dreyer <[email protected]>
Date: Mon May 18 10:50:58 2015 -0600
debian: set rest-bench-dbg ceph-test-dbg dependencies
Debian's debug packages ought to depend on their respective binary
packages. This was the case for many of our ceph packages, but it was
not the case for ceph-test-dbg or rest-bench-dbg.
Add the dependencies on the relevant binary packages, pinned to
"= ${binary:Version}" per convention.
http://tracker.ceph.com/issues/11673 Fixes: #11673
Signed-off-by: Ken Dreyer <[email protected]>
(cherry picked from commit f898ec1e4e3472b0202280f09653a769fc62c8d3)
commit 68211f695941ee128eb9a7fd0d80b615c0ded6cf
Merge: 7d11b19 cd8f183
Author: Loic Dachary <[email protected]>
Date: Mon May 18 14:25:59 2015 +0200
Merge pull request #4697 from ceph/wip-11622-firefly
Wip 11622 firefly
Reviewed-by: Loic Dachary <[email protected]>
commit cd8f1830eb5d7ff75b17d7f0915ee4b3b834b149 (refs/remotes/gh/wip-11622-firefly)
Author: Yehuda Sadeh <[email protected]>
Date: Wed May 13 17:05:22 2015 -0700
rgw: merge manifests correctly when there's prefix override
Fixes: #11622
Backport: hammer, firefly
Prefix override happens in a manifest when a rados object does not
conform to the generic prefix set on the manifest. When merging
manifests (specifically being used in multipart objects upload), we need
to check if the rule that we try to merge has a prefix that is the same
as the previous rule. Beforehand we checked if both had the same
override_prefix setting, but that might not apply as both manifests
might have different prefixes.
Signed-off-by: Yehuda Sadeh <[email protected]>
(cherry picked from commit 389ae6739ddc6239a4dd7c5f7f9bfc9b645b8577)
commit eef3d2f1c400573db90936fd417769183950b6ee
Author: Yehuda Sadeh <[email protected]>
Date: Tue May 12 16:40:10 2015 -0700
rgw: restore buffer of multipart upload after EEXIST
Fixes #11604
Backport: hammer, firefly
When we need to restart a write of part data, we need to revert to
buffer to before the write, otherwise we're going to skip some data.
Signed-off-by: Yehuda Sadeh <[email protected]>
(cherry picked from commit 580ccaec12daae64c38a1616d0be907bdd70a888)
commit 7d11b19003503a9db1572d01f7a170e35b29017d
Merge: 114f2e9 9b33965
Author: Yehuda Sadeh <[email protected]>
Date: Fri May 15 10:27:42 2015 -0700
Merge pull request #4414 from xinxinsh/wip-11125-firefly
rgw: keystone token cache does not work correctly
commit 114f2e9bb5665760a5be9816785508f1c97662d5
Merge: ac7d28a f33effc
Author: Loic Dachary <[email protected]>
Date: Fri May 15 17:03:04 2015 +0200
Merge pull request #4415 from xinxinsh/wip-11244-firefly
cancel_pull: requeue waiters
Reviewed-by: Samuel Just <[email protected]>
commit ac7d28a6977084da0b70a3f2d0a54c8fa55b16fa
Merge: f273792 1f6b1bb
Author: Loic Dachary <[email protected]>
Date: Fri May 15 17:02:27 2015 +0200
Merge pull request #4416 from xinxinsh/wip-10976-firefly
fix PG::all_unfound_are_queried_or_lost for non-existent osds
Reviewed-by: Samuel Just <[email protected]>
commit f273792c675aca95694cd36794d8a854731bf308
Merge: 8a6632b 019b28b
Author: Loic Dachary <[email protected]>
Date: Fri May 15 17:02:05 2015 +0200
Merge pull request #4556 from xinxinsh/wip-11429-firefly
OSD::load_pgs: we need to handle the case where an upgrade from earlier versions which ignored non-existent pgs resurrects a pg with a prehistoric osdmap
Reviewed-by: Samuel Just <[email protected]>
commit 8a6632b4e5ffad305f92c89656b161a521529e45
Merge: 156c385 a71f309
Author: Sage Weil <[email protected]>
Date: Thu May 14 09:50:28 2015 -0700
Merge pull request #4638 from SUSE/wip-11453-firefly
run RGW as root
Reviewed-by: Ken Dreyer <[email protected]>
Reviewed-by: Sage Weil <[email protected]>
commit 019b28b6397dbc3111faa6a8eb57349a48f408d8
Author: Samuel Just <[email protected]>
Date: Mon Apr 20 23:45:57 2015 -0700
OSD: handle the case where we resurrected an old, deleted pg
Prior to giant, we would skip pgs in load_pgs which were not present in
the current osdmap. Those pgs would eventually refer to very old
osdmaps, which we no longer have causing the assertion failure in 11429
once the osd is finally upgraded to a version which does not skip the
pgs. Instead, if we do not have the map for the pg epoch, complain to
the osd log and skip the pg.
Fixes: 11429
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit fbfd50de5b9b40d71d2e768418a8eca28b1afaca)
Conflicts:
src/osd/OSD.cc
resolved by add a new comment line
commit 156c385ef726e56d219c3383a4015c50aec2758a
Merge: fcd0ea3 8cc4bc1
Author: Loic Dachary <[email protected]>
Date: Tue May 12 13:57:36 2015 +0200
Merge pull request #4379 from ceph/wip-11416
rgw: use correct objv_tracker for bucket instance
Reviewed-by: Josh Durgin <[email protected]>
Reviewed-by: Loic Dachary <[email protected]>
commit a71f3091a4ea810c02517642fb4ab9ce5516b452
Author: Ken Dreyer <[email protected]>
Date: Wed Apr 22 16:36:42 2015 -0600
init-radosgw: run RGW as root
The ceph-radosgw service fails to start if the httpd package is not
installed. This is because the init.d file attempts to start the RGW
process with the "apache" UID. If a user is running civetweb, there is
no reason for the httpd or apache2 package to be present on the system.
Switch the init scripts to use "root" as is done on Ubuntu.
http://tracker.ceph.com/issues/11453 Refs: #11453
Reported-by: Vickey Singh <[email protected]>
Signed-off-by: Ken Dreyer <[email protected]>
(cherry picked from commit 47339c5ac352d305e68a58f3d744c3ce0fd3a2ac)
commit fcd0ea3383582e7a1dc8091e7a48e1d4bbaa76ee
Author: Greg Farnum <[email protected]>
Date: Fri May 8 11:29:44 2015 -0700
workunits: remove defunct cephfs set_layout test
Signed-off-by: Greg Farnum <[email protected]>
commit df053b86a89edf8f390400dad8c5e654e14df327
Merge: aef0272 62645d3
Author: Yehuda Sadeh <[email protected]>
Date: Wed May 6 13:07:11 2015 -0700
Merge pull request #4571 from ceph/wip-11256-firefly
Wip 11256 firefly
Reviewed-by: Yehuda Sadeh <[email protected]>
commit aef0272d72afaef849b5d4acbf55626033369ee8
Author: Noah Watkins <[email protected]>
Date: Fri Mar 27 19:34:12 2015 -0700
java: libcephfs_jni.so is in /usr/lib64 on rhel
Signed-off-by: Noah Watkins <[email protected]>
(cherry picked from commit aed3434dc7c5161c72c7d5655faa3bc693fc9777)
commit a551a23d36e3f30ff5b0679a98ee760166ae47ae
Author: Yan, Zheng <[email protected]>
Date: Mon Mar 2 21:04:25 2015 +0800
qa/workunits/fs/misc: fix filelock_interrupt.py
Handle the case that kernel does not support fcntl.F_OFD_SETLK.
Also fix the code that checks if fnctl fails with errno == EINTR.
Signed-off-by: Yan, Zheng <[email protected]>
(cherry picked from commit 4ececa3dc4a21b98f61a592da9e2be60a0d71625)
Reviewed-by: Greg Farnum <[email protected]>
commit 07031b151b4ac6677b1f663ac200d09088deff64
Merge: 83f8d43 3fb97e2
Author: Loic Dachary <[email protected]>
Date: Thu Apr 30 00:32:21 2015 +0200
Merge pull request #4385 from xinxinsh/wip-11199-firefly
osd: ENOENT on clone
Reviewed-by: Samuel Just <[email protected]>
commit 83f8d434a5c245711922ea43a962160177aa5a40
Merge: f1425e0 29bc9e5
Author: Loic Dachary <[email protected]>
Date: Thu Apr 30 00:31:48 2015 +0200
Merge pull request #4384 from xinxinsh/wip-11197-firefly
pg stuck stale after create with activation delay
Reviewed-by: Samuel Just <[email protected]>
commit f1425e093e00343a5ae4b9ff56911bf654a5c152
Merge: e980e00 69d9339
Author: Loic Dachary <[email protected]>
Date: Thu Apr 30 00:31:32 2015 +0200
Merge pull request #4382 from xinxinsh/wip-10718-firefly
osd/PGLog.h: 279: FAILED assert(log.log.size() == log_keys_debug.size())
Reviewed-by: Samuel Just <[email protected]>
commit e980e0036909afc392f9bdf5532ce500af602c2f
Merge: b36229b 110c354
Author: Loic Dachary <[email protected]>
Date: Thu Apr 30 00:23:04 2015 +0200
Merge pull request #4185 from ldachary/wip-11156-firefly
FAILED assert(soid < scrubber.start || soid >= scrubber.end)
Reviewed-by: Samuel Just <[email protected]>
commit b36229b5aeec669cd1494f47120ae207a393846f
Merge: da75978 20c2175
Author: Sage Weil <[email protected]>
Date: Tue Apr 28 08:11:18 2015 -0700
Merge pull request #4475 from ceph/wip-9538.firefly
mon: OSDMonitor: fallback to json-pretty in case of invalid formatter
Reviewed-by: Loic Dachary <[email protected]>
commit 20c2175352c9d4e4d0e709d294fe6fe0695761cc
Author: Loic Dachary <[email protected]>
Date: Fri Sep 19 15:28:36 2014 +0200
mon: osd find / metadata --format plain fallback
ceph --format plain osd find 1 (and metadata) are not implemented and
must fallback to the default (json-pretty).
http://tracker.ceph.com/issues/9538 Fixes: #9538
Signed-off-by: Loic Dachary <[email protected]>
(cherry picked from commit 13780d755115387591888f94ea6c58ac0db3ecc4)
commit da759784ebda11275106c3b280f1d32b64ade00a
Merge: 1a10a7e e1d5773
Author: David Zafman <[email protected]>
Date: Mon Apr 27 10:30:49 2015 -0700
Merge pull request #4453 from ceph/wip-11454
PG::actingset should be used when checking the number of acting OSDs for...
Reviewed-by: Sage Weil <[email protected]>
commit 1a10a7eac190249a41b5200f0cc5e3863e76c31d
Merge: a860e2b b9da6f1
Author: Loic Dachary <[email protected]>
Date: Mon Apr 27 10:14:00 2015 +0200
Merge pull request #4245 from ceph/wip-11113-firefly
librbd: snap_remove should ignore -ENOENT errors
Reviewed-by: Shu, Xinxin <[email protected]>
Reviewed-by: Loic Dachary <[email protected]>
commit a860e2b3c02ef4f1402b54b08a6bacd4b02cc07f
Merge: dd15e54 364563a
Author: Loic Dachary <[email protected]>
Date: Mon Apr 27 10:12:40 2015 +0200
Merge pull request #4206 from ceph/wip-5488-firefly
librbd: acquire cache_lock before refreshing parent
Reviewed-by: Josh Durgin <[email protected]>
commit dd15e54b2fae134126e9795a8a973e391c628eb7
Merge: 51ff2b6 5404fbf
Author: Loic Dachary <[email protected]>
Date: Mon Apr 27 10:09:23 2015 +0200
Merge pull request #3963 from dachary/wip-10153-firefly
Rados.shutdown() dies with Illegal instruction (core dumped)
Reviewed-by: Yehuda Sadeh <[email protected]>
commit 51ff2b60dc576fb444bcfea8f6cd3e12043ed5b8
Merge: 12143ff c0cfd6e
Author: Loic Dachary <[email protected]>
Date: Mon Apr 27 10:08:15 2015 +0200
Merge pull request #4383 from xinxinsh/wip-11144-firefly
erasure-code-profile set races with erasure-code-profile rm
Reviewed-by: Loic Dachary <[email protected]>
commit 1f6b1bb51d0b40899155313165ac5e3a21dde11a
Author: Mykola Golub <[email protected]>
Date: Tue Mar 3 08:45:58 2015 +0200
osd: fix PG::all_unfound_are_queried_or_lost for non-existent osds
A common mistake upon osd loss is to remove the osd from the crush map
before marking the osd lost. This tends to make it so that the user
can no longer mark the osd lost to satisfy all_unfound_are_queried_or_lost.
The simple solution is for all_unfound_are_queried_or_lost to ignore
the osd if it does not exist.
Fixes: #10976
Backports: firefly,giant
Signed-off-by: Mykola Golub <[email protected]>
(cherry picked from commit 5bb51320138ff714806d24312149f6275d546608)
commit e1d57730ddfc92b17562080b10bc22fceb86539a
Author: Guang Yang <[email protected]>
Date: Mon Sep 29 08:21:10 2014 +0000
PG::actingset should be used when checking the number of acting OSDs for a given PG.
Signed-off-by: Guang Yang <[email protected]>
(cherry picked from commit 19be358322be48fafa17b28054619a8b5e7d403b)
Conflicts:
src/osd/PG.cc PG::get_backfill_priority() doesn't exist in firefly
Variation in code related to no "undersized" state in firefly
Fixes: #11454
commit f33effccc0592fddfcd9c5c2f5c3385462aa9b84
Author: Samuel Just <[email protected]>
Date: Thu Mar 26 10:26:48 2015 -0700
ReplicatedPG::cancel_pull: requeue waiters as well
If we are in recovery_wait, we might not recover that object as part of
recover_primary for some time. Worse, if we are waiting on a backfill
which is blocked waiting on a copy_from on the missing object in
question, it can become a dead lock.
Fixes: 11244
Backport: firefly
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit 0b2e272430dd7433e6763be99b8a4cb127d9be19)
commit 9b3396516c00ef931bab2d4aa6288ad974ec579d
Author: Yehuda Sadeh <[email protected]>
Date: Tue Mar 3 11:03:35 2015 -0800
rgw: update keystone cache with token info
Fixes: #11125
Backport: hammer, firefly
Signed-off-by: Yehuda Sadeh <[email protected]>
(cherry picked from commit 6616294aa140ceb83cc61c6ab6f9947636f5e67d)
commit 8cc4bc162c8c1c240e62840d968b967f5f47b682 (refs/remotes/gh/wip-11416)
Author: Yehuda Sadeh <[email protected]>
Date: Wed Dec 17 17:12:43 2014 -0800
rgw: use correct objv_tracker for bucket instance
When trying to create a bucket that already existed, use the
objv_tracker of the newly created instance, and not of the original
bucket.
Signed-off-by: Yehuda Sadeh <[email protected]>
(cherry picked from commit fe158ecc25feefcea8aea4133118e4a84900a8ec)
commit c0cfd6e56ca9d17241da159295bcee7cf44c9ba3
Author: Loic Dachary <[email protected]>
Date: Wed Mar 18 14:17:00 2015 +0100
osd: erasure-code-profile incremental rm before set
It is possible for an incremental change to have both a rm and a set for
a given erasure code profile. It only happens when a rm is followed by a
set. When a set is followed by a rm, the rm will remove the pending set
in the incremental change.
The logic is the same for pool create and pool delete.
We must apply the incremental erasure-code-profile removal before the
creation otherwise rm and set in the same proposal will ignore the set.
This fix is minimal. A better change would be that erasure-code-profile
set checks if there is a pending removal and wait_for_finished_proposal
before creating.
http://tracker.ceph.com/issues/11144 Fixes: #11144
Signed-off-by: Loic Dachary <[email protected]>
(cherry picked from commit 0d52aca0d0c302983d03b0f5213ffed187e4ed63)
Conflicts:
src/osd/OSDMap.cc
resolved by replacing i++ with ++i
commit 3fb97e25b194e92112077385b10381801e02ddb9
Author: Samuel Just <[email protected]>
Date: Tue Mar 24 15:14:34 2015 -0700
ReplicatedPG: trim backfill intervals based on peer's last_backfill_started
Otherwise, we fail to trim the peer's last_backfill_started and get bug 11199.
1) osd 4 backfills up to 31bccdb2/mira01213209-286/head (henceforth: foo)
2) Interval change happens
3) osd 0 now finds itself backfilling to 4 (lb=foo) and osd.5
(lb=b6670ba2/mira01213209-160/snapdir//1, henceforth: bar)
4) recover_backfill causes both 4 and 5 to scan forward, so 4 has an interval
starting at foo, 5 has an interval starting at bar.
5) Once those have come back, recover_backfill attempts to trim off the
last_backfill_started, but 4's interval starts after that, so foo remains in
osd 4's interval (this is the bug)
7) We serve a copyfrom on foo (sent to 4 as well).
8) We eventually get to foo in the backfilling. Normally, they would have the
same version, but of course we don't update osd.4's interval from the log since
it should not have received writes in that interval. Thus, we end up trying to
recover foo on osd.4 anyway.
9) But, an interval change happens between removing foo from osd.4 and
completing the recovery, leaving osd.4 without foo, but with lb >= foo
Fixes: #11199
Backport: firefly
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit 1388d6bd949a18e8ac0aecb0eb79ffb93d316879)
commit 29bc9e56a978d4e18a507e71858baa21037964c4
Author: Samuel Just <[email protected]>
Date: Tue Mar 24 10:48:02 2015 -0700
PG: set/clear CREATING in Primary state entry/exit
Previously, we did not actually set it when we got a pg creation message from
the mon. It would actually get set on the first start_peering_interval after
that point. If we don't get that far, but do send a stat update to the mon, we
can end up with 11197. Instead, let's just set it and clear it upon entry into
and exit from the Primary state.
Fixes: 11197
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit ddf0292250dfb1040d3cad96fa2cf886fd65933c)
commit 12143ff9b25fdd96f8d1a9cecb1329c7f354d414
Merge: 53eff01 bf1d8e8
Author: Yehuda Sadeh <[email protected]>
Date: Mon Apr 6 10:24:06 2015 -0700
Merge pull request #4275 from jeanchlopez/wip-11160-firefly
rgw: shouldn't need to disable rgw_socket_path if frontend is configured
commit bf1d8e888439df75feadde76bafe7d07d0e8481a
Author: Yehuda Sadeh <[email protected]>
Date: Wed Mar 18 20:49:13 2015 -0700
rgw: don't use rgw_socket_path if frontend is configured
Fixes: #11160
Backport: hammer, firefly
Previously if we wanted to use the tcp fcgi socket, we needed to clear
rgw_socket_path.
Signed-off-by: Yehuda Sadeh <[email protected]>
commit 53eff01f1e7ecd3783bb05c47588a134d4fededc
Merge: 899738e 80afc5e
Author: Josh Durgin <[email protected]>
Date: Wed Apr 1 16:30:23 2015 -0700
Merge pull request #4247 from ceph/wip-11303
Fix do_autogen.sh so that -L is allowed
Reviewed-by: Josh Durgin <[email protected]>
commit 80afc5eca293e5e2f168f219931a2f554040cdd8
Author: Alfredo Deza <[email protected]>
Date: Wed Apr 1 19:10:33 2015 -0400
Fix do_autogen.sh so that -L is allowed
Signed-off-by: Alfredo Deza <[email protected]>
commit b9da6f1025683d240baa73a9fcccbf2780035231
Author: Jason Dillaman <[email protected]>
Date: Mon Mar 16 18:40:49 2015 -0400
librbd: snap_remove should ignore -ENOENT errors
If the attempt to deregister the snapshot from the parent
image fails with -ENOENT, ignore the error as it is safe
to assume that the child is not associated with the parent.
Fixes: #11113
Signed-off-by: Jason Dillaman <[email protected]>
(cherry picked from commit cf8094942ccdba831e03e5a79451cfa5d78a135f)
commit b250b3cfae69f4e8354027fae26fd85a792da0df
Author: Jason Dillaman <[email protected]>
Date: Mon Mar 16 18:35:07 2015 -0400
librbd: get_parent_info should protect against invalid parent
get_parent_info should return -ENOENT if the image does not
have an associated parent image.
Signed-off-by: Jason Dillaman <[email protected]>
(cherry picked from commit 21afd0ef8e1fb81c5ace5fd403513c542e2413e3)
commit 69d9339fb352342a87e1148e9b5161246b27776a
Author: Samuel Just <[email protected]>
Date: Mon Feb 2 09:07:27 2015 -0800
PGLog: improve PGLog::check() debugging
Related: 10718
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit c656bcec2441c90b084ca50a17c37625d69942a1)
commit 73cbb6f34a5a556dbbd4db2e6f81391d83447efd
Author: Samuel Just <[email protected]>
Date: Tue Mar 17 10:07:03 2015 -0700
PGLog::merge_log: in tail extend case, log.log might be empty
Even if the tail != last_update, the log might be empty due to split
moving all entries into other logs.
Fixes: 10718
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit f5a2aef3db29b99634250fd388a0c2d9b9a23d38)
commit 62645d30b0ceee075a56bc692fd65cee85b09aa5 (refs/remotes/gh/wip-11256-firefly)
Author: Yehuda Sadeh <[email protected]>
Date: Mon Mar 30 17:34:57 2015 -0700
cls_rgw: use multimap to keep pending operations in bucket index
Fixes: #11256
Multiple concurrent requests might be sent using the same tag, need the
entry map to be able to hold multiple entries.
Signed-off-by: Yehuda Sadeh <[email protected]>
commit 7538319dd7aa80a3318c108d345dee8044cf20a8
Author: Yehuda Sadeh <[email protected]>
Date: Fri Mar 27 16:32:48 2015 -0700
rgw: generate new tag for object when setting object attrs
Fixes: #11256
Backport: firefly, hammer
Beforehand we were reusing the object's tag, which is problematic as
this tag is used for bucket index updates, and we might be clobbering a
racing update (like object removal).
Signed-off-by: Yehuda Sadeh <[email protected]>
commit 364563aac979fdf5ccbb6c588051d097a26bc594
Author: Jason Dillaman <[email protected]>
Date: Mon Mar 16 11:04:22 2015 -0400
librbd: acquire cache_lock before refreshing parent
cache_lock needs to be acquired before snap_lock to avoid
the potential for deadlock.
Fixes: #5488
Signed-off-by: Jason Dillaman <[email protected]>
commit 110c35498942ea0feec395b6e7992f802dd740ce
Author: Samuel Just <[email protected]>
Date: Fri Mar 20 15:28:15 2015 -0700
ReplicatedPG::promote_object: check scrubber and block if necessary
Otherwise, we might attempt to promote into an in-progress scrub
interval causing 11156. I would have added a return value to
promote_object(), but could not find an existing user which
cared to distinguish the cases, even with a null op passed.
All existing users are in maybe_handle_cache. The ones which
pass a null op are for promoting the object in parallel
with a proxy -- a case where not actually performing the promote
does not really matter.
Fixes: #11156
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit 65bb4df599541cd2e0f195b905f24f529e255c00)
commit 899738e10e82b50dcf7dfffe5cc83937179bf323
Merge: 15acfe7 9437cb1
Author: Loic Dachary <[email protected]>
Date: Mon Mar 23 20:38:43 2015 +0100
Merge pull request #4126 from dzafman/wip-11176-firefly
ceph-objectstore-tool: Output only unsupported features when incomatible
Reviewed-by: Loic Dachary <[email protected]>
commit 15acfe7f226ca7bc2c942d5fbcd3a40bd41e5930
Merge: 6c95cd2 cddbff9
Author: Loic Dachary <[email protected]>
Date: Sat Mar 21 11:38:28 2015 +0100
Merge pull request #4079 from dachary/wip-11157-firefly
doc,tests: force checkout of submodules
Reviewed-by: David Zafman <[email protected]>
commit 6c95cd24f6f4a1a933f8799754831e7a5c0a725d
Merge: ea79a3b 43053fc
Author: Yuri Weinstein <[email protected]>
Date: Fri Mar 20 21:06:17 2015 -0700
Merge pull request #4129 from dzafman/wip-11139-firefly
ceph-objectstore-tool: Use exit status 11 for incompatible import attemp...
commit 43053fcd8969c406969fef67613aa37ad1cc86bf
Author: David Zafman <[email protected]>
Date: Fri Mar 20 17:48:01 2015 -0700
ceph-objectstore-tool: Use exit status 11 for incompatible import attempt
This is used so upgrade testing doesn't generate false failure.
Fixes: #11139
Signed-off-by: David Zafman <[email protected]>
(cherry picked from commit 175aff8afe8215547ab57f8d8017ce8fdc0ff543)
commit 9437cb1b284ec9366b51d660396c2c8a9366b31f
Author: David Zafman <[email protected]>
Date: Fri Mar 20 16:57:40 2015 -0700
ceph-objectstore-tool: Output only unsupported features when incomatible
Fixes: #11176
Backport: firefly, giant
Signed-off-by: David Zafman <[email protected]>
(cherry picked from commit 5b23f5b5892b36fb7d06efc0d77e64a24ef6e8c9)
commit ea79a3b122917ddf5dc1972bb9dc5b20f78e2f18
Merge: c1c20d8 07fc9f6
Author: Loic Dachary <[email protected]>
Date: Fri Mar 20 08:44:39 2015 +0100
Merge pull request #3970 from ceph/firefly-11053
mds: fix assertion caused by system clock backwards
Reviewed-by: John Spray <[email protected]>
commit c1c20d89d511499d678fdba0667581e88b9b5d95
Merge: 2fbb9a6 63b39db
Author: Loic Dachary <[email protected]>
Date: Fri Mar 20 08:42:58 2015 +0100
Merge pull request #4021 from ceph/wip-7737-firefly
osd: fix negative degraded objects during backfilling
Reviewed-by: Sage Weil <[email protected]>
commit 2fbb9a63a82ac5136b033799aec303fc151b25e5
Merge: 3160e8d 2c7eda6
Author: Loic Dachary <[email protected]>
Date: Fri Mar 20 08:38:26 2015 +0100
Merge pull request #3952 from dachary/wip-9986-firefly
objecter: fix map skipping
Reviewed-by: Sage Weil <[email protected]>
commit 3160e8d6918a04d1fec9fdccbc30bf007c7940c6
Author: Yehuda Sadeh <[email protected]>
Date: Wed Mar 18 20:55:24 2015 -0700
init-radosgw*: don't require rgw_socket_path to be defined
Fixes: #11159
Backport: hammer, firefly
Scripts required rgw_socket_path to exist in order to start radosgw.
This is not needed.
Reported-by: Dan Mick <[email protected]>
Signed-off-by: Yehuda Sadeh <[email protected]>
(cherry picked from commit 6823bcdcd0ce72cd223e809291f46d82da76115c)
commit cddbff9a3653d6257d13e0ac411cd6e4cd71feef
Author: Loic Dachary <[email protected]>
Date: Thu Mar 19 00:32:39 2015 +0100
doc,tests: force checkout of submodules
When updating submodules, always checkout even if the HEAD is the
desired commit hash (update --force) to avoid the following:
* a directory gmock exists in hammer
* a submodule gmock replaces the directory gmock in master
* checkout master + submodule update : gmock/.git is created
* checkout hammer : the gmock directory still contains the .git from
master because it did not exist at the time and checkout won't
remove untracked directories
* checkout master + submodule update : git rev-parse HEAD is
at the desired commit although the content of the gmock directory
is from hammer
http://tracker.ceph.com/issues/11157 Fixes: #11157
Signed-off-by: Loic Dachary <[email protected]>
commit 63b39dbd529936e60d0fd08dffd35f82b3d1729c (refs/remotes/gh/wip-7737-firefly)
Author: Guang Yang <[email protected]>
Date: Thu Feb 26 08:13:12 2015 +0000
osd: fix negative degraded objects during backfilling
When there is deleting requests during backfilling, the reported number of degraded
objects could be negative, as the primary's num_objects is the latest (locally) but
the number for replicas might not reflect the deletings. A simple fix is to ignore
the negative subtracted value.
Signed-off-by: Guang Yang <[email protected]>
(cherry picked from commit 14d7e36d3c978844da73d0e1c8a3a1ec863bac15)
Conflicts:
src/osd/PG.cc
commit 493d285508914769cba3639b601ae6c20303af0d
Merge: 9839726 8a25a51
Author: Loic Dachary <[email protected]>
Date: Mon Mar 16 23:20:36 2015 +0100
Merge pull request #3966 from theanalyst/wip-10698-backport
rgw: fail s3 POST auth if keystone not configured
Reviewed-by: Yehuda Sadeh <[email protected]>
commit 9839726f009a3189013a23e8226d2f7618f1d56b
Merge: dab85cb 651dc55
Author: Loic Dachary <[email protected]>
Date: Mon Mar 16 23:19:22 2015 +0100
Merge pull request #3934 from dachary/wip-10665-firefly
rgw: Swift API. Dump container's custom metadata.
Reviewed-by: Yehuda Sadeh <[email protected]>
commit dab85cb7fcc5770fe4d6f075cf583a33ea335aa3
Merge: 0e55046 d0fd417
Author: Loic Dachary <[email protected]>
Date: Mon Mar 16 23:18:59 2015 +0100
Merge pull request #3929 from dachary/wip-10475-firefly
rgw: Swift API. Support for X-Remove-Container-Meta-{key} header.
Reviewed-by: Yehuda Sadeh <[email protected]>
commit 0e550461666d6e3d32981f99c8327931a6bd6d62
Merge: 1ca6dd9 963439f
Author: Loic Dachary <[email protected]>
Date: Mon Mar 16 23:18:24 2015 +0100