-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Flink: sync 1.15 with 1.17 for backports missed or not ported identically #7402
Conversation
@@ -233,6 +233,7 @@ public void notifyCheckpointComplete(long checkpointId) throws Exception { | |||
// the files, | |||
// Besides, we need to maintain the max-committed-checkpoint-id to be increasing. | |||
if (checkpointId > maxCommittedCheckpointId) { | |||
LOG.info("Checkpoint {} completed. Attempting commit.", checkpointId); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remember that we merged this one: 5a4761c
What happened with it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like a later backport unintentionally reverted it. I missed it during review. #6949
@@ -65,7 +65,7 @@ public void before() { | |||
|
|||
@After | |||
public void clean() { | |||
sql("DROP CATALOG IF EXISTS %s", catalogName); | |||
dropCatalog(catalogName, true); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This one is not strictly needed for 1.15, as the change which caused the need for this is introduced to Flink 1.16. But it is ok to have it here too, to have less diverged code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah. it is a little better to have less diverged code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes are good.
It would be nice to understand what happened with 5a4761c, but otherwise it is good to go
thanks @pvary for review |
seems that we have some divergencies from the backport effort. maintaining the versions in sync can make future backport easier when comparing
git diff
result.Here are the remaining diffs after this sync. they are due to changes in 1.15 or 1.17.
git diff --no-index flink/v1.15/flink/src/ flink/v1.17/flink/src