Repository navigation
Commit e235389
committed
[fix](fe) Fence catalog removal and controller publication
### What problem does this PR solve?
Issue Number: N/A
Related PR: #69665
Problem Summary: DROP and rename can detach an authorization controller while the old catalog remains published, allowing a concurrent lookup to install a controller that escapes cleanup. In-flight authorization publication can also follow the reused catalog object's new name after rename. Unpublish the mappings before detachment and retain the original name throughout authorization publication and rollback. Removal also waited for network-bound initialization while holding the global catalog lock. Acquire the catalog monitor outside that lock, use a nonblocking manager-lock attempt with identity revalidation, and release the monitor before waiting on manager contention. Preserve synchronous retirement, captured-instance asynchronous close, journal ordering, post-lock cleanup, and monitored write-lock timing.
### Release note
Prevent orphaned authorization controllers during catalog removal and keep unrelated catalog mutations responsive while another catalog initializes.
### Check List (For Author)
- Test: Unit Test via run-fe-ut.sh across CatalogRemovalConcurrencyTest, CatalogMgrTest, CatalogVarbinaryMigrationTest, ExternalCatalogReplayCleanupTest, ExternalCatalogDeadlockTest, and AccessControllerManagerTest (49 tests); final FE Checkstyle (0 violations); git diff --check. Original-code counterchecks reproduced 10 expected failures among the first 11 new cases.
- Behavior changed: Yes. DROP and rename wait for initialization outside the global catalog lock and fence old-name authorization publication.
- Does this need documentation: No.1 parent ba0f1a1 commit e235389
4 files changed
Lines changed: 507 additions & 89 deletions
File tree
- fe/fe-core/src
- main/java/org/apache/doris
- common/lock
- datasource
- mysql/privilege
- test/java/org/apache/doris/datasource
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
115 | 123 | | |
116 | 124 | | |
117 | 125 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| 68 | + | |
68 | 69 | | |
69 | 70 | | |
70 | 71 | | |
| |||
125 | 126 | | |
126 | 127 | | |
127 | 128 | | |
128 | | - | |
129 | | - | |
130 | | - | |
| 129 | + | |
| 130 | + | |
131 | 131 | | |
132 | 132 | | |
| 133 | + | |
| 134 | + | |
133 | 135 | | |
134 | 136 | | |
135 | 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 | + | |
136 | 190 | | |
137 | 191 | | |
138 | 192 | | |
| |||
302 | 356 | | |
303 | 357 | | |
304 | 358 | | |
305 | | - | |
306 | | - | |
307 | | - | |
308 | | - | |
309 | | - | |
310 | | - | |
311 | | - | |
312 | | - | |
313 | | - | |
314 | | - | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
315 | 375 | | |
316 | | - | |
317 | | - | |
318 | | - | |
319 | | - | |
320 | | - | |
321 | | - | |
322 | | - | |
323 | | - | |
324 | | - | |
325 | | - | |
326 | 376 | | |
327 | | - | |
328 | 377 | | |
329 | 378 | | |
330 | 379 | | |
331 | 380 | | |
332 | 381 | | |
333 | 382 | | |
334 | | - | |
335 | | - | |
336 | | - | |
337 | | - | |
338 | | - | |
339 | | - | |
340 | | - | |
341 | | - | |
342 | | - | |
343 | | - | |
344 | | - | |
345 | | - | |
346 | | - | |
347 | | - | |
348 | | - | |
349 | | - | |
350 | | - | |
351 | | - | |
352 | | - | |
353 | | - | |
354 | | - | |
355 | | - | |
356 | | - | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
357 | 402 | | |
358 | 403 | | |
359 | 404 | | |
| |||
642 | 687 | | |
643 | 688 | | |
644 | 689 | | |
645 | | - | |
646 | | - | |
647 | | - | |
648 | | - | |
649 | | - | |
650 | | - | |
651 | | - | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
652 | 694 | | |
653 | 695 | | |
654 | 696 | | |
655 | 697 | | |
656 | 698 | | |
657 | 699 | | |
658 | 700 | | |
659 | | - | |
660 | | - | |
661 | | - | |
662 | | - | |
663 | | - | |
664 | | - | |
665 | | - | |
666 | | - | |
667 | | - | |
668 | | - | |
669 | | - | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
670 | 708 | | |
671 | 709 | | |
672 | 710 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
718 | 718 | | |
719 | 719 | | |
720 | 720 | | |
721 | | - | |
| 721 | + | |
722 | 722 | | |
723 | 723 | | |
724 | 724 | | |
| |||
728 | 728 | | |
729 | 729 | | |
730 | 730 | | |
731 | | - | |
| 731 | + | |
732 | 732 | | |
733 | 733 | | |
734 | 734 | | |
735 | 735 | | |
736 | 736 | | |
737 | 737 | | |
738 | 738 | | |
739 | | - | |
| 739 | + | |
740 | 740 | | |
741 | 741 | | |
742 | | - | |
| 742 | + | |
743 | 743 | | |
744 | 744 | | |
745 | 745 | | |
746 | | - | |
| 746 | + | |
747 | 747 | | |
748 | 748 | | |
749 | 749 | | |
750 | | - | |
| 750 | + | |
751 | 751 | | |
752 | 752 | | |
753 | 753 | | |
754 | 754 | | |
755 | 755 | | |
756 | 756 | | |
757 | | - | |
| 757 | + | |
758 | 758 | | |
759 | | - | |
| 759 | + | |
760 | 760 | | |
761 | | - | |
| 761 | + | |
762 | 762 | | |
763 | 763 | | |
764 | 764 | | |
765 | 765 | | |
766 | | - | |
| 766 | + | |
767 | 767 | | |
768 | 768 | | |
769 | 769 | | |
770 | | - | |
| 770 | + | |
771 | 771 | | |
772 | 772 | | |
773 | 773 | | |
774 | 774 | | |
775 | | - | |
776 | | - | |
| 775 | + | |
| 776 | + | |
777 | 777 | | |
778 | 778 | | |
779 | 779 | | |
| |||
783 | 783 | | |
784 | 784 | | |
785 | 785 | | |
| 786 | + | |
| 787 | + | |
786 | 788 | | |
787 | 789 | | |
788 | 790 | | |
| |||
794 | 796 | | |
795 | 797 | | |
796 | 798 | | |
797 | | - | |
| 799 | + | |
798 | 800 | | |
799 | 801 | | |
800 | 802 | | |
801 | 803 | | |
802 | 804 | | |
803 | 805 | | |
804 | | - | |
805 | | - | |
| 806 | + | |
| 807 | + | |
806 | 808 | | |
807 | | - | |
| 809 | + | |
808 | 810 | | |
809 | 811 | | |
810 | 812 | | |
811 | 813 | | |
812 | 814 | | |
813 | | - | |
| 815 | + | |
814 | 816 | | |
815 | | - | |
| 817 | + | |
816 | 818 | | |
817 | 819 | | |
818 | 820 | | |
819 | | - | |
820 | | - | |
821 | | - | |
| 821 | + | |
| 822 | + | |
| 823 | + | |
822 | 824 | | |
823 | 825 | | |
824 | 826 | | |
825 | | - | |
826 | | - | |
| 827 | + | |
| 828 | + | |
827 | 829 | | |
828 | 830 | | |
829 | 831 | | |
| |||
0 commit comments