Skip to content

Commit acc99b1

Browse files
turboFeiturboFei
committed
fix
1 parent 34c7b3f commit acc99b1

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

‎docs/configuration/settings.md

+2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ You can configure the Kyuubi properties in `$KYUUBI_HOME/conf/kyuubi-defaults.co
8383
| kyuubi.batch.application.starvation.timeout | PT3M | Threshold above which to warn batch application may be starved. | duration | 1.7.0 |
8484
| kyuubi.batch.conf.ignore.list || A comma-separated list of ignored keys for batch conf. If the batch conf contains any of them, the key and the corresponding value will be removed silently during batch job submission. Note that this rule is for server-side protection defined via administrators to prevent some essential configs from tampering. You can also pre-define some config for batch job submission with the prefix: kyuubi.batchConf.[batchType]. For example, you can pre-define `spark.master` for the Spark batch job with key `kyuubi.batchConf.spark.spark.master`. | set | 1.6.0 |
8585
| kyuubi.batch.extra.resource.file.max.size | 0 | The maximum size in bytes of each uploaded extra resource file when creating batch. 0 or negative value means no limit. | long | 1.10.0 |
86+
| kyuubi.batch.pending.check.window | PT24H | The window to check the batch pending max elapse time from metadata store. | duration | 1.10.1 |
8687
| kyuubi.batch.resource.file.max.size | 0 | The maximum size in bytes of the uploaded resource file when creating batch. 0 or negative value means no limit. | long | 1.10.0 |
88+
| kyuubi.batch.search.window | PT168H | The window to search the batch from metadata store. | duration | 1.10.1 |
8789
| kyuubi.batch.session.idle.timeout | PT6H | Batch session idle timeout, it will be closed when it's not accessed for this duration | duration | 1.6.2 |
8890

8991
### Credentials

‎docs/monitor/metrics.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ These metrics include:
9090
| `kyuubi.metadata.request.total` | | meter | 1.6.0 | <div style='width: 150pt;word-wrap: break-word;white-space: normal'> metadata requests time and rate </div> |
9191
| `kyuubi.metadata.request.failed` | | meter | 1.6.0 | <div style='width: 150pt;word-wrap: break-word;white-space: normal'> metadata requests failure time and rate </div> |
9292
| `kyuubi.metadata.request.retrying` | | meter | 1.6.0 | <div style='width: 150pt;word-wrap: break-word;white-space: normal'> retrying metadata requests time and rate, it is not cumulative </div> |
93-
| `kyuubi.operartion.batch_pending_time` | | gauge | 1.10.1 | <div style='width: 150pt;word-wrap: break-word;white-space: normal'> the batch pending max elapsed time on current kyuubi instance </div> |
93+
| `kyuubi.operartion.batch_pending_max_elapse` | | gauge | 1.10.1 | <div style='width: 150pt;word-wrap: break-word;white-space: normal'> the batch pending max elapsed time on current kyuubi instance </div> |
9494

9595
Before v1.5.0, if you use these metrics:
9696
- `kyuubi.statement.total`

‎kyuubi-common/src/main/scala/org/apache/kyuubi/config/KyuubiConf.scala

+2-4
Original file line numberDiff line numberDiff line change
@@ -1932,17 +1932,15 @@ object KyuubiConf {
19321932

19331933
val BATCH_PENDING_CHECK_WINDOW: ConfigEntry[Long] =
19341934
buildConf("kyuubi.batch.pending.check.window")
1935-
.internal
1936-
.doc("The window to check the pending batch.")
1935+
.doc("The window to check the batch pending max elapse time from metadata store.")
19371936
.version("1.10.1")
19381937
.timeConf
19391938
.checkValue(_ > 0, "must be positive number")
19401939
.createWithDefault(Duration.ofDays(1).toMillis)
19411940

19421941
val BATCH_SEARCH_WINDOW: ConfigEntry[Long] =
19431942
buildConf("kyuubi.batch.search.window")
1944-
.internal
1945-
.doc("The window to search the batch.")
1943+
.doc("The window to search the batch from metadata store.")
19461944
.version("1.10.1")
19471945
.timeConf
19481946
.checkValue(_ > 0, "must be positive number")

‎kyuubi-metrics/src/main/scala/org/apache/kyuubi/metrics/MetricsConstants.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ object MetricsConstants {
6464
final val OPERATION_TOTAL: String = OPERATION + "total"
6565
final val OPERATION_STATE: String = OPERATION + "state"
6666
final val OPERATION_EXEC_TIME: String = OPERATION + "exec_time"
67-
final val OPERATION_BATCH_PENDING_TIME: String = OPERATION + "batch_pending_time"
67+
final val OPERATION_BATCH_PENDING_MAX_ELAPSE: String = OPERATION + "batch_pending_max_elapse"
6868

6969
final private val BACKEND_SERVICE = KYUUBI + "backend_service."
7070
final val BS_FETCH_LOG_ROWS_RATE = BACKEND_SERVICE + "fetch_log_rows_rate"

‎kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiRestFrontendService.scala

+5-2
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ class KyuubiRestFrontendService(override val serverable: Serverable)
206206
}
207207
}
208208

209-
private def getBatchPendingTime(): Long = {
209+
private def getBatchPendingMaxElapse(): Long = {
210210
val filter = MetadataFilter(
211211
state = OperationState.PENDING.toString,
212212
kyuubiInstance = connectionUrl,
@@ -234,7 +234,10 @@ class KyuubiRestFrontendService(override val serverable: Serverable)
234234
startBatchChecker()
235235
recoverBatchSessions()
236236
MetricsSystem.tracing { ms =>
237-
ms.registerGauge(MetricsConstants.OPERATION_BATCH_PENDING_TIME, getBatchPendingTime, 0)
237+
ms.registerGauge(
238+
MetricsConstants.OPERATION_BATCH_PENDING_MAX_ELAPSE,
239+
getBatchPendingMaxElapse,
240+
0)
238241
}
239242
} catch {
240243
case e: Exception => throw new KyuubiException(s"Cannot start $getName", e)

0 commit comments

Comments
 (0)