nss-pam-ldapd commit: r1091 - in nss-pam-ldapd: man nslcd
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
nss-pam-ldapd commit: r1091 - in nss-pam-ldapd: man nslcd
- From: "Commits of the nss-pam-ldapd project." <nss-pam-ldapd-commits [at] lists.arthurdejong.org>
- To: nss-pam-ldapd-commits [at] lists.arthurdejong.org
- Reply-to: nss-pam-ldapd-users [at] lists.arthurdejong.org
- Subject: nss-pam-ldapd commit: r1091 - in nss-pam-ldapd: man nslcd
- Date: Sun, 9 May 2010 11:51:27 +0200 (CEST)
Author: arthur
Date: Sun May 9 11:51:26 2010
New Revision: 1091
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1091
Log:
refactor retry timing mechanism to use time between first and last error to
determin when to rerty and only try once (and don't sleep) when we have been
failing for a long time
Modified:
nss-pam-ldapd/man/nslcd.conf.5.xml
nss-pam-ldapd/nslcd/cfg.c
nss-pam-ldapd/nslcd/cfg.h
nss-pam-ldapd/nslcd/myldap.c
Modified: nss-pam-ldapd/man/nslcd.conf.5.xml
==============================================================================
--- nss-pam-ldapd/man/nslcd.conf.5.xml Sat May 8 12:39:30 2010 (r1090)
+++ nss-pam-ldapd/man/nslcd.conf.5.xml Sun May 9 11:51:26 2010 (r1091)
@@ -470,9 +470,9 @@
<term><option>reconnect_maxsleeptime</option>
<replaceable>SECONDS</replaceable></term>
<listitem>
<para>
- Specified the time after the last successful operation from which the
- <acronym>LDAP</acronym> server is considered permanently unavailable.
- Retries will be done only once in this time period.
+ Specifies the time after which the <acronym>LDAP</acronym> server is
+ considered to be permanently unavailable.
+ Once this time is reached retries will be done only once per this time
period.
The default value is 10 seconds.
</para>
</listitem>
Modified: nss-pam-ldapd/nslcd/cfg.c
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.c Sat May 8 12:39:30 2010 (r1090)
+++ nss-pam-ldapd/nslcd/cfg.c Sun May 9 11:51:26 2010 (r1091)
@@ -86,7 +86,7 @@
for (i=0;i<(NSS_LDAP_CONFIG_URI_MAX+1);i++)
{
cfg->ldc_uris[i].uri=NULL;
- cfg->ldc_uris[i].lastok=0;
+ cfg->ldc_uris[i].firstfail=0;
cfg->ldc_uris[i].lastfail=0;
}
#ifdef LDAP_VERSION3
Modified: nss-pam-ldapd/nslcd/cfg.h
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.h Sat May 8 12:39:30 2010 (r1090)
+++ nss-pam-ldapd/nslcd/cfg.h Sun May 9 11:51:26 2010 (r1091)
@@ -71,8 +71,8 @@
struct myldap_uri
{
char *uri;
- /* time of last successful operation */
- time_t lastok;
+ /* time of first failed operation */
+ time_t firstfail;
/* time of last failed operation */
time_t lastfail;
};
Modified: nss-pam-ldapd/nslcd/myldap.c
==============================================================================
--- nss-pam-ldapd/nslcd/myldap.c Sat May 8 12:39:30 2010 (r1090)
+++ nss-pam-ldapd/nslcd/myldap.c Sun May 9 11:51:26 2010 (r1091)
@@ -795,30 +795,45 @@
time_t nexttry;
time_t t;
int rc=LDAP_UNAVAILABLE;
+ struct myldap_uri *current_uri;
+ int dotry[NSS_LDAP_CONFIG_URI_MAX];
+ /* clear time stamps */
+ for (start_uri=0;start_uri<NSS_LDAP_CONFIG_URI_MAX;start_uri++)
+ dotry[start_uri]=1;
/* keep trying until we time out */
endtime=time(NULL)+nslcd_cfg->ldc_reconnect_maxsleeptime;
- nexttry=endtime;
while (1)
{
+ nexttry=endtime;
/* try each configured URL once */
pthread_mutex_lock(&uris_mutex);
start_uri=search->session->current_uri;
do
{
- /* only try if we haven't just had an error and it was a long tme
- since the last ok */
- if ( ( ( nslcd_cfg->ldc_uris[search->session->current_uri].lastfail -
- nslcd_cfg->ldc_uris[search->session->current_uri].lastok ) <
nslcd_cfg->ldc_reconnect_maxsleeptime) ||
- ( time(NULL) >=
(nslcd_cfg->ldc_uris[search->session->current_uri].lastfail+nslcd_cfg->ldc_reconnect_maxsleeptime)
) )
+ current_uri=&(nslcd_cfg->ldc_uris[search->session->current_uri]);
+ /* only try this URI if we should */
+ if (!dotry[search->session->current_uri])
+ { /* skip this URI */ }
+ else if ( (current_uri->lastfail >
(current_uri->firstfail+nslcd_cfg->ldc_reconnect_maxsleeptime)) &&
+ ((t=time(NULL)) <
(current_uri->lastfail+nslcd_cfg->ldc_reconnect_maxsleeptime)) )
+ {
+ /* we are in a hard fail state and have retried not long ago */
+ log_log(LOG_DEBUG,"not retrying server %s which failed just %d
second(s) ago and has been failing for %d seconds",
+ current_uri->uri,(int)(t-current_uri->lastfail),
+ (int)(t-current_uri->firstfail));
+ dotry[search->session->current_uri]=0;
+ }
+ else
{
- pthread_mutex_unlock(&uris_mutex);
/* try to start the search */
+ pthread_mutex_unlock(&uris_mutex);
rc=do_try_search(search);
if (rc==LDAP_SUCCESS)
{
- /* update ok time and return search handle */
+ /* update ok time */
pthread_mutex_lock(&uris_mutex);
- nslcd_cfg->ldc_uris[search->session->current_uri].lastok=time(NULL);
+ current_uri->firstfail=0;
+ current_uri->lastfail=0;
pthread_mutex_unlock(&uris_mutex);
/* flag the search as valid */
search->valid=1;
@@ -829,17 +844,17 @@
/* update time of failure and figure out when we should retry */
pthread_mutex_lock(&uris_mutex);
t=time(NULL);
- nslcd_cfg->ldc_uris[search->session->current_uri].lastfail=t;
- t+=nslcd_cfg->ldc_reconnect_sleeptime;
- if (t<nexttry)
- nexttry=t;
- }
- else if (nslcd_cfg->ldc_uris[search->session->current_uri].lastfail>0)
- {
- /* we are in a hard fail state, figure out when we can retry */
-
t=(nslcd_cfg->ldc_uris[search->session->current_uri].lastfail+nslcd_cfg->ldc_reconnect_maxsleeptime);
- if (t<nexttry)
- nexttry=t;
+ /* update timestaps */
+ if (current_uri->firstfail==0)
+ current_uri->firstfail=t;
+ current_uri->lastfail=t;
+ /* check whether we should try this URI again */
+ if (t <=
(current_uri->firstfail+nslcd_cfg->ldc_reconnect_maxsleeptime))
+ {
+ t+=nslcd_cfg->ldc_reconnect_sleeptime;
+ if (t<nexttry)
+ nexttry=t;
+ }
}
/* try the next URI (with wrap-around) */
search->session->current_uri++;
@@ -851,19 +866,17 @@
/* see if it is any use sleeping */
if (nexttry>=endtime)
{
- log_log(LOG_ERR,"no available LDAP server found");
+ if (search->session->binddn[0]=='\0')
+ log_log(LOG_ERR,"no available LDAP server found");
return rc;
}
/* sleep between tries */
sleeptime=nexttry-time(NULL);
- if (sleeptime>nslcd_cfg->ldc_reconnect_maxsleeptime)
- sleeptime=nslcd_cfg->ldc_reconnect_maxsleeptime;
if (sleeptime>0)
{
log_log(LOG_WARNING,"no available LDAP server found, sleeping %d
seconds",sleeptime);
(void)sleep(sleeptime);
}
- nexttry=time(NULL)+nslcd_cfg->ldc_reconnect_maxsleeptime;
}
}
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits
- nss-pam-ldapd commit: r1091 - in nss-pam-ldapd: man nslcd,
Commits of the nss-pam-ldapd project.
