From 3b7e5ca1a734ed2c0d444b40f93559da10d8c6b3 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@cloudera.com>
Date: Thu, 6 Jun 2024 20:36:55 +0100
Subject: [PATCH] HADOOP-19189. Mukund's feedback

Change-Id: I5a233329b7bae9da9b894f5226f20437bf7672fc
---
 .../s3a/commit/ITestS3ACommitterFactory.java  | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/ITestS3ACommitterFactory.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/ITestS3ACommitterFactory.java
index d09c60b8315c2..78d823854d57e 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/ITestS3ACommitterFactory.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/ITestS3ACommitterFactory.java
@@ -115,10 +115,14 @@ public static Collection<Object[]> params() {
   }
 
   /**
-   * Name of committer to set in fs config. If "" do not set one.
+   * Name of committer to set in filesystem config. If "" do not set one.
    */
   private final String fsCommitterName;
-  private final String pathCommitterName;
+
+  /**
+   * Name of committer to set in job config.
+   */
+  private final String jobCommitterName;
 
   /**
    * Expected committer class.
@@ -126,14 +130,25 @@ public static Collection<Object[]> params() {
    */
   private final Class<? extends AbstractS3ACommitter> committerClass;
 
+  /**
+   * Description from parameters, simply for thread names to be more informative.
+   */
   private final String description;
 
-  public ITestS3ACommitterFactory(final String fsCommitterName,
-      final String pathCommitterName,
+  /**
+   * Create a parameterized instance.
+   * @param fsCommitterName committer to set in filesystem config
+   * @param jobCommitterName committer to set in job config
+   * @param committerClass expected committer class
+   * @param description debug text for thread names.
+   */
+  public ITestS3ACommitterFactory(
+      final String fsCommitterName,
+      final String jobCommitterName,
       final Class<? extends AbstractS3ACommitter> committerClass,
       final String description) {
     this.fsCommitterName = fsCommitterName;
-    this.pathCommitterName = pathCommitterName;
+    this.jobCommitterName = jobCommitterName;
     this.committerClass = committerClass;
     this.description = description;
   }
@@ -178,7 +193,7 @@ public void setup() throws Exception {
     jobConf.set(FileOutputFormat.OUTDIR, outDir.toUri().toString());
     jobConf.set(MRJobConfig.TASK_ATTEMPT_ID, attempt0);
     jobConf.setInt(MRJobConfig.APPLICATION_ATTEMPT_ID, 1);
-    maybeSetCommitterName(jobConf, pathCommitterName);
+    maybeSetCommitterName(jobConf, jobCommitterName);
     tContext = new TaskAttemptContextImpl(jobConf, taskAttempt0);
 
     LOG.info("Filesystem Committer='{}'; task='{}'",