默认不启用MMAP

docker/Dockerfile

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

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000
 	github.com/cespare/xxhash/v2 v2.2.0
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/iwind/TeaGo v0.0.0-20240312020455-6f20b5121caf
+	github.com/iwind/TeaGo v0.0.0-20240429060313-31a7bc8e9cc9
 	github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4
 	github.com/miekg/dns v1.1.43
 	github.com/quic-go/quic-go v0.42.0

go.sum

@@ -30,6 +30,8 @@ github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f h1:f00RU+zOX+B3rLAmMM
 github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
 github.com/iwind/TeaGo v0.0.0-20240312020455-6f20b5121caf h1:WA9qgiynESu/DDTnLH6npRI5AK6UL9qwJ2YZ5qhJX5E=
 github.com/iwind/TeaGo v0.0.0-20240312020455-6f20b5121caf/go.mod h1:SfqVbWyIPdVflyA6lMgicZzsoGS8pyeLiTRe8/CIpGI=
+github.com/iwind/TeaGo v0.0.0-20240429060313-31a7bc8e9cc9 h1:lqSd+OeAMzPlejoVtsmHJEeQ6/MWXCr+Ws2eX9/Rewg=
+github.com/iwind/TeaGo v0.0.0-20240429060313-31a7bc8e9cc9/go.mod h1:SfqVbWyIPdVflyA6lMgicZzsoGS8pyeLiTRe8/CIpGI=
 github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4 h1:VWGsCqTzObdlbf7UUE3oceIpcEKi4C/YBUszQXk118A=
 github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

internal/configloaders/admin_ui_config.go

@@ -93,6 +93,7 @@ func loadAdminUIConfig() (*systemconfigs.AdminUIConfig, error) {
 	}
 
 	var config = &systemconfigs.AdminUIConfig{}
