HIVE-29209: Remove unnecessary usage of LoginException

Author: wecharyu

common/src/java/org/apache/hadoop/hive/common/FileUtils.java

@@ -77,8 +77,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.security.auth.login.LoginException;
-
 /**
  * Collection of file manipulation utilities common across Hive.
  */
@@ -520,7 +518,7 @@ private static void addChildren(FileSystem fsAsUser, Path path, List<FileStatus>
     }
   }
 
-  public static UserGroupInformation getProxyUser(final String user) throws LoginException, IOException {
+  public static UserGroupInformation getProxyUser(final String user) throws IOException {
     UserGroupInformation ugi = Utils.getUGI();
     String currentUser = ugi.getShortUserName();
     UserGroupInformation proxyUser = null;

common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

@@ -49,8 +49,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.security.auth.login.LoginException;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -7050,12 +7048,8 @@ public static URL getHiveServer2SiteLocation() {
    * @throws IOException
    */
   public String getUser() throws IOException {
-    try {
-      UserGroupInformation ugi = Utils.getUGI();
-      return ugi.getUserName();
-    } catch (LoginException le) {
-      throw new IOException(le);
-    }
+    UserGroupInformation ugi = Utils.getUGI();
+    return ugi.getUserName();
   }
 
   public static String getColumnInternalName(int pos) {

hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java

@@ -33,8 +33,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.security.auth.login.LoginException;
-
 import com.google.common.collect.Maps;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
@@ -551,11 +549,7 @@ public static IMetaStoreClient getHiveMetastoreClient(HiveConf hiveConf)
         }
       }
     }
-    try {
-      return hiveClientCache.get(hiveConf);
-    } catch (LoginException e) {
-      throw new IOException("Couldn't create hiveMetaStoreClient, Error getting UGI for user", e);
-    }
+    return hiveClientCache.get(hiveConf);
   }
 
   /**

itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCleanerWithReplication.java

@@ -38,7 +38,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.security.auth.login.LoginException;
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
@@ -65,7 +64,7 @@ public void setup() throws Exception {
   }
 
   @BeforeClass
-  public static void classLevelSetup() throws LoginException, IOException {
+  public static void classLevelSetup() throws IOException {
     Configuration hadoopConf = new Configuration();
     hadoopConf.set("dfs.client.use.datanode.hostname", "true");
     hadoopConf.set("hadoop.proxyuser." + Utils.getUGI().getShortUserName() + ".hosts", "*");

metastore/src/java/org/apache/hadoop/hive/metastore/HiveClientCache.java

@@ -28,8 +28,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.security.auth.login.LoginException;
-
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.hadoop.hive.common.classification.InterfaceAudience;
@@ -250,9 +248,8 @@ public void cleanup() {
    * @return the hive client
    * @throws MetaException
    * @throws IOException
-   * @throws LoginException
    */
