diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java
index 37e8429116..9097c46174 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java
@@ -189,7 +189,8 @@ public void initializeChannels(Configuration conf) throws Exception {
 
     LOG.info("Opening TCP and UDP channels on {} port {}", addr, port);
     addNIOUDP(addr, port);
-    addNIOTCP(addr, port);
+    //TODO Fix dns lookup over TCP
+//    addNIOTCP(addr, port);
   }
 
   /**
@@ -770,6 +771,7 @@ public void nioTCPClient(SocketChannel ch) throws IOException {
       byte[] response = null;
       try {
         query = new Message(in);
+        LOG.info("received TCP query {}", query.getQuestion());
         response = generateReply(query, ch.socket());
         if (response == null) {
           return;
@@ -947,7 +949,7 @@ private void serveNIOUDP(DatagramChannel channel,
           input.flip();
           input.get(in);
           query = new Message(in);
-          LOG.info("{}:  received query {}", remoteAddress,
+          LOG.info("{}: received UDP query {}", remoteAddress,
               query.getQuestion());
           response = generateReply(query, null);
           if (response == null) {
@@ -960,7 +962,7 @@ private void serveNIOUDP(DatagramChannel channel,
         output.put(response);
         output.flip();
 
-        LOG.info("{}:  sending response", remoteAddress);
+        LOG.debug("{}:  sending response", remoteAddress);
         channel.send(output, remoteAddress);
       }
     } catch (Exception e) {