From: Howard Chu <hyc@openldap.org>
Date: Sat, 6 Feb 2021 15:45:22 +0000 (+0000)
Subject: ITS#9456 fix prev commit
X-Git-Tag: OPENLDAP_REL_ENG_2_5_1ALPHA^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0c1bd319e34080434764a7e1096ad1f30818e62;p=thirdparty%2Fopenldap.git

ITS#9456 fix prev commit

No need to reschedule the task inside asyncmeta_timeout_loop.
Frontend already does it if task was init'd with a valid interval.
---

diff --git a/servers/slapd/back-asyncmeta/init.c b/servers/slapd/back-asyncmeta/init.c
index 1a2accf731..2c9e5bd3e6 100644
--- a/servers/slapd/back-asyncmeta/init.c
+++ b/servers/slapd/back-asyncmeta/init.c
@@ -267,7 +267,7 @@ asyncmeta_back_db_open(
 	}
 	mi->mi_suffix = be->be_suffix[0];
 	ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
-	mi->mi_task = ldap_pvt_runqueue_insert( &slapd_rq, 0,
+	mi->mi_task = ldap_pvt_runqueue_insert( &slapd_rq, 1,
 		asyncmeta_timeout_loop, mi, "asyncmeta_timeout_loop", mi->mi_suffix.bv_val );
 	ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
 	return 0;
diff --git a/servers/slapd/back-asyncmeta/meta_result.c b/servers/slapd/back-asyncmeta/meta_result.c
index 0ab539636b..429857d4e8 100644
--- a/servers/slapd/back-asyncmeta/meta_result.c
+++ b/servers/slapd/back-asyncmeta/meta_result.c
@@ -1809,11 +1809,7 @@ void* asyncmeta_timeout_loop(void *ctx, void *arg)
 	if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) {
 		ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
 	}
-	rtask->interval.tv_sec = 1;
-	rtask->interval.tv_usec = 0;
-	ldap_pvt_runqueue_resched(&slapd_rq, rtask, 0);
 	ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
-	slap_wake_listener();
 	return NULL;
 }