From b04b2271f48f427330344ca9c61d76e312e9eb8c Mon Sep 17 00:00:00 2001

From: Mark Reynolds <mreynolds@redhat.com>

Date: Tue, 20 Nov 2012 16:14:42 -0500

Subject: [PATCH 17/22] Ticket 337 - improve CLEANRUV functionality

Bug Description:  Without anonymous access allowed, then task could not

                  contact other servers and retrieve data(ruv, maxcsns, etc).

Fix Description:  Changed all communication to use extended operations, and improved

                  sychronization between the replicas.

https://fedorahosted.org/389/ticket/337

Reviewed by: richm(Thanks Rich!)

(cherry picked from commit ecbd8b7513d05dab5876a88ca56b102c08a7a67c)

(cherry picked from commit 7a3014c0746134403f1fe9a25eac9581750aef0b)

---

 ldap/servers/plugins/replication/cl5_api.c         |   21 +-

 ldap/servers/plugins/replication/repl5.h           |   29 +-

 ldap/servers/plugins/replication/repl5_agmt.c      |   99 --

 ldap/servers/plugins/replication/repl5_agmtlist.c  |   11 +-

 .../servers/plugins/replication/repl5_connection.c |    6 +

 ldap/servers/plugins/replication/repl5_init.c      |   69 +-

 ldap/servers/plugins/replication/repl5_replica.c   |  132 +--

 .../plugins/replication/repl5_replica_config.c     | 1055 +++++++++++++-------

 ldap/servers/plugins/replication/repl_extop.c      |  266 ++++-

 ldap/servers/plugins/replication/replutil.c        |   47 +-

 ldap/servers/slapd/back-ldbm/ldbm_modify.c         |    7 +-

 ldap/servers/slapd/back-ldbm/misc.c                |    2 +-

 ldap/servers/slapd/back-ldbm/proto-back-ldbm.h     |    1 +

 ldap/servers/slapd/entry.c                         |   10 +-

 ldap/servers/slapd/slapi-private.h                 |    2 +-

 15 files changed, 1104 insertions(+), 653 deletions(-)

diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c

index a347c57..6c94b3d 100644

--- a/ldap/servers/plugins/replication/cl5_api.c

+++ b/ldap/servers/plugins/replication/cl5_api.c

