MM-34125: Remove WebSocketDelay feature flag (#17441)
It has been soaked for enough time in community-daily and also in community. Enabling it for all. ```release-note TCP_NO_DELAY is disabled for websocket connections to allow for higher throughput ``` https://mattermost.atlassian.net/browse/MM-34125
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
a16fdb5001
Коммит
4295a1f556
@@ -71,14 +71,14 @@ func (a *App) NewWebConn(ws *websocket.Conn, session model.Session, t i18n.Trans
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if a.srv.Config().FeatureFlags.WebSocketDelay {
|
// Disable TCP_NO_DELAY for higher throughput
|
||||||
// Disable TCP_NO_DELAY for higher throughput
|
// Unfortunately, it doesn't work for tls.Conn,
|
||||||
tcpConn, ok := ws.UnderlyingConn().(*net.TCPConn)
|
// and currently, the API doesn't expose the underlying TCP conn.
|
||||||
if ok {
|
tcpConn, ok := ws.UnderlyingConn().(*net.TCPConn)
|
||||||
err := tcpConn.SetNoDelay(false)
|
if ok {
|
||||||
if err != nil {
|
err := tcpConn.SetNoDelay(false)
|
||||||
mlog.Warn("Error in setting NoDelay socket opts", mlog.Err(err))
|
if err != nil {
|
||||||
}
|
mlog.Warn("Error in setting NoDelay socket opts", mlog.Err(err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,8 +34,6 @@ type FeatureFlags struct {
|
|||||||
|
|
||||||
// Toggle on and off support for Files search
|
// Toggle on and off support for Files search
|
||||||
FilesSearch bool
|
FilesSearch bool
|
||||||
// Feature flag to control setting the TCP_NO_DELAY setting for websockets.
|
|
||||||
WebSocketDelay bool
|
|
||||||
|
|
||||||
// Control support for custom data retention policies
|
// Control support for custom data retention policies
|
||||||
CustomDataRetentionEnabled bool
|
CustomDataRetentionEnabled bool
|
||||||
@@ -52,7 +50,6 @@ func (f *FeatureFlags) SetDefaults() {
|
|||||||
|
|
||||||
f.PluginIncidentManagement = "1.7.0"
|
f.PluginIncidentManagement = "1.7.0"
|
||||||
f.PluginApps = ""
|
f.PluginApps = ""
|
||||||
f.WebSocketDelay = false
|
|
||||||
f.CustomDataRetentionEnabled = false
|
f.CustomDataRetentionEnabled = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user