Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
53 changes: 52 additions & 1 deletion core/config/common_provider/CommonConfigProvider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@ void CommonConfigProvider::GetConfigUpdate() {
LOG_DEBUG(sLogger, ("fetch instanceConfig config, config file number", instanceConfig.size()));
UpdateRemoteInstanceConfig(instanceConfig);
}
const auto& onetimeCommands = heartbeatResponse.onetime_pipeline_config_updates();
if (!onetimeCommands.empty()) {
UpdateRemoteOnetimePipelineConfig(onetimeCommands);
}
++mSequenceNum;
}

Expand All @@ -270,7 +274,8 @@ configserver::proto::v2::HeartbeatRequest CommonConfigProvider::PrepareHeartbeat
heartbeatReq.set_request_id(requestID);
heartbeatReq.set_sequence_num(mSequenceNum);
heartbeatReq.set_capabilities(configserver::proto::v2::AcceptsInstanceConfig
| configserver::proto::v2::AcceptsContinuousPipelineConfig);
| configserver::proto::v2::AcceptsContinuousPipelineConfig
| configserver::proto::v2::AcceptsOnetimePipelineConfig);
heartbeatReq.set_instance_id(GetInstanceId());
heartbeatReq.set_agent_type("LoongCollector");
FillAttributes(*heartbeatReq.mutable_attributes());
Expand Down Expand Up @@ -494,6 +499,52 @@ void CommonConfigProvider::UpdateRemoteInstanceConfig(
}
}

void CommonConfigProvider::UpdateRemoteOnetimePipelineConfig(
const google::protobuf::RepeatedPtrField<configserver::proto::v2::CommandDetail>& commands) {
int64_t now = static_cast<int64_t>(time(nullptr));
lock_guard<mutex> lock(mOnetimePipelineMux);
for (const auto& cmd : commands) {
if (cmd.expire_time() > 0 && cmd.expire_time() < now) {
continue;
}
{
lock_guard<mutex> lockInfoMap(mInfoMapMux);
if (mOnetimePipelineConfigInfoMap.count(cmd.name())) {
continue;
}
}
filesystem::path filePath = mOnetimePipelineConfigDir / (cmd.name() + ".json");
filesystem::path tmpFilePath = mOnetimePipelineConfigDir / (cmd.name() + ".json.new");
{
ofstream fout(tmpFilePath);
if (!fout) {
LOG_WARNING(sLogger, ("failed to open onetime config file", filePath.string()));
continue;
}
fout << cmd.detail();
}
error_code ec;
filesystem::rename(tmpFilePath, filePath, ec);
if (ec) {
LOG_WARNING(sLogger,
("failed to rename onetime config file", filePath.string())("error code", ec.value())(
"error msg", ec.message()));
filesystem::remove(tmpFilePath, ec);
continue;
}
{
lock_guard<mutex> lockInfoMap(mInfoMapMux);
ConfigInfo info;
info.name = cmd.name();
info.version = cmd.expire_time() > 0 ? cmd.expire_time() : 1;
info.status = ConfigFeedbackStatus::APPLYING;
mOnetimePipelineConfigInfoMap[cmd.name()] = std::move(info);
}
Comment thread
cyberzz-dev marked this conversation as resolved.
Outdated
ConfigFeedbackReceiver::GetInstance().RegisterOnetimePipelineConfig(cmd.name(), this);
LOG_INFO(sLogger, ("received onetime pipeline config", cmd.name())("expire_time", cmd.expire_time()));
}
}

bool CommonConfigProvider::FetchInstanceConfigFromServer(
::configserver::proto::v2::HeartbeatResponse& heartbeatResponse,
::google::protobuf::RepeatedPtrField< ::configserver::proto::v2::ConfigDetail>& res) {
Expand Down
2 changes: 2 additions & 0 deletions core/config/common_provider/CommonConfigProvider.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ class CommonConfigProvider : public ConfigProvider, ConfigFeedbackable {
const google::protobuf::RepeatedPtrField<configserver::proto::v2::ConfigDetail>& configs);
void UpdateRemoteInstanceConfig(
const google::protobuf::RepeatedPtrField<configserver::proto::v2::ConfigDetail>& configs);
void UpdateRemoteOnetimePipelineConfig(
const google::protobuf::RepeatedPtrField<configserver::proto::v2::CommandDetail>& commands);

virtual bool
FetchInstanceConfigFromServer(::configserver::proto::v2::HeartbeatResponse&,
Expand Down