@@ -1474,13 +1474,13 @@ int cl5WriteOperation(const char *replName, const char *replGen,

 }

 /* Name:		cl5CreateReplayIterator

-   Description:	creates an iterator that allows to retireve changes that should

-				to be sent to the consumer identified by ruv. The iteration is peformed by 

+   Description:	creates an iterator that allows to retrieve changes that should

+				to be sent to the consumer identified by ruv. The iteration is performed by

                 repeated calls to cl5GetNextOperationToReplay.

    Parameters:  replica - replica whose data we wish to iterate;

 				ruv - consumer ruv;

 				iterator - iterator to be passed to cl5GetNextOperationToReplay call

-   Return:		CL5_SUCCESS, if function is successfull;

+   Return:		CL5_SUCCESS, if function is successful;

                 CL5_MISSING_DATA, if data that should be in the changelog is missing

                 CL5_PURGED_DATA, if some data that consumer needs has been purged.

                 Note that the iterator can be non null if the supplier contains

@@ -1488,14 +1488,14 @@ int cl5WriteOperation(const char *replName, const char *replGen,

                 CL5_NOTFOUND if the consumer is up to data with respect to the supplier

 				CL5_BAD_DATA if invalid parameter is passed;

 				CL5_BAD_STATE  if db has not been open;

-				CL5_DB_ERROR if any other db error occured;

+				CL5_DB_ERROR if any other db error occurred;

 				CL5_MEMORY_ERROR if memory allocation fails.

    Algorithm:   Build a list of csns from consumer's and supplier's ruv. For each element

                 of the consumer's ruv put max csn into the csn list. For each element

                 of the supplier's ruv not in the consumer's ruv put min csn from the

                 supplier's ruv into the list. The list contains, for each known replica,

                 the starting point for changes to be sent to the consumer.

-                Sort the list in accending order.

+                Sort the list in ascending order.

                 Build a hash which contains, for each known replica, whether the

                 supplier can bring the consumer up to data with respect to that replica.

                 The hash is used to decide whether a change can be sent to the consumer 

@@ -1503,7 +1503,7 @@ int cl5WriteOperation(const char *replName, const char *replGen,

                 we can bring the consumer up to date.

                 Position the db cursor on the change entry that corresponds to this csn.

                 Hash entries are created for each replica traversed so far. sendChanges

-                flag is set to FALSE for all repolicas except the last traversed.

+                flag is set to FALSE for all replicas except the last traversed.

  */

 int cl5CreateReplayIteratorEx (Private_Repl_Protocol *prp, const RUV *consumerRuv, 

@@ -6543,7 +6543,9 @@ bail:

 void

 cl5CleanRUV(ReplicaId rid){

     CL5DBFile *file;

-    Object *obj;

+    Object *obj = NULL;

+

+    slapi_rwlock_wrlock (s_cl5Desc.stLock);

     obj = objset_first_obj(s_cl5Desc.dbFiles);

     while (obj){

@@ -6552,6 +6554,11 @@ cl5CleanRUV(ReplicaId rid){

         ruv_delete_replica(file->maxRUV, rid);

         obj = objset_next_obj(s_cl5Desc.dbFiles, obj);

     }

+    if(obj){

+        object_release (obj);

+    }

+

+    slapi_rwlock_unlock (s_cl5Desc.stLock);

 }

 void trigger_cl_trimming(ReplicaId rid){

diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h

index 61b51b0..bd582bc 100644

--- a/ldap/servers/plugins/replication/repl5.h

+++ b/ldap/servers/plugins/replication/repl5.h

@@ -97,8 +97,14 @@

 /* cleanallruv extended ops */

 #define REPL_CLEANRUV_OID "2.16.840.1.113730.3.6.5"

 #define REPL_ABORT_CLEANRUV_OID "2.16.840.1.113730.3.6.6"

-#define CLEANRUV_NOTIFIED 0

-#define CLEANRUV_RELEASED 1

+#define REPL_CLEANRUV_GET_MAXCSN_OID "2.16.840.1.113730.3.6.7"

+#define REPL_CLEANRUV_CHECK_STATUS_OID "2.16.840.1.113730.3.6.8"

+

+#define CLEANRUV_ACCEPTED "accepted"

+#define CLEANRUV_REJECTED "rejected"

+#define CLEANRUV_FINISHED "finished"

+#define CLEANRUV_CLEANING "cleaning"

+#define CLEANRUV_NO_MAXCSN "no maxcsn"

 /* DS 5.0 replication protocol error codes */

 #define NSDS50_REPL_REPLICA_READY 0x00 /* Replica ready, go ahead */

@@ -230,6 +236,8 @@ int multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb);

 int multimaster_extop_EndNSDS50ReplicationRequest(Slapi_PBlock *pb);

 int multimaster_extop_cleanruv(Slapi_PBlock *pb);

 int multimaster_extop_abort_cleanruv(Slapi_PBlock *pb);

+int multimaster_extop_cleanruv_get_maxcsn(Slapi_PBlock *pb);

+int multimaster_extop_cleanruv_check_status(Slapi_PBlock *pb);

 int extop_noop(Slapi_PBlock *pb);

 struct berval *NSDS50StartReplicationRequest_new(const char *protocol_oid,

 	const char *repl_root, char **extra_referrals, CSN *csn);

@@ -365,9 +373,6 @@ PRBool agmt_is_enabled(Repl_Agmt *ra);

 int agmt_set_enabled_from_entry(Repl_Agmt *ra, Slapi_Entry *e, char *returntext);

 char **agmt_get_attrs_to_strip(Repl_Agmt *ra);

 int agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e);

-void agmt_set_cleanruv_notified_from_entry(Repl_Agmt *ra, Slapi_Entry *e);

-int agmt_set_cleanruv_data(Repl_Agmt *ra, ReplicaId rid, int op);

-int agmt_is_cleanruv_notified(Repl_Agmt *ra, ReplicaId rid);

 int agmt_set_timeout(Repl_Agmt *ra, long timeout);

 void agmt_update_done(Repl_Agmt *ra, int is_total);

@@ -454,6 +459,7 @@ LDAP * conn_get_ldap(Repl_Connection *conn);

 void conn_lock(Repl_Connection *conn);

 void conn_unlock(Repl_Connection *conn);

 void conn_delete_internal_ext(Repl_Connection *conn);

+const char* conn_get_bindmethod(Repl_Connection *conn);

 /* In repl5_protocol.c */

 typedef struct repl_protocol Repl_Protocol;

@@ -608,7 +614,7 @@ int replica_config_init();

 void replica_config_destroy ();

 int get_replica_type(Replica *r);

 int replica_execute_cleanruv_task_ext(Object *r, ReplicaId rid);

-void add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn);

