Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

polish pipeline watcher log #2058

Merged
merged 1 commit into from
Jan 23, 2025
Merged

polish pipeline watcher log #2058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 31 additions & 34 deletions core/config/watcher/PipelineConfigWatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace logtail {

PipelineConfigWatcher::PipelineConfigWatcher()
: ConfigWatcher(),
mPipelineManager(CollectionPipelineManager::GetInstance()),
mCollectionPipelineManager(CollectionPipelineManager::GetInstance()),
mTaskPipelineManager(TaskPipelineManager::GetInstance()) {
}

Expand All @@ -48,7 +48,7 @@ pair<CollectionConfigDiff, TaskConfigDiff> PipelineConfigWatcher::CheckConfigDif
InsertPipelines(pDiff, tDiff, configSet, singletonCache);

CheckSingletonInput(pDiff, singletonCache);
for (const auto& name : mPipelineManager->GetAllConfigNames()) {
for (const auto& name : mCollectionPipelineManager->GetAllConfigNames()) {
if (configSet.find(name) == configSet.end()) {
pDiff.mRemoved.push_back(name);
LOG_INFO(sLogger,
Expand Down Expand Up @@ -94,7 +94,7 @@ void PipelineConfigWatcher::InsertBuiltInPipelines(CollectionConfigDiff& pDiff,
unordered_set<string>& configSet,
SingletonConfigCache& singletonCache) {
#ifdef __ENTERPRISE__
const std::map<std::string, std::string>& builtInPipelines
const map<string, string>& builtInPipelines
= EnterpriseConfigProvider::GetInstance()->GetAllBuiltInPipelineConfigs();

for (const auto& pipeline : builtInPipelines) {
Expand Down Expand Up @@ -138,7 +138,7 @@ void PipelineConfigWatcher::InsertBuiltInPipelines(CollectionConfigDiff& pDiff,
if (!IsConfigEnabled(pipelineName, *detail)) {
switch (GetConfigType(*detail)) {
case ConfigType::Collection:
if (mPipelineManager->FindConfigByName(pipelineName)) {
if (mCollectionPipelineManager->FindConfigByName(pipelineName)) {
pDiff.mRemoved.push_back(pipelineName);
LOG_INFO(sLogger,
("existing valid config modified and disabled",
Expand Down Expand Up @@ -178,7 +178,7 @@ void PipelineConfigWatcher::InsertBuiltInPipelines(CollectionConfigDiff& pDiff,

void PipelineConfigWatcher::InsertPipelines(CollectionConfigDiff& pDiff,
TaskConfigDiff& tDiff,
std::unordered_set<std::string>& configSet,
unordered_set<string>& configSet,
SingletonConfigCache& singletonCache) {
for (const auto& dir : mSourceDir) {
error_code ec;
Expand Down Expand Up @@ -248,7 +248,7 @@ void PipelineConfigWatcher::InsertPipelines(CollectionConfigDiff& pDiff,
if (!IsConfigEnabled(configName, *detail)) {
switch (GetConfigType(*detail)) {
case ConfigType::Collection:
if (mPipelineManager->FindConfigByName(configName)) {
if (mCollectionPipelineManager->FindConfigByName(configName)) {
pDiff.mRemoved.push_back(configName);
LOG_INFO(sLogger,
("existing valid config modified and disabled",
Expand Down Expand Up @@ -278,8 +278,8 @@ void PipelineConfigWatcher::InsertPipelines(CollectionConfigDiff& pDiff,
continue;
}
} else {
LOG_DEBUG(sLogger, ("existing config file unchanged", "skip current object"));
CheckUnchangedConfig(configName, path, pDiff, tDiff, singletonCache);
// check unchanged config just for singleton input
CheckUnchangedConfig(configName, path, pDiff, singletonCache);
}
}
}
Expand Down Expand Up @@ -332,7 +332,7 @@ bool PipelineConfigWatcher::CheckModifiedConfig(const string& configName,
SingletonConfigCache& singletonCache) {
switch (GetConfigType(*configDetail)) {
case ConfigType::Collection: {
shared_ptr<CollectionPipeline> p = mPipelineManager->FindConfigByName(configName);
shared_ptr<CollectionPipeline> p = mCollectionPipelineManager->FindConfigByName(configName);
if (!p) {
CollectionConfig config(configName, std::move(configDetail));
if (!config.Parse()) {
Expand Down Expand Up @@ -419,39 +419,36 @@ bool PipelineConfigWatcher::CheckModifiedConfig(const string& configName,
return true;
}

bool PipelineConfigWatcher::CheckUnchangedConfig(const std::string& configName,
bool PipelineConfigWatcher::CheckUnchangedConfig(const string& configName,
const filesystem::path& path,
CollectionConfigDiff& pDiff,
TaskConfigDiff& tDiff,
SingletonConfigCache& singletonCache) {
auto pipeline = mPipelineManager->FindConfigByName(configName);
auto task = mTaskPipelineManager->FindPipelineByName(configName).get();
if (task) {
if (mTaskPipelineManager->FindPipelineByName(configName)) {
return true;
} else if (pipeline) { // running pipeline in last config update
std::unique_ptr<Json::Value> configDetail = make_unique<Json::Value>();
}

const auto& pipeline = mCollectionPipelineManager->FindConfigByName(configName);
if (pipeline) {
// if this pipeline is selected in the end, we simply pass it, thus, the config here is just a dummy
unique_ptr<Json::Value> configDetail = make_unique<Json::Value>();
CollectionConfig config(configName, std::move(configDetail));
config.mCreateTime = pipeline->GetContext().GetCreateTime();
config.mSingletonInput = pipeline->GetSingletonInput();
PushPipelineConfig(std::move(config), ConfigDiffEnum::Unchanged, pDiff, singletonCache);
} else { // low priority singleton input in last config update, sort it again
} else {
// low priority singleton input in last config update, sort it again
unique_ptr<Json::Value> detail = make_unique<Json::Value>();
if (!LoadConfigDetailFromFile(path, *detail)) {
return false;
}
if (!IsConfigEnabled(configName, *detail)) {
LOG_DEBUG(sLogger, ("unchanged config found and disabled", "skip current object")("config", configName));
LOG_DEBUG(sLogger,
("existing disabled config file unchanged", "skip current object")("config", configName));
return false;
}
CollectionConfig config(configName, std::move(detail));
if (!config.Parse()) {
LOG_ERROR(sLogger, ("new config found but invalid", "skip current object")("config", configName));
AlarmManager::GetInstance()->SendAlarm(CATEGORY_CONFIG_ALARM,
"new config found but invalid: skip current object, config: "
+ configName,
config.mProject,
config.mLogstore,
config.mRegion);
LOG_DEBUG(sLogger, ("existing invalid config file unchanged", "skip current object")("config", configName));
return false;
}
if (config.mSingletonInput) {
Expand Down Expand Up @@ -492,15 +489,15 @@ void PipelineConfigWatcher::PushPipelineConfig(CollectionConfig&& config,

void PipelineConfigWatcher::CheckSingletonInput(CollectionConfigDiff& pDiff, SingletonConfigCache& singletonCache) {
for (auto& [name, configs] : singletonCache) {
std::sort(configs.begin(),
configs.end(),
[](const std::shared_ptr<PipelineConfigWithDiffInfo>& a,
const std::shared_ptr<PipelineConfigWithDiffInfo>& b) -> bool {
if (a->config.mCreateTime == b->config.mCreateTime) {
return a->config.mName < b->config.mName;
}
return a->config.mCreateTime < b->config.mCreateTime;
});
sort(configs.begin(),
configs.end(),
[](const shared_ptr<PipelineConfigWithDiffInfo>& a,
const shared_ptr<PipelineConfigWithDiffInfo>& b) -> bool {
if (a->config.mCreateTime == b->config.mCreateTime) {
return a->config.mName < b->config.mName;
}
return a->config.mCreateTime < b->config.mCreateTime;
});
for (size_t i = 0; i < configs.size(); ++i) {
const auto& diffEnum = configs[i]->diffEnum;
const auto& configName = configs[i]->config.mName;
Expand Down
5 changes: 2 additions & 3 deletions core/config/watcher/PipelineConfigWatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class PipelineConfigWatcher : public ConfigWatcher {
std::pair<CollectionConfigDiff, TaskConfigDiff> CheckConfigDiff();

#ifdef APSARA_UNIT_TEST_MAIN
void SetPipelineManager(const CollectionPipelineManager* pm) { mPipelineManager = pm; }
void SetPipelineManager(const CollectionPipelineManager* pm) { mCollectionPipelineManager = pm; }
#endif

private:
Expand Down Expand Up @@ -78,15 +78,14 @@ class PipelineConfigWatcher : public ConfigWatcher {
bool CheckUnchangedConfig(const std::string& configName,
const std::filesystem::path& path,
CollectionConfigDiff& pDiff,
TaskConfigDiff& tDiff,
SingletonConfigCache& singletonCache);
void PushPipelineConfig(CollectionConfig&& config,
ConfigDiffEnum diffEnum,
CollectionConfigDiff& pDiff,
SingletonConfigCache& singletonCache);
void CheckSingletonInput(CollectionConfigDiff& pDiff, SingletonConfigCache& singletonCache);

const CollectionPipelineManager* mPipelineManager = nullptr;
const CollectionPipelineManager* mCollectionPipelineManager = nullptr;
const TaskPipelineManager* mTaskPipelineManager = nullptr;

#ifdef APSARA_UNIT_TEST_MAIN
Expand Down
Loading