Adds immediate migration results in progress

This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071

No files matched your search

@@ -40,15 +40,15 @@ GroupHandler::~GroupHandler()
bool GroupHandler::init(int32_t coreDomain)
{
DEBUG_LOG() << "Initializing GroupHandler ...";
DEBUG_LOG(m_logger) << "Initializing GroupHandler ...";
bool bAllPartsInitialized = m_heartbeatListener->init() &&
startGroupCore(coreDomain);
if (bAllPartsInitialized)
DEBUG_LOG() << "GroupHandler successfully initialized.";
DEBUG_LOG(m_logger) << "GroupHandler successfully initialized.";
else
ERROR_LOG() << "GroupHandler initialization failed.";
ERROR_LOG(m_logger) << "GroupHandler initialization failed.";
return bAllPartsInitialized;
}
@@ -137,14 +137,14 @@ bool GroupHandler::startGroupCore(int32_t domainId)
{
if (domainId != m_ddsHandler->connector()->getDomainId())
{
ERROR_LOG() << "Could not start group Core for domain "
ERROR_LOG(m_logger) << "Could not start group Core for domain "
<< domainId
<< ", this ServiceManagement instance only supports domain "
<< m_ddsHandler->connector()->getDomainId();
return false;
}
DEBUG_LOG() << "Starting core group ...";
DEBUG_LOG(m_logger) << "Starting core group ...";
GroupRequest groupToSearch;
groupToSearch.type(Core::ServiceGroupType::Core);
@@ -157,7 +157,7 @@ bool GroupHandler::startGroupCore(int32_t domainId)
if (coreScheme == nullptr)
{
ERROR_LOG() << "Could not start core group because there are no services linked to it";
ERROR_LOG(m_logger) << "Could not start core group because there are no services linked to it";
return false;
}
@@ -174,7 +174,7 @@ void GroupHandler::onStartGroupRequest(const rti::core::SampleIdentity &cookie,
{
auto ret = onStartGroup(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_ddsHandler->fts()->startGroupReply(cookie, ret);
}
@@ -182,13 +182,13 @@ void GroupHandler::slotStartGroupRequest(const GroupRequest &request)
{
auto ret = onStartGroup(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
emit startGroupReply(ret);
}
Core::FunctionReplyObject GroupHandler::onStartGroup(const GroupRequest &request)
{
DEBUG_LOG() << "New StartGroupRequest: " << request;
DEBUG_LOG(m_logger) << "New StartGroupRequest: " << request;
if (request.domainId() != m_ddsHandler->connector()->getDomainId())
return Core::FunctionReplyObject(request.requestId(),
@@ -219,7 +219,7 @@ Core::FunctionReplyObject GroupHandler::onStartGroup(const GroupRequest &request
// if there is a similar group, we should take the services from there (to avoid restarting services on exeuction -> pause or pause -> resume)
if (similarGroup)
{
DEBUG_LOG() << "Taking existing services from group " << similarGroup->type()
DEBUG_LOG(m_logger) << "Taking existing services from group " << similarGroup->type()
<< " to " << existingGroup->type();
existingGroup->takeServicesFromGroup(similarGroup);
similarGroup->stop();
@@ -235,7 +235,7 @@ Core::FunctionReplyObject GroupHandler::onStartGroup(const GroupRequest &request
Core::FunctionReplyObject GroupHandler::onStopAllForExercise(int domainId, int exercisePartitionId)
{
DEBUG_LOG() << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId;
DEBUG_LOG(m_logger) << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId;
QVector<Group *> stillAliveGroups;
int cntStopped = 0;
@@ -257,7 +257,7 @@ Core::FunctionReplyObject GroupHandler::onStopAllForExercise(int domainId, int e
}
m_groups = stillAliveGroups;
DEBUG_LOG() << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId
DEBUG_LOG(m_logger) << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId
<< " - done. Stopped " << cntStopped << " groups"
<< ", still alive: " << cntAlive;
return Core::FunctionReplyObject(exercisePartitionId);
@@ -267,7 +267,7 @@ void GroupHandler::onStopGroupRequest(const rti::core::SampleIdentity &cookie, c
{
auto ret = onStopGroup(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_ddsHandler->fts()->stopGroupReply(cookie, ret);
}
@@ -275,13 +275,13 @@ void GroupHandler::slotStopGroupRequest(const GroupRequest &request)
{
auto ret = onStopGroup(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
emit stopGroupReply(ret);
}
Core::FunctionReplyObject GroupHandler::onStopGroup(const GroupRequest &request)
{
DEBUG_LOG() << "New StopGroupRequest: " << request;
DEBUG_LOG(m_logger) << "New StopGroupRequest: " << request;
Group *existingGroup = getGroup(request);
@@ -303,13 +303,13 @@ void GroupHandler::onRestartGroupRequest(const rti::core::SampleIdentity &cookie
{
auto ret = onRestartGroup(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_ddsHandler->fts()->restartGroupReply(cookie, ret);
}
Core::FunctionReplyObject GroupHandler::onRestartGroup(const GroupRequest &request)
{
DEBUG_LOG() << "New RestartGroupRequest: " << request;
DEBUG_LOG(m_logger) << "New RestartGroupRequest: " << request;
Group *existingGroup = getGroup(request);