+void add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn, char *forcing);

 int is_cleaned_rid(ReplicaId rid);

 int replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,

                                int *returncode, char *returntext, void *arg);

@@ -616,17 +622,15 @@ void replica_cleanallruv_thread_ext(void *arg);

 void stop_ruv_cleaning();

 int task_aborted();

 void replica_abort_task_thread(void *arg);

-void delete_cleaned_rid(Replica *r, ReplicaId rid, CSN *maxcsn);

+void remove_cleaned_rid(ReplicaId rid);

 int process_repl_agmts(Replica *replica, int *agmt_info, char *oid, Slapi_Task *task, struct berval *payload, int op);

 int decode_cleanruv_payload(struct berval *extop_value, char **payload);

-struct berval *create_ruv_payload(char *value);

-void replica_add_cleanruv_data(Replica *r, char *val);

-void replica_remove_cleanruv_data(Replica *r, char *val);

-CSN *replica_get_cleanruv_maxcsn(Replica *r, ReplicaId rid);

+struct berval *create_cleanruv_payload(char *value);

 void ruv_get_cleaned_rids(RUV *ruv, ReplicaId *rids);

 void add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root);

 int is_task_aborted(ReplicaId rid);

-void delete_aborted_rid(Replica *replica, ReplicaId rid, char *repl_root);

+void delete_aborted_rid(Replica *replica, ReplicaId rid, char *repl_root, int skip);

+int is_pre_cleaned_rid(ReplicaId rid);

 void set_cleaned_rid(ReplicaId rid);

 void cleanruv_log(Slapi_Task *task, char *task_type, char *fmt, ...);

@@ -643,6 +647,7 @@ typedef struct _cleanruv_data

 	char *repl_root;

 	Slapi_DN *sdn;

 	char *certify;

+	char *force;

 } cleanruv_data;

 /* replutil.c */

diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c

index d25f54b..935fb37 100644

--- a/ldap/servers/plugins/replication/repl5_agmt.c

+++ b/ldap/servers/plugins/replication/repl5_agmt.c

@@ -141,7 +141,6 @@ typedef struct repl5agmt {

 	char **attrs_to_strip; /* for fractional replication, if a "mod" is empty, strip out these attributes:

 	                        * modifiersname, modifytimestamp, internalModifiersname, internalModifyTimestamp, etc */

 	int agreement_type;

-	int cleanruv_notified[CLEANRIDSIZ + 1]; /* specifies if the replica has been notified of a CLEANALLRUV task */

 } repl5agmt;

 /* Forward declarations */

@@ -252,7 +251,6 @@ agmt_new_from_entry(Slapi_Entry *e)

 	Repl_Agmt *ra;

 	Slapi_Attr *sattr;

 	char *tmpstr;

-	char **clean_vals = NULL;

 	char **denied_attrs = NULL;

 	char *auto_initialize = NULL;

 	char *val_nsds5BeginReplicaRefresh = "start";

