Compare commits

...

4 Commits

Author SHA1 Message Date
刘祥超
073890c843 默认不启用MMAP 2024-05-01 12:51:24 +08:00
刘祥超
44765ed970 Dockerfile版本号修改为1.3.8 2024-05-01 08:53:53 +08:00
刘祥超
39bd6264e7 版本号修改为1.3.8 2024-04-30 19:51:35 +08:00
刘祥超
8a480d296f 可以在集群设置中修改节点最大并发读/写数 2024-04-30 19:51:30 +08:00
8 changed files with 30 additions and 6 deletions

View File

@@ -1,7 +1,7 @@
FROM --platform=linux/amd64 alpine:latest FROM --platform=linux/amd64 alpine:latest
LABEL maintainer="goedge.cdn@gmail.com" LABEL maintainer="goedge.cdn@gmail.com"
ENV TZ "Asia/Shanghai" ENV TZ "Asia/Shanghai"
ENV VERSION 1.3.7 ENV VERSION 1.3.8
ENV ROOT_DIR /usr/local/goedge ENV ROOT_DIR /usr/local/goedge
ENV TAR_FILE edge-admin-linux-amd64-plus-v${VERSION}.zip ENV TAR_FILE edge-admin-linux-amd64-plus-v${VERSION}.zip

View File

@@ -1,9 +1,9 @@
package teaconst package teaconst
const ( const (
Version = "1.3.7" Version = "1.3.8"
APINodeVersion = "1.3.7" APINodeVersion = "1.3.8"
ProductName = "Edge Admin" ProductName = "Edge Admin"
ProcessName = "edge-admin" ProcessName = "edge-admin"

View File

@@ -114,6 +114,8 @@ func (this *IndexAction) RunGet(params struct {
"autoInstallNftables": cluster.AutoInstallNftables, "autoInstallNftables": cluster.AutoInstallNftables,
"autoSystemTuning": cluster.AutoSystemTuning, "autoSystemTuning": cluster.AutoSystemTuning,
"autoTrimDisks": cluster.AutoTrimDisks, "autoTrimDisks": cluster.AutoTrimDisks,
"maxConcurrentReads": cluster.MaxConcurrentReads,
"maxConcurrentWrites": cluster.MaxConcurrentWrites,
"sshParams": sshParams, "sshParams": sshParams,
"domainName": fullDomainName, "domainName": fullDomainName,
} }
@@ -143,6 +145,8 @@ func (this *IndexAction) RunPost(params struct {
AutoInstallNftables bool AutoInstallNftables bool
AutoSystemTuning bool AutoSystemTuning bool
AutoTrimDisks bool AutoTrimDisks bool
MaxConcurrentReads int32
MaxConcurrentWrites int32
Must *actions.Must Must *actions.Must
}) { }) {
@@ -200,6 +204,8 @@ func (this *IndexAction) RunPost(params struct {
AutoSystemTuning: params.AutoSystemTuning, AutoSystemTuning: params.AutoSystemTuning,
AutoTrimDisks: params.AutoTrimDisks, AutoTrimDisks: params.AutoTrimDisks,
SshParamsJSON: sshParamsJSON, SshParamsJSON: sshParamsJSON,
MaxConcurrentReads: params.MaxConcurrentReads,
MaxConcurrentWrites: params.MaxConcurrentWrites,
}) })
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)

View File

@@ -81,6 +81,8 @@ func (this *CreateAction) RunPost(params struct {
AutoInstallNftables bool AutoInstallNftables bool
AutoSystemTuning bool AutoSystemTuning bool
AutoTrimDisks bool AutoTrimDisks bool
MaxConcurrentReads int32
MaxConcurrentWrites int32
// DNS相关 // DNS相关
DnsDomainId int64 DnsDomainId int64
@@ -151,6 +153,8 @@ func (this *CreateAction) RunPost(params struct {
AutoInstallNftables: params.AutoInstallNftables, AutoInstallNftables: params.AutoInstallNftables,
AutoSystemTuning: params.AutoSystemTuning, AutoSystemTuning: params.AutoSystemTuning,
AutoTrimDisks: params.AutoTrimDisks, AutoTrimDisks: params.AutoTrimDisks,
MaxConcurrentReads: params.MaxConcurrentReads,
MaxConcurrentWrites: params.MaxConcurrentWrites,
}) })
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)

View File

@@ -56,7 +56,7 @@ func (this *UpdateAction) RunGet(params struct {
{ {
_, ok := cachePolicy.Options["enableMMAP"] _, ok := cachePolicy.Options["enableMMAP"]
if !ok { if !ok {
cachePolicy.Options["enableMMAP"] = true cachePolicy.Options["enableMMAP"] = false
} }
} }
} }

View File

@@ -126,6 +126,20 @@
<p class="comment">执行TRIM后可以移除SSD硬盘中无效的数据从而显著提升SSD硬盘写入性能。</p> <p class="comment">执行TRIM后可以移除SSD硬盘中无效的数据从而显著提升SSD硬盘写入性能。</p>
</td> </td>
</tr> </tr>
<tr>
<td>节点I/O最大读并发数</td>
<td>
<input name="maxConcurrentReads" v-model="cluster.maxConcurrentReads" type="text" style="width: 5em" maxlength="4"/>
<p class="comment">0表示根据系统资源自动计算通常不需要修改请在专业人士指导下操作。</p>
</td>
</tr>
<tr>
<td>节点I/O最大写并发数</td>
<td>
<input name="maxConcurrentWrites" v-model="cluster.maxConcurrentWrites" type="text" style="width: 5em" maxlength="4"/>
<p class="comment">0表示根据系统资源自动计算通常不需要修改请在专业人士指导下操作。</p>
</td>
</tr>
</tbody> </tbody>
</table> </table>
<submit-btn></submit-btn> <submit-btn></submit-btn>

View File

@@ -73,7 +73,7 @@
<tr v-show="moreOptionsVisible && policyType == 'file'"> <tr v-show="moreOptionsVisible && policyType == 'file'">
<td class="color-border">启用MMAP</td> <td class="color-border">启用MMAP</td>
<td> <td>
<checkbox name="enableMMAP" checked="checked"></checkbox> <checkbox name="enableMMAP"></checkbox>
<p class="comment">选中后表示允许系统自动利用MMAP提升缓存读取性能。</p> <p class="comment">选中后表示允许系统自动利用MMAP提升缓存读取性能。</p>
</td> </td>
</tr> </tr>

View File

@@ -12,7 +12,7 @@ Tea.context(function () {
if (this.policyType == "file") { if (this.policyType == "file") {
let options = this.cachePolicy.options let options = this.cachePolicy.options
if (options != null && typeof options == "object" && typeof options["dir"] === "undefined") { if (options != null && typeof options == "object" && typeof options["dir"] === "undefined") {
options["enableMMAP"] = true options["enableMMAP"] = false
options["dir"] = "/opt/cache" options["dir"] = "/opt/cache"
options["memoryPolicy"] = { options["memoryPolicy"] = {
capacity: { capacity: {