Fix 2487 Server does not update properly the task entry when trying to init...

pgamba

25.06.2007 9516aa8db8085f0fa983117ef4af952dfa8ae3f1

Fix 2487 Server does not update properly the task entry when trying to initialize cn=schema between two servers

 opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java

@@ -66,7 +66,6 @@
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.backends.jeb.BackendImpl;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
@@ -324,17 +323,6 @@
        }
      }
    }

    /**
     * Update the state of the task.
     */
    protected TaskState updateTaskCompletionState()
    {
      if (exception == null)
        return TaskState.COMPLETED_SUCCESSFULLY;
      else
        return TaskState.STOPPED_BY_ERROR;
    }
  }

  /**
@@ -2607,7 +2595,7 @@
      {
        // Update the task that initiated the import
        ((InitializeTask)ieContext.initializeTask).
        setState(ieContext.updateTaskCompletionState(),ieContext.exception);
        updateTaskCompletionState(ieContext.exception);

        releaseIEContext();
      }
@@ -3121,15 +3109,16 @@

    Backend backend = retrievesBackend(baseDN);

    try
    {
    if (!backend.supportsLDIFImport())
    {
      Message message = ERR_INIT_IMPORT_NOT_SUPPORTED.get(
                          backend.getBackendID().toString());
      logError(message);
      throw new DirectoryException(ResultCode.OTHER, message);
        de = new DirectoryException(ResultCode.OTHER, message);
    }

    try
      else
    {
      if (initializeMessage.getRequestorID() == serverId)
      {
@@ -3166,7 +3155,7 @@
        TRACER.debugInfo("The import has ended successfully on " +
          this.baseDN);
      stateSavingDisabled = false;

      }
    }
    catch(Exception e)
    {
@@ -3175,20 +3164,33 @@
    }
    finally
    {
      if ((ieContext != null)  && (ieContext.exception != null))
        de = ieContext.exception;

      // Cleanup
      if (importConfig != null)
      {
      importConfig.close();

      // Re-enable backend
      closeBackendImport(backend);
      }

      // Update the task that initiated the import
      if ((ieContext != null ) && (ieContext.initializeTask != null))
      {
        ((InitializeTask)ieContext.initializeTask).
        setState(ieContext.updateTaskCompletionState(),ieContext.exception);
        updateTaskCompletionState(de);
      }
      releaseIEContext();

    }
    // Sends up the root error.
    if (de != null)
    {
      throw de;
    }
    else
    {
      // Retrieves the generation ID associated with the data imported
      try
      {
@@ -3211,9 +3213,6 @@
      // Re-exchange generationID and state with RS
      broker.reStart();
    }
    // Sends up the root error.
    if (de != null)
      throw de;
  }

  /**

 opends/src/server/org/opends/server/tasks/InitializeTask.java

@@ -185,11 +185,10 @@
  /**
   * Set the state for the current task.
   *
   * @param newState The new state value to set
   * @param de  When the new state is different from COMPLETED_SUCCESSFULLY
   * this is the exception that contains the cause of the failure.
   */
  public void setState(TaskState newState, DirectoryException de)
  public void updateTaskCompletionState(DirectoryException de)
  {
    try
    {
@@ -197,11 +196,15 @@
      {
        initTaskError = de.getMessageObject();
      }
      if (de == null)
        initState =  TaskState.COMPLETED_SUCCESSFULLY;
      else
        initState =  TaskState.STOPPED_BY_ERROR;

      if (debugEnabled())
      {
        TRACER.debugInfo("InitializeTask/setState: %s", newState);
        TRACER.debugInfo("InitializeTask/setState: %s", initState);
      }
      initState = newState;
      synchronized (initState)
      {
        initState.notify();