@@ -431,20 +429,6 @@ agmt_new_from_entry(Slapi_Entry *e)

 	ra->last_init_start_time = 0UL;

 	ra->last_init_status[0] = '\0';

-	/* cleanruv notification */

-	clean_vals = slapi_entry_attr_get_charray(e, type_nsds5ReplicaCleanRUVnotified);

-	if(clean_vals){

-		int i;

-		for (i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){

-			ra->cleanruv_notified[i] = atoi(clean_vals[i]);

-		}

-		if(i < CLEANRIDSIZ)

-		    ra->cleanruv_notified[i + 1] = 0;

-		slapi_ch_array_free(clean_vals);

-	} else {

-		ra->cleanruv_notified[0] = 0;

-	}

-

 	/* Fractional attributes */

 	slapi_entry_attr_find(e, type_nsds5ReplicatedAttributeList, &sattr);

@@ -2623,89 +2607,6 @@ agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e)

     return -1;

 }

-int

-agmt_is_cleanruv_notified(Repl_Agmt *ra, ReplicaId rid){

-    int notified = 0;

-    int i;

-

-    PR_Lock(ra->lock);

-    for(i = 0; i < CLEANRIDSIZ && ra->cleanruv_notified[i]; i++){

-        if(ra->cleanruv_notified[i] == rid){

-            notified = 1;

-            break;

-        }

-    }

-    PR_Unlock(ra->lock);

-

-    return notified;

-}

-

-/*

- *  This will trigger agmt_set_cleanruv_notified_from_entry() to be called,

- *  which will update the in memory agmt.

- *

- *  op can be:  CLEANRUV_NOTIFIED or CLEANRUV_RELEASED

- */

-int

-agmt_set_cleanruv_data(Repl_Agmt *ra, ReplicaId rid, int op){

-    Slapi_PBlock *pb;

-    LDAPMod *mods[2];

-    LDAPMod mod;

-    struct berval *vals[2];

-    struct berval val;

-    char data[6];

-    int rc = 0;

-

-    if(ra == NULL){

-        return -1;

-    }

-

-    if(op == CLEANRUV_NOTIFIED){

-        /* add the cleanruv data */

-    	mod.mod_op  = LDAP_MOD_ADD|LDAP_MOD_BVALUES;

-    } else {

-        /* remove the cleanruv data */

-    	mod.mod_op  = LDAP_MOD_DELETE|LDAP_MOD_BVALUES;

-    }

-

-    pb = slapi_pblock_new();

-    val.bv_len = PR_snprintf(data, sizeof(data), "%d", (int)rid);

-    mod.mod_type = (char *)type_nsds5ReplicaCleanRUVnotified;

-    mod.mod_bvalues = vals;

-    vals [0] = &val;

-    vals [1] = NULL;

-    val.bv_val = data;

-    mods[0] = &mod;

-    mods[1] = NULL;

-

-    slapi_modify_internal_set_pb_ext (pb, ra->dn, mods, NULL, NULL,

-        repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);

-    slapi_modify_internal_pb (pb);

-    slapi_pblock_destroy(pb);

-

-    return rc;

-}

-

-void

-agmt_set_cleanruv_notified_from_entry(Repl_Agmt *ra, Slapi_Entry *e){

-    char **attr_vals = NULL;

-    int i;

-

-    PR_Lock(ra->lock);

-    attr_vals = slapi_entry_attr_get_charray(e, type_nsds5ReplicaCleanRUVnotified);

-    if(attr_vals){

-        for (i = 0; i < CLEANRIDSIZ && attr_vals[i]; i++){

-            ra->cleanruv_notified[i] = atoi(attr_vals[i]);

-        }

-        if( i < CLEANRIDSIZ )

-            ra->cleanruv_notified[i + 1] = 0;

-        slapi_ch_array_free(attr_vals);

-    } else {

-        ra->cleanruv_notified[0] = 0;

-    }

-    PR_Unlock(ra->lock);

-}

-

 /* this is called whenever an update (total/incremental)

    is completed */

 void 

diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c

index 537cfd8..70f71a8 100644

--- a/ldap/servers/plugins/replication/repl5_agmtlist.c

+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c

@@ -248,7 +248,12 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry

             /* we don't allow delete attribute operations unless it was issued by

                the replication plugin - handled above */

             if (mods[i]->mod_op & LDAP_MOD_DELETE)

-            {                

+            {

+                if(strcasecmp (mods[i]->mod_type, type_nsds5ReplicaCleanRUVnotified) == 0){

+                    /* allow the deletion of cleanallruv agmt attr */

+                    continue;

+                }

+

                 slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: " 

                                 "deletion of %s attribute is not allowed\n", type_nsds5ReplicaInitialize);	

                 *returncode = LDAP_UNWILLING_TO_PERFORM;

@@ -508,10 +513,6 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry

                 rc = SLAPI_DSE_CALLBACK_ERROR;

             }

         }

-        else if (slapi_attr_types_equivalent(mods[i]->mod_type, type_nsds5ReplicaCleanRUVnotified))

-        {

-            agmt_set_cleanruv_notified_from_entry(agmt, e);

-        }

         else if (0 == windows_handle_modify_agreement(agmt, mods[i]->mod_type, e))

         {

             slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: " 

diff --git a/ldap/servers/plugins/replication/repl5_connection.c b/ldap/servers/plugins/replication/repl5_connection.c

index 51a2bc5..5efd0e6 100644

--- a/ldap/servers/plugins/replication/repl5_connection.c

+++ b/ldap/servers/plugins/replication/repl5_connection.c

@@ -1760,6 +1760,12 @@ bind_method_to_mech(int bindmethod)

 	return LDAP_SASL_SIMPLE;

 }

+const char*

+conn_get_bindmethod(Repl_Connection *conn)

+{

+    return (bind_method_to_mech(conn->bindmethod));

+}

+

 /*

  * Check the result of an ldap BIND operation to see we it

  * contains the expiration controls

diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c

index 7a80c6f..a0f02fe 100644

--- a/ldap/servers/plugins/replication/repl5_init.c

+++ b/ldap/servers/plugins/replication/repl5_init.c

@@ -123,7 +123,7 @@ static char *cleanruv_oid_list[] = {

 		NULL

 };

 static char *cleanruv_name_list[] = {

-		NSDS_REPL_NAME_PREFIX " Cleanruv",

+		NSDS_REPL_NAME_PREFIX " CleanAllRUV",

 		NULL

 };

 static char *cleanruv_abort_oid_list[] = {

@@ -131,9 +131,26 @@ static char *cleanruv_abort_oid_list[] = {

 		NULL

 };

 static char *cleanruv_abort_name_list[] = {

-		NSDS_REPL_NAME_PREFIX " Cleanruv Abort",

+		NSDS_REPL_NAME_PREFIX " CleanAllRUV Abort",

 		NULL

 };

+static char *cleanruv_maxcsn_oid_list[] = {

+               REPL_CLEANRUV_GET_MAXCSN_OID,

+               NULL

+};

+static char *cleanruv_maxcsn_name_list[] = {

+               NSDS_REPL_NAME_PREFIX " CleanAllRUV Retrieve MaxCSN",

+               NULL

+};

+static char *cleanruv_status_oid_list[] = {

+               REPL_CLEANRUV_CHECK_STATUS_OID,

+               NULL

+};

+static char *cleanruv_status_name_list[] = {

+               NSDS_REPL_NAME_PREFIX " CleanAllRUV Check Status",

+               NULL

+};

+

 /* List of plugin identities for every plugin registered. Plugin identity

    is passed by the server in the plugin init function and must be supplied 

@@ -403,6 +420,52 @@ multimaster_end_extop_init( Slapi_PBlock *pb )

     return rc;

 }

+int

+multimaster_cleanruv_maxcsn_extop_init( Slapi_PBlock *pb )

+{

+	int rc= 0; /* OK */

+	void *identity = NULL;

+

+	/* get plugin identity and store it to pass to internal operations */

+	slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);

+	PR_ASSERT (identity);

+

+	if (slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, SLAPI_PLUGIN_VERSION_01 ) != 0 ||

+			  slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, (void *)&multimasterextopdesc ) != 0 ||

+			  slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_OIDLIST, (void *)cleanruv_maxcsn_oid_list ) != 0  ||

+			  slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_maxcsn_name_list ) != 0  ||

+			  slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_cleanruv_get_maxcsn ))

+	{

+		slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_extop_init failed\n" );

+		rc= -1;

+	}

+

+	return rc;

+}

+

+int

+multimaster_cleanruv_status_extop_init( Slapi_PBlock *pb )

+{

+	int rc= 0; /* OK */

+	void *identity = NULL;

+

+	/* get plugin identity and store it to pass to internal operations */

+	slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);

+	PR_ASSERT (identity);

+

+	if (slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, SLAPI_PLUGIN_VERSION_01 ) != 0 ||

+			  slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, (void *)&multimasterextopdesc ) != 0 ||

+			  slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_OIDLIST, (void *)cleanruv_status_oid_list ) != 0  ||

+			  slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_status_name_list ) != 0  ||

+			  slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_cleanruv_check_status ))

+	{

+		slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_extop_init failed\n" );

+		rc= -1;

+	}

+

+	return rc;

+}

+

 int

 multimaster_total_extop_init( Slapi_PBlock *pb )

@@ -679,6 +742,8 @@ int replication_multimaster_plugin_init(Slapi_PBlock *pb)

 		rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_response_extop_init", multimaster_response_extop_init, "Multimaster replication extended response plugin", NULL, identity);

 		rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_extop_init", multimaster_cleanruv_extop_init, "Multimaster replication cleanruv extended operation plugin", NULL, identity);

 		rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_abort_extop_init", multimaster_cleanruv_abort_extop_init, "Multimaster replication cleanruv abort extended operation plugin", NULL, identity);

+		rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_maxcsn_extop_init", multimaster_cleanruv_maxcsn_extop_init, "Multimaster replication cleanruv maxcsn extended operation plugin", NULL, identity);

+		rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_status_extop_init", multimaster_cleanruv_status_extop_init, "Multimaster replication cleanruv status extended operation plugin", NULL, identity);

 		if (0 == rc)

 		{

 			multimaster_initialised = 1;

diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c

index 2b1d958..b3df831 100644

--- a/ldap/servers/plugins/replication/repl5_replica.c

+++ b/ldap/servers/plugins/replication/repl5_replica.c

@@ -88,7 +88,6 @@ struct replica {

 	PRBool state_update_inprogress; /* replica state is being updated */

 	PRLock *agmt_lock;          /* protects agreement creation, start and stop */

 	char *locking_purl;			/* supplier who has exclusive access */

-	char *repl_cleanruv_data[CLEANRIDSIZ + 1];

 };

@@ -310,7 +309,6 @@ replica_destroy(void **arg)

 {

 	Replica *r;

 	void *repl_name;

-	int i;

 	if (arg == NULL)

 		return;

@@ -397,10 +395,6 @@ replica_destroy(void **arg)

 		csnplFree(&r->min_csn_pl);;

 	}

-	for(i = 0;r->repl_cleanruv_data[i] != NULL; i++){

-		slapi_ch_free_string(&r->repl_cleanruv_data[i]);

-	}

-

 	slapi_ch_free((void **)arg);

 }

@@ -1502,7 +1496,7 @@ int replica_check_for_data_reload (Replica *r, void *arg)

                 slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_check_for_data_reload: "

                     "Warning: for replica %s there were some differences between the changelog max RUV and the "

                     "database RUV.  If there are obsolete elements in the database RUV, you "

-                    "should remove them using CLEANRUV task.  If they are not obsolete, "

+                    "should remove them using the CLEANALLRUV task.  If they are not obsolete, "

                     "you should check their status to see why there are no changes from those "

                     "servers in the changelog.\n",

                     slapi_sdn_get_dn(r->repl_root));

