|
 |
dc8c34 |
From b781f06791afe27a780b51bc9a232ecac97a894b Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
dc8c34 |
Date: Mon, 18 May 2015 14:51:55 -0400
|
|
|
dc8c34 |
Subject: [PATCH 325/327] Ticket 48158 - cleanAllRUV task limit not being
|
|
|
dc8c34 |
enforced correctly
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Bug Description: The task limit check was only counting tasks that had
|
|
|
dc8c34 |
already begun the cleaning process. If the task was waiting
|
|
|
dc8c34 |
for a replica to be online before it starting the cleaning
|
|
|
dc8c34 |
process, then task count was not incremented, and limit
|
|
|
dc8c34 |
check was essentially bypassed.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Fix Description: Use the "pre-cleaned" rid list to determine the task count.
|
|
|
dc8c34 |
The pre-cleaned list is updated as soon a task request
|
|
|
dc8c34 |
comes in - not once the cleaning starts.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/48158
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Reviwed by: nhosoi(Thanks!)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
(cherry picked from commit d774b19fe6a1626cca3c92b125e56a22771bba5a)
|
|
|
dc8c34 |
(cherry picked from commit fd427d1db9820ce3bb81e2b72e20caa7e35bf6f9)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/plugins/replication/repl5_replica_config.c | 2 +-
|
|
|
dc8c34 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
|
|
|
dc8c34 |
index a9aeed3..ae4c2ff 100644
|
|
|
dc8c34 |
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
|
|
|
dc8c34 |
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
|
|
|
dc8c34 |
@@ -3152,7 +3152,7 @@ get_cleanruv_task_count()
|
|
|
dc8c34 |
|
|
|
dc8c34 |
slapi_rwlock_wrlock(rid_lock);
|
|
|
dc8c34 |
for(i = 0; i < CLEANRIDSIZ; i++){
|
|
|
dc8c34 |
- if(cleaned_rids[i] != 0){
|
|
|
dc8c34 |
+ if(pre_cleaned_rids[i] != 0){
|
|
|
dc8c34 |
count++;
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.9.3
|
|
|
dc8c34 |
|