You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/12/23 19:53:09 UTC

svn commit: r1052353 - in /trafficserver/traffic/trunk: contrib/perl/AdminClient/lib/Apache/TS/ iocore/dns/ iocore/hostdb/ proxy/config/ proxy/mgmt2/ proxy/mgmt2/html2/configure/ test/plugin/test-mgmt/

Author: zwoop
Date: Thu Dec 23 18:53:09 2010
New Revision: 1052353

URL: http://svn.apache.org/viewvc?rev=1052353&view=rev
Log:
TS-597 Eliminate dedicated default DNS for SplitDNS

Author: Zhao Yongming
Review: Leif

This patch also eliminates the need for this configuation:

     proxy.config.dns.splitdns.def_domain

Modified:
    trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
    trafficserver/traffic/trunk/iocore/dns/DNS.cc
    trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h
    trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc
    trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
    trafficserver/traffic/trunk/proxy/config/records.config.in
    trafficserver/traffic/trunk/proxy/config/splitdns.config
    trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
    trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_dns_split.ink
    trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c

Modified: trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm (original)
+++ trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm Thu Dec 23 18:53:09 2010
@@ -309,7 +309,6 @@ The Apache Traffic Server Administration
  proxy.config.dns.retries
  proxy.config.dns.round_robin_nameservers
  proxy.config.dns.search_default_domains
- proxy.config.dns.splitdns.def_domain
  proxy.config.dns.splitDNS.enabled
  proxy.config.dns.splitdns.filename
  proxy.config.dns.url_expansions

Modified: trafficserver/traffic/trunk/iocore/dns/DNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/DNS.cc?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/DNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/DNS.cc Thu Dec 23 18:53:09 2010
@@ -445,7 +445,7 @@ DNSHandler::startEvent_sdns(int event, E
   if (ip == DEFAULT_DOMAIN_NAME_SERVER) {
     // seems that res_init always sets m_res.nscount to at least 1!
     if (!m_res->nscount)
-      Warning("bad '/etc/resolv.conf': no nameservers given");
+      Warning("bad nameserver config, fallback to 127.0.0.1");
     struct sockaddr_in *sa = &m_res->nsaddr_list[0].sin;
     ip = sa->sin_addr.s_addr;
     if (!ip)

Modified: trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/dns/P_SplitDNSProcessor.h Thu Dec 23 18:53:09 2010
@@ -58,7 +58,6 @@ struct DNSServer;
 enum DNSResultType
 { DNS_SRVR_UNDEFINED = 0,
   DNS_SRVR_SPECIFIED,
-  DNS_SRVR_DEFAULT,
   DNS_SRVR_FAIL
 };
 
@@ -124,18 +123,14 @@ struct SplitDNS:public SplitDNSConfigInf
   SplitDNS();
   ~SplitDNS();
 
-  void *getDNSRecord(char *hostname);
+  void *getDNSRecord(const char *hostname);
   void findServer(RD * rdata, SplitDNSResult * result);
 
 
   DNS_table *m_DNSSrvrTable;
-  SplitDNSRecord *m_DefaultDNSSrvr;
 
   int32_t m_SplitDNSlEnable;
 
-  char m_def_domain[MAXDNAME];
-  int m_def_domain_len;
-
   /* ----------------------------
      required by the alleged fast
      path

Modified: trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc Thu Dec 23 18:53:09 2010
@@ -73,7 +73,6 @@ enum SplitDNSCB_t
 static const char *SDNSResultStr[] = {
   "DNSServer_Undefined",
   "DNSServer_Specified",
-  "DNSServer_Default",
   "DNSServer_Failed"
 };
 
@@ -96,10 +95,9 @@ inline SplitDNSResult::SplitDNSResult()
    SplitDNS::SplitDNS()
    -------------------------------------------------------------- */
 SplitDNS::SplitDNS()
-: m_DNSSrvrTable(NULL), m_DefaultDNSSrvr(NULL), m_SplitDNSlEnable(0), m_def_domain_len(0),
+: m_DNSSrvrTable(NULL), m_SplitDNSlEnable(0),
   m_bEnableFastPath(false), m_pxLeafArray(NULL), m_numEle(0)
 {
-  memset(m_def_domain, 0, MAXDNAME);
 }
 
 
@@ -108,10 +106,6 @@ SplitDNS::~SplitDNS()
   if (m_DNSSrvrTable) {
     delete m_DNSSrvrTable;
   }
-
-  if (m_DefaultDNSSrvr) {
-    delete m_DefaultDNSSrvr;
-  }
 }
 
 
@@ -179,26 +173,6 @@ SplitDNSConfig::reconfigure()
     params->m_bEnableFastPath = true;
   }
 
