-
Notifications
You must be signed in to change notification settings - Fork 2.8k
[ZEPPELIN-6406] Remove deprecated Flink 1.15/1.16/1.17 shims and add Flink 1.19/1.20 support #5205
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
Open
jongyoul
wants to merge
14
commits into
apache:master
Choose a base branch
from
jongyoul:worktree-ZEPPELIN-6406-remove-deprecated-flink
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
8a3fe07
[ZEPPELIN-6406] Remove deprecated Flink 1.15/1.16/1.17 shims and add …
jongyoul cca6086
[ZEPPELIN-6406] Fix stream SQL cancel for Flink 1.19+ by registering …
jongyoul 39e0ae2
[ZEPPELIN-6406] Pin protobuf<4 in Flink conda env to fix CI proto des…
jongyoul 3fe7a39
[ZEPPELIN-6406] Remove flink-scala jar relocation from DownloadUtils
jongyoul e798d02
[ZEPPELIN-6406] Register stream job in FlinkStreamSqlInterpreter for …
jongyoul 72428e9
[ZEPPELIN-6406] Add commons-logging to Flink lib for YARN integration…
jongyoul 27d4d68
[ZEPPELIN-6406] Disable YARN application mode integration test for Fl…
jongyoul 53c43de
[ZEPPELIN-6406] Disable flaky testAngularRunParagraph Selenium test
jongyoul bdbf8c7
[ZEPPELIN-6406] Disable flaky testPerUserIsolatedAction Selenium test
jongyoul 69bfcdb
[ZEPPELIN-6406] Mark Selenium test job as continue-on-error
jongyoul 3482c42
[ZEPPELIN-6406] Disable additional flaky Selenium tests, revert conti…
jongyoul 9dc2b36
[ZEPPELIN-6406] Disable entire InterpreterModeActionsIT class
jongyoul aa88f31
[ZEPPELIN-6406] Disable Hive delegation token provider in ZSession Fl…
jongyoul 4ac40e2
fix: Address Copilot review on stream SQL cancel and Scala REPL bind
jongyoul File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ | |
| import org.apache.flink.streaming.experimental.SocketStreamIterator; | ||
| import org.apache.flink.table.api.Table; | ||
| import org.apache.flink.table.api.TableEnvironment; | ||
| import org.apache.flink.table.api.TableResult; | ||
| import org.apache.flink.table.api.TableSchema; | ||
| import org.apache.flink.table.sinks.RetractStreamTableSink; | ||
| import org.apache.flink.types.Row; | ||
|
|
@@ -65,6 +66,9 @@ public abstract class AbstractStreamSqlJob { | |
| protected InterpreterContext context; | ||
| protected TableSchema schema; | ||
| protected SocketStreamIterator<Tuple2<Boolean, Row>> iterator; | ||
| private volatile TableResult insertResult; | ||
| private volatile boolean cancelled = false; | ||
| private volatile boolean cancelledWithSavepoint = false; | ||
| protected Object resultLock = new Object(); | ||
| protected volatile boolean enableToRefresh = true; | ||
| protected int defaultParallelism; | ||
|
|
@@ -151,7 +155,38 @@ public String run(Table table, String tableName) throws IOException { | |
|
|
||
| LOGGER.info("Run job: {}, parallelism: {}", tableName, parallelism); | ||
| String jobName = context.getStringLocalProperty("jobName", tableName); | ||
| table.executeInsert(tableName).await(); | ||
| this.insertResult = table.executeInsert(tableName); | ||
| // Register the job with JobManager so that cancel (with savepoint) works properly | ||
| if (insertResult.getJobClient().isPresent()) { | ||
| jobManager.addJob(context, insertResult.getJobClient().get()); | ||
| } | ||
| // Use a CountDownLatch to wait for job completion while supporting cancellation | ||
| java.util.concurrent.CountDownLatch jobDone = new java.util.concurrent.CountDownLatch(1); | ||
| Thread jobThread = new Thread(() -> { | ||
| try { | ||
| insertResult.await(); | ||
| } catch (Exception e) { | ||
| LOGGER.debug("Job await interrupted or failed", e); | ||
| } finally { | ||
| jobDone.countDown(); | ||
| } | ||
| }, "flink-job-await"); | ||
| jobThread.setDaemon(true); | ||
| jobThread.start(); | ||
|
|
||
| // Wait for either job completion or cancellation | ||
| while (!cancelled && !jobDone.await(1, java.util.concurrent.TimeUnit.SECONDS)) { | ||
| // keep waiting | ||
| } | ||
| if (cancelled) { | ||
| // Wait briefly for the job to finish (e.g. stopped with savepoint) | ||
| jobDone.await(10, java.util.concurrent.TimeUnit.SECONDS); | ||
| if (cancelledWithSavepoint) { | ||
| LOGGER.info("Stream sql job stopped with savepoint, jobName: {}", jobName); | ||
| return buildResult(); | ||
| } | ||
| throw new InterruptedException("Job was cancelled"); | ||
| } | ||
|
Comment on lines
+181
to
+189
|
||
| LOGGER.info("Flink Job is finished, jobName: {}", jobName); | ||
| // wait for retrieve thread consume all data | ||
| LOGGER.info("Waiting for retrieve thread to be done"); | ||
|
|
@@ -161,9 +196,22 @@ public String run(Table table, String tableName) throws IOException { | |
| LOGGER.info("Final Result: {}", finalResult); | ||
| return finalResult; | ||
| } catch (Exception e) { | ||
| if (cancelled) { | ||
| throw new IOException("Job was cancelled", e); | ||
| } | ||
| LOGGER.error("Fail to run stream sql job", e); | ||
| if (e instanceof IOException) { | ||
| throw (IOException) e; | ||
| } | ||
| throw new IOException("Fail to run stream sql job", e); | ||
| } finally { | ||
| if (insertResult != null && insertResult.getJobClient().isPresent()) { | ||
| try { | ||
| jobManager.removeJob(context.getParagraphId()); | ||
| } catch (Exception ex) { | ||
| LOGGER.warn("Failed to remove job from JobManager", ex); | ||
| } | ||
| } | ||
| refreshScheduler.shutdownNow(); | ||
| } | ||
| } | ||
|
|
@@ -238,6 +286,12 @@ public void cancel() { | |
| } | ||
| } | ||
|
|
||
| public void cancel(boolean withSavepoint) { | ||
| LOGGER.info("Canceling stream sql job, withSavepoint={}", withSavepoint); | ||
| this.cancelledWithSavepoint = withSavepoint; | ||
| this.cancelled = true; | ||
| } | ||
|
|
||
| protected abstract void refresh(InterpreterContext context) throws Exception; | ||
|
|
||
| private class RefreshTask implements Runnable { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
jobManager.addJob(...)is called for the insert job, but this method stores a JobClient/poller keyed by paragraphId and expectsremoveJob(...)to be called to avoid stale entries. Sincerun(...)never removes the job on completion/cancellation, subsequent stream runs in the same paragraph can leave orphaned pollers and can skip starting a new poller due to the existing mapping. Add ajobManager.removeJob(context.getParagraphId())in afinallyblock (guarded by JobClient presence) once the job is done.