You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by ss...@apache.org on 2012/10/09 04:27:19 UTC
svn commit: r1395845 - in
/hadoop/common/branches/branch-2/hadoop-yarn-project: ./
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-...
Author: sseth
Date: Tue Oct 9 02:27:18 2012
New Revision: 1395845
URL: http://svn.apache.org/viewvc?rev=1395845&view=rev
Log:
merge YARN-33 from trunk. Change LocalDirsHandlerService to validate the configured local and log dirs. (Contributed by Mayank Bansal)
Added:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java
- copied unchanged from r1395844, hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1395845&r1=1395844&r2=1395845&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Tue Oct 9 02:27:18 2012
@@ -35,6 +35,9 @@ Release 2.0.3-alpha - Unreleased
YARN-40. Provided support for missing YARN commands (Devaraj K and Vinod
Kumar Vavilapalli via vinodkv)
+ YARN-33. Change LocalDirsHandlerService to validate the configured local and
+ log dirs. (Mayank Bansal via sseth)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java?rev=1395845&r1=1395844&r2=1395845&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LocalDirsHandlerService.java Tue Oct 9 02:27:18 2012
@@ -19,6 +19,9 @@
package org.apache.hadoop.yarn.server.nodemanager;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
@@ -77,6 +80,8 @@ public class LocalDirsHandlerService ext
/** when disk health checking code was last run */
private long lastDisksCheckTime;
+
+ private static String FILE_SCHEME = "file";
/**
* Class which is used by the {@link Timer} class to periodically execute the
@@ -84,13 +89,13 @@ public class LocalDirsHandlerService ext
*/
private final class MonitoringTimerTask extends TimerTask {
- public MonitoringTimerTask(Configuration conf) {
+ public MonitoringTimerTask(Configuration conf) throws YarnException {
localDirs = new DirectoryCollection(
- conf.getTrimmedStrings(YarnConfiguration.NM_LOCAL_DIRS));
+ validatePaths(conf.getTrimmedStrings(YarnConfiguration.NM_LOCAL_DIRS)));
logDirs = new DirectoryCollection(
- conf.getTrimmedStrings(YarnConfiguration.NM_LOG_DIRS));
- localDirsAllocator =
- new LocalDirAllocator(YarnConfiguration.NM_LOCAL_DIRS);
+ validatePaths(conf.getTrimmedStrings(YarnConfiguration.NM_LOG_DIRS)));
+ localDirsAllocator = new LocalDirAllocator(
+ YarnConfiguration.NM_LOCAL_DIRS);
logDirsAllocator = new LocalDirAllocator(YarnConfiguration.NM_LOG_DIRS);
}
@@ -106,6 +111,7 @@ public class LocalDirsHandlerService ext
/**
* Method which initializes the timertask and its interval time.
+ *
*/
@Override
public void init(Configuration config) {
@@ -294,4 +300,31 @@ public class LocalDirsHandlerService ext
public Path getLogPathToRead(String pathStr) throws IOException {
return logDirsAllocator.getLocalPathToRead(pathStr, getConfig());
}
+
+ public static String[] validatePaths(String[] paths) {
+ ArrayList<String> validPaths = new ArrayList<String>();
+ for (int i = 0; i < paths.length; ++i) {
+ try {
+ URI uriPath = new URI(paths[i]);
+ if (uriPath.getScheme() == null
+ || uriPath.getScheme().equals(FILE_SCHEME)) {
+ validPaths.add(uriPath.getPath());
+ } else {
+ LOG.warn(paths[i] + " is not a valid path. Path should be with "
+ + FILE_SCHEME + " scheme or without scheme");
+ throw new YarnException(paths[i]
+ + " is not a valid path. Path should be with " + FILE_SCHEME
+ + " scheme or without scheme");
+ }
+ } catch (URISyntaxException e) {
+ LOG.warn(e.getMessage());
+ throw new YarnException(paths[i]
+ + " is not a valid path. Path should be with " + FILE_SCHEME
+ + " scheme or without scheme");
+ }
+ }
+ String[] arrValidPaths = new String[validPaths.size()];
+ validPaths.toArray(arrValidPaths);
+ return arrValidPaths;
+ }
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java?rev=1395845&r1=1395844&r2=1395845&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java Tue Oct 9 02:27:18 2012
@@ -35,6 +35,7 @@ import static org.mockito.Mockito.verify
import static org.mockito.Mockito.when;
import java.net.InetSocketAddress;
+import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -157,6 +158,7 @@ public class TestResourceLocalizationSer
// verify directory creation
for (Path p : localDirs) {
+ p = new Path((new URI(p.toString())).getPath());
Path usercache = new Path(p, ContainerLocalizer.USERCACHE);
verify(spylfs)
.mkdir(eq(usercache),
@@ -192,7 +194,8 @@ public class TestResourceLocalizationSer
sDirs[i] = localDirs.get(i).toString();
}
conf.setStrings(YarnConfiguration.NM_LOCAL_DIRS, sDirs);
-
+ String logDir = lfs.makeQualified(new Path(basedir, "logdir " )).toString();
+ conf.set(YarnConfiguration.NM_LOG_DIRS, logDir);
LocalizerTracker mockLocallilzerTracker = mock(LocalizerTracker.class);
DrainDispatcher dispatcher = new DrainDispatcher();
dispatcher.init(conf);
@@ -379,7 +382,8 @@ public class TestResourceLocalizationSer
sDirs[i] = localDirs.get(i).toString();
}
conf.setStrings(YarnConfiguration.NM_LOCAL_DIRS, sDirs);
-
+ String logDir = lfs.makeQualified(new Path(basedir, "logdir " )).toString();
+ conf.set(YarnConfiguration.NM_LOG_DIRS, logDir);
DrainDispatcher dispatcher = new DrainDispatcher();
dispatcher.init(conf);
dispatcher.start();