-  char *def_domain = IOCORE_ConfigReadString("proxy.config.dns.splitdns.def_domain");
-
-  if (def_domain) {
-    ink_strncpy(params->m_def_domain, def_domain, MAXDNAME);
-    xfree(def_domain);
-  } else {
-    // If def_domain comes back NULL, then either: the record
-    // doesn't exist -or- the record does exist but is currently set
-    // to NULL.  In this case, just clear the m_def_domain.
-    memset(params->m_def_domain, 0, MAXDNAME);
-  }
-
-  /* ----------------------------
-     Handle default DNS server
-     ---------------------------- */
-  params->m_DefaultDNSSrvr = createDefaultServer();
-  if ((0 == params->m_def_domain[0]) && (0 != params->m_DefaultDNSSrvr) && (true == params->m_bEnableFastPath)) {
-    ink_strncpy(params->m_def_domain, params->m_DefaultDNSSrvr->m_servers.x_def_domain, MAXDNAME);
-  }
-  params->m_def_domain_len = strlen(params->m_def_domain);
   m_id = SplitDNSconfigProcessor.set(m_id, params);
 
   if (is_debug_tag_set("splitdns_config")) {
@@ -218,13 +192,6 @@ SplitDNSConfig::print()
   Debug("splitdns_config", "DNS Server Selection Config\n");
   Debug("splitdns_config", "\tEnabled \n", params->m_SplitDNSlEnable);
 
-  if (params->m_DefaultDNSSrvr == NULL) {
-    Debug("splitdns_config", "\tNo Default DNS Server\n");
-  } else {
-    Debug("splitdns_config", "\tDefault DNS Server:\n");
-    params->m_DefaultDNSSrvr->Print();
-  }
-
   params->m_DNSSrvrTable->Print();
   SplitDNSConfig::release(params);
 }
@@ -234,47 +201,23 @@ SplitDNSConfig::print()
    SplitDNS::getDNSRecord()
    -------------------------------------------------------------- */
 void *
