Skip to content

Ensure Krb auth before killing YARN apps in graceful shutdown of hadoop batch index tasks #9785

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

Merged
gianm merged 1 commit into from
Nov 16, 2020
Merged

Ensure Krb auth before killing YARN apps in graceful shutdown of hadoop batch index tasks #9785

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,8 @@ public static Path distributedClassPath(Path base)
* Dose authenticate against a secured hadoop cluster
* In case of any bug fix make sure to fix the code at HdfsStorageAuthentication#authenticate as well.
*
* @param config containing the principal name and keytab path.
*/
public static void authenticate(HadoopDruidIndexerConfig config)
public static void authenticate()
{
String principal = HadoopDruidIndexerConfig.HADOOP_KERBEROS_CONFIG.getPrincipal();
String keytab = HadoopDruidIndexerConfig.HADOOP_KERBEROS_CONFIG.getKeytab();
Expand Down Expand Up @@ -348,7 +347,7 @@ public static Configuration injectSystemProperties(Configuration conf, HadoopDru

public static void ensurePaths(HadoopDruidIndexerConfig config)
{
authenticate(config);
authenticate();
// config.addInputPaths() can have side-effects ( boo! :( ), so this stuff needs to be done before anything else
try {
Job job = Job.getInstance(
Expand Down
3 changes: 3 additions & 0 deletions indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.druid.indexer.HadoopDruidIndexerJob;
import org.apache.druid.indexer.HadoopIngestionSpec;
import org.apache.druid.indexer.IngestionState;
import org.apache.druid.indexer.JobHelper;
import org.apache.druid.indexer.MetadataStorageUpdaterJobHandler;
import org.apache.druid.indexer.TaskMetricsGetter;
import org.apache.druid.indexer.TaskMetricsUtils;
Expand Down Expand Up @@ -765,6 +766,8 @@ public String[] runTask(String[] args) throws Exception
}

if (jobId != null) {
// This call to JobHelper#authenticate will be transparent if already authenticated or using inseucre Hadoop.
JobHelper.authenticate();
int res = ToolRunner.run(new JobClient(), new String[]{
"-kill",
jobId
Expand Down