Browse Source

Minor code cleanup

Todd Lipcon 15 years ago
parent
commit
20ea945ca8

+ 0 - 1
apps/filebrowser/src/filebrowser/views_test.py

@@ -112,7 +112,6 @@ def test_view_gz():
   try:
     c = make_logged_in_client()
     cluster.fs.setuser(cluster.superuser)
-
     if cluster.fs.isdir("/test-gz-filebrowser"):
       cluster.fs.rmtree('/test-gz-filebrowser/')
 

+ 7 - 7
desktop/core/src/desktop/lib/thrift_util.py

@@ -161,19 +161,19 @@ def connect_to_thrift(conf):
 
   Returns a tuple of (service, protocol, transport)
   """
-  def sasl_factory():
-    saslc = sasl.Client()
-    saslc.setAttr("host", conf.host)
-    saslc.setAttr("service", conf.kerberos_principal)
-    saslc.init()
-    return saslc
-
   sock = TSocket(conf.host, conf.port)
   if conf.timeout_seconds:
     # Thrift trivia: You can do this after the fact with
     # self.wrapped.transport._TBufferedTransport__trans.setTimeout(seconds*1000)
     sock.setTimeout(conf.timeout_seconds*1000.0)
   if conf.use_sasl:
+    def sasl_factory():
+      saslc = sasl.Client()
+      saslc.setAttr("host", conf.host)
+      saslc.setAttr("service", conf.kerberos_principal)
+      saslc.init()
+      return saslc
+
     transport = TSaslClientTransport(sasl_factory, "GSSAPI", sock)
   else:
     transport = TBufferedTransport(sock)

+ 1 - 1
desktop/libs/hadoop/java/src/java/org/apache/hadoop/thriftfs/HadoopThriftAuthBridge.java

@@ -199,7 +199,7 @@ class HadoopThriftAuthBridge {
         }
         TSaslServerTransport saslTrans = (TSaslServerTransport)trans;
         String authId = saslTrans.getSaslServer().getAuthorizationID();
-        System.err.println("AUTH ID ======>" + authId);
+        LOG.debug("Authenticated  " + authId + " for Thrift call ");
 
         UserGroupInformation clientUgi = UserGroupInformation.createRemoteUser(authId);