upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6152 add olcProxyCacheOffline for manually toggling cache expiration,

Browse source 
assume some external process will tell us when network is on/offline
This commit is contained in:
Howard Chu 2009-08-02 01:20:03 +00:00
parent 076c1d23cf
commit dd88fdbcc3
1 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
servers/slapd/overlays/pcache.c
View file

@ -195,6 +195,8 @@ typedef struct cache_manager_s {
char defer_db_open; /* defer open for online add */ char defer_db_open; /* defer open for online add */
time_t cc_period; /* interval between successive consistency checks (sec) */ time_t cc_period; /* interval between successive consistency checks (sec) */
#define PCACHE_CC_PAUSED 1
#define PCACHE_CC_OFFLINE 2
int cc_paused; int cc_paused;
void *cc_arg; void *cc_arg;
@ -2083,9 +2085,9 @@ over:;
/* If the consistency checker suspended itself, /* If the consistency checker suspended itself,
* wake it back up * wake it back up
*/ */
if ( cm->cc_paused ) { if ( cm->cc_paused == PCACHE_CC_PAUSED ) {
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
if ( cm->cc_paused ) { if ( cm->cc_paused == PCACHE_CC_PAUSED ) {
cm->cc_paused = 0; cm->cc_paused = 0;
ldap_pvt_runqueue_resched( &slapd_rq, cm->cc_arg, 0 ); ldap_pvt_runqueue_resched( &slapd_rq, cm->cc_arg, 0 );
} }
@ -2574,9 +2576,15 @@ consistency_check(
SlapReply rs = {REP_RESULT}; SlapReply rs = {REP_RESULT};
CachedQuery* query; CachedQuery* query;
int return_val, pause = 1; int return_val, pause = PCACHE_CC_PAUSED;
QueryTemplate* templ; QueryTemplate* templ;
/* Don't expire anything when we're offline */
if ( cm->cc_paused & PCACHE_CC_OFFLINE ) {
pause = PCACHE_CC_OFFLINE;
goto leave;
}
connection_fake_init( &conn, &opbuf, ctx ); connection_fake_init( &conn, &opbuf, ctx );
op = &opbuf.ob_op; op = &opbuf.ob_op;
@ -2631,12 +2639,15 @@ consistency_check(
query = templ->query_last; query = templ->query_last;
} }
} }
leave:
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) { if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) {
ldap_pvt_runqueue_stoptask( &slapd_rq, rtask ); ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
} }
/* If there were no queries, defer processing for a while */ /* If there were no queries, defer processing for a while */
cm->cc_paused = pause; if ( cm->cc_paused != pause )
cm->cc_paused = pause;
ldap_pvt_runqueue_resched( &slapd_rq, rtask, pause ); ldap_pvt_runqueue_resched( &slapd_rq, rtask, pause );
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
@ -2651,7 +2662,8 @@ enum {
PC_ATTR, PC_ATTR,
PC_TEMP, PC_TEMP,
PC_RESP, PC_RESP,
PC_QUERIES PC_QUERIES,
PC_OFFLINE
}; };
static ConfigDriver pc_cf_gen; static ConfigDriver pc_cf_gen;
@ -2696,6 +2708,11 @@ static ConfigTable pccfg[] = {
"( OLcfgOvAt:2.7 NAME 'olcProxyCheckCacheability' " "( OLcfgOvAt:2.7 NAME 'olcProxyCheckCacheability' "
"DESC 'Check whether the results of a query are cacheable, e.g. for schema issues' " "DESC 'Check whether the results of a query are cacheable, e.g. for schema issues' "
"SYNTAX OMsBoolean )", NULL, NULL }, "SYNTAX OMsBoolean )", NULL, NULL },
{ "proxyCacheOffline", "TRUE|FALSE",
2, 2, 0, ARG_ON_OFF|ARG_MAGIC|PC_OFFLINE, pc_cf_gen,
"( OLcfgOvAt:2.8 NAME 'olcProxyCacheOffline' "
"DESC 'Set cache to offline mode and disable expiration' "
"SYNTAX OMsBoolean )", NULL, NULL },
{ NULL, NULL, 0, 0, 0, ARG_IGNORED } { NULL, NULL, 0, 0, 0, ARG_IGNORED }
}; };
@ -2706,7 +2723,7 @@ static ConfigOCs pcocs[] = {
"DESC 'ProxyCache configuration' " "DESC 'ProxyCache configuration' "
"SUP olcOverlayConfig " "SUP olcOverlayConfig "
"MUST ( olcProxyCache $ olcProxyAttrset $ olcProxyTemplate ) " "MUST ( olcProxyCache $ olcProxyAttrset $ olcProxyTemplate ) "
"MAY ( olcProxyResponseCB $ olcProxyCacheQueries $ olcProxySaveQueries $ olcProxyCheckCacheability ) )", "MAY ( olcProxyResponseCB $ olcProxyCacheQueries $ olcProxySaveQueries $ olcProxyCheckCacheability $ olcProxyCacheOffline ) )",
Cft_Overlay, pccfg, NULL, pc_cfadd }, Cft_Overlay, pccfg, NULL, pc_cfadd },
{ "( OLcfgOvOc:2.2 " { "( OLcfgOvOc:2.2 "
"NAME 'olcPcacheDatabase' " "NAME 'olcPcacheDatabase' "
@ -2854,17 +2871,23 @@ pc_cf_gen( ConfigArgs *c )
case PC_QUERIES: case PC_QUERIES:
c->value_int = cm->max_queries; c->value_int = cm->max_queries;
break; break;
case PC_OFFLINE:
c->value_int = (cm->cc_paused & PCACHE_CC_OFFLINE) != 0;
break;
} }
return rc; return rc;
} else if ( c->op == LDAP_MOD_DELETE ) { } else if ( c->op == LDAP_MOD_DELETE ) {
return 1; /* FIXME */ rc = 1;
#if 0
switch( c->type ) { switch( c->type ) {
case PC_ATTR: case PC_ATTR: /* FIXME */
case PC_TEMP: case PC_TEMP:
break;
case PC_OFFLINE:
cm->cc_paused &= ~PCACHE_CC_OFFLINE;
rc = 0;
break;
} }
return rc; return rc;
#endif
} }
switch( c->type ) { switch( c->type ) {
@ -3151,6 +3174,12 @@ pc_cf_gen( ConfigArgs *c )
} }
cm->max_queries = c->value_int; cm->max_queries = c->value_int;
break; break;
case PC_OFFLINE:
if ( c->value_int )
cm->cc_paused |= PCACHE_CC_OFFLINE;
else
cm->cc_paused &= ~PCACHE_CC_OFFLINE;
break;
} }
return rc; return rc;
} }