mirror of
https://github.com/Icinga/icinga2.git
synced 2025-05-14 03:20:15 +02:00
This commit removes a distinction in how dependency objects are checked for cycles in the resulting graph depending on whether they are part of the initially loaded configuration during process startup or as part of a runtime update. The DependencyCycleChecker helper class is extended with a mechanism that allows additional dependencies to be considered during the cycle search. This allows using it to check for cycles before actually registering the dependencies with the checkables. The aforementioned case-distinction for initial/runtime-update config is removed by making use of the newly added BeforeOnAllConfigLoaded signal to perform the cycle check at once for each batch of dependencies inside ConfigItem::CommitNewItems() for both cases now. During the initial config loading, there can be multiple batches of dependencies as objects from apply rules are created separately, so parts of the dependency graph might be visited multiple times now, however that is limited to a minimum as only parts of the graph that are reachable from the newly added dependencies are searched.
275 lines
8.5 KiB
C++
275 lines
8.5 KiB
C++
/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
|
|
|
|
#include "cli/daemonutility.hpp"
|
|
#include "base/configobject.hpp"
|
|
#include "base/exception.hpp"
|
|
#include "base/utility.hpp"
|
|
#include "base/logger.hpp"
|
|
#include "base/application.hpp"
|
|
#include "base/scriptglobal.hpp"
|
|
#include "config/configcompiler.hpp"
|
|
#include "config/configcompilercontext.hpp"
|
|
#include "config/configitembuilder.hpp"
|
|
#include "icinga/dependency.hpp"
|
|
#include <set>
|
|
|
|
using namespace icinga;
|
|
|
|
static bool ExecuteExpression(Expression *expression)
|
|
{
|
|
if (!expression)
|
|
return false;
|
|
|
|
try {
|
|
ScriptFrame frame(true);
|
|
expression->Evaluate(frame);
|
|
} catch (const std::exception& ex) {
|
|
Log(LogCritical, "config", DiagnosticInformation(ex));
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static bool IncludeZoneDirRecursive(const String& path, const String& package, bool& success)
|
|
{
|
|
String zoneName = Utility::BaseName(path);
|
|
|
|
/* We don't have an activated zone object yet. We may forcefully guess from configitems
|
|
* to not include this specific synced zones directory.
|
|
*/
|
|
if(!ConfigItem::GetByTypeAndName(Type::GetByName("Zone"), zoneName)) {
|
|
return false;
|
|
}
|
|
|
|
/* register this zone path for cluster config sync */
|
|
ConfigCompiler::RegisterZoneDir("_etc", path, zoneName);
|
|
|
|
std::vector<std::unique_ptr<Expression> > expressions;
|
|
Utility::GlobRecursive(path, "*.conf", [&expressions, zoneName, package](const String& file) {
|
|
ConfigCompiler::CollectIncludes(expressions, file, zoneName, package);
|
|
}, GlobFile);
|
|
|
|
DictExpression expr(std::move(expressions));
|
|
if (!ExecuteExpression(&expr))
|
|
success = false;
|
|
|
|
return true;
|
|
}
|
|
|
|
static bool IncludeNonLocalZone(const String& zonePath, const String& package, bool& success)
|
|
{
|
|
/* Note: This include function must not call RegisterZoneDir().
|
|
* We do not need to copy it for cluster config sync. */
|
|
|
|
String zoneName = Utility::BaseName(zonePath);
|
|
|
|
/* We don't have an activated zone object yet. We may forcefully guess from configitems
|
|
* to not include this specific synced zones directory.
|
|
*/
|
|
if(!ConfigItem::GetByTypeAndName(Type::GetByName("Zone"), zoneName)) {
|
|
return false;
|
|
}
|
|
|
|
/* Check whether this node already has an authoritative config version
|
|
* from zones.d in etc or api package directory, or a local marker file)
|
|
*/
|
|
if (ConfigCompiler::HasZoneConfigAuthority(zoneName) || Utility::PathExists(zonePath + "/.authoritative")) {
|
|
Log(LogNotice, "config")
|
|
<< "Ignoring non local config include for zone '" << zoneName << "': We already have an authoritative copy included.";
|
|
return true;
|
|
}
|
|
|
|
std::vector<std::unique_ptr<Expression> > expressions;
|
|
Utility::GlobRecursive(zonePath, "*.conf", [&expressions, zoneName, package](const String& file) {
|
|
ConfigCompiler::CollectIncludes(expressions, file, zoneName, package);
|
|
}, GlobFile);
|
|
|
|
DictExpression expr(std::move(expressions));
|
|
if (!ExecuteExpression(&expr))
|
|
success = false;
|
|
|
|
return true;
|
|
}
|
|
|
|
static void IncludePackage(const String& packagePath, bool& success)
|
|
{
|
|
/* Note: Package includes will register their zones
|
|
* for config sync inside their generated config. */
|
|
String packageName = Utility::BaseName(packagePath);
|
|
|
|
if (Utility::PathExists(packagePath + "/include.conf")) {
|
|
std::unique_ptr<Expression> expr = ConfigCompiler::CompileFile(packagePath + "/include.conf",
|
|
String(), packageName);
|
|
|
|
if (!ExecuteExpression(&*expr))
|
|
success = false;
|
|
}
|
|
}
|
|
|
|
bool DaemonUtility::ValidateConfigFiles(const std::vector<std::string>& configs, const String& objectsFile)
|
|
{
|
|
bool success;
|
|
|
|
Namespace::Ptr systemNS = ScriptGlobal::Get("System");
|
|
VERIFY(systemNS);
|
|
|
|
Namespace::Ptr internalNS = ScriptGlobal::Get("Internal");
|
|
VERIFY(internalNS);
|
|
|
|
if (!objectsFile.IsEmpty())
|
|
ConfigCompilerContext::GetInstance()->OpenObjectsFile(objectsFile);
|
|
|
|
if (!configs.empty()) {
|
|
for (const String& configPath : configs) {
|
|
try {
|
|
std::unique_ptr<Expression> expression = ConfigCompiler::CompileFile(configPath, String(), "_etc");
|
|
success = ExecuteExpression(&*expression);
|
|
if (!success)
|
|
return false;
|
|
} catch (const std::exception& ex) {
|
|
Log(LogCritical, "cli", "Could not compile config files: " + DiagnosticInformation(ex, false));
|
|
Application::Exit(1);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Load cluster config files from /etc/icinga2/zones.d.
|
|
* This should probably be in libremote but
|
|
* unfortunately moving it there is somewhat non-trivial. */
|
|
success = true;
|
|
|
|
/* Only load zone directory if we're not in staging validation. */
|
|
if (!internalNS->Contains("ZonesStageVarDir")) {
|
|
String zonesEtcDir = Configuration::ZonesDir;
|
|
if (!zonesEtcDir.IsEmpty() && Utility::PathExists(zonesEtcDir)) {
|
|
std::set<String> zoneEtcDirs;
|
|
Utility::Glob(zonesEtcDir + "/*", [&zoneEtcDirs](const String& zoneEtcDir) { zoneEtcDirs.emplace(zoneEtcDir); }, GlobDirectory);
|
|
|
|
bool hasSuccess = true;
|
|
|
|
while (!zoneEtcDirs.empty() && hasSuccess) {
|
|
hasSuccess = false;
|
|
|
|
for (auto& zoneEtcDir : zoneEtcDirs) {
|
|
if (IncludeZoneDirRecursive(zoneEtcDir, "_etc", success)) {
|
|
zoneEtcDirs.erase(zoneEtcDir);
|
|
hasSuccess = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
for (auto& zoneEtcDir : zoneEtcDirs) {
|
|
Log(LogWarning, "config")
|
|
<< "Ignoring directory '" << zoneEtcDir << "' for unknown zone '" << Utility::BaseName(zoneEtcDir) << "'.";
|
|
}
|
|
}
|
|
|
|
if (!success)
|
|
return false;
|
|
}
|
|
|
|
/* Load package config files - they may contain additional zones which
|
|
* are authoritative on this node and are checked in HasZoneConfigAuthority(). */
|
|
String packagesVarDir = Configuration::DataDir + "/api/packages";
|
|
if (Utility::PathExists(packagesVarDir))
|
|
Utility::Glob(packagesVarDir + "/*", [&success](const String& packagePath) { IncludePackage(packagePath, success); }, GlobDirectory);
|
|
|
|
if (!success)
|
|
return false;
|
|
|
|
/* Load cluster synchronized configuration files. This can be overridden for staged sync validations. */
|
|
String zonesVarDir = Configuration::DataDir + "/api/zones";
|
|
|
|
/* Cluster config sync stage validation needs this. */
|
|
if (internalNS->Contains("ZonesStageVarDir")) {
|
|
zonesVarDir = internalNS->Get("ZonesStageVarDir");
|
|
|
|
Log(LogNotice, "DaemonUtility")
|
|
<< "Overriding zones var directory with '" << zonesVarDir << "' for cluster config sync staging.";
|
|
}
|
|
|
|
|
|
if (Utility::PathExists(zonesVarDir)) {
|
|
std::set<String> zoneVarDirs;
|
|
Utility::Glob(zonesVarDir + "/*", [&zoneVarDirs](const String& zoneVarDir) { zoneVarDirs.emplace(zoneVarDir); }, GlobDirectory);
|
|
|
|
bool hasSuccess = true;
|
|
|
|
while (!zoneVarDirs.empty() && hasSuccess) {
|
|
hasSuccess = false;
|
|
|
|
for (auto& zoneVarDir : zoneVarDirs) {
|
|
if (IncludeNonLocalZone(zoneVarDir, "_cluster", success)) {
|
|
zoneVarDirs.erase(zoneVarDir);
|
|
hasSuccess = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
for (auto& zoneEtcDir : zoneVarDirs) {
|
|
Log(LogWarning, "config")
|
|
<< "Ignoring directory '" << zoneEtcDir << "' for unknown zone '" << Utility::BaseName(zoneEtcDir) << "'.";
|
|
}
|
|
}
|
|
|
|
if (!success)
|
|
return false;
|
|
|
|
/* This is initialized inside the IcingaApplication class. */
|
|
Value vAppType;
|
|
VERIFY(systemNS->Get("ApplicationType", &vAppType));
|
|
|
|
Type::Ptr appType = Type::GetByName(vAppType);
|
|
|
|
if (ConfigItem::GetItems(appType).empty()) {
|
|
ConfigItemBuilder builder;
|
|
builder.SetType(appType);
|
|
builder.SetName("app");
|
|
builder.AddExpression(new ImportDefaultTemplatesExpression());
|
|
ConfigItem::Ptr item = builder.Compile();
|
|
item->Register();
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool DaemonUtility::LoadConfigFiles(const std::vector<std::string>& configs,
|
|
std::vector<ConfigItem::Ptr>& newItems,
|
|
const String& objectsFile, const String& varsfile)
|
|
{
|
|
ActivationScope ascope;
|
|
|
|
if (!DaemonUtility::ValidateConfigFiles(configs, objectsFile)) {
|
|
ConfigCompilerContext::GetInstance()->CancelObjectsFile();
|
|
return false;
|
|
}
|
|
|
|
// After evaluating the top-level statements of the config files (happening in ValidateConfigFiles() above),
|
|
// prevent further modification of the global scope. This allows for a faster execution of the following steps
|
|
// as Freeze() disables locking as it's not necessary on a read-only data structure anymore.
|
|
ScriptGlobal::GetGlobals()->Freeze();
|
|
|
|
WorkQueue upq(25000, Configuration::Concurrency);
|
|
upq.SetName("DaemonUtility::LoadConfigFiles");
|
|
bool result = ConfigItem::CommitItems(ascope.GetContext(), upq, newItems);
|
|
|
|
if (!result) {
|
|
ConfigCompilerContext::GetInstance()->CancelObjectsFile();
|
|
return false;
|
|
}
|
|
|
|
try {
|
|
ScriptGlobal::WriteToFile(varsfile);
|
|
} catch (const std::exception& ex) {
|
|
Log(LogCritical, "cli", "Could not write vars file: " + DiagnosticInformation(ex, false));
|
|
Application::Exit(1);
|
|
}
|
|
|
|
ConfigCompilerContext::GetInstance()->FinishObjectsFile();
|
|
|
|
return true;
|
|
}
|