bugfix: add restart empty sd protection #1494
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
humingcheng
reviewed
Dec 2, 2024
pkg/rest/first_launch.go
Outdated
| ) | ||
|
|
||
| func Init() { | ||
| enableInstanceNullProtect = config.GetBool("instance_null_protect.enable", true) |
There was a problem hiding this comment.
默认是关，因为这个功能会影响调试，可能造成开源开发者的困扰。
pkg/rest/first_launch.go
Outdated
|
|
||
| func Init() { | ||
| enableInstanceNullProtect = config.GetBool("instance_null_protect.enable", true) | ||
| restartProtectInterval = time.Duration(config.GetInt("instance_null_protect.restart_protect_interval", 120)) * time.Second |
There was a problem hiding this comment.
输入参数校验，有效值1-120秒，默认120秒，如果参数非法则打日志提示，并设置为120秒。
pkg/rest/first_launch.go
Outdated
| restartProtectInterval = time.Duration(config.GetInt("instance_null_protect.restart_protect_interval", 120)) * time.Second | ||
| RestartProtectHttpCode = config.GetInt("instance_null_protect.http_status", 304) | ||
| logDir := filepath.Dir(config.GetString("log.file", "", config.WithStandby("logfile"))) | ||
| firstLaunchFlagPath = filepath.Join(logDir, "first_launch.flag") |
pkg/rest/first_launch.go
Outdated
| ) | ||
|
|
||
| /** | ||
| for restart service center, set a 2-minute time window to return http status 304 on discovery apis, |
| @@ -167,6 +168,10 @@ func (s *InstanceResource) FindInstances(w http.ResponseWriter, r *http.Request) | |||
| w.WriteHeader(http.StatusNotModified) | |||
| return | |||
| } | |||
| if len(resp.Instances) == 0 && rest.IsWithinRestartProtection() { | |||
There was a problem hiding this comment.
保护逻辑，放在service/disco目录下
humingcheng
reviewed
Dec 2, 2024
|
|
||
| func Init() { | ||
| enableInstanceNullProtect = config.GetBool("instance_null_protect.enable", false) | ||
| restartProtectInterval = time.Duration(config.GetInt("instance_null_protect.restart_protect_interval", 120)) * time.Second |
There was a problem hiding this comment.
enable为false的时候，直接退出，不用做初始化的操作了
humingcheng
approved these changes
Dec 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The SDK switches back to the service center which has recovered from the crash as soon as the sc server starts, even though the service center has not synced data from the peer yet, which results in an interruption of service discovery.
add ut