Skip to content

MAPREDUCE-7375 JobSubmissionFiles don't set right permission after mkdirs #4237

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
cnauroth merged 5 commits into from
Jan 12, 2023
Merged

MAPREDUCE-7375 JobSubmissionFiles don't set right permission after mkdirs #4237

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c06114
set permission for JobSubmissionFiles
skysiders Apr 27, 2022
a272117
set permission for JobSubmissionFiles
skysiders Apr 27, 2022
9896814
Merge branch 'apache:trunk' into MAPREDUCE-7375
skysiders Jul 29, 2022
c075f59
fix some mistakes in test code
skysiders Jul 29, 2022
98a9ffe
modify checkstyle
skysiders Dec 23, 2022
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
1 change: 1 addition & 0 deletions ...p-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmissionFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public static Path getStagingDir(Cluster cluster, Configuration conf,
}
} catch (FileNotFoundException e) {
fs.mkdirs(stagingArea, new FsPermission(JOB_DIR_PERMISSION));
Copy link
Contributor

@cnauroth cnauroth Jul 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest using static method FileSystem.mkdirs(fs, stagingArea, new FsPermission(JOB_DIR_PERMISSION)). It's one less line of code and potentially one less remote call for certain FileSystem implementations.

fs.setPermission(stagingArea, JOB_DIR_PERMISSION);
}
return stagingArea;
}
Expand Down
17 changes: 17 additions & 0 deletions ...preduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestJobSubmissionFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.HdfsConfiguration;
/**
* Tests for JobSubmissionFiles Utility class.
*/
Expand Down Expand Up @@ -139,4 +141,19 @@ public void testGetStagingDirWhenShortFileOwnerNameAndShortUserName()
assertEquals(stagingPath,
JobSubmissionFiles.getStagingDir(cluster, conf, user));
}

@Test
public void testDirPermission() throws Exception {
Cluster cluster = mock(Cluster.class);
HdfsConfiguration CONF = new HdfsConfiguration();
Copy link
Contributor

@cnauroth cnauroth Jul 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: lower-case conf for local variables.

MiniDFSCluster cluster1 = new MiniDFSCluster.Builder(CONF).numDataNodes(2).build();
Copy link
Contributor

@cnauroth cnauroth Jul 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: different variable name for greater clarity, e.g. dfsCluster.

Also, please use a finally block to guarantee calling MiniDFSCluster#shutdown() at the end of the test.

FileSystem fs = cluster1.getFileSystem();
UserGroupInformation user = UserGroupInformation
.createUserForTesting(USER_1_SHORT_NAME, GROUP_NAMES);
Path stagingPath = new Path(fs.getUri().toString() + "/testDirPermission");

when(cluster.getStagingAreaDir()).thenReturn(stagingPath);
Path res = JobSubmissionFiles.getStagingDir(cluster, CONF, user);
assertEquals(new FsPermission(0700),fs.getFileStatus(res).getPermission());
Copy link
Contributor

@cnauroth cnauroth Jul 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: please add a single space after the comma.

}
}