Commit 7f862ec7 by Elvin Sindrilaru

MGM: Use different path on disk for the metadata flusher depending on the…

MGM: Use different path on disk for the metadata flusher depending on the instace name and daemon port
parent ecb77ce3
Pipeline #414388 canceled with stages
in 42 minutes 28 seconds
......@@ -1901,12 +1901,14 @@ Master::BootNamespace()
MasterLog(eos_err("msg=\"mgmofs.qdbcluster configuration is missing\""));
return false;
} else {
std::string instance_name = gOFS->MgmOfsInstanceName.c_str();
std::ostringstream instance_id;
instance_id << gOFS->MgmOfsInstanceName << ":"
<< gOFS->ManagerPort;
contSettings["qdb_cluster"] = gOFS->mQdbCluster;
contSettings["qdb_flusher_md"] = instance_name + "_md";
contSettings["qdb_flusher_quota"] = instance_name + "_quota";
contSettings["qdb_flusher_md"] = instance_id.str() + "_md";
contSettings["qdb_flusher_quota"] = instance_id.str() + "_quota";
fileSettings["qdb_cluster"] = gOFS->mQdbCluster;
fileSettings["qdb_flusher_md"] = instance_name + "_md";
fileSettings["qdb_flusher_md"] = instance_id.str() + "_md";
}
}
......
......@@ -157,9 +157,9 @@ XrdSfsGetFileSystem(XrdSfsFileSystem* native_fs,
// Constructor MGM Ofs
//------------------------------------------------------------------------------
XrdMgmOfs::XrdMgmOfs(XrdSysError* ep):
ConfigFN(0), ConfEngine(0), CapabilityEngine(0), mCapabilityValidity(3600),
MgmOfsMessaging(0), MgmOfsVstMessaging(0), ManagerPort(1094),
LinuxStatsStartup{0},
ConfigFN(0), ConfEngine(0), CapabilityEngine(0),
mCapabilityValidity(3600), MgmOfsMessaging(0), MgmOfsVstMessaging(0),
ManagerPort(1094), LinuxStatsStartup{0},
StartTime(0), HostName(0), HostPref(0), Initialized(kDown), mFileInitTime(0),
mTotalInitTime(0), Shutdown(false), RemoveStallRuleAfterBoot(false),
BootFileId(0), BootContainerId(0), IsRedirect(true), IsStall(true),
......@@ -584,7 +584,8 @@ XrdMgmOfs::Emsg(const char* pfx,
eos_debug("Unable to %s %s; %s", op, target, etext);
} else {
if ((!strcmp(op, "get-if-clock")) || (!strcmp(op, "stat")) ||
((!strcmp(pfx, "attr_get") || (!strcmp(pfx, "attr_ls")) || (!strcmp(pfx, "commit"))) &&
((!strcmp(pfx, "attr_get") || (!strcmp(pfx, "attr_ls")) ||
(!strcmp(pfx, "commit"))) &&
(ecode == ENOENT))) {
eos_debug("Unable to %s %s; %s", op, target, etext);
} else {
......
......@@ -1312,7 +1312,7 @@ public:
IConfigEngine* ConfEngine; ///< storing/restoring configuration
//! Authorization module for token encryption/decryption
XrdCapability* CapabilityEngine;
uint64_t mCapabilityValidity; ////< Time in seconds the capability is valid
uint64_t mCapabilityValidity; ///< Time in seconds the capability is valid
XrdOucString MgmOfsBroker; ///< Url of the message broker without MGM subject
XrdOucString MgmOfsBrokerUrl; ///< Url of the message broker with MGM subject
XrdOucString MgmOfsVstBrokerUrl; ///< Url of the message broker
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment