Fix API ping endpoint race condition (#14365)

This corrects an issue found when running multiple clustered
Mattermost servers and using the optional `get_server_status`
check on the ping API endpoint. This is done by allowing each
server to write and read from its own health check key in the
system table.
Этот коммит содержится в:
Gabe Jackson
2020-05-05 10:44:18 -04:00
коммит произвёл GitHub
родитель 40b20c3eaf
Коммит 22c949618c

Просмотреть файл

@@ -79,7 +79,7 @@ func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) {
// Database Write/Read Check
currentTime := fmt.Sprintf("%d", time.Now().Unix())
healthCheckKey := "health_check"
healthCheckKey := fmt.Sprintf("health_check_%s", c.App.GetClusterId())
writeErr := c.App.Srv().Store.System().SaveOrUpdate(&model.System{
Name: healthCheckKey,
@@ -99,7 +99,15 @@ func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) {
mlog.Debug("Incorrect healthcheck value", mlog.String("expected", currentTime), mlog.String("got", healthCheck.Value))
s[dbStatusKey] = model.STATUS_UNHEALTHY
s[model.STATUS] = model.STATUS_UNHEALTHY
} else {
}
_, writeErr = c.App.Srv().Store.System().PermanentDeleteByName(healthCheckKey)
if writeErr != nil {
mlog.Debug("Unable to remove ping health check value from database", mlog.Err(writeErr))
s[dbStatusKey] = model.STATUS_UNHEALTHY
s[model.STATUS] = model.STATUS_UNHEALTHY
}
if s[dbStatusKey] == model.STATUS_OK {
mlog.Debug("Able to write/read files to database")
}
}