Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -39,17 +39,17 @@ ServiceManagement::ServiceHandler::~ServiceHandler()
|
||||
|
||||
bool ServiceManagement::ServiceHandler::init()
|
||||
{
|
||||
DEBUG_LOG() << "Initializing ServiceHandler ...";
|
||||
DEBUG_LOG(m_logger) << "Initializing ServiceHandler ...";
|
||||
|
||||
connect(m_heartBeatObserverTimer, &QTimer::timeout,
|
||||
this, &ServiceHandler::onHeartBeatObserverTimerTimeout);
|
||||
|
||||
|
||||
HEARTBEAT_OBSERVER_INTERVAL = Settings::observerIntervall();
|
||||
DEBUG_LOG() << HEARTBEAT_OBSERVER_INTERVAL;
|
||||
DEBUG_LOG(m_logger) << HEARTBEAT_OBSERVER_INTERVAL;
|
||||
m_heartBeatObserverTimer->start(HEARTBEAT_OBSERVER_INTERVAL);
|
||||
|
||||
DEBUG_LOG() << "ServiceHandler successfully initialized.";
|
||||
DEBUG_LOG(m_logger) << "ServiceHandler successfully initialized.";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -78,21 +78,21 @@ ServiceManagement::ServiceProcess *ServiceManagement::ServiceHandler::getProcess
|
||||
void ServiceManagement::ServiceHandler::onRestartServiceRequest(const rti::core::SampleIdentity &cookie,
|
||||
const RestartServiceRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onRestartServiceRequest " << request;
|
||||
DEBUG_LOG(m_logger) << "onRestartServiceRequest " << request;
|
||||
|
||||
ServiceProcess *proc = serviceProcessFromServiceProcId(request.id());
|
||||
|
||||
Core::FunctionReplyObject ret(request.id());
|
||||
if (proc == nullptr)
|
||||
{
|
||||
INFO_LOG() << "Got restart request for non existing service ID "
|
||||
INFO_LOG(m_logger) << "Got restart request for non existing service ID "
|
||||
<< request.id();
|
||||
ret.setStr(tr_lts("dds", "There is no ServiceProcess with id %1")).arg(request.id());
|
||||
m_ddsHandler->fts()->restartServiceReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "Restart request for service "
|
||||
DEBUG_LOG(m_logger) << "Restart request for service "
|
||||
<< proc->serviceName()
|
||||
<< ", domain "
|
||||
<< proc->domainId()
|
||||
@@ -108,7 +108,7 @@ void ServiceManagement::ServiceHandler::onRestartServiceRequest(const rti::core:
|
||||
|
||||
void ServiceManagement::ServiceHandler::stopAllServices()
|
||||
{
|
||||
INFO_LOG() << "Stopping all Services ...";
|
||||
INFO_LOG(m_logger) << "Stopping all Services ...";
|
||||
|
||||
// shutdown async
|
||||
for (Service *service : std::as_const(m_services))
|
||||
@@ -116,12 +116,12 @@ void ServiceManagement::ServiceHandler::stopAllServices()
|
||||
for (Service *service : std::as_const(m_services))
|
||||
service->waitForStopped();
|
||||
|
||||
INFO_LOG() << "... all Services stopped :)";
|
||||
INFO_LOG(m_logger) << "... all Services stopped :)";
|
||||
}
|
||||
|
||||
void ServiceManagement::ServiceHandler::onNewServiceInfoFromProc(const ServiceInformation &info)
|
||||
{
|
||||
TRACE_LOG() << "Publishing new ServiceInformation: " << info;
|
||||
TRACE_LOG(m_logger) << "Publishing new ServiceInformation: " << info;
|
||||
|
||||
m_ddsHandler->dts()->publish(info);
|
||||
|
||||
@@ -133,11 +133,11 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr
|
||||
if (type == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
TRACE_LOG() << "Got new CurrentRunningState: " << data;
|
||||
TRACE_LOG(m_logger) << "Got new CurrentRunningState: " << data;
|
||||
|
||||
if (!data.pid())
|
||||
{
|
||||
INFO_LOG() << "PID 0 is not allowed.";
|
||||
INFO_LOG(m_logger) << "PID 0 is not allowed.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr
|
||||
{
|
||||
if (currentProc->remotePid() == data.pid())
|
||||
{
|
||||
DEBUG_LOG() << "Found my prog " << data.pid() << " to "<< currentProc->pid() << " " << currentProc->serviceName();
|
||||
DEBUG_LOG(m_logger) << "Found my prog " << data.pid() << " to "<< currentProc->pid() << " " << currentProc->serviceName();
|
||||
proc = currentProc;
|
||||
retData.pid() = proc->processId();
|
||||
found = true;
|
||||
@@ -170,7 +170,7 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr
|
||||
{
|
||||
if (!m_unknownPidsWarned.contains(data.pid()))
|
||||
{
|
||||
ERROR_LOG() << "Got CurrentRunningState for non existing process with PID "
|
||||
ERROR_LOG(m_logger) << "Got CurrentRunningState for non existing process with PID "
|
||||
<< data.pid();
|
||||
m_unknownPidsWarned += data.pid();
|
||||
}
|
||||
@@ -238,7 +238,7 @@ void ServiceManagement::ServiceHandler::onHeartBeatObserverTimerTimeout()
|
||||
|
||||
if (currentProc->lastHeartbeatMSec() < minAge)
|
||||
{
|
||||
WARNING_LOG() << "Heartbeat TIMEOUT for " << currentProc->debugInfo()
|
||||
WARNING_LOG(m_logger) << "Heartbeat TIMEOUT for " << currentProc->debugInfo()
|
||||
<< " - Restarting ..."
|
||||
<< " min heartbeat age: " << QDateTime::fromMSecsSinceEpoch(minHeartbeatAge).toString(QStringLiteral("HH:mm:ss"));
|
||||
currentProc->addStartAttempt();
|
||||
|
||||
Reference in new issue
Block a user