Fix OPENDJ-398: Misleading replication messages: "Replication server XXXX w...

Matthew Swift

07.00.2012 fadd9123507393341accd77400e81c9adf43c0c5

Fix OPENDJ-398: Misleading replication messages: "Replication server XXXX was attempting to connect to replication server YYYY but has disconnected in handshake phase"

Don't log anything when a stop message is received during handshaking. Also add missing exception handling for failed connection attempts.

 opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java

@@ -23,7 +23,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions copyright 2011 ForgeRock AS
 *      Portions copyright 2011-2012 ForgeRock AS
 */
package org.opends.server.replication.server;

@@ -44,11 +44,7 @@
import org.opends.server.replication.common.ServerState;
import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.Attributes;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.types.*;

/**
 * This class defines a server handler, which handles all interaction with a
@@ -190,22 +186,21 @@
      // Reject bad responses
      if (!(msg instanceof ReplServerStartMsg))
      {
        Message message;
        if (msg instanceof StopMsg)
        {
          // Remote replication server is probably shutting down.
          message = ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(
              String.valueOf(getReplicationServerId()),
              session.getReadableRemoteAddress());
          // Remote replication server is probably shutting down or simultaneous
          // cross-connect detected.
          abortStart(null);
          return;
        }
        else
        {
          message = ERR_REPLICATION_PROTOCOL_MESSAGE_TYPE.get(msg
          Message message = ERR_REPLICATION_PROTOCOL_MESSAGE_TYPE.get(msg
              .getClass().getCanonicalName(), "ReplServerStartMsg");
        }
        abortStart(message);
        return;
      }
      }

      // Process hello from remote
      processStartFromRemote((ReplServerStartMsg)msg);
@@ -213,6 +208,7 @@
      // Duplicate server ?
      if (!replicationServerDomain.checkForDuplicateRS(this))
      {
        // Simultaneous cross connect.
        abortStart(null);
        return;
      }
@@ -246,6 +242,12 @@

        // wait and process Topo from remote RS
        TopologyMsg inTopoMsg = waitAndProcessTopoFromRemoteRS();
        if (inTopoMsg == null)
        {
          // Simultaneous cross connect.
          abortStart(null);
          return;
        }

        logTopoHandshakeSNDandRCV(outTopoMsg, inTopoMsg);

@@ -269,13 +271,32 @@

      super.finalizeStart();
    }
    catch(IOException ioe)
    catch (IOException e)
    {
      // FIXME receive
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      Message errMessage = ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(
          String.valueOf(getReplicationServerId()),
          session.getReadableRemoteAddress());
      abortStart(errMessage);
    }
    catch (DirectoryException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      abortStart(e.getMessageObject());
    }
    catch(Exception e)
    {
      // FIXME more detailed exceptions
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      abortStart(Message.raw(e.getLocalizedMessage()));
    }
    finally
    {
@@ -332,6 +353,12 @@

        // wait and process Topo from remote RS
        inTopoMsg = waitAndProcessTopoFromRemoteRS();
        if (inTopoMsg == null)
        {
          // Simultaneous cross connect.
          abortStart(null);
          return;
        }

        // send our own TopologyMsg to remote RS
        TopologyMsg outTopoMsg = sendTopoToRemoteRS();
@@ -447,21 +474,33 @@
      logError(message);

      super.finalizeStart();

    }
    catch(IOException ioe) {
      Message errMessage = ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(
        Integer.toString(inReplServerStartMsg.getServerId()),
        Integer.toString(replicationServerDomain.getReplicationServer().
        getServerId()));
    catch (IOException e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      Message errMessage = ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(Integer
          .toString(inReplServerStartMsg.getServerId()), Integer
          .toString(replicationServerDomain.getReplicationServer()
              .getServerId()));
      abortStart(errMessage);
    }
    catch(DirectoryException de)
    catch (DirectoryException e)
    {
      abortStart(de.getMessageObject());
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      abortStart(e.getMessageObject());
    }
    catch(Exception e)
    {
      if (debugEnabled())
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      abortStart(Message.raw(e.getLocalizedMessage()));
    }
    finally
@@ -498,12 +537,11 @@

  /**
   * Wait receiving the TopologyMsg from the remote RS and process it.
   * @return the topologyMsg received.
   * @return the topologyMsg received or {@code null} if stop was received.
   * @throws DirectoryException
   * @throws IOException
   */
  private TopologyMsg waitAndProcessTopoFromRemoteRS()
  throws DirectoryException, IOException
      throws DirectoryException
  {
    ReplicationMsg msg = null;
    try
@@ -518,22 +556,19 @@

    if (!(msg instanceof TopologyMsg))
    {
      Message message;
      if (msg instanceof StopMsg)
      {
        // Remote replication server is probably shutting down.
        message = ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(
            String.valueOf(getReplicationServerId()),
            session.getReadableRemoteAddress());
        // Remote replication server is probably shutting down, or cross
        // connection attempt.
        return null;
      }
      else
      {
        message = ERR_REPLICATION_PROTOCOL_MESSAGE_TYPE.get(
            msg.getClass().getCanonicalName(),
            "TopologyMsg");
      }
        Message message = ERR_REPLICATION_PROTOCOL_MESSAGE_TYPE.get(msg
            .getClass().getCanonicalName(), "TopologyMsg");
      throw new DirectoryException(ResultCode.OTHER, message);
    }
    }

    // Remote RS sent his topo msg
    TopologyMsg inTopoMsg = (TopologyMsg) msg;