Skip to content

Commit

Permalink
[KYUUBI #5789] Flink engine kyuubi.session.engine.flink.fetch.timeout…
Browse files Browse the repository at this point in the history
… parameter on the server is not effective

# 🔍 Description
## Issue References 🔗

This pull request fixes #5789

## Describe Your Solution 🔧

First initialize the server 'kyuubi.session.engine.flink.fetch.timeout' parameters, if the server parameter does not exist, it is set to unlimited duration; And then obtain the client 'kyuubi.session.engine.flink.fetch.timeout' parameters, if the client parameters use the server does not exist.

## Types of changes 🔖

- [x] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Test Plan 🧪

#### Behavior Without This Pull Request ⚰️

#### Behavior With This Pull Request 🎉

#### Related Unit Tests

---

# Checklists
## 📝 Author Self Checklist

- [x] My code follows the [style guidelines](https://kyuubi.readthedocs.io/en/master/contributing/code/style.html) of this project
- [x] I have performed a self-review
- [x] I have commented my code, particularly in hard-to-understand areas
- [] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
- [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)

## 📝 Committer Pre-Merge Checklist

- [x] Pull request title is okay.
- [x] No license issues.
- [x] Milestone correctly set?
- [x] Test coverage is ok
- [x] Assignees are selected.
- [x] Minimum number of approvals
- [x] No changes are requested

Closes #5790 from junjiem/fix-5789.

Closes #5789

925ac25 [junjie.miao] fix flink engine kyuubi.session.engine.flink.fetch.timeout parameter on the server is not effective bug

Authored-by: junjie.miao <[email protected]>
Signed-off-by: Paul Lin <[email protected]>
(cherry picked from commit fc3a215)
Signed-off-by: Paul Lin <[email protected]>
  • Loading branch information
junjiem authored and link3280 committed Nov 30, 2023
1 parent 0cef494 commit 700d72a
Showing 1 changed file with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ class FlinkSQLOperationManager extends OperationManager("FlinkSQLOperationManage

private lazy val resultMaxRowsDefault = getConf.get(ENGINE_FLINK_MAX_ROWS)

private lazy val resultFetchTimeoutDefault = getConf.get(ENGINE_FLINK_FETCH_TIMEOUT)
.map(_ milliseconds).getOrElse(Duration.Inf)

private lazy val operationConvertCatalogDatabaseDefault =
getConf.get(ENGINE_OPERATION_CONVERT_CATALOG_DATABASE_ENABLED)

Expand Down Expand Up @@ -71,7 +74,7 @@ class FlinkSQLOperationManager extends OperationManager("FlinkSQLOperationManage

val resultFetchTimeout =
flinkSession.normalizedConf.get(ENGINE_FLINK_FETCH_TIMEOUT.key).map(_.toLong milliseconds)
.getOrElse(Duration.Inf)
.getOrElse(resultFetchTimeoutDefault)

val op = mode match {
case NoneMode =>
Expand Down

0 comments on commit 700d72a

Please sign in to comment.