Skip to content

Commit

Permalink
Bug 4528: ICAP transactions quit on async DNS lookups (#795)
Browse files Browse the repository at this point in the history
The bug directly affected some ICAP OPTIONS transactions and indirectly
affected some ICAP REQMOD/RESPMOD transactions:

* OPTIONS: When a transaction needed to look up an IP address of the
  ICAP service, and that address was not cached by Squid, it ended
  prematurely because Adaptation::Icap::Xaction::doneAll() was unaware
  of ipcache_nbgethostbyname()'s async nature. This bug is fixed now.

* REQMOD/RESPMOD: Adaptation::Icap::ModXact masked the _direct_ effects
  of the bug: ModXact::startWriting() sets state.writing before calling
  openConnection() which schedules the DNS lookup. That "I am still
  writing" state makes ModXact::doneAll() false while a REQMOD or
  RESPMOD transaction waits for the DNS lookup.

  However, REQMOD and RESPMOD transactions that require an OPTIONS
  transaction (because the service options have never been fetched
  before or have expired) could still fail because the OPTIONS
  transaction they trigger could fail as described in the first bullet.
  For example, the first few REQMOD and RESPMOD transactions for a given
  service -- all those started before the DNS lookup completes and Squid
  caches its result -- could fail this way. With the OPTIONS now fixed,
  these REQMOD and RESPMOD transactions should work correctly.

Broken since inception (commit fb505fa).
  • Loading branch information
rousskov authored and yadij committed Jun 17, 2021
1 parent a526d36 commit 76f4839
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/adaptation/icap/Xaction.cc
Expand Up @@ -88,6 +88,7 @@ Adaptation::Icap::Xaction::Xaction(const char *aTypeName, Adaptation::Icap::Serv
isRetriable(true),
isRepeatable(true),
ignoreLastWrite(false),
waitingForDns(false),
stopReason(NULL),
connector(NULL),
reader(NULL),
Expand Down Expand Up @@ -189,12 +190,17 @@ Adaptation::Icap::Xaction::openConnection()
debugs(93,3, typeName << " opens connection to " << s.cfg().host.termedBuf() << ":" << s.cfg().port);

// Locate the Service IP(s) to open
assert(!waitingForDns);
waitingForDns = true; // before the possibly-synchronous ipcache_nbgethostbyname()
ipcache_nbgethostbyname(s.cfg().host.termedBuf(), icapLookupDnsResults, this);
}

void
Adaptation::Icap::Xaction::dnsLookupDone(const ipcache_addrs *ia)
{
assert(waitingForDns);
waitingForDns = false;

Adaptation::Icap::ServiceRep &s = service();

if (ia == NULL) {
Expand Down Expand Up @@ -420,7 +426,8 @@ void Adaptation::Icap::Xaction::callEnd()

bool Adaptation::Icap::Xaction::doneAll() const
{
return !connector && !securer && !reader && !writer && Adaptation::Initiate::doneAll();
return !waitingForDns && !connector && !securer && !reader && !writer &&
Adaptation::Initiate::doneAll();
}

void Adaptation::Icap::Xaction::updateTimeout()
Expand Down Expand Up @@ -690,6 +697,9 @@ void Adaptation::Icap::Xaction::fillPendingStatus(MemBuf &buf) const

buf.append(";", 1);
}

if (waitingForDns)
buf.append("D", 1);
}

void Adaptation::Icap::Xaction::fillDoneStatus(MemBuf &buf) const
Expand Down
1 change: 1 addition & 0 deletions src/adaptation/icap/Xaction.h
Expand Up @@ -136,6 +136,7 @@ class Xaction: public Adaptation::Initiate
bool isRetriable; ///< can retry on persistent connection failures
bool isRepeatable; ///< can repeat if no or unsatisfactory response
bool ignoreLastWrite;
bool waitingForDns; ///< expecting a ipcache_nbgethostbyname() callback

const char *stopReason;

Expand Down

0 comments on commit 76f4839

Please sign in to comment.