[BugFix]keep connector/catalog map in consistent as much as possible (backport #46995) (backport #47329)

mergify[bot] commented 2 days ago

Why I'm doing:

What I'm doing:

Fixes #issue cp #46995

What type of PR is this:

[x] BugFix
[ ] Feature
[ ] Enhancement
[ ] Refactor
[ ] UT
[ ] Doc
[ ] Tool

Does this PR entail a change in behavior?

[ ] Yes, this PR will result in a change in behavior.
[x] No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

[ ] Interface/UI changes: syntax, type conversion, expression evaluation, display information
[ ] Parameter changes: default values, similar parameters but with different default values
[ ] Policy changes: use new policy to replace old one, functionality automatically enabled
[ ] Feature removed
[ ] Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

[ ] I have added test cases for my bug fix or my new feature
[ ] This pr needs user documentation (for new or modified features or behaviors)
- [ ] I have added documentation for my new feature or new function
[x] This is a backport pr

Bugfix cherry-pick branch check:

[x] I have checked the version labels which the pr will be auto-backported to the target branch
- [x] 3.3
- [ ] 3.2
- [x] 3.1
- [ ] 3.0
- [ ] 2.5

This is an automatic backport of pull request #47329 done by Mergify.

Why I'm doing:

What I'm doing:

Fixes #issue cp #46995

What type of PR is this:

[x] BugFix
[ ] Feature
[ ] Enhancement
[ ] Refactor
[ ] UT
[ ] Doc
[ ] Tool

Does this PR entail a change in behavior?

[ ] Yes, this PR will result in a change in behavior.
[x] No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

[ ] Interface/UI changes: syntax, type conversion, expression evaluation, display information
[ ] Parameter changes: default values, similar parameters but with different default values
[ ] Policy changes: use new policy to replace old one, functionality automatically enabled
[ ] Feature removed
[ ] Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

[ ] I have added test cases for my bug fix or my new feature
[ ] This pr needs user documentation (for new or modified features or behaviors)
- [ ] I have added documentation for my new feature or new function
[x] This is a backport pr

mergify[bot] commented 2 days ago

Cherry-pick of 5a89d2ba5d19fd2b2cb00e15a94f514fa315bb2f has failed:

On branch mergify/bp/branch-3.1/pr-47329
Your branch is up to date with 'origin/branch-3.1'.

You are currently cherry-picking commit 5a89d2ba5d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    modified:   fe/fe-core/src/main/java/com/starrocks/catalog/ExternalCatalog.java
    modified:   fe/fe-core/src/main/java/com/starrocks/connector/ConnectorMgr.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   fe/fe-core/src/main/java/com/starrocks/server/CatalogMgr.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

mergify[bot] commented 2 days ago

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

StarRocks / starrocks