This is an automated email from the ASF dual-hosted git repository.
bowenliang pushed a commit to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/branch-1.6 by this push:
new d45a60de6 [KYUUBI #5754] [MINOR] Fix engine id of the engine probe
failures logging messages
d45a60de6 is described below
commit d45a60de6ec6381a5ffc3e0c05f5ad184240eafb
Author: Bowen Liang <liangbo...@gf.com.cn>
AuthorDate: Thu Nov 23 15:45:51 2023 +0800
[KYUUBI #5754] [MINOR] Fix engine id of the engine probe failures logging
messages
# :mag: Description
## Issue References ๐
As described.
## Describe Your Solution ๐ง
Fix the engine id in engine probe failures messages.
## Types of changes :bookmark:
- [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 :coffin:
#### Behavior With This Pull Request :tada:
#### 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
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature
works
- [ ] 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
- [ ] Pull request title is okay.
- [ ] No license issues.
- [ ] Milestone correctly set?
- [ ] Test coverage is ok
- [ ] Assignees are selected.
- [ ] Minimum number of approvals
- [ ] No changes are requested
**Be nice. Be informative.**
Closes #5754 from bowenliang123/engineid-some.
Closes #5754
893678472 [Bowen Liang] fix engine id of the engine probe failures logging
messages
Authored-by: Bowen Liang <liangbo...@gf.com.cn>
Signed-off-by: Bowen Liang <liangbo...@gf.com.cn>
(cherry picked from commit f7bbe5b9deaa0cd99497cad53e75e6e53c72528b)
Signed-off-by: Bowen Liang <liangbo...@gf.com.cn>
---
.../main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/kyuubi-server/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala
b/kyuubi-server/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala
index c91a538a1..11273f1f3 100644
---
a/kyuubi-server/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala
+++
b/kyuubi-server/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala
@@ -92,10 +92,11 @@ class KyuubiSyncThriftClient private (
remoteEngineBroken = false
} catch {
case e: Throwable =>
- warn(s"The engine[$engineId] alive probe fails", e)
+ val engineIdStr = engineId.getOrElse("")
+ warn(s"The engine[$engineIdStr] alive probe fails", e)
val now = System.currentTimeMillis()
if (now - engineLastAlive > engineAliveTimeout) {
- error(s"Mark the engine[$engineId] not alive with no recent
alive probe" +
+ error(s"Mark the engine[$engineIdStr] not alive with no
recent alive probe" +
s" success: ${now - engineLastAlive} ms exceeds timeout
$engineAliveTimeout ms")
remoteEngineBroken = true
}