-  public IMetaStoreClient get(final HiveConf hiveConf) throws MetaException, IOException, LoginException {
+  public IMetaStoreClient get(final HiveConf hiveConf) throws MetaException, IOException {
     final HiveClientCacheKey cacheKey = HiveClientCacheKey.fromHiveConf(hiveConf, getThreadId());
     ICacheableMetaStoreClient cacheableHiveMetaStoreClient = null;
 
@@ -279,10 +276,9 @@ public IMetaStoreClient get(final HiveConf hiveConf) throws MetaException, IOExc
    * @return
    * @throws IOException
    * @throws MetaException
-   * @throws LoginException
    */
   private ICacheableMetaStoreClient getOrCreate(final HiveClientCacheKey cacheKey)
-      throws IOException, MetaException, LoginException {
+      throws IOException, MetaException {
     try {
       return hiveCache.get(cacheKey, new Callable<ICacheableMetaStoreClient>() {
         @Override
@@ -301,8 +297,6 @@ public ICacheableMetaStoreClient call() throws MetaException {
         throw (IOException) t;
       } else if (t instanceof MetaException) {
         throw (MetaException) t;
-      } else if (t instanceof LoginException) {
-        throw (LoginException) t;
       } else {
         throw new IOException("Error creating hiveMetaStoreClient", t);
       }
@@ -321,14 +315,14 @@ static class HiveClientCacheKey {
     final private HiveConf hiveConf;
     final private int threadId;
 
-    private HiveClientCacheKey(HiveConf hiveConf, final int threadId) throws IOException, LoginException {
+    private HiveClientCacheKey(HiveConf hiveConf, final int threadId) throws IOException {
       this.metaStoreURIs = hiveConf.getVar(HiveConf.ConfVars.METASTORE_URIS);
       ugi = Utils.getUGI();
       this.hiveConf = hiveConf;
       this.threadId = threadId;
     }
 
-    public static HiveClientCacheKey fromHiveConf(HiveConf hiveConf, final int threadId) throws IOException, LoginException {
+    public static HiveClientCacheKey fromHiveConf(HiveConf hiveConf, final int threadId) throws IOException {
       return new HiveClientCacheKey(hiveConf, threadId);
     }
 

metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreUtils.java

@@ -24,8 +24,6 @@
 import java.util.List;
 import java.util.Properties;
 
-import javax.security.auth.login.LoginException;
-
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
@@ -248,11 +246,7 @@ public static IMetaStoreClient getHiveMetastoreClient(HiveConf hiveConf)
         }
       }
     }
-    try {
-      return hiveClientCache.get(hiveConf);
-    } catch (LoginException e) {
-      throw new IOException("Couldn't create hiveMetaStoreClient, Error getting UGI for user", e);
-    }
+    return hiveClientCache.get(hiveConf);
   }
 
 }

metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveClientCache.java

@@ -30,7 +30,6 @@
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.junit.Test;
 
-import javax.security.auth.login.LoginException;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -42,7 +41,7 @@ public class TestHiveClientCache {
   final HiveConf hiveConf = new HiveConf();
 
   @Test
-  public void testCacheHit() throws IOException, MetaException, LoginException {
+  public void testCacheHit() throws IOException, MetaException {
     HiveClientCache cache = new HiveClientCache(1000);
     HiveClientCache.ICacheableMetaStoreClient client =
         (HiveClientCache.ICacheableMetaStoreClient) cache.get(hiveConf);
@@ -60,7 +59,7 @@ public void testCacheHit() throws IOException, MetaException, LoginException {
   }
 
   @Test
-  public void testCacheMiss() throws IOException, MetaException, LoginException {
+  public void testCacheMiss() throws IOException, MetaException {
     HiveClientCache cache = new HiveClientCache(1000);
     IMetaStoreClient client = cache.get(hiveConf);
     assertNotNull(client);
@@ -77,7 +76,7 @@ public void testCacheMiss() throws IOException, MetaException, LoginException {
    * Also verify that the expiry time configuration is honoured
    */
   @Test
-  public void testCacheExpiry() throws IOException, MetaException, LoginException, InterruptedException {
+  public void testCacheExpiry() throws IOException, MetaException, InterruptedException {
     HiveClientCache cache = new HiveClientCache(1);
     HiveClientCache.ICacheableMetaStoreClient client =
         (HiveClientCache.ICacheableMetaStoreClient) cache.get(hiveConf);
@@ -105,7 +104,7 @@ public void testMultipleThreadAccess() throws ExecutionException, InterruptedExc
 
     class GetHiveClient implements Callable<IMetaStoreClient> {
       @Override
-      public IMetaStoreClient call() throws IOException, MetaException, LoginException {
+      public IMetaStoreClient call() throws IOException, MetaException {
         return cache.get(hiveConf);
       }
     }
@@ -126,7 +125,7 @@ public IMetaStoreClient call() throws IOException, MetaException, LoginException
   }
 
   @Test
-  public void testCloseAllClients() throws IOException, MetaException, LoginException {
+  public void testCloseAllClients() throws IOException, MetaException {
     final HiveClientCache cache = new HiveClientCache(1000);
     HiveClientCache.ICacheableMetaStoreClient client1 =
         (HiveClientCache.ICacheableMetaStoreClient) cache.get(hiveConf);

ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java

@@ -28,8 +28,6 @@
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 
-import javax.security.auth.login.LoginException;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -1059,11 +1057,10 @@ public PreWarmVertex createPreWarmVertex(TezConfiguration conf,
   /**
    * @param conf
    * @return path to destination directory on hdfs
-   * @throws LoginException if we are unable to figure user information
    * @throws IOException when any dfs operation fails.
    */
   @SuppressWarnings("deprecation")
-  public Path getDefaultDestDir(Configuration conf) throws LoginException, IOException {
+  public Path getDefaultDestDir(Configuration conf) throws IOException {
     UserGroupInformation ugi = Utils.getUGI();
     String userName = ugi.getShortUserName();
     String userPathStr = HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_USER_INSTALL_DIR);
@@ -1097,10 +1094,9 @@ public Path getDefaultDestDir(Configuration conf) throws LoginException, IOExcep
    * @param conf
    * @return List<LocalResource> local resources to add to execution
    * @throws IOException when hdfs operation fails
-   * @throws LoginException when getDefaultDestDir fails with the same exception
    */
   public List<LocalResource> localizeTempFilesFromConf(
-      String hdfsDirPathStr, Configuration conf) throws IOException, LoginException {
+      String hdfsDirPathStr, Configuration conf) throws IOException {
     List<LocalResource> tmpResources = new ArrayList<LocalResource>();
 
     if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_ADD_FILES_USE_HDFS_LOCATION)) {
@@ -1233,7 +1229,7 @@ private Map<String, LocalResource> addTempResources(Configuration conf, String h
     return tmpResourcesMap;
   }
 
-  public FileStatus getHiveJarDirectory(Configuration conf) throws IOException, LoginException {
+  public FileStatus getHiveJarDirectory(Configuration conf) throws IOException {
     FileStatus fstatus = null;
     String hdfsDirPathStr = HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_JAR_DIRECTORY, (String)null);
     if (hdfsDirPathStr != null) {
@@ -1612,14 +1608,8 @@ public Vertex createVertex(JobConf conf, BaseWork workUnit, Path scratchDir,
    */
   public Path createTezDir(Path scratchDir, Configuration conf)
       throws IOException {
-    UserGroupInformation ugi;
-    String userName = System.getProperty("user.name");
-    try {
-      ugi = Utils.getUGI();
-      userName = ugi.getShortUserName();
-    } catch (LoginException e) {
-      throw new IOException(e);
-    }
+    UserGroupInformation ugi = Utils.getUGI();
+    String userName = ugi.getShortUserName();
 
     scratchDir = new Path(scratchDir, userName);
 

ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolSession.java

@@ -25,8 +25,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.security.auth.login.LoginException;
-
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.ql.session.SessionState.LogHelper;
 import org.apache.hadoop.hive.registry.impl.TezAmInstance;
@@ -120,7 +118,7 @@ void close(boolean keepTmpDir) throws Exception {
   @Override
   protected void openInternal(String[] additionalFiles,
       boolean isAsync, LogHelper console, HiveResources resources)
-          throws IOException, LoginException, URISyntaxException, TezException {
+          throws IOException, URISyntaxException, TezException {
     super.openInternal(additionalFiles, isAsync, console, resources);
     parent.registerOpenSession(this);
     if (expirationTracker != null) {

ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java

@@ -39,7 +39,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.security.auth.login.LoginException;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -236,7 +235,7 @@ public static String makeSessionId() {
     return UUID.randomUUID().toString();
   }
 
-  public void open() throws IOException, LoginException, URISyntaxException, TezException {
+  public void open() throws IOException, URISyntaxException, TezException {
     String[] noFiles = null;
     open(noFiles);
   }
@@ -246,24 +245,24 @@ public void open() throws IOException, LoginException, URISyntaxException, TezEx
    * submit multiple DAGs against a session (as long as they are executed serially).
    */
   public void open(String[] additionalFilesNotFromConf)
-      throws IOException, LoginException, URISyntaxException, TezException {
+      throws IOException, URISyntaxException, TezException {
     openInternal(additionalFilesNotFromConf, false, null, null);
   }
 
 
   public void open(HiveResources resources)
-      throws LoginException, IOException, URISyntaxException, TezException {
+      throws IOException, URISyntaxException, TezException {
     openInternal(null, false, null, resources);
   }
 
   public void beginOpen(String[] additionalFiles, LogHelper console)
-      throws IOException, LoginException, URISyntaxException, TezException {
+      throws IOException, URISyntaxException, TezException {
     openInternal(additionalFiles, true, console, null);
   }
 
   protected void openInternal(String[] additionalFilesNotFromConf,
       boolean isAsync, LogHelper console, HiveResources resources)
-          throws IOException, LoginException, URISyntaxException, TezException {
+          throws IOException, URISyntaxException, TezException {
     // TODO Why is the queue name set again. It has already been setup via setQueueName. Do only one of the two.
     String confQueueName = conf.get(TezConfiguration.TEZ_QUEUE_NAME);
     if (queueName != null && !queueName.equals(confQueueName)) {
@@ -634,7 +633,7 @@ private void setupSessionAcls(Configuration tezConf, HiveConf hiveConf) throws
 
   /** This is called in openInternal and in TezTask.updateSession to localize conf resources. */
   public void ensureLocalResources(Configuration conf, String[] newFilesNotFromConf)
-          throws IOException, LoginException, URISyntaxException, TezException {
+          throws IOException, URISyntaxException, TezException {
     if (resources == null) {
       throw new AssertionError("Ensure called on an unitialized (or closed) session " + sessionId);
     }
@@ -820,12 +819,11 @@ private Path createTezDir(String sessionId, String suffix) throws IOException {
    * @param localJarPath Local path to the jar to be localized.
    * @return LocalResource corresponding to the localized hive exec resource.
    * @throws IOException when any file system related call fails.
-   * @throws LoginException when we are unable to determine the user.
    * @throws URISyntaxException when current jar location cannot be determined.
    */
   @VisibleForTesting
   LocalResource createJarLocalResource(String localJarPath)
-      throws IOException, LoginException, IllegalArgumentException {
+      throws IOException, IllegalArgumentException {
     // TODO Reduce the number of lookups that happen here. This shouldn't go to HDFS for each call.
     // The hiveJarDir can be determined once per client.
     FileStatus destDirStatus = utils.getHiveJarDirectory(conf);
@@ -854,19 +852,7 @@ private String getKey(final FileStatus fileStatus) {
     return fileStatus.getPath() + ":" + fileStatus.getLen() + ":" + fileStatus.getModificationTime();
   }
 
-  private void addJarLRByClassName(String className, final Map<String, LocalResource> lrMap) throws
-      IOException, LoginException {
-    Class<?> clazz;
-    try {
-      clazz = Class.forName(className);
-    } catch (ClassNotFoundException e) {
-      throw new IOException("Cannot find " + className + " in classpath", e);
-    }
-    addJarLRByClass(clazz, lrMap);
-  }
-
-  private void addJarLRByClass(Class<?> clazz, final Map<String, LocalResource> lrMap) throws IOException,
-      LoginException {
+  private void addJarLRByClass(Class<?> clazz, final Map<String, LocalResource> lrMap) throws IOException {
     String jarPath = Utilities.jarFinderGetJar(clazz);
     if (jarPath == null) {
       throw new IOException("Can't find jar for: " + clazz);