@@ -1819,12 +1813,13 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)

         PRThread *thread = NULL;

         struct berval *payload = NULL;

         CSN *maxcsn = NULL;

-        char *csnpart;

-        char *iter;

+        ReplicaId rid;

         char csnstr[CSN_STRSIZE];

-        char *ridstr;

         char *token = NULL;

-        ReplicaId rid;

+        char *forcing;

+        char *csnpart;

+        char *ridstr;

+        char *iter;

         int i;

         for(i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){

@@ -1833,7 +1828,6 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)

             /*

              *  Set the cleanruv data, and add the cleaned rid

              */

-            r->repl_cleanruv_data[i] = slapi_ch_strdup(clean_vals[i]);

             token = ldap_utf8strtok_r(clean_vals[i], ":", &iter);

             if(token){

                 rid = atoi(token);

@@ -1851,15 +1845,18 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)

             maxcsn = csn_new();

             csn_init_by_string(maxcsn, csnpart);

             csn_as_string(maxcsn, PR_FALSE, csnstr);

-            add_cleaned_rid(rid, r, csnstr);

+            forcing = ldap_utf8strtok_r(iter, ":", &iter);

+            if(forcing == NULL){

+                forcing = "no";

+            }

             slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: cleanAllRUV task found, "

                 "resuming the cleaning of rid(%d)...\n", rid);

             /*

              *  Create payload

              */

-            ridstr = slapi_ch_smprintf("%d:%s:%s", rid, slapi_sdn_get_dn(replica_get_root(r)), csnstr);

-            payload = create_ruv_payload(ridstr);

+            ridstr = slapi_ch_smprintf("%d:%s:%s:%s", rid, slapi_sdn_get_dn(replica_get_root(r)), csnstr, forcing);

+            payload = create_cleanruv_payload(ridstr);

             slapi_ch_free_string(&ridstr);

             if(payload == NULL){

@@ -1882,8 +1879,10 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)

                 data->rid = rid;

                 data->task = NULL;

                 data->maxcsn = maxcsn;

-                data->sdn = slapi_sdn_dup(r->repl_root);

                 data->payload = payload;

+                data->sdn = slapi_sdn_dup(r->repl_root);

+                data->force = slapi_ch_strdup(forcing);

+                data->repl_root = NULL;

                 thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread_ext,

                         (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,

@@ -1895,11 +1894,11 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)

                     csn_free(&maxcsn);

                     slapi_sdn_free(&data->sdn);

                     ber_bvfree(data->payload);

+                    slapi_ch_free_string(&data->force);

                     slapi_ch_free((void **)&data);

                 }

             }

         }

-        r->repl_cleanruv_data[i] = NULL;

 done:

         slapi_ch_array_free(clean_vals);

@@ -1909,13 +1908,12 @@ done:

     {

         PRThread *thread = NULL;

         struct berval *payload;

-        CSN *maxcsn = NULL;

-        char *iter;

+        ReplicaId rid;

+        char *certify = NULL;

         char *ridstr = NULL;

-        char *repl_root;

         char *token = NULL;

-        char *certify = NULL;

-        ReplicaId rid;

+        char *repl_root;

+        char *iter;

         int i;

         for(i = 0; clean_vals[i]; i++){

@@ -1926,21 +1924,27 @@ done:

                 rid = atoi(token);

                 if(rid <= 0 || rid >= READ_ONLY_REPLICA_ID){

                     slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: invalid replica id(%d) "

-                        "aborting task.\n", rid);

+                        "aborting abort task.\n", rid);

                     goto done2;

                 }

             } else {

                 slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: unable to parse cleanallruv "

-                    "data (%s), aborting task.\n",clean_vals[i]);

+                    "data (%s), aborting abort task.\n",clean_vals[i]);

                 goto done2;

             }

             repl_root = ldap_utf8strtok_r(iter, ":", &iter);

             certify = ldap_utf8strtok_r(iter, ":", &iter);