+	config.DNSResolver.Type = nodeconfigs.DNSResolverTypeDefault // 默认值
 	err = json.Unmarshal(resp.ValueJSON, config)
 	if err != nil {
 		logs.Println("[UI_MANAGER]" + err.Error())
@@ -108,7 +109,7 @@ func loadAdminUIConfig() (*systemconfigs.AdminUIConfig, error) {
 }
 
 func defaultAdminUIConfig() *systemconfigs.AdminUIConfig {
-	return &systemconfigs.AdminUIConfig{
+	var config = &systemconfigs.AdminUIConfig{
 		ProductName:        langs.DefaultMessage(codes.AdminUI_DefaultProductName),
 		AdminSystemName:    langs.DefaultMessage(codes.AdminUI_DefaultSystemName),
 		ShowOpenSourceInfo: true,
@@ -117,6 +118,8 @@ func defaultAdminUIConfig() *systemconfigs.AdminUIConfig {
 		DefaultPageSize:    10,
 		TimeZone:           nodeconfigs.DefaultTimeZoneLocation,
 	}
+	config.DNSResolver.Type = nodeconfigs.DNSResolverTypeDefault
+	return config
 }
 
 // 修改时区

internal/const/const.go

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

internal/nodes/admin_node.go

@@ -8,6 +8,7 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/iwind/TeaGo"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/lists"
@@ -87,6 +88,9 @@ func (this *AdminNode) Run() {
 	// 启动API节点
 	this.startAPINode()
 
+	// 设置DNS相关
+	this.setupDNS()
+
 	// 启动IP库
 	this.startIPLibrary()
 
@@ -254,6 +258,33 @@ func (this *AdminNode) addPortsToFirewall() {
 	utils.AddPortsToFirewall(ports)
 }
 
+// 设置DNS相关
+func (this *AdminNode) setupDNS() {
+	config, loadErr := configloaders.LoadAdminUIConfig()
+	if loadErr != nil {
+		// 默认使用go原生
+		err := os.Setenv("GODEBUG", "netdns=go")
+		if err != nil {
+			logs.Println("[DNS_RESOLVER]set env failed: " + err.Error())
+		}
+		return
+	}
+
+	var err error
+	switch config.DNSResolver.Type {
+	case nodeconfigs.DNSResolverTypeGoNative:
+		err = os.Setenv("GODEBUG", "netdns=go")
+	case nodeconfigs.DNSResolverTypeCGO:
+		err = os.Setenv("GODEBUG", "netdns=cgo")
+	default:
+		// 默认使用go原生
+		err = os.Setenv("GODEBUG", "netdns=go")
+	}
+	if err != nil {
+		logs.Println("[DNS_RESOLVER]set env failed: " + err.Error())
+	}
+}
+
 // 启动API节点
 func (this *AdminNode) startAPINode() {
 	var configPath = Tea.Root + "/edge-api/configs/api.yaml"

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

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

internal/web/actions/default/clusters/create.go

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

internal/web/actions/default/servers/components/cache/update.go

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

internal/web/actions/default/settings/ui/index.go

@@ -55,6 +55,7 @@ func (this *IndexAction) RunPost(params struct {
 	LogoFile           *actions.File
 	DefaultPageSize    int
 	TimeZone           string
+	DnsResolverType    string
 
 	SupportModuleCDN bool
 	SupportModuleNS  bool
@@ -85,6 +86,7 @@ func (this *IndexAction) RunPost(params struct {
 	config.ShowVersion = params.ShowVersion
 	config.Version = params.Version
 	config.TimeZone = params.TimeZone
+	config.DNSResolver.Type = params.DnsResolverType
 
 	if params.DefaultPageSize > 0 {
 		config.DefaultPageSize = params.DefaultPageSize
@@ -111,10 +113,10 @@ func (this *IndexAction) RunPost(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		fileId := createResp.FileId
+		var fileId = createResp.FileId
 
 		// 上传内容
-		buf := make([]byte, 512*1024)
+		var buf = make([]byte, 512*1024)
 		reader, err := params.FaviconFile.OriginFile.Open()
 		if err != nil {
 			this.ErrorPage(err)
@@ -158,10 +160,10 @@ func (this *IndexAction) RunPost(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		fileId := createResp.FileId
+		var fileId = createResp.FileId
 
 		// 上传内容
-		buf := make([]byte, 512*1024)
+		var buf = make([]byte, 512*1024)
 		reader, err := params.LogoFile.OriginFile.Open()
 		if err != nil {
 			this.ErrorPage(err)

internal/web/actions/default/setup/mysql/mysqlinstallers/mysql_installer.go

@@ -344,10 +344,12 @@ func (this *MySQLInstaller) InstallFromFile(xzFilePath string, targetDir string)
 
 		// waiting for startup
 		for i := 0; i < 30; i++ {
-			_, err = net.Dial("tcp", "127.0.0.1:3306")
+			var conn net.Conn
+			conn, err = net.Dial("tcp", "127.0.0.1:3306")
 			if err != nil {
 				time.Sleep(1 * time.Second)
 			} else {
+				_ = conn.Close()
 				break
 			}
 		}

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

@@ -126,6 +126,20 @@
                         <p class="comment">执行TRIM后可以移除SSD硬盘中无效的数据，从而显著提升SSD硬盘写入性能。</p>
                     </td>
                 </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>
 		</table>
 		<submit-btn></submit-btn>

web/views/@default/servers/addOriginPopup.html

@@ -46,7 +46,7 @@
             <td>回源主机名</td>
             <td>
                 <input type="text" name="host" placeholder="比如example.com" maxlength="100"/>
-                <p class="comment">可选项。请求源站时的Host字段值，用于设置访问源站的站点域名<span v-if="isHTTP">，支持请求变量</span>。</p>
+                <p class="comment">可选项。请求源站时的Host字段值，用于设置访问源站的站点域名<span v-if="isHTTP">，支持请求变量</span>；如果用户访问的域名和源站域名不一致，请务必设置为源站域名。</p>
             </td>
         </tr>
 

web/views/@default/servers/components/cache/createPopup.html

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

web/views/@default/servers/components/cache/update.js

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

web/views/@default/servers/server/settings/origins/addPopup.html

@@ -48,7 +48,7 @@
             <td>回源主机名</td>
             <td>
                 <input type="text" name="host" placeholder="比如example.com" maxlength="100"/>
-                <p class="comment">可选项。请求源站时的Host字段值，用于设置访问源站的站点域名<span v-if="isHTTP">，支持请求变量</span>。</p>
+                <p class="comment">可选项。请求源站时的Host字段值，用于设置访问源站的站点域名<span v-if="isHTTP">，支持请求变量</span>；如果用户访问的域名和源站域名不一致，请务必设置为源站域名。</p>
             </td>
         </tr>
 

web/views/@default/servers/server/settings/origins/updatePopup.html

@@ -49,7 +49,7 @@
             <td>回源主机名</td>
             <td>
                 <input type="text" name="host"  v-model="origin.host" placeholder="比如example.com" maxlength="100"/>
-                <p class="comment">可选项。请求源站时的Host字段值，用于设置访问源站的站点域名<span v-if="isHTTP">，支持请求变量</span>。</p>
+                <p class="comment">可选项。请求源站时的Host字段值，用于设置访问源站的站点域名<span v-if="isHTTP">，支持请求变量</span>；如果用户访问的域名和源站域名不一致，请务必设置为源站域名。</p>
             </td>
         </tr>
 

web/views/@default/settings/ui/index.html

@@ -109,7 +109,18 @@
                         </select>
                     </div>
                 </div>
-                <p class="comment">显示时间使用的时区。</p>
+                <p class="comment">当前管理系统显示时间使用的时区。</p>
+            </td>
+        </tr>
+        <tr>
+            <td>使用的DNS解析库</td>
+            <td>
+                <select class="ui dropdown auto-width" name="dnsResolverType" v-model="config.dnsResolver.type">
+                    <option value="default">默认</option>
+                    <option value="cgo">CGO</option>
+                    <option value="goNative">Go原生</option>
+                </select>
+                <p class="comment">当前管理系统使用的DNS解析库；修改此项配置后，需要重启管理系统进程才会生效；通常不需要修改；如要修改，请在专家指导下进行。</p>
             </td>
         </tr>
     </table>