diff --git a/pom.xml b/pom.xml index aeb5b9fd..24e189de 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.hadoop hadoop-yarn-server-nodemanager - 2.3.0 + 2.4.0 @@ -35,7 +35,7 @@ org.apache.hadoop hadoop-common - 2.3.0 + 2.4.0 org.apache.hadoop diff --git a/src/main/java/org/apache/hadoop/yarn/server/nodemanager/GlusterContainerExecutor.java b/src/main/java/org/apache/hadoop/yarn/server/nodemanager/GlusterContainerExecutor.java index 92416012..cc3e468f 100644 --- a/src/main/java/org/apache/hadoop/yarn/server/nodemanager/GlusterContainerExecutor.java +++ b/src/main/java/org/apache/hadoop/yarn/server/nodemanager/GlusterContainerExecutor.java @@ -51,22 +51,26 @@ import org.slf4j.Logger; public class GlusterContainerExecutor extends LinuxContainerExecutor { - static Logger log = org.slf4j.LoggerFactory.getLogger(GlusterContainerExecutor.class); - /** + private static final Log LOG = LogFactory + .getLog(GlusterContainerExecutor.class); + + /** * We override the YARN-1235 patch here. * @param user * @return */ @Override String getRunAsUser(String user) { - log.info("Container EXEC overrid: returning user " + user); + LOG.info("Container EXEC overrid: returning user " + user); //return UserGroupInformation.isSecurityEnabled() ? user : nonsecureLocalUser; return user; } -@Override -public void deleteAsUser(String arg0,Path arg1,Path...arg2){ - log.info("DELETE AS USER " + arg0 + " " + arg1 +" " + arg2); - super.deleteAsUser(arg0, arg1, arg2); -} + + @Override + public void deleteAsUser(String user, Path subDir, Path... basedirs) { + LOG.info("DELETE AS USER " + user + " " + subDir +" " + basedirs); + super.deleteAsUser(user, subDir, basedirs); + } + }