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

TEZ-4413: Fix permission may not be set after crash. #368

Merged
merged 2 commits into from
Sep 6, 2024
Merged

TEZ-4413: Fix permission may not be set after crash. #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b2b286
TEZ-4413: Fix permission may not be set after crash.
ayushtkn Aug 29, 2024
7724335
Update the comment.
ayushtkn Sep 6, 2024
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
13 changes: 12 additions & 1 deletion ...-plugin/src/main/java/org/apache/tez/dag/history/logging/proto/DatePartitionedLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.tez.dag.history.logging.proto;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.time.LocalDate;
import java.time.LocalDateTime;
Expand Down Expand Up @@ -71,10 +72,20 @@ public DatePartitionedLogger(Parser<T> parser, Path baseDir, Configuration conf,

private void createDirIfNotExists(Path path) throws IOException {
FileSystem fileSystem = path.getFileSystem(conf);
FileStatus fileStatus = null;
try {
if (!fileSystem.exists(path)) {
fileStatus = fileSystem.getFileStatus(path);
} catch (FileNotFoundException fnf) {
abstractdog marked this conversation as resolved.
Show resolved Hide resolved
// ignore: regardless of the outcome of FileSystem.getFileStatus call (exception or returning null),
// we handle the fileStatus == null case later on, so it's safe to ignore this exception now
}
try {
if (fileStatus == null) {
fileSystem.mkdirs(path);
fileSystem.setPermission(path, DIR_PERMISSION);
} else if (!fileStatus.getPermission().equals(DIR_PERMISSION)) {
LOG.info("Permission on path {} is {}, setting it to {}", path, fileStatus.getPermission(), DIR_PERMISSION);
fileSystem.setPermission(path, DIR_PERMISSION);
}
} catch (IOException e) {
// Ignore this exception, if there is a problem it'll fail when trying to read or write.
Expand Down
20 changes: 20 additions & 0 deletions ...rc/test/java/org/apache/tez/dag/history/logging/proto/TestProtoHistoryLoggingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@

import com.google.protobuf.CodedInputStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ContainerId;
Expand Down Expand Up @@ -267,6 +270,23 @@ public void testServiceSplitEvents() throws Exception {
scanner.close();
}

@Test
public void testDirPermissions() throws IOException {
Path basePath = new Path(tempFolder.newFolder().getAbsolutePath());
Configuration conf = new Configuration();
FileSystem fs = basePath.getFileSystem(conf);
FsPermission expectedPermissions = FsPermission.createImmutable((short) 01777);

// Check the directory already exists and doesn't have the expected permissions.
Assert.assertTrue(fs.exists(basePath));
Assert.assertNotEquals(expectedPermissions, fs.getFileStatus(basePath).getPermission());

new DatePartitionedLogger<>(HistoryEventProto.PARSER, basePath, conf, new FixedClock(Time.now()));

// Check the permissions they should be same as the expected permissions
Assert.assertEquals(expectedPermissions, fs.getFileStatus(basePath).getPermission());
}

private List<DAGHistoryEvent> makeHistoryEvents(TezDAGID dagId,
ProtoHistoryLoggingService service) {
List<DAGHistoryEvent> historyEvents = new ArrayList<>();
Expand Down
Loading