支持设置单节点最大线程数、单节点TCP最大连接数

internal/web/actions/default/clusters/cluster/settings/index.go

@@ -8,6 +8,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
 )
 
 type IndexAction struct {
@@ -65,22 +66,32 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["timeZoneLocation"] = nodeconfigs.FindTimeZoneLocation(cluster.TimeZone)
 
 	this.Data["cluster"] = maps.Map{
-		"id":         cluster.Id,
-		"name":       cluster.Name,
-		"installDir": cluster.InstallDir,
-		"timeZone":   cluster.TimeZone,
+		"id":                    cluster.Id,
+		"name":                  cluster.Name,
+		"installDir":            cluster.InstallDir,
+		"timeZone":              cluster.TimeZone,
+		"nodeMaxThreads":        cluster.NodeMaxThreads,
+		"nodeTCPMaxConnections": cluster.NodeTCPMaxConnections,
 	}
 
+	// 默认值
+	this.Data["defaultNodeMaxThreads"] = nodeconfigs.DefaultMaxThreads
+	this.Data["defaultNodeMaxThreadsMin"] = nodeconfigs.DefaultMaxThreadsMin
+	this.Data["defaultNodeMaxThreadsMax"] = nodeconfigs.DefaultMaxThreadsMax
+	this.Data["defaultNodeTCPMaxConnections"] = nodeconfigs.DefaultTCPMaxConnections
+
 	this.Show()
 }
 
 // RunPost 保存设置
 func (this *IndexAction) RunPost(params struct {
-	ClusterId  int64
-	Name       string
-	GrantId    int64
-	InstallDir string
-	TimeZone   string
+	ClusterId             int64
+	Name                  string
+	GrantId               int64
+	InstallDir            string
+	TimeZone              string
+	NodeMaxThreads        int32
+	NodeTCPMaxConnections int32
 
 	Must *actions.Must
 }) {
@@ -91,12 +102,21 @@ func (this *IndexAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入集群名称")
 
+	if params.NodeMaxThreads > 0 {
+		params.Must.
+			Field("nodeMaxThreads", params.NodeMaxThreads).
+			Gte(int64(nodeconfigs.DefaultMaxThreadsMin), "单节点最大线程数最小值不能小于"+types.String(nodeconfigs.DefaultMaxThreadsMin)).
+			Lte(int64(nodeconfigs.DefaultMaxThreadsMax), "单节点最大线程数最大值不能大于"+types.String(nodeconfigs.DefaultMaxThreadsMax))
+	}
+
 	_, err := this.RPC().NodeClusterRPC().UpdateNodeCluster(this.AdminContext(), &pb.UpdateNodeClusterRequest{
-		NodeClusterId: params.ClusterId,
-		Name:          params.Name,
-		NodeGrantId:   params.GrantId,
-		InstallDir:    params.InstallDir,
-		TimeZone:      params.TimeZone,
+		NodeClusterId:         params.ClusterId,
+		Name:                  params.Name,
+		NodeGrantId:           params.GrantId,
+		InstallDir:            params.InstallDir,
+		TimeZone:              params.TimeZone,
+		NodeMaxThreads:        params.NodeMaxThreads,
+		NodeTCPMaxConnections: params.NodeTCPMaxConnections,
 	})
 	if err != nil {
 		this.ErrorPage(err)

web/views/@default/clusters/cluster/settings/index.html

@@ -20,27 +20,46 @@
 				<td>节点安装目录</td>
 				<td>
 					<input type="text" name="installDir" maxlength="100" v-model="cluster.installDir"/>
-					<p class="comment">当节点没有单独设置安装目录时，默认使用此设置。如果集群和节点都没有设置安装目录，则使用<span class="ui label tiny">/$登录用户/edge-node</span> 目录。</p>
+					<p class="comment">当节点没有单独设置安装目录时，默认使用此设置。如果集群和节点都没有设置安装目录，则使用<span class="ui label tiny">$登录用户HOME路径/edge-node</span> 目录。</p>
 				</td>
 			</tr>
             <tr>
-                <td>时区</td>
-                <td>
-                    <div class="ui fields inline">
-                        <div class="ui field">
-                            <select class="ui dropdown" v-model="timeZoneGroupCode">
-                                <option v-for="timeZoneGroup in timeZoneGroups" :value="timeZoneGroup.code">{{timeZoneGroup.name}}</option>
-                            </select>
-                        </div>
-                        <div class="ui field">
-                            <select class="ui dropdown" name="timeZone" v-model="cluster.timeZone">
-                                <option v-for="timeZoneLocation in timeZoneLocations" :value="timeZoneLocation.name" v-if="timeZoneLocation.group == timeZoneGroupCode">{{timeZoneLocation.name}} ({{timeZoneLocation.offset}})</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="comment">节点记录日志使用的时区。</p>
-                </td>
+                <td colspan="2"><more-options-indicator></more-options-indicator></td>
             </tr>
+            <tbody v-show="moreOptionsVisible">
+                <tr>
+                    <td>时区</td>
+                    <td>
+                        <div class="ui fields inline">
+                            <div class="ui field">
+                                <select class="ui dropdown" v-model="timeZoneGroupCode">
+                                    <option v-for="timeZoneGroup in timeZoneGroups" :value="timeZoneGroup.code">{{timeZoneGroup.name}}</option>
+                                </select>
+                            </div>
+                            <div class="ui field">
+                                <select class="ui dropdown" name="timeZone" v-model="cluster.timeZone">
+                                    <option v-for="timeZoneLocation in timeZoneLocations" :value="timeZoneLocation.name" v-if="timeZoneLocation.group == timeZoneGroupCode">{{timeZoneLocation.name}} ({{timeZoneLocation.offset}})</option>
+                                </select>
+                            </div>
+                        </div>
+                        <p class="comment">节点记录日志使用的时区。</p>
+                    </td>
+                </tr>
+                <tr>
+                    <td>单节点最大线程数</td>
+                    <td>
+                        <input type="text" name="nodeMaxThreads" maxlength="6" v-model="cluster.nodeMaxThreads"/>
+                        <p class="comment">取值在{{defaultNodeMaxThreadsMin}}和{{defaultNodeMaxThreadsMax}}之间；如果为0，则默认为{{defaultNodeMaxThreads}}。</p>
+                    </td>
+                </tr>
+                <tr>
+                    <td>单节点TCP最大连接数</td>
+                    <td>
+                        <input type="text" name="nodeTCPMaxConnections" maxlength="6" v-model="cluster.nodeTCPMaxConnections"/>
+                        <p class="comment">如果为0，则默认为{{defaultNodeTCPMaxConnections}}。</p>
+                    </td>
+                </tr>
+            </tbody>
 		</table>
 		<submit-btn></submit-btn>
 	</form>

web/views/@default/clusters/create.html

@@ -38,7 +38,7 @@
 			<td>节点安装目录</td>
 			<td>
 				<input type="text" name="installDir" maxlength="100"/>
-				<p class="comment">当节点没有单独设置安装目录时，默认使用此设置。如果集群和节点都没有设置安装目录，则使用<span class="ui label tiny">/$登录用户/edge-node</span>
+				<p class="comment">当节点没有单独设置安装目录时，默认使用此设置。如果集群和节点都没有设置安装目录，则使用<span class="ui label tiny">$登录用户HOME路径/edge-node</span>
 					目录。</p>
 			</td>
 		</tr>