ITS#4188

CHANGES

@@ -8,6 +8,7 @@ OpenLDAP 2.4.6 Engineering
 	Fixed slapd X509 parsing (ITS#5070, #5151)
 	Fixed slapd slap_passwd_parse (ITS#5159)
 	Added slapd attribute value sorting (ITS#5153)
+	Added slapd checking for long-running tasks (ITS#4188)
 	Fixed slapd syncrepl cookie propagation (ITS#5170)
 	Fixed slapd-bdb/hdb suffix logging (ITS#5128)
 	Fixed slapd-bdb/hdb IDL LRU handling (ITS#5121)

include/ldap_pvt_thread.h

@@ -215,6 +215,7 @@ typedef enum {
 	LDAP_PVT_THREAD_POOL_PARAM_OPEN,
 	LDAP_PVT_THREAD_POOL_PARAM_STARTING,
 	LDAP_PVT_THREAD_POOL_PARAM_ACTIVE,
+	LDAP_PVT_THREAD_POOL_PARAM_PAUSING,
 	LDAP_PVT_THREAD_POOL_PARAM_PENDING,
 	LDAP_PVT_THREAD_POOL_PARAM_BACKLOAD,
 	LDAP_PVT_THREAD_POOL_PARAM_ACTIVE_MAX,

libraries/libldap_r/tpool.c

@@ -397,6 +397,10 @@ ldap_pvt_thread_pool_query(
 		count = pool->ltp_active_count;
 		break;
 
+	case LDAP_PVT_THREAD_POOL_PARAM_PAUSING:
+		count = pool->ltp_pause;
+		break;
+
 	case LDAP_PVT_THREAD_POOL_PARAM_PENDING:
 		count = pool->ltp_pending_count;
 		break;

servers/slapd/result.c

@@ -743,6 +743,13 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 		return LDAP_SIZELIMIT_EXCEEDED;
 	}
 
+	/* Every 64 entries, check for thread pool pause */
+	if (( rs->sr_nentries & 0x3f == 0x3f ) &&
+		ldap_pvt_thread_pool_query( &connection_pool,
+			LDAP_PVT_THREAD_POOL_PARAM_PAUSING, &i ) == 0 && i ) {
+		return LDAP_BUSY;
+	}
+
 	rs->sr_type = REP_SEARCH;
 
 	/* eventually will loop through generated operational attribute types