From 4d4dc93f4044cd685b6e8e2db7a3cd73eb36b7ce Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 13 Oct 2003 19:16:28 +0000 Subject: [PATCH] Preinit facility for proxy --- TODO | 4 - include/yaz++/proxy.h | 34 ++++++-- src/config.xml | 8 +- src/yaz-proxy-config.cpp | 63 +++++++++++++- src/yaz-proxy.cpp | 218 +++++++++++++++++++++++++++++++++++++++------- 5 files changed, 280 insertions(+), 47 deletions(-) diff --git a/TODO b/TODO index 066e9f9..2e26ceb 100644 --- a/TODO +++ b/TODO @@ -3,14 +3,10 @@ Control the various optimizations with config.. Handle invalidate sessions (-1 hit, control-number search). -MARCXML support. - Live status (via search, present). Documentation update. -Avoid reverse map in COMSTACK. - SRW/SRU. Threading. diff --git a/include/yaz++/proxy.h b/include/yaz++/proxy.h index 1d0c12d..047f086 100644 --- a/include/yaz++/proxy.h +++ b/include/yaz++/proxy.h @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: proxy.h,v 1.15 2003-10-10 17:58:29 adam Exp $ + * $Id: proxy.h,v 1.16 2003-10-13 19:16:28 adam Exp $ */ #include @@ -25,11 +25,27 @@ public: Yaz_ProxyConfig(); ~Yaz_ProxyConfig(); int read_xml(const char *fname); + + int get_target_no(int no, + const char **name, + const char **url, + int *limit_bw, + int *limit_pdu, + int *limit_req, + int *target_idletime, + int *client_idletime, + int *max_clients, + int *keepalive_limit_bw, + int *keepalive_limit_pdu, + int *pre_init); + void get_target_info(const char *name, const char **url, int *limit_bw, int *limit_pdu, int *limit_req, int *target_idletime, int *client_idletime, int *max_clients, - int *keepalive_limit_bw, int *keepalive_limit_pdu); + int *keepalive_limit_bw, int *keepalive_limit_pdu, + int *pre_init); + int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo); int check_syntax(ODR odr, const char *name, Odr_oid *syntax, char **addinfo); @@ -41,7 +57,8 @@ private: void return_target_info(xmlNodePtr ptr, const char **url, int *limit_bw, int *limit_pdu, int *limit_req, int *target_idletime, int *client_idletime, - int *keepalive_limit_bw, int *keepalive_limit_pdu); + int *keepalive_limit_bw, int *keepalive_limit_pdu, + int *pre_init); void return_limit(xmlNodePtr ptr, int *limit_bw, int *limit_pdu, int *limit_req); int check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query, @@ -100,7 +117,8 @@ class YAZ_EXPORT Yaz_bw { /// Private class class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc { friend class Yaz_Proxy; - Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable); + Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable, + Yaz_Proxy *parent); ~Yaz_ProxyClient(); void recv_Z_PDU(Z_APDU *apdu, int len); IYaz_PDU_Observer* sessionNotify @@ -131,6 +149,9 @@ class YAZ_EXPORT Yaz_ProxyClient : public Yaz_Z_Assoc { ODR m_init_odr; Z_APDU *m_initResponse; Yaz_RecordCache m_cache; + void pre_init_client(); + int m_target_idletime; + Yaz_Proxy *m_root; }; /// Information Retrieval Proxy Server. @@ -184,7 +205,8 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { int m_marcxml_flag; void convert_to_marcxml(Z_NamePlusRecordList *p); public: - Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable); + Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, + Yaz_Proxy *parent = 0); ~Yaz_Proxy(); void recv_Z_PDU(Z_APDU *apdu, int len); void recv_Z_PDU_0(Z_APDU *apdu); @@ -205,5 +227,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { int set_config(const char *name); int reconfig() { m_reconfig_flag = 1; } int send_to_client(Z_APDU *apdu); + void server(const char *addr); + void pre_init(); }; diff --git a/src/config.xml b/src/config.xml index efe5126..74e64e5 100644 --- a/src/config.xml +++ b/src/config.xml @@ -15,11 +15,12 @@ 20 - 180 - 120 + 300 + 180 + 1 localhost:9999 @@ -29,11 +30,14 @@ 60 10 + 300 + 180 + 2 diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp index 056354b..54ddd59 100644 --- a/src/yaz-proxy-config.cpp +++ b/src/yaz-proxy-config.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy-config.cpp,v 1.8 2003-10-10 17:58:29 adam Exp $ + * $Id: yaz-proxy-config.cpp,v 1.9 2003-10-13 19:16:29 adam Exp $ */ #include @@ -116,13 +116,21 @@ void Yaz_ProxyConfig::return_target_info(xmlNodePtr ptr, int *target_idletime, int *client_idletime, int *keepalive_limit_bw, - int *keepalive_limit_pdu) + int *keepalive_limit_pdu, + int *pre_init) { + *pre_init = 0; int no_url = 0; ptr = ptr->children; for (; ptr; ptr = ptr->next) { if (ptr->type == XML_ELEMENT_NODE + && !strcmp((const char *) ptr->name, "preinit")) + { + const char *v = get_text(ptr); + *pre_init = v ? atoi(v) : 1; + } + if (ptr->type == XML_ELEMENT_NODE && !strcmp((const char *) ptr->name, "url")) { const char *t = get_text(ptr); @@ -444,6 +452,51 @@ xmlNodePtr Yaz_ProxyConfig::find_target_node(const char *name) } #endif +int Yaz_ProxyConfig::get_target_no(int no, + const char **name, + const char **url, + int *limit_bw, + int *limit_pdu, + int *limit_req, + int *target_idletime, + int *client_idletime, + int *max_clients, + int *keepalive_limit_bw, + int *keepalive_limit_pdu, + int *pre_init) +{ +#if HAVE_XML2 + xmlNodePtr ptr; + if (!m_proxyPtr) + return 0; + int i = 0; + for (ptr = m_proxyPtr->children; ptr; ptr = ptr->next) + if (ptr->type == XML_ELEMENT_NODE && + !strcmp((const char *) ptr->name, "target")) + { + if (i == no) + { + struct _xmlAttr *attr; + for (attr = ptr->properties; attr; attr = attr->next) + if (!strcmp((const char *) attr->name, "name")) + { + if (attr->children + && attr->children->type==XML_TEXT_NODE + && attr->children->content) + *name = (const char *) attr->children->content; + } + return_target_info(ptr, url, limit_bw, limit_pdu, limit_req, + target_idletime, client_idletime, + keepalive_limit_bw, keepalive_limit_pdu, + pre_init); + return 1; + } + i++; + } +#endif + return 0; +} + void Yaz_ProxyConfig::get_target_info(const char *name, const char **url, int *limit_bw, @@ -453,7 +506,8 @@ void Yaz_ProxyConfig::get_target_info(const char *name, int *client_idletime, int *max_clients, int *keepalive_limit_bw, - int *keepalive_limit_pdu) + int *keepalive_limit_pdu, + int *pre_init) { #if HAVE_XML2 xmlNodePtr ptr; @@ -488,7 +542,8 @@ void Yaz_ProxyConfig::get_target_info(const char *name, } return_target_info(ptr, url, limit_bw, limit_pdu, limit_req, target_idletime, client_idletime, - keepalive_limit_bw, keepalive_limit_pdu); + keepalive_limit_bw, keepalive_limit_pdu, + pre_init); } #else *url = name; diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index a559383..39f53da 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy.cpp,v 1.56 2003-10-10 17:58:29 adam Exp $ + * $Id: yaz-proxy.cpp,v 1.57 2003-10-13 19:16:29 adam Exp $ */ #include @@ -52,12 +52,13 @@ static const char *apdu_name(Z_APDU *apdu) return "other"; } -Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) : +Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, + Yaz_Proxy *parent = 0) : Yaz_Z_Assoc(the_PDU_Observable), m_bw_stat(60), m_pdu_stat(60) { m_PDU_Observable = the_PDU_Observable; m_client = 0; - m_parent = 0; + m_parent = parent; m_clientPool = 0; m_seqno = 1; m_keepalive_limit_bw = 500000; @@ -150,8 +151,7 @@ IYaz_PDU_Observer *Yaz_Proxy::sessionNotify(IYaz_PDU_Observable *the_PDU_Observable, int fd) { check_reconfigure(); - Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable); - new_proxy->m_parent = this; + Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable, this); new_proxy->m_config = 0; new_proxy->m_config_fname = 0; new_proxy->timeout(m_client_idletime); @@ -249,13 +249,17 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) proxy_host = m_default_target; } int client_idletime = -1; + int pre_init = 0; + url[0] = m_default_target; + url[1] = 0; if (cfg) cfg->get_target_info(proxy_host, url, &m_bw_max, &m_pdu_max, &m_max_record_retrieve, &m_target_idletime, &client_idletime, &parent->m_max_clients, &m_keepalive_limit_bw, - &m_keepalive_limit_pdu); + &m_keepalive_limit_pdu, + &pre_init); if (client_idletime != -1) { m_client_idletime = client_idletime; @@ -308,12 +312,13 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) c->m_sr_transform = 0; c->m_waiting = 0; c->m_resultSetStartPoint = 0; + c->m_target_idletime = m_target_idletime; if (c->client(m_proxyTarget)) { delete c; return 0; } - c->timeout(m_target_idletime); + c->timeout(30); } c->m_seqno = parent->m_seqno; if (c->m_server && c->m_server != this) @@ -333,6 +338,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) assert (c->m_prev); assert (*c->m_prev == c); if (c->m_server == 0 && c->m_cookie == 0 && + c->m_waiting == 0 && !strcmp(m_proxyTarget, c->get_hostname())) { cc = c; @@ -352,6 +358,9 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) c->m_server = this; (parent->m_seqno)++; + + parent->pre_init(); + return c; } } @@ -424,6 +433,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) delete c->m_server; } (parent->m_seqno)++; + c->m_target_idletime = m_target_idletime; + c->timeout(m_target_idletime); return c; } } @@ -431,7 +442,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) { yaz_log (LOG_LOG, "%sNEW %d %s", m_session_str, parent->m_seqno, m_proxyTarget); - c = new Yaz_ProxyClient(m_PDU_Observable->clone()); + c = new Yaz_ProxyClient(m_PDU_Observable->clone(), parent); c->m_next = parent->m_clientPool; if (c->m_next) c->m_next->m_prev = &c->m_next; @@ -458,6 +469,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) delete c; return 0; } + c->m_target_idletime = m_target_idletime; c->timeout(30); } @@ -617,7 +629,7 @@ int Yaz_ProxyClient::send_to_target(Z_APDU *apdu) { int len = 0; int r = send_Z_PDU(apdu, &len); - yaz_log (LOG_DEBUG, "%sSending %s to %s %d bytes", + yaz_log (LOG_LOG, "%sSending %s to %s %d bytes", get_session_str(), apdu_name(apdu), get_hostname(), len); m_bytes_sent += len; @@ -626,8 +638,6 @@ int Yaz_ProxyClient::send_to_target(Z_APDU *apdu) Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) { - if (*m_parent->m_optimize == '0') - return apdu; // don't optimize result sets.. if (apdu->which == Z_APDU_presentRequest) { Z_PresentRequest *pr = apdu->u.presentRequest; @@ -635,9 +645,31 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) int toget = *pr->numberOfRecordsRequested; int start = *pr->resultSetStartPoint; - if (m_client->m_last_resultSetId && - !strcmp(m_client->m_last_resultSetId, pr->resultSetId)) + yaz_log(LOG_LOG, "%sPresent %s %d+%d", m_session_str, + pr->resultSetId, start, toget); + + if (*m_parent->m_optimize == '0') + return apdu; + + if (!m_client->m_last_resultSetId) + { + Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse); + new_apdu->u.presentResponse->records = + create_nonSurrogateDiagnostics(odr_encode(), 30, + pr->resultSetId); + send_to_client(new_apdu); + return 0; + } + if (!strcmp(m_client->m_last_resultSetId, pr->resultSetId)) { + if (start+toget-1 > m_client->m_last_resultCount) + { + Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentResponse); + new_apdu->u.presentResponse->records = + create_nonSurrogateDiagnostics(odr_encode(), 13, 0); + send_to_client(new_apdu); + return 0; + } if (m_client->m_cache.lookup (odr_encode(), &npr, start, toget, pr->preferredRecordSyntax, pr->recordComposition)) @@ -676,9 +708,10 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) char query_str[120]; this_query->print(query_str, sizeof(query_str)-1); - yaz_log(LOG_LOG, "%sQuery %s", m_session_str, query_str); + yaz_log(LOG_LOG, "%sSearch %s", m_session_str, query_str); - if (m_client->m_last_ok && m_client->m_last_query && + if (*m_parent->m_optimize != '0' && + m_client->m_last_ok && m_client->m_last_query && m_client->m_last_query->match(this_query) && !strcmp(m_client->m_last_resultSetId, sr->resultSetName) && m_client->m_last_databases.match(this_databases)) @@ -1140,6 +1173,8 @@ void Yaz_Proxy::shutdown() yaz_log (LOG_LOG, "%sShutdown (client to proxy)", m_session_str); } + if (m_parent) + m_parent->pre_init(); delete this; } @@ -1154,6 +1189,8 @@ void Yaz_ProxyClient::shutdown() { yaz_log (LOG_LOG, "%sShutdown (proxy to target) %s", get_session_str(), get_hostname()); + m_waiting = 1; + m_root->pre_init(); delete m_server; delete this; } @@ -1174,20 +1211,20 @@ void Yaz_ProxyClient::failNotify() void Yaz_ProxyClient::connectNotify() { - yaz_log (LOG_LOG, "%sConnection accepted by %s", get_session_str(), - get_hostname()); + const char *s = get_session_str(); + const char *h = get_hostname(); + yaz_log (LOG_LOG, "%sConnection accepted by %s timeout=%d", s, h, + m_target_idletime); int to; - if (m_server) - to = m_server->get_target_idletime(); - else - to = 600; - timeout(to); + timeout(m_target_idletime); + if (!m_server) + pre_init_client(); } IYaz_PDU_Observer *Yaz_ProxyClient::sessionNotify(IYaz_PDU_Observable *the_PDU_Observable, int fd) { - return new Yaz_ProxyClient(the_PDU_Observable); + return new Yaz_ProxyClient(the_PDU_Observable, 0); } Yaz_ProxyClient::~Yaz_ProxyClient() @@ -1203,19 +1240,121 @@ Yaz_ProxyClient::~Yaz_ProxyClient() xfree (m_cookie); } +void Yaz_ProxyClient::pre_init_client() +{ + Z_APDU *apdu = create_Z_PDU(Z_APDU_initRequest); + Z_InitRequest *req = apdu->u.initRequest; + + ODR_MASK_SET(req->options, Z_Options_search); + ODR_MASK_SET(req->options, Z_Options_present); + ODR_MASK_SET(req->options, Z_Options_namedResultSets); + ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl); + ODR_MASK_SET(req->options, Z_Options_scan); + ODR_MASK_SET(req->options, Z_Options_sort); + ODR_MASK_SET(req->options, Z_Options_extendedServices); + ODR_MASK_SET(req->options, Z_Options_delSet); + + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1); + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); + + if (send_to_target(apdu) < 0) + { + delete this; + } + else + { + m_waiting = 1; + m_init_flag = 1; + } +} + +void Yaz_Proxy::pre_init() +{ + int i; + const char *name = 0; + const char *zurl_in_use[MAX_ZURL_PLEX]; + int limit_bw, limit_pdu, limit_req; + int target_idletime, client_idletime; + int max_clients; + int keepalive_limit_bw, keepalive_limit_pdu; + int pre_init; + + Yaz_ProxyConfig *cfg = check_reconfigure(); + + yaz_log(LOG_LOG, "pre_init"); + zurl_in_use[0] = 0; + for (i = 0; cfg && cfg->get_target_no(i, &name, zurl_in_use, + &limit_bw, &limit_pdu, &limit_req, + &target_idletime, &client_idletime, + &max_clients, + &keepalive_limit_bw, + &keepalive_limit_pdu, + &pre_init) ; i++) + { + if (pre_init) + { + int j; + for (j = 0; zurl_in_use[j]; j++) + { + Yaz_ProxyClient *c; + int spare = 0; + for (c = m_clientPool; c; c = c->m_next) + { + if (!strcmp(zurl_in_use[j], c->get_hostname()) + && c->m_server == 0 && c->m_cookie == 0) + spare++; + } + yaz_log(LOG_LOG, "pre_init %s %s spare=%d pre_init=%d", + name, zurl_in_use[j], spare, pre_init); + if (spare < pre_init) + { + c = new Yaz_ProxyClient(m_PDU_Observable->clone(), this); + c->m_next = m_clientPool; + if (c->m_next) + c->m_next->m_prev = &c->m_next; + m_clientPool = c; + c->m_prev = &m_clientPool; + + if (c->client(zurl_in_use[j])) + { + timeout(60); + delete c; + return; + } + c->timeout(30); + c->m_waiting = 1; + c->m_target_idletime = target_idletime; + yaz_log(LOG_LOG, "pre_init name=%s zurl=%s timeout=%d", name, + zurl_in_use[j], target_idletime); + c->m_seqno = m_seqno++; + } + } + } + } +} + void Yaz_Proxy::timeoutNotify() { - if (m_bw_hold_PDU) + if (m_parent) { - timeout(m_client_idletime); - Z_APDU *apdu = m_bw_hold_PDU; - m_bw_hold_PDU = 0; - recv_Z_PDU_0(apdu); + if (m_bw_hold_PDU) + { + timeout(m_client_idletime); + Z_APDU *apdu = m_bw_hold_PDU; + m_bw_hold_PDU = 0; + recv_Z_PDU_0(apdu); + } + else + { + yaz_log (LOG_LOG, "%sTimeout (client to proxy)", m_session_str); + shutdown(); + } } else { - yaz_log (LOG_LOG, "%sTimeout (client to proxy)", m_session_str); - shutdown(); + timeout(600); + pre_init(); } } @@ -1226,7 +1365,8 @@ void Yaz_ProxyClient::timeoutNotify() shutdown(); } -Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) : +Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable, + Yaz_Proxy *parent) : Yaz_Z_Assoc (the_PDU_Observable) { m_cookie = 0; @@ -1244,6 +1384,10 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) : m_resultSetStartPoint = 0; m_bytes_sent = m_bytes_recv = 0; m_pdu_recv = 0; + m_server = 0; + m_seqno = 0; + m_target_idletime = 600; + m_root = parent; } const char *Yaz_Proxy::option(const char *name, const char *value) @@ -1263,10 +1407,12 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) m_bytes_recv += len; m_pdu_recv++; m_waiting = 0; - yaz_log (LOG_DEBUG, "%sReceiving %s from %s %d bytes", get_session_str(), + yaz_log (LOG_LOG, "%sReceiving %s from %s %d bytes", get_session_str(), apdu_name(apdu), get_hostname(), len); if (apdu->which == Z_APDU_initResponse) { + if (!m_server) // if this is a pre init session , check for more + m_root->pre_init(); NMEM nmem = odr_extract_mem (odr_decode()); odr_reset (m_init_odr); nmem_transfer (m_init_odr->mem, nmem); @@ -1340,3 +1486,11 @@ void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len) shutdown(); } } + +void Yaz_Proxy::server(const char *addr) +{ + Yaz_Z_Assoc::server(addr); + + timeout(1); +} + -- 1.7.10.4