+

+            if(!is_cleaned_rid(rid)){

+                slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: replica id(%d) is not "

+                    "being cleaned, nothing to abort.  Aborting abort task.\n", rid);

+                delete_aborted_rid(r, rid, repl_root, 0);

+                goto done2;

+            }

+

+            add_aborted_rid(rid, r, repl_root);

             stop_ruv_cleaning();

-            maxcsn = replica_get_cleanruv_maxcsn(r, rid);

-            delete_cleaned_rid(r, rid, maxcsn);

-            csn_free(&maxcsn);

             slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: abort task found, "

                 "resuming abort of rid(%d).\n", rid);

@@ -1951,8 +1955,8 @@ done:

             if (data == NULL) {

                 slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to allocate cleanruv_data.\n");

             } else {

-                ridstr = slapi_ch_smprintf("%d:%s", rid, repl_root);

-                payload = create_ruv_payload(ridstr);

+                ridstr = slapi_ch_smprintf("%d:%s:%s", rid, repl_root, certify);

+                payload = create_cleanruv_payload(ridstr);

                 slapi_ch_free_string(&ridstr);

                 if(payload == NULL){

@@ -2583,7 +2587,7 @@ replica_ruv_smods_for_op( Slapi_PBlock *pb, char **uniqueid, Slapi_Mods **smods

            must use the CLEANRUV task instead */

         slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, 

                         "replica_ruv_smods_for_op: attempted to directly modify the tombstone RUV "

-                        "entry [%s] - use the CLEANRUV task instead\n",

+                        "entry [%s] - use the CLEANALLRUV task instead\n",

                         slapi_entry_get_dn_const(target_entry));

         return (-1);

     }

@@ -3430,7 +3434,7 @@ replica_replace_ruv_tombstone(Replica *r)

     if (rc != LDAP_SUCCESS)

     {

-        if ((rc != LDAP_NO_SUCH_OBJECT) || !replica_is_state_flag_set(r, REPLICA_IN_USE))

+        if ((rc != LDAP_NO_SUCH_OBJECT && rc != LDAP_TYPE_OR_VALUE_EXISTS) || !replica_is_state_flag_set(r, REPLICA_IN_USE))

         {

             slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_replace_ruv_tombstone: "

                 "failed to update replication update vector for replica %s: LDAP "

@@ -3794,69 +3798,3 @@ replica_get_attr ( Slapi_PBlock *pb, const char* type, void *value )

 	return rc;

 }

-

-void

-replica_add_cleanruv_data(Replica *r, char *val)

-{

-    int i;

-

-    PR_Lock(r->repl_lock);

-

-    for (i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i] != NULL; i++); /* goto the end of the list */

-    if( i < CLEANRIDSIZ){

-        r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */

-        r->repl_cleanruv_data[i + 1] = 0;

-    }

-

-    PR_Unlock(r->repl_lock);

-}

-

-void

-replica_remove_cleanruv_data(Replica *r, char *val)

-{

-    int i;

-

-    PR_Lock(r->repl_lock);

-

-    for(i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i] && strcmp(r->repl_cleanruv_data[i], val) != 0; i++);

-    if( i < CLEANRIDSIZ ){

-        slapi_ch_free_string(&r->repl_cleanruv_data[i]);

-        for(; i < CLEANRIDSIZ; i++){

-            /* rewrite entire array */

-            r->repl_cleanruv_data[i] = r->repl_cleanruv_data[i + 1];

-        }

-    }

-

-    PR_Unlock(r->repl_lock);

-}

-

-CSN *

-replica_get_cleanruv_maxcsn(Replica *r, ReplicaId rid)

-{

-    CSN *newcsn;

-    char *csnstr;

-    char *token;

-    char *iter;

-    int repl_rid = 0;

-    int i;

-

-    PR_Lock(r->repl_lock);

-

-    for(i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i]; i++){

-        token = ldap_utf8strtok_r(r->repl_cleanruv_data[i], ":", &iter);

-        if(token){