fix: fix PreservedDirDepth not working with polling and wildcard path #1866
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
yyuuttaaoo
commented
Nov 17, 2024
| @@ -157,11 +157,13 @@ void CreateHandler::Handle(const Event& event) { | |||
| if (!config.first) | |||
| return; | |||
| else if (event.IsDir()) | |||
| ConfigManager::GetInstance()->RegisterHandlersRecursively(path, config, false); | |||
| ConfigManager::GetInstance()->RegisterHandlers(path, config); | |||
There was a problem hiding this comment.
必须使用这个函数，因为要防止递归时注册超过PreservedDirDepth的过时的目录
yyuuttaaoo
commented
Nov 17, 2024
| } | ||
| return true; | ||
| } | ||
| if (preservedDirDepth < 0) { |
There was a problem hiding this comment.
=0和<0需要区分，=0时总是注册baseDir，<0时必须符合不超时的条件
yyuuttaaoo
commented
Nov 17, 2024
| // break;// fail early, do not try to register others | ||
| return false; | ||
| } | ||
| if (maxDepth == 0) { | ||
| return true; | ||
| } | ||
| bool result = true; | ||
|
|
||
| if (preservedDirDepth == 0) { |
There was a problem hiding this comment.
=0时就必须进入checkpoint恢复的注册方式，在此方式下保持PreservedDirDepth=0确保注册成功
messixukejia
approved these changes
Nov 17, 2024
| @@ -149,15 +149,15 @@ void SLSClientManager::Stop() { | |||
| mIsUpdateRealIpThreadRunning = false; | |||
| } | |||
| mStopCV.notify_all(); | |||
| if (mDataServerSwitchPolicy == EndpointSwitchPolicy::DESIGNATED_FIRST) { | |||
| if (mDataServerSwitchPolicy == EndpointSwitchPolicy::DESIGNATED_FIRST && mProbeNetworkThreadRes.valid()) { | |||
There was a problem hiding this comment.
这次pr valid补充了好几个地方，都比较散。很多都是Init函数创建的，是否有必要valid？
如果有必要，valid后续如何避免漏掉？
henryzhx8
approved these changes
Nov 18, 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.
No description provided.