This is an automated email from the ASF dual-hosted git repository.
snemeth pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 478d2f2 YARN-10901. Permission checking error on an existing
directory in LogAggregationFileController#verifyAndCreateRemoteLogDir (#3410)
478d2f2 is described below
commit 478d2f2897abba5bad2f5204b0d4ec02cbb7ba30
Author: Tamas Domok <domokta...@gmail.com>
AuthorDate: Tue Sep 14 17:35:07 2021 +0200
YARN-10901. Permission checking error on an existing directory in
LogAggregationFileController#verifyAndCreateRemoteLogDir (#3410)
Co-authored-by: Tamas Domok <tdo...@cloudera.com>
---
.../LogAggregationFileController.java | 13 +++-
.../TestLogAggregationFileController.java | 75 ++++++++++++++++++++++
2 files changed, 86 insertions(+), 2 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileController.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileController.java
index 35f2d45..697ecbc 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileController.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileController.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.yarn.logaggregation.filecontroller;
import com.google.common.annotations.VisibleForTesting;
+import org.apache.commons.lang3.RandomStringUtils;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -368,10 +369,13 @@ public abstract class LogAggregationFileController {
throw new YarnRuntimeException("Failed to create remoteLogDir ["
+ remoteRootLogDir + "]", e);
}
- } else{
+ } else {
//Check if FS has capability to set/modify permissions
+ Path permissionCheckFile = new Path(qualified,
String.format("%s.permission_check",
+ RandomStringUtils.randomAlphanumeric(8)));
try {
- remoteFS.setPermission(qualified, new FsPermission(TLDIR_PERMISSIONS));
+ remoteFS.createNewFile(permissionCheckFile);
+ remoteFS.setPermission(permissionCheckFile, new
FsPermission(TLDIR_PERMISSIONS));
} catch (UnsupportedOperationException use) {
LOG.info("Unable to set permissions for configured filesystem since"
+ " it does not support this", remoteFS.getScheme());
@@ -379,6 +383,11 @@ public abstract class LogAggregationFileController {
} catch (IOException e) {
LOG.warn("Failed to check if FileSystem suppports permissions on "
+ "remoteLogDir [" + remoteRootLogDir + "]", e);
+ } finally {
+ try {
+ remoteFS.delete(permissionCheckFile, false);
+ } catch (IOException ignored) {
+ }
}
}
}
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/filecontroller/TestLogAggregationFileController.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/filecontroller/TestLogAggregationFileController.java
new file mode 100644
index 0000000..3566884
--- /dev/null
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/filecontroller/TestLogAggregationFileController.java
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.logaggregation.filecontroller;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.net.URI;
+
+import static
org.apache.hadoop.yarn.logaggregation.filecontroller.LogAggregationFileController.TLDIR_PERMISSIONS;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+
+/**
+ * Test for the abstract {@link LogAggregationFileController} class,
+ * checking its core functionality.
+ */
+public class TestLogAggregationFileController {
+
+ @Test
+ public void testRemoteDirCreationWithCustomUser() throws Exception {
+ FileSystem fs = mock(FileSystem.class);
+ doReturn(new URI("")).when(fs).getUri();
+ doReturn(new FileStatus(128, false, 0, 64, System.currentTimeMillis(),
+ System.currentTimeMillis(), new FsPermission(TLDIR_PERMISSIONS),
+ "not_yarn_user", "yarn_group", new Path("/tmp/logs"))).when(fs)
+ .getFileStatus(any(Path.class));
+
+ Configuration conf = new Configuration();
+ LogAggregationFileController controller = mock(
+ LogAggregationFileController.class, Mockito.CALLS_REAL_METHODS);
+ controller.fsSupportsChmod = true;
+ doReturn(fs).when(controller).getFileSystem(any(Configuration.class));
+
+ UserGroupInformation ugi = UserGroupInformation.createUserForTesting(
+ "yarn_user", new String[]{"yarn_group", "other_group"});
+ UserGroupInformation.setLoginUser(ugi);
+
+ doNothing().when(controller).initInternal(any(Configuration.class));
+ controller.initialize(conf, "TFile");
+ controller.verifyAndCreateRemoteLogDir();
+
+ verify(fs).createNewFile(any());
+ verify(fs).setPermission(any(), eq(new FsPermission(TLDIR_PERMISSIONS)));
+ verify(fs).delete(any(), eq(false));
+ Assert.assertTrue(controller.fsSupportsChmod);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