-SplitDNS::getDNSRecord(char *hostname)
+SplitDNS::getDNSRecord(const char *hostname)
 {
-  char szHostName[MAXDNAME];
-  char *pInHost = hostname;
-  size_t remaining_str_size = sizeof szHostName;
-
   Debug("splitdns", "Called SplitDNS::getDNSRecord(%s)", hostname);
-  if (0 < m_def_domain_len) {
-    if (0 == strchr(hostname, '.')) {
-      int hlen = strlen(hostname) + m_def_domain_len;
-
-      if (MAXDNAME > hlen) {
-        ink_strncpy(szHostName, hostname, remaining_str_size);
-        remaining_str_size -= strlen(hostname);
-        strncat(szHostName, ".", remaining_str_size);
-        remaining_str_size--;
-        strncat(szHostName, m_def_domain, remaining_str_size);
-        pInHost = &szHostName[0];
-      }
-    }
-  }
 
   DNSRequestData *pRD = DNSReqAllocator.alloc();
-  pRD->m_pHost = pInHost;
+  pRD->m_pHost = hostname;
 
   SplitDNSResult res;
   findServer(pRD, &res);
 
-  pRD->m_pHost = 0;
   DNSReqAllocator.free(pRD);
 
-  if (DNS_SRVR_UNDEFINED == res.r) {
-    Warning("Failed to match a valid DNS server!");
-    ink_assert(!"Failed to match a valid DNS server");
-  } else if (DNS_SRVR_DEFAULT == res.r) {
-    Debug("splitdns", "Failed to match a valid DNS server! Using defaults ...");
-    return (void *) &(res.m_rec->m_servers);
-  } else if (DNS_SRVR_SPECIFIED == res.r) {
+  if (DNS_SRVR_SPECIFIED == res.r) {
     return (void *) &(res.m_rec->m_servers);
   }
 
+  Debug("splitdns", "Fail to match a valid splitdns rule, fallback to default dns resolver");
   return NULL;
 }
 
@@ -286,7 +229,6 @@ void
 SplitDNS::findServer(RD * rdata, SplitDNSResult * result)
 {
   DNS_table *tablePtr = m_DNSSrvrTable;
-  SplitDNSRecord *defaultPtr = m_DefaultDNSSrvr;
   SplitDNSRecord *rec;
 
   ink_assert(result->r == DNS_SRVR_UNDEFINED);
@@ -342,16 +284,7 @@ SplitDNS::findServer(RD * rdata, SplitDN
 
   rec = result->m_rec;
   if (rec == NULL) {
-    /* ------------------------------------------
-       return default DNS server.
-       however, still return DNS_SRVR_UNDEFINED
-       ------------------------------------------ */
-    if (defaultPtr != NULL) {
-      rec = result->m_rec = defaultPtr;
-      result->r = DNS_SRVR_DEFAULT;
-    } else {
-      result->r = DNS_SRVR_UNDEFINED;
-    }
+    result->r = DNS_SRVR_UNDEFINED;
     return;
   } else {
     result->r = DNS_SRVR_SPECIFIED;
@@ -369,8 +302,7 @@ SplitDNS::findServer(RD * rdata, SplitDN
       result->m_rec->Print();
       break;
     default:
-      // This covers:
-      // DNS_SRVR_UNDEFINED and DNS_SRVR_DEFAULT
+      // DNS_SRVR_UNDEFINED
       break;
     }
   }
@@ -654,49 +586,6 @@ SplitDNSRecord::Print()
 }
 
 
-/* --------------------------------------------------------------
-    SplitDNSRecord* createDefaultServer()
-   -------------------------------------------------------------- */
-SplitDNSRecord *
-createDefaultServer()
-{
-  SplitDNSRecord *newRec;
-  // TODO: Hmmmm, we ought to only have to read this once, in DNS.cc ...
-  char *resolv_conf = IOCORE_ConfigReadString("proxy.config.dns.resolv_conf");
-  ink_res_state res = new __ink_res_state;
-
-  memset(res, 0, sizeof(__ink_res_state));
-  if (ink_res_init(res, 0, 0, 0, 0, resolv_conf) < 0) {
-    Warning("no default name server configured!");
-    xfree(resolv_conf);
-    return 0;
-  }
-  xfree(resolv_conf);
-
-  newRec = NEW(new SplitDNSRecord);
-  for (int i = 0; i < res->nscount; i++) {
-    // TODO: IPv6 ?
-    newRec->m_servers.x_server_ip[i] = res->nsaddr_list[i].sin.sin_addr.s_addr;
-    newRec->m_servers.x_dns_server_port[i] = ntohs(res->nsaddr_list[i].sin.sin_port);
-  }
-
-  newRec->m_servers.x_dnsH = new DNSHandler;
-  newRec->m_servers.x_dnsH->m_res = res;
-
-  newRec->m_servers.x_dnsH->mutex = SplitDNSConfig::dnsHandler_mutex;
-  newRec->m_servers.x_dnsH->options = _res.options;
-  newRec->m_servers.x_dnsH->ip = DEFAULT_DOMAIN_NAME_SERVER;
-  newRec->m_servers.x_dnsH->port = DOMAIN_SERVICE_PORT;
-
-  SET_CONTINUATION_HANDLER(newRec->m_servers.x_dnsH, &DNSHandler::startEvent_sdns);
-  (eventProcessor.eventthread[ET_DNS][0])->schedule_imm(newRec->m_servers.x_dnsH);
-  newRec->m_dnsSrvr_cnt = res->nscount;
-  ink_strncpy(newRec->m_servers.x_def_domain, res->defdname, MAXDNAME);
-
-  newRec->m_domain_srch_list = 0;
-  return newRec;
-}
-
 class SplitDNSConfigInfoReleaser:public Continuation
 {
 public:

Modified: trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc Thu Dec 23 18:53:09 2010
@@ -548,8 +548,8 @@ Ldelete:
 
 
 HostDBInfo *
-probe(ProxyMutex * mutex,
-      INK_MD5 & md5, char *hostname, int len, int ip, int port, void *pDS, bool ignore_timeout, bool is_srv_lookup)
+probe(ProxyMutex *mutex, INK_MD5 & md5, char *hostname, int len, int ip, int port, void *pDS, bool ignore_timeout,
+      bool is_srv_lookup)
 {
   ink_debug_assert(this_ethread() == hostDB.lock_for_bucket((int) (fold_md5(md5) % hostDB.buckets))->thread_holding);
   if (hostdb_enable) {
@@ -670,15 +670,9 @@ HostDBProcessor::getby(Continuation * co
       if (0 != pSD) {
         pDS = ((SplitDNS *) pSD)->getDNSRecord(hostname);
 
-        if (0 == pSD) {
-          MUTEX_TRY_LOCK(lock, cont->mutex, thread);
-          if (!lock)
-            goto Lretry;
-          cont->handleEvent(EVENT_HOST_DB_LOOKUP, NULL);
-          return ACTION_RESULT_DONE;
+        if (0 != pDS) {
+          pServerLine = ((DNSServer *) pDS)->x_dns_ip_line;
         }
-
-        pServerLine = ((DNSServer *) pDS)->x_dns_ip_line;
       }
       SplitDNSConfig::release((SplitDNS *) pSD);
     }
@@ -882,11 +876,9 @@ HostDBProcessor::getbyname_imm(Continuat
       if (0 != pSD) {
         pDS = ((SplitDNS *) pSD)->getDNSRecord(hostname);
 
-        if (0 == pDS) {
-          (cont->*process_hostdb_info) (NULL);
-          return ACTION_RESULT_DONE;
+        if (0 != pDS) {
+          pServerLine = ((DNSServer *) pDS)->x_dns_ip_line;
         }
-        pServerLine = ((DNSServer *) pDS)->x_dns_ip_line;
       }
       SplitDNSConfig::release((SplitDNS *) pSD);
     }
@@ -1093,7 +1085,7 @@ HostDBProcessor::failed_connect_on_ip_fo
       return ACTION_RESULT_DONE;
     }
 #ifdef SPLIT_DNS
-    HostDBInfo *r = probe(mutex, md5, hostname, len, ip, port, pSD);
+    HostDBInfo *r = probe(mutex, md5, hostname, len, ip, port, pDS);
 #else
     HostDBInfo *r = probe(mutex, md5, hostname, len, ip, port, 0);
 #endif

Modified: trafficserver/traffic/trunk/proxy/config/records.config.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.in?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.in (original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.in Thu Dec 23 18:53:09 2010
@@ -357,7 +357,6 @@ CONFIG proxy.config.cache.threads_per_di
 ##############################################################################
 CONFIG proxy.config.dns.search_default_domains INT 1
 CONFIG proxy.config.dns.splitDNS.enabled INT 0
-CONFIG proxy.config.dns.splitdns.def_domain STRING NULL
 CONFIG proxy.config.dns.max_dns_in_flight INT 2048
    # Additional URL expansions for http DNS lookup
 CONFIG proxy.config.dns.url_expansions STRING NULL

Modified: trafficserver/traffic/trunk/proxy/config/splitdns.config
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/splitdns.config?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/splitdns.config (original)
+++ trafficserver/traffic/trunk/proxy/config/splitdns.config Thu Dec 23 18:53:09 2010
@@ -36,9 +36,7 @@
 #                    separated by spaces or ';'.  )
 # 
 # Each line must include at least a named= directive with an IP address
-# in the "dot" format. "def_domain=" and "search_list=" are optional. If
-# they are not provided, their values are read from "/etc/resolv.conf"
-# (on unix) or from the Registry (on WIN NT/2000 platforms).
+# in the "dot" format. "def_domain=" and "search_list=" are optional.
 #
 # Additional notes:
 #
@@ -49,13 +47,8 @@
 # will terminate the search.
 #
 # If a host name is not fully qualified, i.e. does not have the domain 
-# specifier (ex. 'internal' instead of internal.example.com'), the system
-# uses the 'proxy.config.dns.splitdns.def_domain' value to append to the
-# host name. If 'proxy.config.dns.splitdns.def_domain' is not set, and 
-# there is no rule using the primary destination specifier 'url_regex', 
-# the system uses the default domain values from the TCP/IP configuration
-# params. Otherwise, it is assumed that a rule is provided to cover such a 
-# scenario.
+# specifier (ex. 'internal' instead of internal.example.com'), then
+# there is no rule using the primary destination specifier 'url_regex'. 
 #
 #    
 # Example:

Modified: trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Thu Dec 23 18:53:09 2010
@@ -1110,8 +1110,6 @@ RecordElement RecordsConfig[] = {
   ,
   {RECT_CONFIG, "proxy.config.dns.splitdns.filename", RECD_STRING, "splitdns.config", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.dns.splitdns.def_domain", RECD_STRING, NULL, RECU_DYNAMIC, RR_NULL, RECC_STR, "^[^[:space:]]*$", RECA_NULL}
-  ,
   {RECT_CONFIG, "proxy.config.dns.url_expansions", RECD_STRING, NULL, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.dns.nameservers", RECD_STRING, NULL, RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}

Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_dns_split.ink
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_dns_split.ink?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_dns_split.ink (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_dns_split.ink Thu Dec 23 18:53:09 2010
@@ -56,23 +56,6 @@
       </ul>
     </td>
   </tr>
-
-  <tr> 
-    <td height="2" colspan="2" class="configureLabel"><@submit_error_flg proxy.config.dns.splitdns.def_domain>Default Domain</td>
-  </tr>
-  <tr>
-    <td nowrap class="bodyText">
-      <input type="text" size="18" name="proxy.config.dns.splitdns.def_domain" value="<@record proxy.config.dns.splitdns.def_domain>">
-    </td>
-     <td class="configureHelp" valign="top" align="left"> 
-      <ul>
-        <li>Specifies the default domain for split DNS requests.
-        <li>This value is appended automatically to the hostname if it does
-            not include a domain before split DNS determines which DNS server
-            to use.
-      </ul>
-    </td>
-  </tr>
 </table>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="10"> 

Modified: trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c?rev=1052353&r1=1052352&r2=1052353&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c (original)
+++ trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c Thu Dec 23 18:53:09 2010
@@ -306,7 +306,6 @@ const char *stringVariables[] = {
   "proxy.config.http.cache.vary_default_other",
   "proxy.config.socks.socks_server_ip_str",
   "proxy.config.cluster.ethernet_interface",
-  "proxy.config.dns.splitdns.def_domain",
   "proxy.config.dns.url_expansions",
   "proxy.config.log.hostname",
   "proxy.config.log.logfile_dir",