-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathv0.87.2.txt
1413 lines (962 loc) · 48.3 KB
/
v0.87.2.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 87a7cec9ab11c677de2ab23a7668a77d2f5b955e (tag: refs/tags/v0.87.2, refs/remotes/gh/giant)
Author: Jenkins <[email protected]>
Date: Fri Apr 24 12:31:27 2015 -0700
0.87.2
commit c1301e84aee0f399db85e2d37818a66147a0ce78
Merge: 1a13e10 9e9c3c6
Author: Loic Dachary <[email protected]>
Date: Tue Apr 7 21:08:24 2015 +0200
Merge pull request #4214 from dachary/wip-10430-giant
osd/osd_types.cc: 456: FAILED assert(m_seed < old_pg_num)
Reviewed-by: David Zafman <[email protected]>
commit 1a13e1065829c59987c2f57a13eaa03de31df4ed
Merge: 1fb08d3 5f4e62f
Author: Loic Dachary <[email protected]>
Date: Tue Apr 7 16:39:28 2015 +0200
Merge pull request #4258 from ceph/wip-10643-v2
mon: MDSMonitor: additional backports for #10643
Reviewed-by: Abhishek Lekshmanan <[email protected]>
Reviewed-by: Loic Dachary <[email protected]>
commit 1fb08d3066b14b178a8912ffb3c9f50d2333738c
Merge: 90b37d9 7684ee2
Author: Josh Durgin <[email protected]>
Date: Thu Apr 2 08:55:48 2015 -0700
Merge pull request #4261 from ceph/wip-11303-giant
allow -L to disable lttng. Enable it by default
Reviewed-by: Josh Durgin <[email protected]>
commit 7684ee25ac21810153a44bdc4fc00b36e39eb12f
Author: Alfredo Deza <[email protected]>
Date: Thu Apr 2 10:34:02 2015 -0400
allow -L to disable lttng. Enable it by default
Signed-off-by: Alfredo Deza <[email protected]>
commit 5f4e62f382767ee69e5b0c701b1a01d9e4132237
Author: Joao Eduardo Luis <[email protected]>
Date: Fri Oct 17 19:08:20 2014 +0100
mon: MDSMonitor: wait for osdmon to be writable when requesting proposal
Otherwise we may end up requesting the osdmon to propose while it is
mid-proposal. We can't simply return EAGAIN to the user either because
then we would have to expect the user to be able to successfully race
with the whole cluster in finding a window in which 'mds fs new' command
would succeed -- which is not a realistic expectation. Having the
command to osdmon()->wait_for_writable() guarantees that the command
will be added to a queue and that we will, eventually, tend to it.
Fixes: #9794
Signed-off-by: Joao Eduardo Luis <[email protected]>
(cherry picked from commit 2ae1cba595d9c56a0a4c534b34fe25250e7eb2d5)
commit 257bd17db6470ca050403b1c8ff8daa94a4b80b5
Author: Joao Eduardo Luis <[email protected]>
Date: Fri Oct 17 18:59:51 2014 +0100
mon: MDSMonitor: have management_command() returning int instead of bool
We can more easily differentiate between errors we get out of this
function, which makes the code a bit more versatile and readable.
Signed-off-by: Joao Eduardo Luis <[email protected]>
(cherry picked from commit 0dd473cbad4f9ea403fe60badffdc6da4dd3aa3c)
commit 9e9c3c652339d85863af01cac621228f04eb4f18
Author: David Zafman <[email protected]>
Date: Thu Oct 9 11:20:13 2014 -0700
osd: Get pgid ancestor from last_map when building past intervals
Fixed OSD::build_past_intervals_parallel() and PG::generate_past_intervals()
Fixes: #10430
Signed-off-by: David Zafman <[email protected]>
(cherry picked from commit 0c5b66da7a9ba516340d06d9e806beb9d1040d0e)
commit 90b37d9bdcc044e26f978632cd68f19ece82d19a
Merge: 2ccbc14 9f1f355
Author: Loic Dachary <[email protected]>
Date: Thu Mar 26 07:58:14 2015 +0100
Merge pull request #4175 from wonzhq/objecter-timer-2
Objecter: failed assert(tick_event==NULL) at osdc/Objecter.cc
Reviewed-by: Loic Dachary <[email protected]>
commit 9f1f35546e00e8f1ecbce0697d59b64f3537facf
Author: Zhiqiang Wang <[email protected]>
Date: Wed Mar 25 16:32:44 2015 +0800
Objecter: failed assert(tick_event==NULL) at osdc/Objecter.cc
When the Objecter timer erases the tick_event from its events queue and
calls tick() to dispatch it, if the Objecter::rwlock is held by shutdown(),
it waits there to get the rwlock. However, inside the shutdown function,
it checks the tick_event and tries to cancel it. The cancel_event function
returns false since tick_event is already removed from the events queue. Thus
tick_event is not set to NULL in shutdown(). Later the tick function return
ealier and doesn't set tick_event to NULL as well. This leads to the assertion
failure.
This is a regression introduced by an incorrect conflict resolution when
d790833 was backported.
Fixes: #11183
Signed-off-by: Zhiqiang Wang <[email protected]>
commit 2ccbc14d17b54ea4fd4126cb04a7b83cd64c7f1e
Merge: 02f9cdb de4b087
Author: Loic Dachary <[email protected]>
Date: Mon Mar 23 20:39:26 2015 +0100
Merge pull request #4127 from dzafman/wip-11176-giant
ceph-objectstore-tool: Output only unsupported features when incomatible
Reviewed-by: Loic Dachary <[email protected]>
commit 02f9cdbf889071ca6fe3811d9b9a92a0b630fa55
Merge: 83bcc51 fc43d8c
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:11:46 2015 +0100
Merge pull request #4097 from dachary/wip-10497-giant
librados: c api does not translate op flag
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 83bcc516743e426c7a8c6f6401721bffbbec4fc0
Merge: ebab2bd d790833
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:11:26 2015 +0100
Merge pull request #4096 from dachary/wip-9617-giant
objecter shutdown races with msg dispatch
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit ebab2bd5f36205d666673600624aaa3e5e06c405
Merge: e31c92d 970a797
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:11:03 2015 +0100
Merge pull request #4095 from dachary/wip-9675-giant
splitting a pool doesn't start when rule_id != ruleset_id
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit e31c92d8dd814d276357e431ed87b93d75933f77
Merge: f0ec5e3 7653511
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:10:42 2015 +0100
Merge pull request #4094 from dachary/wip-9891-giant
Assertion: os/DBObjectMap.cc: 1214: FAILED assert(0)
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit f0ec5e3b3ed58af65323bcc494e589935147aa45
Merge: dd7c15b 13b0147
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:10:25 2015 +0100
Merge pull request #4093 from dachary/wip-9915-giant
osd: eviction logic reversed
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit dd7c15b2b24027a7cc5fa4bff21222c5a4606e60
Merge: 33b09e1 13b8364
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:09:28 2015 +0100
Merge pull request #4092 from dachary/wip-9985-giant
osd: incorrect atime calculation
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 33b09e18aa78252d94cbec8bf94ec97ed5bb1573
Merge: 950123e 5550cdd
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:08:41 2015 +0100
Merge pull request #4091 from dachary/wip-9986-giant
objecter: map epoch skipping broken
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 950123e4daa85562b2f52e0e12e0bae07f444095
Merge: abdc065 21f81b8
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:08:16 2015 +0100
Merge pull request #4090 from dachary/wip-10059-giant
osd/ECBackend.cc: 876: FAILED assert(0)
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit abdc065acd6cafa6439e9c1724cc87de02352bd7
Merge: aee2825 1ccf583
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:07:52 2015 +0100
Merge pull request #4089 from dachary/wip-10080-giant
Pipe::connect() cause osd crash when osd reconnect to its peer
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit aee28250fee66bca08d91e56ce47ec46c2e9fc24
Merge: 6582253 3e875ab
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:07:20 2015 +0100
Merge pull request #4088 from dachary/wip-6003-giant
journal Unable to read past sequence 406 ...
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 65822530ebfdea2feb9192c6eb6e3b8b9d60fe33
Merge: 4b20f2d 96a5c67
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:06:51 2015 +0100
Merge pull request #4082 from dachary/wip-10106-giant
rgw acl response should start with <?xml version=1.0 ?>
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 4b20f2d2d1ee52deed33617f000fa342ebce2e49
Merge: 7ff3a67 c7b02f5
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:06:23 2015 +0100
Merge pull request #4078 from dachary/wip-11157-giant
doc,tests: force checkout of submodules
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 7ff3a67c44ba3dc20a663a7dc6ba28c25714f063
Merge: 440e706 4d4eb9f
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:05:20 2015 +0100
Merge pull request #4077 from dachary/wip-10150-giant
osd/ReplicatedPG.cc: 10853: FAILED assert(r >= 0) (in _scan_range)
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 440e70607e7e3cd1d8ca33843c626109431caf8d
Merge: 66f639b 499d94f
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:04:51 2015 +0100
Merge pull request #4076 from dachary/wip-10153-giant
Rados.shutdown() dies with Illegal instruction (core dumped)
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 66f639b30ce6c74caae9397f20053761203f8e87
Merge: 43b45df b79852f
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:04:25 2015 +0100
Merge pull request #4074 from dachary/wip-10220-giant
mon/Paxos.cc: 1033: FAILED assert(mon->is_leader())
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 43b45dfacd598bab51fa06c5d0e2d0605d6e83d6
Merge: d282cfd b318e2f
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 23:03:35 2015 +0100
Merge pull request #3548 from ceph/wip-10643
mon: MDSMonitor: missing backports for giant
Reviewed-by: Abhishek Lekshmanan <[email protected]>
Reviewed-by: Loic Dachary <[email protected]>
commit d282cfd5ae3e65b74801cd27480ce8c0bd72d9a7
Merge: 3f3b981 681c99f
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 22:12:58 2015 +0100
Merge pull request #4053 from dachary/wip-8011-giant
osd/ReplicatedPG.cc: 5244: FAILED assert(soid < scrubber.start || soid >= scrubber.end)
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 3f3b98123cb46080068c1c73f4be41acbe18bd0d
Merge: 6919eb1 4427358
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 22:12:40 2015 +0100
Merge pull request #4052 from dachary/wip-10844-giant
mon: caps validation should rely on EntityName instead of entity_name_t
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 6919eb1684e34a6395963be6cc65215a51f5ba13
Merge: 8876585 1d4ffbe
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 22:12:15 2015 +0100
Merge pull request #4050 from dachary/wip-10817-giant
WorkQueue: make timeout when calling WaitInterval configurable
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 88765851bd56a6a526f6ab724920c8858ec4956c
Merge: 6da3171 92c352d
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 22:11:43 2015 +0100
Merge pull request #4049 from dachary/wip-10787-giant
mon: OSDMonitor::map_cache is buggy, send_incremental is not conservative
Reviewed-by: Abhishek Lekshmanan <[email protected]>
Reviewed-by: Sage Weil <[email protected]>
commit 6da3171f21b8e1a56fe941a5028f2ccfdccee18a
Merge: 5a6eefc 25fcaca
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 22:09:28 2015 +0100
Merge pull request #4048 from dachary/wip-10770-giant
rgw: pending bucket index operations are not cancelled correctly
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 5a6eefcb40c94da9a900d9893ecb6eaaf8fd0cea
Merge: c67a7a5 2858327
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 22:09:06 2015 +0100
Merge pull request #4046 from dachary/wip-10723-giant
rados python binding leaks Ioctx objects
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit c67a7a52dc96f176431125921e36e4a2b8a30f1c
Merge: 41dcd2d d5b1b7e
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 22:08:45 2015 +0100
Merge pull request #4044 from dachary/wip-10617-giant
osd: pgs for deleted pools don't finish getting removed if osd restarts
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 41dcd2d9c307dd0b25d27bd6673943f3fdaaa28b
Merge: 42e7413 c3d998e
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 22:08:20 2015 +0100
Merge pull request #4034 from dachary/wip-10475-giant
rgw: Swift API. Support for X-Remove-Container-Meta-{key} header.
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit 42e741339913990521c4509f4e266921f8dbe007
Merge: ffb76d1 fa8d454
Author: Loic Dachary <[email protected]>
Date: Sun Mar 22 22:07:53 2015 +0100
Merge pull request #4033 from dachary/wip-10471-giant
rgw: index swift keys appropriately
Reviewed-by: Abhishek Lekshmanan <[email protected]>
commit de4b08704172ac31b511dde50e5c11d58d811ca2
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 ffb76d16c5d9d65ac94d21b4e8fc1fdf86441977
Merge: fea29b1 61d6006
Author: John Spray <[email protected]>
Date: Thu Mar 19 22:07:58 2015 +0000
Merge pull request #3971 from ceph/giant-11053
mds: fix assertion caused by system clock backwards
Reviewed-by: John Spray <[email protected]>
commit c3d998e4c3c9d90b50c3f6c0af7d48785616e032
Author: Dmytro Iurchenko <[email protected]>
Date: Tue Feb 3 17:54:38 2015 +0200
rgw: Swift API. Support for X-Remove-Container-Meta-{key} header.
Fixes: #10475
Backport: hammer, firefly
Reported-by: Josh Durgin <[email protected]>
Signed-off-by: Dmytro Iurchenko <[email protected]>
(cherry picked from commit f67bfa24fd6f69c2fcc0987eba8b6b426dd78320)
Conflicts:
src/rgw/rgw_rest.h
trivial merge: prototype of an unrelated function changed
src/rgw/rgw_op.cc
s/is_object_op/!(s->object == NULL)/
commit fc43d8c2c54ec9e9cb6ef4d19cca695eb2fb3aab
Author: Matt Richards <[email protected]>
Date: Thu Jan 8 13:16:17 2015 -0800
librados: Translate operation flags from C APIs
The operation flags in the public C API are a distinct enum
and need to be translated to Ceph OSD flags, like as happens in
the C++ API. It seems like the C enum and the C++ enum consciously
use the same values, so I reused the C++ translation function.
Signed-off-by: Matthew Richards <[email protected]>
(cherry picked from commit 49d114f1fff90e5c0f206725a5eb82c0ba329376)
commit d790833cb84d6f6349146e4f9abdcdffb4db2ee0
Author: Josh Durgin <[email protected]>
Date: Mon Sep 29 18:17:29 2014 -0700
Objecter: check the 'initialized' atomic_t safely
shutdown() resets initialized to 0, but we can still receive messages
after this point, so fix message handlers to skip messages in this
case instead of asserting.
Also read initialized while holding Objecter::rwlock to avoid races
where e.g. handle_osd_map() checks initialized -> 1, continues,
shutdown() is called, sets initialized to 0, then handle_osd_map()
goes about its business and calls op_submit(), which would fail the
assert(initialized.read()) check. Similar races existed in other
message handlers which change Objecter state.
The Objecter is not destroyed until after its Messenger in
the MDS, OSD, and librados, so this should be safe.
Fixes: #9617
Backport: giant
Signed-off-by: Josh Durgin <[email protected]>
(cherry picked from commit e506f896a9217324ab7a7865989f4454562aed5f)
Conflicts:
src/osdc/Objecter.cc
context changed: Objecter::tick() did not have
assert(initialized.read())
commit ce436a33e0f720ea4b8cf0363bcac1126be3c28b
Author: Josh Durgin <[email protected]>
Date: Mon Sep 29 18:12:50 2014 -0700
Objecter: init with a constant of the correct type
Just a tiny cleanup.
Signed-off-by: Josh Durgin <[email protected]>
(cherry picked from commit 1feba200aae7d9a042cda705c3de8fba2fc82331)
commit 970a79753dc52d82d2abf29ffe6f88adac678eb0
Author: Xiaoxi Chen <[email protected]>
Date: Wed Aug 20 15:35:44 2014 +0800
CrushWrapper: pick a ruleset same as rule_id
Originally in the add_simple_ruleset funtion, the ruleset_id
is not reused but rule_id is reused. So after some add/remove
against rules, the newly created rule likely to have
ruleset!=rule_id.
We dont want this happen because we are trying to hold the constraint
that ruleset == rule_id.
Signed-off-by: Xiaoxi Chen <[email protected]>
(cherry picked from commit 78e84f34da83abf5a62ae97bb84ab70774b164a6)
commit 76535116823f02f0392226e5725fbfef14c277ba
Author: Samuel Just <[email protected]>
Date: Fri Feb 20 13:43:46 2015 -0800
DBObjectMap: lock header_lock on sync()
Otherwise, we can race with another thread updating state.seq
resulting in the old, smaller value getting persisted. If there
is a crash at that time, we will reuse a sequence number, resulting
in an inconsistent node tree and bug #9891.
Fixes: 9891
Backport: giant, firefly, dumpling
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit 2b63dd25fc1c73fa42e52e9ea4ab5a45dd9422a0)
Conflicts:
src/os/DBObjectMap.cc
because we have state.v = 1; instead of state.v = 2;
commit 13b01473c5c1a116d6cd6acbbb6cbe08ee6e9433
Author: Zhiqiang Wang <[email protected]>
Date: Tue Oct 28 09:37:11 2014 +0800
osd: cache tiering: fix the atime logic of the eviction
Reported-by: Xinze Chi <[email protected]>
Signed-off-by: Zhiqiang Wang <[email protected]>
(cherry picked from commit 622c5ac41707069ef8db92cb67c9185acf125d40)
commit 13b8364dc869b2eefcb6646cff1e18c31126ce7d
Author: Sage Weil <[email protected]>
Date: Fri Oct 31 19:33:59 2014 -0700
osd/ReplicatedPG: fix compile error
From 1fef4c3d541cba360738437420ebfa2447d5802e.
Signed-off-by: Sage Weil <[email protected]>
(cherry picked from commit 4a9ad7dc2da6f4fa6a64235776a3f1d2799aef60)
commit 55541b90db0a6d6c26c1fae6a4958fa5a320f82c
Author: Xinze Chi <[email protected]>
Date: Wed Oct 29 07:11:11 2014 +0000
Get the currently atime of the object in cache pool for eviction
Because if there are mutiple atime in agent_state for the same object, we should use the recently one.
Signed-off-by: Xinze Chi <[email protected]>
(cherry picked from commit 1fef4c3d541cba360738437420ebfa2447d5802e)
commit 5550cdd876db913b152edad17a4de16bded31627
Author: Ding Dinghua <[email protected]>
Date: Thu Oct 30 14:58:42 2014 +0800
osdc/Objecter: Fix a bug of dead looping in Objecter::handle_osd_map
If current map epoch is less than oldest epoch, current map epoch
should step up to oldest epoch.
Fixes: #9986
Signed-off-by: Ding Dinghua <[email protected]>
(cherry picked from commit e0166a23c2cf655bfb4cf873be021a14d9b9be27)
commit 7c5056f5cf77065e0e5a920f525f0a3be6b4b299
Author: Ding Dinghua <[email protected]>
Date: Thu Oct 30 14:58:05 2014 +0800
osdc/Objecter: e shouldn't be zero in Objecter::handle_osd_map
Signed-off-by: Ding Dinghua <[email protected]>
(cherry picked from commit 31c584c8ba022cd44fe2872d221f3026618cefab)
commit 21f81b85de652aede51e88b87bdff71f2e411da3
Author: Samuel Just <[email protected]>
Date: Wed Nov 19 08:20:16 2014 -0800
PG: always clear_primary_state on new interval, but only clear pg temp if not primary
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit f692bfe076b8ddb679c6d1a6ea78cc47f0876326)
commit 0c3f7637d8cf2146a4268330d8c0506ad38c354d
Author: Samuel Just <[email protected]>
Date: Fri Nov 14 15:44:20 2014 -0800
PG: always clear_primary_state when leaving Primary
Otherwise, entries from the log collection process might leak into the next
epoch, where we might end up choosing a different authoritative log. In this
case, it resulted in us not rolling back to log entries on one of the replicas
prior to trying to recover from an affected object due to the peer_missing not
being cleared.
Fixes: #10059
Backport: giant, firefly, dumpling
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit c87bde64dfccb5d6ee2877cc74c66fc064b1bcd7)
commit 1ccf58355d0796172935938572cf68ceb31a6801
Author: Greg Farnum <[email protected]>
Date: Tue Dec 2 15:17:57 2014 -0800
SimpleMessenger: allow RESETSESSION whenever we forget an endpoint
In the past (e229f8451d37913225c49481b2ce2896ca6788a2) we decided to disable
reset of lossless Pipes, because lossless peers resetting caused trouble and
they can't forget about each other. But they actually can: if mark_down()
is called.
I can't figure out how else we could forget about a remote endpoint, so I think
it's okay if we tell them we reset in order to clean up state. That's desirable
so that we don't get into strange situations with out-of-whack counters.
Fixes: #10080
Backport: giant, firefly, dumpling
Signed-off-by: Greg Farnum <[email protected]>
(cherry picked from commit 8cd1fdd7a778eb84cb4d7161f73bc621cc394261)
commit 3e875ab108de8d2aa3717f76a3fe48ede286abb7
Author: Samuel Just <[email protected]>
Date: Fri Feb 6 09:52:29 2015 -0800
FileJournal: fix journalq population in do_read_entry()
Fixes: 6003
Backport: dumpling, firefly, giant
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit bae1f3eaa09c4747b8bfc6fb5dc673aa6989b695)
Conflicts:
src/os/FileJournal.cc
because reinterpret_cast was added near two hunks after firefly
commit 96a5c67121dde0d4d4cd13793bb131414b64cc28
Author: Yehuda Sadeh <[email protected]>
Date: Fri Jan 30 18:42:40 2015 -0800
rgw: flush xml header on get acl request
Fixes: #10106
Backport: firefly, giant
dump_start() updates the formatter with the appropriate prefix, however,
we never flushed the formatter.
Signed-off-by: Yehuda Sadeh <[email protected]>
(cherry picked from commit eb45f861343162e018968b8c56693a8c6f5b2cab)
commit c7b02f5a7347ea8688c5214f85bb9f612925a586
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 4d4eb9faf1871c4469b78a7ee75d527ce5cc67ad
Author: Samuel Just <[email protected]>
Date: Thu Dec 11 13:05:54 2014 -0800
ReplicatedPG::scan_range: an object can disappear between the list and the attr get
The first item in the range is often last_backfill, upon which writes
can be occuring. It's trimmed off on the primary side anyway.
Fixes: 10150
Backport: dumpling, firefly, giant
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit dce6f288ad541fe7f0ef8374301cd712dd3bfa39)
commit 499d94f573e78f6545bd5a12ade6b5ba5a75bbca
Author: Federico Simoncelli <[email protected]>
Date: Sat Nov 15 14:14:04 2014 +0000
common: do not unlock rwlock on destruction
According to pthread_rwlock_unlock(3p):
Results are undefined if the read-write lock rwlock is not held
by the calling thread.
and:
https://sourceware.org/bugzilla/show_bug.cgi?id=17561
Calling pthread_rwlock_unlock on an rwlock which is not locked
is undefined.
calling pthread_rwlock_unlock on RWLock destruction could cause
an unknown behavior for two reasons:
- the lock is acquired by another thread (undefined)
- the lock is not acquired (undefined)
Moreover since glibc-2.20 calling pthread_rwlock_unlock on a
rwlock that is not locked results in a SIGILL that kills the
application.
This patch removes the pthread_rwlock_unlock call on destruction
and replaces it with an assertion to check that the RWLock is
not in use.
Any code that relied on the implicit release is now going to
break the assertion, e.g.:
{
RWLock l;
l.get(for_write);
} // implicit release, wrong.
Signed-off-by: Federico Simoncelli <[email protected]>
(cherry picked from commit cf2104d4d991361c53f6e2fea93b69de10cd654b)
commit b79852f3ab0643bbb3f6b71a56b15e5a4b5fc1f5
Author: Joao Eduardo Luis <[email protected]>
Date: Wed Dec 10 17:46:35 2014 +0000
mon: Paxos: reset accept timeout before submiting work to the store
Otherwise we may trigger the timeout while waiting for the work to be
committed to the store -- and it would only take the write to take a bit
longer than 10 seconds (default accept timeout).
We do wait for the work to be properly committed to the store before
extending the lease though.
Fixes: #10220
Signed-off-by: Joao Eduardo Luis <[email protected]>
(cherry picked from commit 18534615f184ba56b441fd1d4242eb06debdfe13)
commit e997c9fed5feb3e877dfe07ffac1327b85d09ea2
Author: Joao Eduardo Luis <[email protected]>
Date: Tue Dec 9 17:35:47 2014 +0000
mon: MonitorDBStore: allow randomly injecting random delays on writes
Adds two new config options:
mon_inject_transaction_delay_probability : DOUBLE (0.0-1.0, default: 0.0)
mon_inject_transaction_delay_max : DOUBLE (seconds, default: 10.0)
If probability is set to a value greater than 0, just before applying
the transaction, the store will decide whether to inject a delay,
randomly choosing a value between 0 and the max.
Signed-off-by: Joao Eduardo Luis <[email protected]>
(cherry picked from commit beaa04e4119765d5775a6c48fd072dd95c984e3b)
commit 1d4ffbe1d233de555c1ecb0a33eebe2391b29f33
Author: Samuel Just <[email protected]>
Date: Mon Feb 9 17:41:19 2015 -0800
ShardedThreadPool: make wait timeout on empty queue configurable
Fixes: 10818
Backport: giant
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit 7002f934e6664daa995ca0629c0ea3bae1c6bddf)
commit 292c4339c064968c2aa05eec701fbc2a8d82dab0
Author: Samuel Just <[email protected]>
Date: Mon Feb 9 17:11:38 2015 -0800
WorkQueue: make wait timeout on empty queue configurable
Fixes: 10817
Backport: giant, firefly, dumpling
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit 5aa6f910843e98a05bfcabe6f29d612cf335edbf)
commit fea29b1bcbd17b3d1f642398ec70dbe258bbc98f
Author: Samuel Just <[email protected]>
Date: Thu Nov 20 15:15:08 2014 -0800
PGLog: include rollback_info_trimmed_to in (read|write)_log
Fixes: #10157
Backport: firefly, giant
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit 1fe8b846641486cc294fe7e1d2450132c38d2dba)
commit 4427358bb556d902b01df27fd097cc3eefa561da
Author: Joao Eduardo Luis <[email protected]>
Date: Wed Feb 11 23:36:01 2015 +0000
mon: MonCap: take EntityName instead when expanding profiles
entity_name_t is tightly coupled to the messenger, while EntityName is
tied to auth. When expanding profiles we want to tie the profile
expansion to the entity that was authenticated. Otherwise we may incur
in weird behavior such as having caps validation failing because a given
client messenger inst does not match the auth entity it used.
e.g., running
ceph --name osd.0 config-key exists foo daemon-private/osd.X/foo
has entity_name_t 'client.12345' and EntityName 'osd.0'. Using
entity_name_t during profile expansion would not allow the client access
to daemon-private/osd.X/foo (client.12345 != osd.X).
Fixes: #10844
Backport: firefly,giant
Signed-off-by: Joao Eduardo Luis <[email protected]>
(cherry picked from commit 87544f68b88fb3dd17c519de3119a9ad9ab21dfb)
commit 8902279dd4b52516d59db712bd59e8d9372611a6
Author: Joao Eduardo Luis <[email protected]>
Date: Fri Nov 14 21:03:54 2014 +0000
mon: Monitor: stash auth entity name in session
Backport: giant
Signed-off-by: Joao Eduardo Luis <[email protected]>
(cherry picked from commit ca8e1efc0be9bffcfbdce5593526d257aa498062)
commit 681c99fe12cfa6318f8cf06f4e825805635bcc07
Author: Samuel Just <[email protected]>
Date: Thu Nov 20 14:27:39 2014 -0800
ReplicatedPG: fail a non-blocking flush if the object is being scrubbed
Fixes: #8011
Backport: firefly, giant
Signed-off-by: Samuel Just <[email protected]>
(cherry picked from commit 9b26de3f3653d38dcdfc5b97874089f19d2a59d7)
commit 1f58a0adc3b23785fac00083d721b62f6a4c44a1
Merge: 9fee7ba fe7d4ca
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:52:01 2015 -0700
Merge pull request #4042 from dachary/wip-10546-giant
ceph time check start round bug in monitor.cc
commit 9fee7ba9d7343bda29bc5113f8db5cdd9c09d71a
Merge: ca635ce e7af52a
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:50:26 2015 -0700
Merge pull request #4047 from dachary/wip-10762-giant
mon: osd gets marked down twice
commit ca635ce3eb21135b08613b97ce0c56977de44351
Merge: 9094185 5771f57
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:49:53 2015 -0700
Merge pull request #4041 from dachary/wip-10512-giant
osd: cancel_flush requeues blocked events after blocking event
commit 90941850ceb2c080ac72c67fed991c951b13f449
Merge: bc1b9d2 5fca232
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:47:26 2015 -0700
Merge pull request #4031 from dachary/wip-10353-giant
crush: set_choose_tries = 100 for erasure code rulesets
commit bc1b9d22d29a74e6853834fb0430e8803710bbbf
Merge: bd69cfc 30a1744
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:47:08 2015 -0700
Merge pull request #4029 from dachary/wip-9910-giant
msg/Pipe: discard delay queue before incoming queue
Reviewed-by: Greg Farnum <[email protected]>
commit bd69cfcbd58103843fbc42c4e55d43c2bafe54ff
Merge: 30f7df2 4bd5237
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:44:53 2015 -0700
Merge pull request #4030 from dachary/wip-10351-giant
mount.ceph: avoid spurious error message
Reviewed-by: John Spray <[email protected]>
commit 30f7df2b110f73477354fbfa607b4777317dddfa
Merge: e5a50c3 8307318
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:44:00 2015 -0700
Merge pull request #4028 from dachary/wip-10259-giant
osd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::o...
commit e5a50c3ae42c8b9d16a19a13e10fc35b91149e73
Merge: ba1d55d a5a76f8
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:42:10 2015 -0700
Merge pull request #4027 from dachary/wip-10257-giant
mon: PGMonitor: several stats output error fixes
commit ba1d55de1e92a0143702e9e3fbbb1820db17d6c3
Merge: 530fce4 640986f
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:41:56 2015 -0700
Merge pull request #3998 from dzafman/wip-10677
Fix ceph command manpage to match ceph -h (giant)
Reviewed-by: Xinxin Shu <[email protected]>
commit 530fce4d7cf51f4a4ac1e70ebe20b2795a30010e
Merge: a2a3dad 8a5a3c7
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:40:02 2015 -0700
Merge pull request #3921 from sponce/wip-11078-giant
Fix libstriprados::stat, use strtoll insdead of strtol
commit a2a3dad8ec00434b99d6d538615bf8ff9eada217
Merge: 0f57188 984df3b
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:36:28 2015 -0700
Merge pull request #3819 from tchaikov/giant-pg-leak-10421
osd: fix PG leak in SnapTrimWQ._clear()
commit 0f5718822793074ffab45124afb3bf3160e92004
Merge: 776c82c c5c6fcd
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:35:37 2015 -0700
Merge pull request #3771 from ceph/wip-10883-giant
osd: Fix FileJournal wrap to get header out first
commit 776c82caac36de14a5f895688f81c88a883fca3e
Merge: 938e036 37f196e
Author: Sage Weil <[email protected]>
Date: Tue Mar 17 10:35:29 2015 -0700
Merge pull request #3637 from sponce/wip-10758-giant
Backport of pull request 3633 to giant : Fixed write_full behavior in libradosstriper
commit 92c352d047c84035478e71828e32f554d9f507fc
Author: Sage Weil <[email protected]>
Date: Thu Feb 12 13:49:50 2015 -0800