[MM-57106] Remove unused cluster settings (#26490)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
2e96a3f1e7
Коммит
7337c384a8
@@ -33,7 +33,7 @@ func TestUpdateConfigRace(t *testing.T) {
|
||||
|
||||
cfg := &model.Config{}
|
||||
cfg.SetDefaults()
|
||||
cfg.ClusterSettings.MaxIdleConns = model.NewInt(1)
|
||||
cfg.ClusterSettings.GossipPort = model.NewInt(9999)
|
||||
searchEngine := searchengine.NewBroker(cfg)
|
||||
layer := searchlayer.NewSearchLayer(&testlib.TestStore{Store: store}, searchEngine, cfg)
|
||||
var wg sync.WaitGroup
|
||||
|
||||
@@ -19,7 +19,7 @@ type ClusterDiscovery struct {
|
||||
ClusterName string `json:"cluster_name"`
|
||||
Hostname string `json:"hostname"`
|
||||
GossipPort int32 `json:"gossip_port"`
|
||||
Port int32 `json:"port"`
|
||||
Port int32 `json:"port"` // Deperacted: Port is unused. It's only kept for backwards compatibility.
|
||||
CreateAt int64 `json:"create_at"`
|
||||
LastPingAt int64 `json:"last_ping_at"`
|
||||
}
|
||||
|
||||
@@ -934,10 +934,6 @@ type ClusterSettings struct {
|
||||
EnableExperimentalGossipEncryption *bool `access:"environment_high_availability,write_restrictable,cloud_restrictable"`
|
||||
ReadOnlyConfig *bool `access:"environment_high_availability,write_restrictable,cloud_restrictable"`
|
||||
GossipPort *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
|
||||
StreamingPort *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
|
||||
MaxIdleConns *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
|
||||
MaxIdleConnsPerHost *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
|
||||
IdleConnTimeoutMilliseconds *int `access:"environment_high_availability,write_restrictable,cloud_restrictable"` // telemetry: none
|
||||
}
|
||||
|
||||
func (s *ClusterSettings) SetDefaults() {
|
||||
@@ -984,22 +980,6 @@ func (s *ClusterSettings) SetDefaults() {
|
||||
if s.GossipPort == nil {
|
||||
s.GossipPort = NewInt(8074)
|
||||
}
|
||||
|
||||
if s.StreamingPort == nil {
|
||||
s.StreamingPort = NewInt(8075)
|
||||
}
|
||||
|
||||
if s.MaxIdleConns == nil {
|
||||
s.MaxIdleConns = NewInt(100)
|
||||
}
|
||||
|
||||
if s.MaxIdleConnsPerHost == nil {
|
||||
s.MaxIdleConnsPerHost = NewInt(128)
|
||||
}
|
||||
|
||||
if s.IdleConnTimeoutMilliseconds == nil {
|
||||
s.IdleConnTimeoutMilliseconds = NewInt(90000)
|
||||
}
|
||||
}
|
||||
|
||||
type MetricsSettings struct {
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
"EmailNotificationContentsType": "full",
|
||||
"LoginButtonColor": "",
|
||||
"LoginButtonBorderColor": "",
|
||||
"LoginButtonTextColor": "",
|
||||
"LoginButtonTextColor": ""
|
||||
},
|
||||
"RateLimitSettings": {
|
||||
"Enable": false,
|
||||
@@ -307,11 +307,7 @@
|
||||
"UseIPAddress": true,
|
||||
"UseExperimentalGossip": true,
|
||||
"ReadOnlyConfig": true,
|
||||
"GossipPort": 8074,
|
||||
"StreamingPort": 8075,
|
||||
"MaxIdleConns": 100,
|
||||
"MaxIdleConnsPerHost": 128,
|
||||
"IdleConnTimeoutMilliseconds": 90000
|
||||
"GossipPort": 8074
|
||||
},
|
||||
"MetricsSettings": {
|
||||
"Enable": false,
|
||||
|
||||
Ссылка в новой задаче
Block a user