Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "CDAP-8367 Rewrite the hive-site.xml that explore container uses" #8025

Merged
merged 1 commit into from
Feb 17, 2017
Merged

Revert "CDAP-8367 Rewrite the hive-site.xml that explore container uses" #8025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions cdap-explore/src/main/java/co/cask/cdap/explore/service/ExploreServiceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@
import com.google.common.collect.Sets;
import com.google.common.io.ByteStreams;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.MRJobConfig;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.VersionInfo;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.tez.dag.api.TezConfiguration;
Expand Down Expand Up @@ -585,11 +583,6 @@ private static File updateHiveConfFile(File confFile, File tempDir) {
conf.setBoolean(Job.MAPREDUCE_JOB_USER_CLASSPATH_FIRST, false);
conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_CLASSLOADER, false);

// We override this param due to the change in HIVE-14383. Otherwise, the hive job will be launched as the
// 'hive' user (or fail to even launch, if on ClouderaManager). See CDAP-8367 for more details.
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
UserGroupInformation.AuthenticationMethod.SIMPLE.name());

String sparkHome = System.getenv(Constants.SPARK_HOME);
if (sparkHome != null) {
LOG.debug("Setting spark.home in hive conf to {}", sparkHome);
Expand Down