feat: support singleton input #1933
Open
+308
−39
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
Collaborator
Abingcbc
commented
Nov 28, 2024
•
Abingcbc
commented
- 加载流水线时，对只能存在一个实例的input进行限制
- 对加载的配置顺序进行排序，保证先创建的配置，先加载流水线
Abingcbc
force-pushed
the
singleton_input
branch
from
c99d876
to
5c0d9c8
Compare
henryzhx8
requested changes
Nov 29, 2024
Comment on lines
+58
to
+59
| bool IsGlobalSingletonProcessorPlugin(const std::string& name) const; | ||
| bool IsGlobalSingletonFlusherPlugin(const std::string& name) const; |
There was a problem hiding this comment.
processor和flusher没有这种可能，真的有需求了再加
| } | ||
| return false; | ||
| } | ||
|
|
| for (const auto& input : inputConfig) { | ||
| auto inputType = (*input)["Type"].asString(); | ||
| if (PluginRegistry::GetInstance()->IsGlobalSingletonInputPlugin(inputType) | ||
| && mPluginCntMap["inputs"][inputType] > 0) { |
There was a problem hiding this comment.
这里判断不对，配置变更的场景，先init再stop老的，这里肯定大于0。不要依赖这个Map，这个map本身以前是用来做自监控的。
Comment on lines
+61
to
+62
| bool PreCheckPipelineConfig(PipelineConfig& config); | ||
| bool CheckIfGlobalSingletonInputLoaded(std::vector<const Json::Value*>& inputConfig); |
| @@ -111,6 +115,10 @@ void logtail::PipelineManager::UpdatePipelines(PipelineConfigDiff& diff) { | |||
| ConfigFeedbackStatus::APPLIED); | |||
| } | |||
| for (auto& config : diff.mAdded) { | |||
| if (!PreCheckPipelineConfig(config)) { | |||
There was a problem hiding this comment.
不用在这里特别调用了，直接在buildpipline里面构建input的地方调用就行了
| @@ -405,4 +406,23 @@ bool PipelineConfigWatcher::CheckModifiedConfig(const string& configName, | |||
| return true; | |||
| } | |||
|
|
|||
| void PipelineConfigWatcher::SortPipelineConfigDiff(PipelineConfigDiff& pDiff) { | |||
| // sort rule | |||
There was a problem hiding this comment.
一个原本运行的配置，创建时间晚，现在变更了；又有一个原本没运行的配置，创建时间早，新加了，预期行为是什么？现在代码符合预期吗？
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.