Fix for issue #2829 (Problems configuring and unconfiguring replication se...

lutoff

12.59.2009 d24cd9dbc64c0a85f7d4178eadadc1d5cb4f6c44

Fix for  issue #2829 (Problems configuring and unconfiguring replication servers)
scenario:
 1) configure and start 2 servers s1 and s2
 2) enable the replication between them
 3) disable replication on server s1
 4) disable replication on server s2
 5) re-enable the replication between them

we've got an error on step 5

The root cause is actually on step 3, when the replication is disabled
on server s1: all references to s1, including the s1 public instance
key, are removed from "cn=admin data" on all servers. To do that, we
just remove the info on one server, and the replication protocol will
propagate it on all the other.
The drawback (actually the issue) is that this public instance key is
indirectly used by several components. At least, the replication
protocol itself required the key to establish the connection between
replication servers on s1 and s2.
So, when we try to re-enable the replication the s1 public instance
key cannot be found and we've got the error.


fix:
At the end of the disable-replication process, we add again the
previously removed public instance key. 

 opends/src/ads/org/opends/admin/ads/ADSContextHelper.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2007-2008 Sun Microsystems, Inc.
 *      Copyright 2007-2009 Sun Microsystems, Inc.
 */

package org.opends.admin.ads;
@@ -268,12 +268,15 @@
        ctx.createSubcontext(keyDn, keyAttrs).close();
      }

      if (serverEntryDn != null)
      {
      /* associate server entry with certificate entry via key ID attribute */
      ctx.modifyAttributes(serverEntryDn,
          InitialLdapContext.REPLACE_ATTRIBUTE,
          (new BasicAttributes(
              ServerProperty.INSTANCE_KEY_ID.getAttributeName(), keyID)));
    }
    }
    catch (NamingException ne)
    {
      throw new ADSContextException(

 opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2007-2008 Sun Microsystems, Inc.
 *      Copyright 2007-2009 Sun Microsystems, Inc.
 */

package org.opends.server.tools.dsreplication;
@@ -63,10 +63,12 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapName;
import javax.net.ssl.TrustManager;

import org.opends.admin.ads.ADSContext;
import org.opends.admin.ads.ADSContextException;
import org.opends.admin.ads.ADSContextHelper;
import org.opends.admin.ads.ReplicaDescriptor;
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.SuffixDescriptor;
@@ -75,6 +77,7 @@
import org.opends.admin.ads.TopologyCacheFilter;
import org.opends.admin.ads.ADSContext.ADSPropertySyntax;
import org.opends.admin.ads.ADSContext.AdministratorProperty;
import org.opends.admin.ads.ADSContext.ServerProperty;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.admin.ads.util.PreferredConnection;
@@ -4909,10 +4912,18 @@
      }
    }

    boolean recreateServerKey = false ;
    Object keyId = null ;
    Object certValue = null ;
    if (disableAllBaseDns)
    {
      // Unregister the server from the ADS
      server.updateAdsPropertiesWithServerProperties();
      recreateServerKey = true ;
      keyId = server.getAdsProperties().
          get(ADSContext.ServerProperty.INSTANCE_KEY_ID);
      certValue = server.getAdsProperties().
          get(ADSContext.ServerProperty.INSTANCE_PUBLIC_KEY_CERTIFICATE);
      try
      {
        adsCtx.unregisterServer(server.getAdsProperties());
@@ -4924,6 +4935,7 @@
        catch (Throwable t)
        {
        }
        recreateServerKey = true ;
      }
      catch (ADSContextException adce)
      {
@@ -5034,6 +5046,25 @@
        }
      }
    }
    if (recreateServerKey)
    {
      Map<ServerProperty, Object> serverProperties =
        new HashMap<ServerProperty, Object>();
      serverProperties.put(ServerProperty.INSTANCE_KEY_ID, keyId);
      serverProperties.put(ServerProperty.INSTANCE_PUBLIC_KEY_CERTIFICATE,
          certValue);
      LdapName ldapName = null ;
      ADSContextHelper helper = new ADSContextHelper();
      try
      {
        helper.registerInstanceKeyCertificate(
            adsCtx.getDirContext(),serverProperties,ldapName);
      }
      catch (ADSContextException e)
      {
      }

    }
  }

  /**