fix the issue that health check may set liveness wrongly #1127
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2618,6 +2618,8 @@ func (s *Store) reResolve(c *RegionCache) (bool, error) { | |
| addr = store.GetAddress() | ||
| if s.addr != addr || !s.IsSameLabels(store.GetLabels()) { | ||
| newStore := &Store{storeID: s.storeID, addr: addr, peerAddr: store.GetPeerAddress(), saddr: store.GetStatusAddress(), storeType: storeType, labels: store.GetLabels(), state: uint64(resolved)} | ||
| newStore.livenessState = atomic.LoadUint32(&s.livenessState) | ||
| newStore.unreachableSince = s.unreachableSince | ||
| if s.addr == addr { | ||
| newStore.slowScore = s.slowScore | ||
| } | ||
|
|
@@ -2783,50 +2785,84 @@ func (s *Store) requestLivenessAndStartHealthCheckLoopIfNeeded(bo *retry.Backoff | |
| // It may be already started by another thread. | ||
| if atomic.CompareAndSwapUint32(&s.livenessState, uint32(reachable), uint32(liveness)) { | ||
| s.unreachableSince = time.Now() | ||
| reResolveInterval := 30 * time.Second | ||
|
There was a problem hiding this comment. Better to make it a constant value. There was a problem hiding this comment. The rawkv tests use failpoint to set it shorter. There was a problem hiding this comment. how about var DefReResolveInterval = 30 * time.Second // global scope.
func (s *Store) checkUntilHealth(c *RegionCache, liveness livenessState){
reResolveInterval = DefReResolveInterval
...
}and if test needs a shorter reResolveInterval, change There was a problem hiding this comment.
Personally I do not prefer that. The global var is required to be handled carefully to avoid data race in ut. I've struggled with |
||
| if val, err := util.EvalFailpoint("injectReResolveInterval"); err == nil { | ||
| if dur, err := time.ParseDuration(val.(string)); err == nil { | ||
| reResolveInterval = dur | ||
| } | ||
| } | ||
| go s.checkUntilHealth(c, liveness, reResolveInterval) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| func (s *Store) checkUntilHealth(c *RegionCache, liveness livenessState, reResolveInterval time.Duration) { | ||
| ticker := time.NewTicker(time.Second) | ||
| defer func() { | ||
| ticker.Stop() | ||
| if liveness != reachable { | ||
| logutil.BgLogger().Warn("[health check] store was still not reachable at the end of health check loop", | ||
| zap.Uint64("storeID", s.storeID), | ||
| zap.String("state", s.getResolveState().String()), | ||
| zap.String("liveness", s.getLivenessState().String())) | ||
| } | ||
| }() | ||
| lastCheckPDTime := time.Now() | ||
|
|
||
| for { | ||
| select { | ||
| case <-c.ctx.Done(): | ||
| return | ||
| case <-ticker.C: | ||
| if time.Since(lastCheckPDTime) > reResolveInterval { | ||
| lastCheckPDTime = time.Now() | ||
|
|
||
| valid, err := s.reResolve(c) | ||
| if err != nil { | ||
| logutil.BgLogger().Warn("[health check] failed to re-resolve unhealthy store", zap.Error(err)) | ||
| } else if !valid { | ||
| if s.getResolveState() == deleted { | ||
| // if the store is deleted, a new store with same id must be inserted (guaranteed by reResolve). | ||
| newStore, _ := c.getStore(s.storeID) | ||
|
There was a problem hiding this comment. Is it necessary to add an assertion There was a problem hiding this comment. It's guaranteed by |
||
| logutil.BgLogger().Info("[health check] store meta changed", | ||
| zap.Uint64("storeID", s.storeID), | ||
| zap.String("oldAddr", s.addr), | ||
| zap.String("oldLabels", fmt.Sprintf("%v", s.labels)), | ||
| zap.String("newAddr", newStore.addr), | ||
| zap.String("newLabels", fmt.Sprintf("%v", newStore.labels))) | ||
| go newStore.checkUntilHealth(c, liveness, reResolveInterval) | ||
| } | ||
| return | ||
| } | ||
| } | ||
|
|
||
| liveness = s.requestLiveness(c.ctx, c) | ||
| atomic.StoreUint32(&s.livenessState, uint32(liveness)) | ||
| if liveness == reachable { | ||
| logutil.BgLogger().Info("[health check] store became reachable", zap.Uint64("storeID", s.storeID)) | ||
| return | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (s *Store) requestLiveness(ctx context.Context, tk testingKnobs) (l livenessState) { | ||
| // It's not convenient to mock liveness in integration tests. Use failpoint to achieve that instead. | ||
| if val, err := util.EvalFailpoint("injectLiveness"); err == nil { | ||
| liveness := val.(string) | ||
| if strings.Contains(liveness, " ") { | ||
| for _, item := range strings.Split(liveness, " ") { | ||
| kv := strings.Split(item, ":") | ||
| if len(kv) != 2 { | ||
| continue | ||
| } | ||
| if kv[0] == s.addr { | ||
| liveness = kv[1] | ||
| break | ||
| } | ||
| } | ||
| } | ||
| switch liveness { | ||
| case "unreachable": | ||
| return unreachable | ||
| case "reachable": | ||
|
|
||
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about abstracting a
newStorefunction to force specify thelivenessStateandunreachableSinceas the input parameters.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about to handle it later (as a part of #1104). There are 4
&Store{...}in region_cache.go now, I'd like to handle them togather according to the store lifecycle. Let this PR fix the corresponding issue by now.