X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=1275732deca06397e9fba9ede45272a387bc44eb;hb=ea5275ed931fa06ac765dfb49e5af2036a6ec8b3;hp=a559383077dc6ceaa96df5daa8e066451989935f;hpb=5554ddf9c4d9670aaaa8f8b9ce6def1dadff3c96;p=yazpp-moved-to-github.git diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index a559383..1275732 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.66 2003-10-23 09:10:12 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) : 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; @@ -66,11 +67,12 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) : m_default_target = 0; m_proxy_authentication = 0; m_max_clients = 150; + m_log_mask = 0; m_seed = time(0); m_client_idletime = 600; m_target_idletime = 600; m_optimize = xstrdup ("1"); - strcpy(m_session_str, "x"); + strcpy(m_session_str, "0"); m_session_no=0; m_bytes_sent = m_bytes_recv = 0; m_bw_hold_PDU = 0; @@ -103,6 +105,8 @@ int Yaz_Proxy::set_config(const char *config) xfree(m_config_fname); m_config_fname = xstrdup(config); int r = m_config->read_xml(config); + if (!r) + m_config->get_generic_info(&m_log_mask, &m_max_clients); return r; } @@ -138,6 +142,11 @@ Yaz_ProxyConfig *Yaz_Proxy::check_reconfigure() int r = cfg->read_xml(m_config_fname); if (r) yaz_log(LOG_WARN, "reconfigure failed"); + else + { + m_log_mask = 0; + cfg->get_generic_info(&m_log_mask, &m_max_clients); + } } else yaz_log(LOG_LOG, "reconfigure"); @@ -150,14 +159,19 @@ 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); new_proxy->m_target_idletime = m_target_idletime; new_proxy->set_default_target(m_default_target); + new_proxy->m_max_clients = m_max_clients; + new_proxy->m_log_mask = m_log_mask; new_proxy->set_APDU_log(get_APDU_log()); + if (m_log_mask & PROXY_LOG_APDU_CLIENT) + new_proxy->set_APDU_yazlog(1); + else + new_proxy->set_APDU_yazlog(0); new_proxy->set_proxy_authentication(m_proxy_authentication); sprintf(new_proxy->m_session_str, "%ld:%d ", (long) time(0), m_session_no); m_session_no++; @@ -244,18 +258,29 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) Yaz_ProxyConfig *cfg = check_reconfigure(); if (proxy_host) { +#if 0 +/* only to be enabled for debugging... */ + if (!strcmp(proxy_host, "stop")) + exit(0); +#endif xfree(m_default_target); m_default_target = xstrdup(proxy_host); proxy_host = m_default_target; } int client_idletime = -1; + url[0] = m_default_target; + url[1] = 0; if (cfg) + { + int pre_init = 0; 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; @@ -275,9 +300,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) m_proxyTarget = (char*) xstrdup(load_balance(url)); } if (cookie && *cookie) - { - Yaz_ProxyClient *cc = 0; - + { // search in sessions with a cookie for (c = parent->m_clientPool; c; c = c->m_next) { assert (c->m_prev); @@ -285,74 +308,71 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) if (c->m_cookie && !strcmp(cookie,c->m_cookie) && !strcmp(m_proxyTarget, c->get_hostname())) { - cc = c; - } - } - if (cc) - { - // found it in cache - c = cc; - // The following handles "cancel" - // If connection is busy (waiting for PDU) and - // we have an initRequest we can safely do re-open - if (c->m_waiting && apdu->which == Z_APDU_initRequest) - { - yaz_log (LOG_LOG, "%s REOPEN target=%s", m_session_str, - c->get_hostname()); - c->close(); - c->m_init_flag = 0; - - c->m_last_ok = 0; - c->m_cache.clear(); - c->m_last_resultCount = 0; - c->m_sr_transform = 0; - c->m_waiting = 0; - c->m_resultSetStartPoint = 0; - if (c->client(m_proxyTarget)) + // Found it in cache + // The following handles "cancel" + // If connection is busy (waiting for PDU) and + // we have an initRequest we can safely do re-open + if (c->m_waiting && apdu->which == Z_APDU_initRequest) { - delete c; - return 0; + yaz_log (LOG_LOG, "%s REOPEN target=%s", m_session_str, + c->get_hostname()); + c->close(); + c->m_init_flag = 0; + + c->m_last_ok = 0; + c->m_cache.clear(); + c->m_last_resultCount = 0; + 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(30); } - c->timeout(m_target_idletime); + c->m_seqno = parent->m_seqno; + if (c->m_server && c->m_server != this) + c->m_server->m_client = 0; + c->m_server = this; + (parent->m_seqno)++; + yaz_log (LOG_DEBUG, "get_client 1 %p %p", this, c); + return c; } - c->m_seqno = parent->m_seqno; - if (c->m_server && c->m_server != this) - c->m_server->m_client = 0; - c->m_server = this; - (parent->m_seqno)++; - yaz_log (LOG_DEBUG, "get_client 1 %p %p", this, c); - return c; } } else if (!c) { - Yaz_ProxyClient *cc = 0; - + // don't have a client session yet. Search in session w/o cookie for (c = parent->m_clientPool; c; c = c->m_next) { 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; - } - } - if (cc) - { - // found it in cache - c = cc; + // found it in cache + yaz_log (LOG_LOG, "%sREUSE %s", + m_session_str, c->get_hostname()); + + c->m_seqno = parent->m_seqno; + assert(c->m_server == 0); + c->m_server = this; - yaz_log (LOG_LOG, "%sREUSE %d %d %s", - m_session_str, - c->m_seqno, parent->m_seqno, c->get_hostname()); + if (parent->m_log_mask & PROXY_LOG_APDU_SERVER) + c->set_APDU_yazlog(1); + else + c->set_APDU_yazlog(0); - c->m_seqno = parent->m_seqno; - assert(c->m_server == 0); - c->m_server = this; - - (parent->m_seqno)++; - return c; + (parent->m_seqno)++; + + parent->pre_init(); + + return c; + } } } if (!m_client) @@ -424,6 +444,14 @@ 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); + + if (parent->m_log_mask & PROXY_LOG_APDU_SERVER) + c->set_APDU_yazlog(1); + else + c->set_APDU_yazlog(0); + return c; } } @@ -431,7 +459,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,8 +486,13 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu) delete c; return 0; } + c->m_target_idletime = m_target_idletime; c->timeout(30); + if (parent->m_log_mask & PROXY_LOG_APDU_SERVER) + c->set_APDU_yazlog(1); + else + c->set_APDU_yazlog(0); } yaz_log (LOG_DEBUG, "get_client 3 %p %p", this, c); return c; @@ -606,8 +639,9 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu) convert_to_marcxml(p->u.databaseOrSurDiagnostics); } int r = send_Z_PDU(apdu, &len); - yaz_log (LOG_DEBUG, "%sSending %s to client %d bytes", m_session_str, - apdu_name(apdu), len); + if (m_log_mask & PROXY_LOG_APDU_CLIENT) + yaz_log (LOG_DEBUG, "%sSending %s to client %d bytes", m_session_str, + apdu_name(apdu), len); m_bytes_sent += len; m_bw_stat.add_bytes(len); return r; @@ -617,27 +651,48 @@ 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", - get_session_str(), - apdu_name(apdu), get_hostname(), len); + if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER) + yaz_log (LOG_LOG, "%sSending %s to %s %d bytes", + get_session_str(), + apdu_name(apdu), get_hostname(), len); m_bytes_sent += len; return r; } 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; - Z_NamePlusRecordList *npr; 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 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)) @@ -661,6 +716,7 @@ Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu) return 0; } } +#endif } if (apdu->which != Z_APDU_searchRequest) @@ -676,9 +732,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)) @@ -841,8 +898,9 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu, int len) int reduce = 0; m_bytes_recv += len; - yaz_log (LOG_DEBUG, "%sReceiving %s from client %d bytes", m_session_str, - apdu_name(apdu), len); + if (m_log_mask & PROXY_LOG_APDU_CLIENT) + yaz_log (LOG_DEBUG, "%sReceiving %s from client %d bytes", + m_session_str, apdu_name(apdu), len); if (m_bw_hold_PDU) // double incoming PDU. shutdown now. shutdown(); @@ -952,37 +1010,34 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu) if (apdu->which == Z_APDU_searchRequest) { Z_SearchRequest *sr = apdu->u.searchRequest; - if (*sr->smallSetUpperBound > 0 || *sr->largeSetLowerBound > 1) + int err = 0; + char *addinfo = 0; + Yaz_ProxyConfig *cfg = check_reconfigure(); + + if (cfg) + err = cfg->check_syntax(odr_encode(), + m_default_target, + sr->preferredRecordSyntax, + &addinfo); + if (err == -1) { - int err = 0; - char *addinfo = 0; - Yaz_ProxyConfig *cfg = check_reconfigure(); - - if (cfg) - err = cfg->check_syntax(odr_encode(), - m_default_target, - sr->preferredRecordSyntax, - &addinfo); - if (err == -1) - { - sr->preferredRecordSyntax = - yaz_oidval_to_z3950oid(odr_decode(), CLASS_RECSYN, - VAL_USMARC); - m_marcxml_flag = 1; - } - else if (err) - { - Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse); - - new_apdu->u.searchResponse->referenceId = sr->referenceId; - new_apdu->u.searchResponse->records = - create_nonSurrogateDiagnostics(odr_encode(), err, addinfo); - *new_apdu->u.searchResponse->searchStatus = 0; - - send_to_client(new_apdu); - - return 0; - } + sr->preferredRecordSyntax = + yaz_oidval_to_z3950oid(odr_decode(), CLASS_RECSYN, + VAL_USMARC); + m_marcxml_flag = 1; + } + else if (err) + { + Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse); + + new_apdu->u.searchResponse->referenceId = sr->referenceId; + new_apdu->u.searchResponse->records = + create_nonSurrogateDiagnostics(odr_encode(), err, addinfo); + *new_apdu->u.searchResponse->searchStatus = 0; + + send_to_client(new_apdu); + + return 0; } } else if (apdu->which == Z_APDU_presentRequest) @@ -1140,6 +1195,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; } @@ -1174,20 +1231,19 @@ void Yaz_ProxyClient::failNotify() void Yaz_ProxyClient::connectNotify() { - yaz_log (LOG_LOG, "%sConnection accepted by %s", get_session_str(), - get_hostname()); - int to; - if (m_server) - to = m_server->get_target_idletime(); - else - to = 600; - timeout(to); + 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); + 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 +1259,141 @@ 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(); + + zurl_in_use[0] = 0; + + if (m_log_mask & PROXY_LOG_APDU_CLIENT) + set_APDU_yazlog(1); + else + set_APDU_yazlog(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; + int in_use = 0; + int other = 0; + for (c = m_clientPool; c; c = c->m_next) + { + if (!strcmp(zurl_in_use[j], c->get_hostname())) + { + if (c->m_cookie == 0) + { + if (c->m_server == 0) + spare++; + else + in_use++; + } + else + other++; + } + } + yaz_log(LOG_LOG, "%s pre-init %s %s use=%d other=%d spare=%d preinit=%d", + m_session_str, + name, zurl_in_use[j], in_use, other, 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 (m_log_mask & PROXY_LOG_APDU_SERVER) + c->set_APDU_yazlog(1); + else + c->set_APDU_yazlog(0); + + 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; + 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(); } } @@ -1223,10 +1401,13 @@ void Yaz_ProxyClient::timeoutNotify() { yaz_log (LOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(), get_hostname()); + m_waiting = 1; + m_root->pre_init(); 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 +1425,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 +1448,13 @@ 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(), - apdu_name(apdu), get_hostname(), len); + if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER) + 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 +1528,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); +} +