mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

kenneth_suter
31.28.2007 1205a7a466d93932ca5dd190bbd01eddb13dee70
Allows the upgrader to detect broken replication following an upgrade and improves the error notification.
3 files modified
15 ■■■■ changed files
opends/src/messages/messages/replication.properties 4 ●●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java 6 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java 5 ●●●●● patch | view | raw | blame | history
opends/src/messages/messages/replication.properties
@@ -80,8 +80,8 @@
 changes that this server has already processed
NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=More than one replication \
 server should be configured
NOTICE_EXCEPTION_STARTING_SESSION_20=Caught Exception during initial \
 communication with replication server :
SEVERE_ERR_EXCEPTION_STARTING_SESSION_20=Caught exception during initial \
 communication with replication server: %s
MILD_ERR_CANNOT_RECOVER_CHANGES_21=Error when searching old changes from the \
 database for base DN %s
NOTICE_COULD_NOT_FIND_CHANGELOG_WITH_MY_CHANGES_22=Could not find a \
opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java
@@ -28,12 +28,12 @@
package org.opends.quicksetup.util;
import org.opends.messages.Message;
import org.opends.messages.Severity;
import org.opends.quicksetup.ReturnCode;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.ApplicationException;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.QuickSetupMessages.*;
import java.util.List;
@@ -56,9 +56,9 @@
  static private final String UNHEALTHY_SERVER_LOG_REGEX =
    new StringBuilder()
    .append(".*(")
    .append(ServerConstants.ERROR_SEVERITY_FATAL)
    .append(Severity.FATAL_ERROR.name())
    .append("|")
    .append(ServerConstants.ERROR_SEVERITY_SEVERE_ERROR)
    .append(Severity.SEVERE_ERROR.name())
    .append(")+.*").toString();
opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
@@ -371,7 +371,8 @@
          }
          catch (Exception e)
          {
            Message message = NOTE_EXCEPTION_STARTING_SESSION.get();
            Message message =
                    ERR_EXCEPTION_STARTING_SESSION.get(e.getMessage());
            logError(message);
          }
          finally
@@ -497,7 +498,7 @@
      } catch (Exception e)
      {
        MessageBuilder mb = new MessageBuilder();
        mb.append(NOTE_EXCEPTION_STARTING_SESSION.get());
        mb.append(ERR_EXCEPTION_STARTING_SESSION.get(e.getMessage()));
        mb.append(stackTraceToSingleLineString(e));
        logError(mb.toMessage());
      }