From 8bae065572bfbe59ba46eefd00775ca0993a39b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Fri, 22 Apr 2022 20:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=81=A5=E5=BA=B7=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E5=A2=9E=E5=8A=A0=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=BA60s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../@default/clusters/cluster/settings/health/runPopup.html | 3 ++-
 .../@default/clusters/cluster/settings/health/runPopup.js   | 6 ++++++
 .../@default/servers/components/cache/createPopup.html      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/views/@default/clusters/cluster/settings/health/runPopup.html b/web/views/@default/clusters/cluster/settings/health/runPopup.html
index b15ef255..969ff768 100644
--- a/web/views/@default/clusters/cluster/settings/health/runPopup.html
+++ b/web/views/@default/clusters/cluster/settings/health/runPopup.html
@@ -3,8 +3,9 @@
 <h3>健康检查</h3>
 
 <span class="red" v-if="isRequesting">正在执行中，请等待执行完毕...</span>
+<span class="red" v-if="!isRequesting && errorString.length > 0">{{errorString}}</span>
 
-<form method="post" class="ui form" v-if="!isRequesting">
+<form method="post" class="ui form" v-if="!isRequesting && errorString.length == 0">
 	<p>成功节点：<span class="green">{{countSuccess}}</span> &nbsp; 失败节点：<span class="red">{{countFail}}</span></p>
 	<table class="ui table selectable celled" v-if="results.length > 0">
 		<thead>
diff --git a/web/views/@default/clusters/cluster/settings/health/runPopup.js b/web/views/@default/clusters/cluster/settings/health/runPopup.js
index 511d9578..7e7659fe 100644
--- a/web/views/@default/clusters/cluster/settings/health/runPopup.js
+++ b/web/views/@default/clusters/cluster/settings/health/runPopup.js
@@ -5,6 +5,7 @@ Tea.context(function () {
 	this.results = []
 	this.countSuccess = 0
 	this.countFail = 0
+	this.errorString = ""
 
 	this.$delay(function () {
 		this.run()
@@ -12,11 +13,13 @@ Tea.context(function () {
 
 	this.run = function () {
 		this.isRequesting = true
+		this.errorString = ""
 
 		this.$post("$")
 			.params({
 				clusterId: this.clusterId
 			})
+			.timeout(60)
 			.success(function (resp) {
 				this.results = resp.data.results
 				let that = this
@@ -32,6 +35,9 @@ Tea.context(function () {
 					}
 				})
 			})
+			.error(function () {
+				this.errorString = "执行健康检查超时，请重试"
+			})
 			.done(function () {
 				this.isRequesting = false
 			})
diff --git a/web/views/@default/servers/components/cache/createPopup.html b/web/views/@default/servers/components/cache/createPopup.html
index 31dc8e33..20c50fa7 100644
--- a/web/views/@default/servers/components/cache/createPopup.html
+++ b/web/views/@default/servers/components/cache/createPopup.html
@@ -43,7 +43,7 @@
                 <td class="color-border">缓存文件句柄缓存</td>
                 <td>
                     <input type="text" name="fileOpenFileCacheMax" maxlength="6" value="0" style="width: 10em"/>
-                    <p class="comment">保持缓存文件句柄，提升缓存文件打开速度，建议数量是缓存文件数量的10%。</p>
+                    <p class="comment">保持缓存文件句柄，提升缓存文件打开速度，建议数量不超过缓存文件数量的10%。</p>
                 </td>
             </tr>
             <tr v-show="teaIsPlus">