|
 |
058656 |
From 403c5b61efb5aca3cbea31170d13dfba190ef355 Mon Sep 17 00:00:00 2001
|
|
|
058656 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
058656 |
Date: Thu, 2 Nov 2017 12:55:11 -0400
|
|
|
058656 |
Subject: [PATCH] Ticket 49439 - cleanallruv is not logging information
|
|
|
058656 |
|
|
|
058656 |
Bug Description: During the logging refector effro from ticket 48978
|
|
|
058656 |
a mistake was made and cleanruv_log() was using
|
|
|
058656 |
LOG_NOTICE (which is not a true log level), it was
|
|
|
058656 |
supposed to be SLAPI_LOG_NOTICE.
|
|
|
058656 |
|
|
|
058656 |
We also use DEBUG defines to contorl the logging for
|
|
|
058656 |
debug builds
|
|
|
058656 |
|
|
|
058656 |
Fix Description: Remove the LDAP_DEBUG defines in cleanruv_log, and set
|
|
|
058656 |
the correct logging severity level.
|
|
|
058656 |
|
|
|
058656 |
https://pagure.io/389-ds-base/issue/49439
|
|
|
058656 |
|
|
|
058656 |
Reviewed by: firstyear(Thanks!)
|
|
|
058656 |
|
|
|
058656 |
(cherry picked from commit e1f866a5e3ccce8e061e361c0e3dd11175a8acf2)
|
|
|
058656 |
---
|
|
|
058656 |
.../plugins/replication/repl5_replica_config.c | 30 ++++++++++------------
|
|
|
058656 |
1 file changed, 14 insertions(+), 16 deletions(-)
|
|
|
058656 |
|
|
|
058656 |
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
|
|
|
058656 |
index 9c3c75458..9c8d6adbb 100644
|
|
|
058656 |
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
|
|
|
058656 |
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
|
|
|
058656 |
@@ -1783,7 +1783,7 @@ replica_cleanallruv_thread(void *arg)
|
|
|
058656 |
/*
|
|
|
058656 |
* need to sleep between passes
|
|
|
058656 |
*/
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, LOG_NOTICE, "Not all replicas have received the "
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE, "Not all replicas have received the "
|
|
|
058656 |
"cleanallruv extended op, retrying in %d seconds",
|
|
|
058656 |
interval);
|
|
|
058656 |
if (!slapi_is_shutting_down()) {
|
|
|
058656 |
@@ -1825,7 +1825,7 @@ replica_cleanallruv_thread(void *arg)
|
|
|
058656 |
found_dirty_rid = 0;
|
|
|
058656 |
} else {
|
|
|
058656 |
found_dirty_rid = 1;
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, LOG_NOTICE, "Replica is not cleaned yet (%s)",
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE, "Replica is not cleaned yet (%s)",
|
|
|
058656 |
agmt_get_long_name(agmt));
|
|
|
058656 |
break;
|
|
|
058656 |
}
|
|
|
058656 |
@@ -1843,7 +1843,7 @@ replica_cleanallruv_thread(void *arg)
|
|
|
058656 |
* Need to sleep between passes unless we are shutting down
|
|
|
058656 |
*/
|
|
|
058656 |
if (!slapi_is_shutting_down()) {
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, LOG_NOTICE, "Replicas have not been cleaned yet, "
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE, "Replicas have not been cleaned yet, "
|
|
|
058656 |
"retrying in %d seconds",
|
|
|
058656 |
interval);
|
|
|
058656 |
PR_Lock(notify_lock);
|
|
|
058656 |
@@ -1883,10 +1883,10 @@ done:
|
|
|
058656 |
* Shutdown or abort
|
|
|
058656 |
*/
|
|
|
058656 |
if (!is_task_aborted(data->rid) || slapi_is_shutting_down()) {
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, LOG_NOTICE,
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE,
|
|
|
058656 |
"Server shutting down. Process will resume at server startup");
|
|
|
058656 |
} else {
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, LOG_NOTICE, "Task aborted for rid(%d).", data->rid);
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE, "Task aborted for rid(%d).", data->rid);
|
|
|
058656 |
delete_cleaned_rid_config(data);
|
|
|
058656 |
remove_cleaned_rid(data->rid);
|
|
|
058656 |
}
|
|
|
058656 |
@@ -2053,7 +2053,7 @@ check_replicas_are_done_cleaning(cleanruv_data *data)
|
|
|
058656 |
break;
|
|
|
058656 |
}
|
|
|
058656 |
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, LOG_NOTICE,
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE,
|
|
|
058656 |
"Not all replicas finished cleaning, retrying in %d seconds",
|
|
|
058656 |
interval);
|
|
|
058656 |
if (!slapi_is_shutting_down()) {
|
|
|
058656 |
@@ -2163,7 +2163,7 @@ check_replicas_are_done_aborting(cleanruv_data *data)
|
|
|
058656 |
if (not_all_aborted == 0) {
|
|
|
058656 |
break;
|
|
|
058656 |
}
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, ABORT_CLEANALLRUV_ID, LOG_NOTICE,
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, ABORT_CLEANALLRUV_ID, SLAPI_LOG_NOTICE,
|
|
|
058656 |
"Not all replicas finished aborting, retrying in %d seconds", interval);
|
|
|
058656 |
if (!slapi_is_shutting_down()) {
|
|
|
058656 |
PR_Lock(notify_lock);
|
|
|
058656 |
@@ -2210,7 +2210,7 @@ check_agmts_are_caught_up(cleanruv_data *data, char *maxcsn)
|
|
|
058656 |
not_all_caughtup = 0;
|
|
|
058656 |
} else {
|
|
|
058656 |
not_all_caughtup = 1;
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, LOG_NOTICE,
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE,
|
|
|
058656 |
"Replica not caught up (%s)", agmt_get_long_name(agmt));
|
|
|
058656 |
break;
|
|
|
058656 |
}
|
|
|
058656 |
@@ -2220,7 +2220,7 @@ check_agmts_are_caught_up(cleanruv_data *data, char *maxcsn)
|
|
|
058656 |
if (not_all_caughtup == 0 || is_task_aborted(data->rid)) {
|
|
|
058656 |
break;
|
|
|
058656 |
}
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, LOG_NOTICE,
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE,
|
|
|
058656 |
"Not all replicas caught up, retrying in %d seconds", interval);
|
|
|
058656 |
if (!slapi_is_shutting_down()) {
|
|
|
058656 |
PR_Lock(notify_lock);
|
|
|
058656 |
@@ -2270,7 +2270,7 @@ check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task)
|
|
|
058656 |
not_all_alive = 0;
|
|
|
058656 |
} else {
|
|
|
058656 |
not_all_alive = 1;
|
|
|
058656 |
- cleanruv_log(task, rid, CLEANALLRUV_ID, LOG_NOTICE, "Replica not online (%s)",
|
|
|
058656 |
+ cleanruv_log(task, rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE, "Replica not online (%s)",
|
|
|
058656 |
agmt_get_long_name(agmt));
|
|
|
058656 |
break;
|
|
|
058656 |
}
|
|
|
058656 |
@@ -2280,7 +2280,7 @@ check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task)
|
|
|
058656 |
if (not_all_alive == 0 || is_task_aborted(rid)) {
|
|
|
058656 |
break;
|
|
|
058656 |
}
|
|
|
058656 |
- cleanruv_log(task, rid, CLEANALLRUV_ID, LOG_NOTICE, "Not all replicas online, retrying in %d seconds...",
|
|
|
058656 |
+ cleanruv_log(task, rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE, "Not all replicas online, retrying in %d seconds...",
|
|
|
058656 |
interval);
|
|
|
058656 |
|
|
|
058656 |
if (!slapi_is_shutting_down()) {
|
|
|
058656 |
@@ -3063,7 +3063,7 @@ replica_abort_task_thread(void *arg)
|
|
|
058656 |
* Need to sleep between passes. unless we are shutting down
|
|
|
058656 |
*/
|
|
|
058656 |
if (!slapi_is_shutting_down()) {
|
|
|
058656 |
- cleanruv_log(data->task, data->rid, ABORT_CLEANALLRUV_ID, LOG_NOTICE, "Retrying in %d seconds", interval);
|
|
|
058656 |
+ cleanruv_log(data->task, data->rid, ABORT_CLEANALLRUV_ID, SLAPI_LOG_NOTICE, "Retrying in %d seconds", interval);
|
|
|
058656 |
PR_Lock(notify_lock);
|
|
|
058656 |
PR_WaitCondVar(notify_cvar, PR_SecondsToInterval(interval));
|
|
|
058656 |
PR_Unlock(notify_lock);
|
|
|
058656 |
@@ -3184,7 +3184,7 @@ replica_cleanallruv_send_extop(Repl_Agmt *ra, cleanruv_data *clean_data, int che
|
|
|
058656 |
/* extop was accepted */
|
|
|
058656 |
rc = 0;
|
|
|
058656 |
} else {
|
|
|
058656 |
- cleanruv_log(clean_data->task, clean_data->rid, CLEANALLRUV_ID, LOG_NOTICE,
|
|
|
058656 |
+ cleanruv_log(clean_data->task, clean_data->rid, CLEANALLRUV_ID, SLAPI_LOG_NOTICE,
|
|
|
058656 |
"Replica %s does not support the CLEANALLRUV task. "
|
|
|
058656 |
"Sending replica CLEANRUV task...",
|
|
|
058656 |
slapi_sdn_get_dn(agmt_get_dn_byref(ra)));
|
|
|
058656 |
@@ -3352,7 +3352,7 @@ replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *basedn, char *rid_text,
|
|
|
058656 |
csn_init_by_string(repl_max, remote_maxcsn);
|
|
|
058656 |
if (csn_compare(repl_max, max) < 0) {
|
|
|
058656 |
/* we are not caught up yet, free, and return */
|
|
|
058656 |
- cleanruv_log(task, atoi(rid_text), CLEANALLRUV_ID, LOG_NOTICE,
|
|
|
058656 |
+ cleanruv_log(task, atoi(rid_text), CLEANALLRUV_ID, SLAPI_LOG_NOTICE,
|
|
|
058656 |
"Replica maxcsn (%s) is not caught up with deleted replica's maxcsn(%s)",
|
|
|
058656 |
remote_maxcsn, maxcsn);
|
|
|
058656 |
rc = -1;
|
|
|
058656 |
@@ -3525,7 +3525,6 @@ stop_ruv_cleaning()
|
|
|
058656 |
void
|
|
|
058656 |
cleanruv_log(Slapi_Task *task, int rid, char *task_type, int sev_level, char *fmt, ...)
|
|
|
058656 |
{
|
|
|
058656 |
-#ifdef LDAP_DEBUG
|
|
|
058656 |
va_list ap1;
|
|
|
058656 |
va_list ap2;
|
|
|
058656 |
va_list ap3;
|
|
|
058656 |
@@ -3550,7 +3549,6 @@ cleanruv_log(Slapi_Task *task, int rid, char *task_type, int sev_level, char *fm
|
|
|
058656 |
va_end(ap2);
|
|
|
058656 |
va_end(ap3);
|
|
|
058656 |
va_end(ap4);
|
|
|
058656 |
-#endif
|
|
|
058656 |
}
|
|
|
058656 |
|
|
|
058656 |
char *
|
|
|
058656 |
--
|
|
|
058656 |
2.13.6
|
|
|
058656 |
|