From 8c72ea9c140a5f74eeac10ba2f3e41b0e42d0341 Mon Sep 17 00:00:00 2001 From: Ran Date: Tue, 4 Apr 2023 11:16:59 +0800 Subject: [PATCH] fix: Support for a minimum timeout value of -1 in thread pool execution(#1069) --- .../src/views/hippo4j/instance/index.vue | 205 +++++++++--------- .../src/views/hippo4j/threadpool/index.vue | 4 +- 2 files changed, 111 insertions(+), 98 deletions(-) diff --git a/hippo4j-ui/src/views/hippo4j/instance/index.vue b/hippo4j-ui/src/views/hippo4j/instance/index.vue index 3c750ac4..2f358acb 100755 --- a/hippo4j-ui/src/views/hippo4j/instance/index.vue +++ b/hippo4j-ui/src/views/hippo4j/instance/index.vue @@ -149,9 +149,9 @@ --> @@ -169,122 +169,127 @@ width="1000px" >
- + {{ $t('common.close') }} - + {{ $t('common.refresh') }}
@@ -358,7 +363,7 @@ v-model="temp.executeTimeOut" :placeholder="$t('threadPool.executionTimeoutUnit')" controls-position="right" - :min="0" + :min="-1" :max="999999" /> @@ -394,11 +399,11 @@ /> - +
- {{ $t('common.cancel') }} + {{ $t('common.cancel') }} {{ $t('common.confirm') }} @@ -406,8 +411,8 @@ - - + + {{ $t('common.confirm') }} @@ -426,9 +431,9 @@ - {{ $t('common.close') }} + {{ $t('common.close') }} - + {{ $t('common.refresh') }} @@ -446,8 +451,8 @@ import Pagination from '@/components/Pagination'; import axios from 'axios'; export default { - components: { Pagination }, - directives: { waves }, + components: {Pagination}, + directives: {waves}, filters: { statusFilter(status) { const statusMap = { @@ -520,48 +525,48 @@ export default { threadPoolOptions: [], itemOptions: [], queueTypeOptions: [ - { key: 1, display_name: 'ArrayBlockingQueue' }, - { key: 2, display_name: 'LinkedBlockingQueue' }, - { key: 3, display_name: 'LinkedBlockingDeque' }, - { key: 4, display_name: 'SynchronousQueue' }, - { key: 5, display_name: 'LinkedTransferQueue' }, - { key: 6, display_name: 'PriorityBlockingQueue' }, + {key: 1, display_name: 'ArrayBlockingQueue'}, + {key: 2, display_name: 'LinkedBlockingQueue'}, + {key: 3, display_name: 'LinkedBlockingDeque'}, + {key: 4, display_name: 'SynchronousQueue'}, + {key: 5, display_name: 'LinkedTransferQueue'}, + {key: 6, display_name: 'PriorityBlockingQueue'}, { key: 9, display_name: 'ResizableLinkedBlockingQueue (动态修改队列大小)', }, ], rejectedOptions: [ - { key: 1, display_name: 'CallerRunsPolicy' }, - { key: 2, display_name: 'AbortPolicy' }, - { key: 3, display_name: 'DiscardPolicy' }, - { key: 4, display_name: 'DiscardOldestPolicy' }, - { key: 5, display_name: 'RunsOldestTaskPolicy' }, - { key: 6, display_name: 'SyncPutQueuePolicy' }, - { key: 99, display_name: 'CustomRejectedPolicy（自定义 SPI 策略）' }, + {key: 1, display_name: 'CallerRunsPolicy'}, + {key: 2, display_name: 'AbortPolicy'}, + {key: 3, display_name: 'DiscardPolicy'}, + {key: 4, display_name: 'DiscardOldestPolicy'}, + {key: 5, display_name: 'RunsOldestTaskPolicy'}, + {key: 6, display_name: 'SyncPutQueuePolicy'}, + {key: 99, display_name: 'CustomRejectedPolicy（自定义 SPI 策略）'}, ], alarmTypes: [ - { key: 1, display_name: '报警' }, - { key: 0, display_name: '不报警' }, + {key: 1, display_name: '报警'}, + {key: 0, display_name: '不报警'}, ], allowCoreThreadTimeOutTypes: [ - { key: 1, display_name: '超时' }, - { key: 0, display_name: '不超时' }, + {key: 1, display_name: '超时'}, + {key: 0, display_name: '不超时'}, ], rules: { - tenantId: [{ required: true, message: 'this is required', trigger: 'blur' }], - itemId: [{ required: true, message: 'this is required', trigger: 'blur' }], - tpId: [{ required: true, message: 'this is required', trigger: 'blur' }], - coreSize: [{ required: true, message: 'this is required', trigger: 'blur' }], - maxSize: [{ required: true, message: 'this is required', trigger: 'blur' }], - queueType: [{ required: true, message: 'this is required', trigger: 'blur' }], - executeTimeOut: [{ required: true, message: 'this is required', trigger: 'blur' }], - keepAliveTime: [{ required: true, message: 'this is required', trigger: 'blur' }], - isAlarm: [{ required: true, message: 'this is required', trigger: 'blur' }], - capacity: [{ required: true, message: 'this is required', trigger: 'blur' }], - capacityAlarm: [{ required: true, message: 'this is required', trigger: 'blur' }], - livenessAlarm: [{ required: true, message: 'this is required', trigger: 'blur' }], - rejectedType: [{ required: true, message: 'this is required', trigger: 'blur' }], + tenantId: [{required: true, message: 'this is required', trigger: 'blur'}], + itemId: [{required: true, message: 'this is required', trigger: 'blur'}], + tpId: [{required: true, message: 'this is required', trigger: 'blur'}], + coreSize: [{required: true, message: 'this is required', trigger: 'blur'}], + maxSize: [{required: true, message: 'this is required', trigger: 'blur'}], + queueType: [{required: true, message: 'this is required', trigger: 'blur'}], + executeTimeOut: [{required: true, message: 'this is required', trigger: 'blur'}], + keepAliveTime: [{required: true, message: 'this is required', trigger: 'blur'}], + isAlarm: [{required: true, message: 'this is required', trigger: 'blur'}], + capacity: [{required: true, message: 'this is required', trigger: 'blur'}], + capacityAlarm: [{required: true, message: 'this is required', trigger: 'blur'}], + livenessAlarm: [{required: true, message: 'this is required', trigger: 'blur'}], + rejectedType: [{required: true, message: 'this is required', trigger: 'blur'}], }, dialogStatus: '', textMap: { @@ -593,15 +598,15 @@ export default { }, fetchData() { if (!this.listQuery.tenantId) { - this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') })); + this.$message.warning(this.$t('message.emptyWarning', {name: this.$t('tenantManage.tenant')})); return; } if (!this.listQuery.itemId) { - this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') })); + this.$message.warning(this.$t('message.emptyWarning', {name: this.$t('projectManage.item')})); return; } if (!this.listQuery.tpId) { - this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('threadPool.threadPool') })); + this.$message.warning(this.$t('message.emptyWarning', {name: this.$t('threadPool.threadPool')})); return; } this.listLoading = true; @@ -620,9 +625,9 @@ export default { }, initSelect() { tenantApi - .list({ size: this.size }) + .list({size: this.size}) .then((response) => { - const { records } = response; + const {records} = response; for (let i = 0; i < records.length; i++) { this.tenantOptions.push({ key: records[i].tenantId, @@ -630,7 +635,8 @@ export default { }); } }) - .catch(() => {}); + .catch(() => { + }); }, resetTemp() { this.isRejectShow = false; @@ -667,7 +673,8 @@ export default { }); } }) - .catch(() => {}); + .catch(() => { + }); }, // 打开弹框 handleUpdate(row) { @@ -722,7 +729,7 @@ export default { clientAddressStr = clientAddress; } threadPoolApi - .runState({ clientAddress: clientAddressStr, tpId: row.tpId }) + .runState({clientAddress: clientAddressStr, tpId: row.tpId}) .then((response) => { this.instanceDialogFormVisible = true; this.runTimeTemp = response; @@ -737,12 +744,12 @@ export default { this.handleStackInfo(); }, handleStackInfo() { - const { clientAddress, tpId } = this.rowInfo; + const {clientAddress, tpId} = this.rowInfo; const clientBasePath = this.rowInfo.clientBasePath || ''; let clientAddressStr = clientAddress + clientBasePath; threadPoolApi - .runThreadState({ clientAddress: clientAddressStr, tpId: tpId }) + .runThreadState({clientAddress: clientAddressStr, tpId: tpId}) .then((response) => { const data = response; if (data && data.length != 0) { @@ -798,7 +805,8 @@ export default { this.listLoading = false; }, 1500); }) - .catch(() => {}); + .catch(() => { + }); } }); }, @@ -816,11 +824,11 @@ export default { this.itemOptions = []; this.threadPoolOptions = []; - const tenantId = { tenantId: this.listQuery.tenantId, size: this.size }; + const tenantId = {tenantId: this.listQuery.tenantId, size: this.size}; itemApi .list(tenantId) .then((response) => { - const { records = [] } = response || {}; + const {records = []} = response || {}; for (var i = 0; i < records.length; i++) { this.itemOptions.push({ key: records[i].itemId, @@ -828,18 +836,19 @@ export default { }); } }) - .catch(() => {}); + .catch(() => { + }); }, itemSelectList() { this.listQuery.tpId = null; this.threadPoolOptions = []; - const itemId = { itemId: this.listQuery.itemId, size: this.size }; + const itemId = {itemId: this.listQuery.itemId, size: this.size}; threadPoolApi .list(itemId) .then((response) => { - const { records = [] } = response || {}; + const {records = []} = response || {}; for (var i = 0; i < records.length; i++) { this.threadPoolOptions.push({ key: records[i].tpId, @@ -847,16 +856,18 @@ export default { }); } }) - .catch(() => {}); + .catch(() => { + }); }, }, };