From 7243c66412f9bc84f84d83d84487ad44e40bd223 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Wed, 16 Sep 2026 18:18:52 +0000
Subject: [PATCH] [#995] Classify the failure of a task on the message that reports it (#996)
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index bfed2aa..4dbb239 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -1420,7 +1420,7 @@
try
{
SearchResultEntry sr = getLastSearchResult(conn, taskDN, "ds-task-log-message", "ds-task-state");
- String logMsg = firstValueAsString(sr, "ds-task-log-message");
+ String logMsg = InstallerHelper.getRelevantLogMessage(InstallerHelper.getTaskLogMessages(sr));
if (logMsg != null && !logMsg.equals(lastLogMsg))
{
logger.info(LocalizableMessage.raw(logMsg));
@@ -1574,7 +1574,7 @@
"ds-task-purge-conflicts-historical-purge-completed-in-time",
"ds-task-purge-conflicts-historical-purge-completed-in-time",
"ds-task-purge-conflicts-historical-last-purged-changenumber");
- String logMsg = firstValueAsString(sr, "ds-task-log-message");
+ String logMsg = InstallerHelper.getRelevantLogMessage(InstallerHelper.getTaskLogMessages(sr));
if (logMsg != null && !logMsg.equals(lastLogMsg))
{
logger.info(LocalizableMessage.raw(logMsg));
@@ -6734,7 +6734,7 @@
try
{
SearchResultEntry sr = getLastSearchResult(conn, dn, "ds-task-log-message", "ds-task-state");
- String logMsg = firstValueAsString(sr, "ds-task-log-message");
+ String logMsg = InstallerHelper.getRelevantLogMessage(InstallerHelper.getTaskLogMessages(sr));
if (logMsg != null && !logMsg.equals(lastLogMsg))
{
logger.info(LocalizableMessage.raw(logMsg));
@@ -6870,7 +6870,8 @@
}
}
- String logMsg = firstValueAsString(sr, "ds-task-log-message");
+ List<String> logMsgs = InstallerHelper.getTaskLogMessages(sr);
+ String logMsg = InstallerHelper.getRelevantLogMessage(logMsgs);
if (logMsg != null && !logMsg.equals(lastLogMsg))
{
logger.info(LocalizableMessage.raw(logMsg));
@@ -6906,8 +6907,7 @@
ClientException ce = new ClientException(
ReturnCode.APPLICATION_ERROR, errorMsg,
null);
- if (lastLogMsg == null
- || helper.isPeersNotFoundError(lastLogMsg))
+ if (helper.isPeersNotFoundError(logMsgs))
{
logger.warn(LocalizableMessage.raw("Throwing peer not found error. "+
"Last Log Msg: "+lastLogMsg));
--
Gitblit v1.10.0