You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:51:33 UTC
svn commit: r1077751 - in
/hadoop/common/branches/branch-0.20-security-patches: ./ bin/ src/c++/jsvc/
src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/
src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/
src/core/org/apache/hado...
Author: omalley
Date: Fri Mar 4 04:51:32 2011
New Revision: 1077751
URL: http://svn.apache.org/viewvc?rev=1077751&view=rev
Log:
commit 8a29dde7fa440980e025832f664c844d134c23ee
Author: Owen O'Malley <om...@apache.org>
Date: Wed Mar 2 16:25:19 2011 -0800
clean up sloppy merges done as part of patch line flattening.
Removed:
hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/build.xml
hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/commons-daemon-1.0.2-src.tar.gz
Modified:
hadoop/common/branches/branch-0.20-security-patches/bin/hadoop
hadoop/common/branches/branch-0.20-security-patches/build.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/util/ServletUtil.java
hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java
Modified: hadoop/common/branches/branch-0.20-security-patches/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/bin/hadoop?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/bin/hadoop (original)
+++ hadoop/common/branches/branch-0.20-security-patches/bin/hadoop Fri Mar 4 04:51:32 2011
@@ -330,27 +330,6 @@ if [ "$starting_secure_dn" = "true" ]; t
HADOOP_SECURE_DN_PID="/tmp/hadoop_secure_dn.pid"
else
HADOOP_SECURE_DN_PID="$HADOOP_PID_DIR/hadoop_secure_dn.pid"
-
-if [ "$COMMAND" = "datanode" ]; then
- if [[ $EUID -eq 0 ]]; then
- if [ "$HADOOP_SECURE_DN_USER" = "" ]; then
- HADOOP_SECURE_DN_USER="hdfs"
- fi
-
- if [ "$HADOOP_PID_DIR" = "" ]; then
- HADOOP_SECURE_DN_PID="/tmp/hadoop_secure_dn.pid"
- else
- HADOOP_SECURE_DN_PID="$HADOOP_PID_DIR/hadoop_secure_dn.pid"
- fi
-
- exec "jsvc" -outfile "$HADOOP_LOG_DIR/jsvc.out" \
- -errfile "$HADOOP_LOG_DIR/jsvc.err" \
- -pidfile "$HADOOP_SECURE_DN_PID" \
- -nodetach \
- -user "$HADOOP_SECURE_DN_USER" \
- -cp "$CLASSPATH" \
- $JAVA_HEAP_MAX $HADOOP_OPTS \
- org.apache.hadoop.hdfs.server.datanode.SecureDataNodeStarter "$@"
fi
exec "$HADOOP_HOME/bin/jsvc" -Dproc_$COMMAND -outfile "$HADOOP_LOG_DIR/jsvc.out" \
Modified: hadoop/common/branches/branch-0.20-security-patches/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/build.xml?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/build.xml Fri Mar 4 04:51:32 2011
@@ -26,7 +26,7 @@
<property file="${user.home}/build.properties" />
<property file="${basedir}/build.properties" />
- <property name="Name" value="Yahoo! Distribution of Hadoop"/>
+ <property name="Name" value="Hadoop"/>
<property name="name" value="hadoop"/>
<property name="version" value="0.20.202.0-SNAPSHOT"/>
<property name="final.name" value="${name}-${version}"/>
@@ -183,10 +183,6 @@
<!-- end of task-controller properties -->
- <!-- jsvc properties set here -->
- <property name="c++.jsvc.src"
- value="${basedir}/src/c++/jsvc" />
-
<!-- IVY properteis set here -->
<property name="ivy.dir" location="ivy" />
<loadproperties srcfile="${ivy.dir}/libraries.properties"/>
@@ -661,7 +657,7 @@
<section name="org/apache/hadoop">
<attribute name="Implementation-Title" value="Hadoop"/>
<attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="Yahoo!"/>
+ <attribute name="Implementation-Vendor" value="Apache"/>
</section>
</manifest>
<fileset dir="${conf.dir}" includes="${jar.properties.list}" />
@@ -826,7 +822,7 @@
<section name="org/apache/hadoop">
<attribute name="Implementation-Title" value="Hadoop"/>
<attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="Yahoo!"/>
+ <attribute name="Implementation-Vendor" value="Apache"/>
</section>
</manifest>
</jar>
@@ -1235,7 +1231,7 @@
use="true"
windowtitle="${Name} ${version} API"
doctitle="${Name} ${version} Developer API"
- bottom="This release is based on the Yahoo! Distribution of Hadoop, powering the largest Hadoop clusters in the Universe!<br>Copyright &copy; ${year} The Apache Software Foundation."
+ bottom="Copyright &copy; ${year} The Apache Software Foundation"
maxmemory="${javadoc.maxmemory}"
>
<packageset dir="${core.src.dir}"/>
@@ -1278,7 +1274,7 @@
use="true"
windowtitle="${Name} ${version} API"
doctitle="${Name} ${version} API"
- bottom="This release is based on the Yahoo! Distribution of Hadoop, powering the largest Hadoop clusters in the Universe!<br>Copyright &copy; ${year} The Apache Software Foundation."
+ bottom="Copyright &copy; ${year} The Apache Software Foundation"
maxmemory="${javadoc.maxmemory}"
>
<packageset dir="${core.src.dir}"/>
@@ -2315,14 +2311,16 @@
<!-- end of task-controller targets -->
- <!-- jsvc targets -->
- <target name="jsvc" if="compile.c++">
- <subant target="jsvc">
- <property name="c++.jsvc.src" value="${c++.jsvc.src}" />
- <property name="build.c++.jsvc" value="${build.c++}/jsvc" />
- <property name="jsvc.install.dir" value="${dist.dir}/bin" />
- <fileset file="${c++.jsvc.src}/build.xml"/>
- </subant>
- </target>
+ <target name="jsvc" >
+ <mkdir dir="${jsvc.build.dir}" />
+ <get src="${jsvc.location}" dest="${jsvc.build.dir}/${jsvc.dest.name}" />
+
+ <untar compression="gzip" src="${jsvc.build.dir}/${jsvc.dest.name}" dest="${jsvc.build.dir}" />
+
+ <copy file="${jsvc.build.dir}/jsvc" todir="${jsvc.install.dir}" verbose="true" />
+ <chmod perm="ugo+x" type="file">
+ <fileset file="${jsvc.install.dir}/jsvc"/>
+ </chmod>
+ </target>
</project>
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java Fri Mar 4 04:51:32 2011
@@ -50,5 +50,4 @@ public class EchoUserResolver implements
UserGroupInformation ugi) {
return ugi;
}
-
}
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java Fri Mar 4 04:51:32 2011
@@ -22,7 +22,6 @@ import java.io.InputStream;
import java.io.PrintStream;
import java.net.URI;
import java.security.PrivilegedExceptionAction;
-import java.util.Collection;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java Fri Mar 4 04:51:32 2011
@@ -43,7 +43,6 @@ import org.apache.hadoop.mapreduce.Recor
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.hadoop.security.UnixUserGroupInformation;
import org.apache.hadoop.tools.rumen.JobStory;
import org.apache.commons.logging.Log;
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java Fri Mar 4 04:51:32 2011
@@ -183,6 +183,7 @@ abstract class JobFactory<T> implements
};
}
+
/**
* Obtain the error that caused the thread to exit unexpectedly.
*/
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java Fri Mar 4 04:51:32 2011
@@ -83,7 +83,6 @@ class JobSubmitter implements Gridmix.Co
try {
// pre-compute split information
try {
- UserGroupInformation.setCurrentUser(job.getUgi());
job.buildSplits(inputDir);
} catch (IOException e) {
LOG.warn("Failed to submit " + job.getJob().getJobName() + " as " +
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java Fri Mar 4 04:51:32 2011
@@ -33,11 +33,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.hadoop.security.UnixUserGroupInformation;
-
public class RoundRobinUserResolver implements UserResolver {
public static final Log LOG = LogFactory.getLog(RoundRobinUserResolver.class);
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java Fri Mar 4 04:51:32 2011
@@ -25,7 +25,6 @@ import org.apache.hadoop.fs.ContentSumma
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.mapred.Counters;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
@@ -67,12 +66,6 @@ public class TestGridmixSubmission {
).getLogger().setLevel(Level.DEBUG);
}
- private static final Path DEST = new Path("/gridmix");
-
- private static FileSystem dfs = null;
- private static MiniDFSCluster dfsCluster = null;
- private static MiniMRCluster mrCluster = null;
-
private static final int NJOBS = 3;
private static final long GENDATA = 30; // in megabytes
private static final int GENSLOP = 100 * 1024; // +/- 100k for logs
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java Fri Mar 4 04:51:32 2011
@@ -29,7 +29,6 @@ import org.apache.hadoop.fs.FSDataOutput
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
-import org.apache.hadoop.security.UnixUserGroupInformation;
import org.apache.hadoop.security.UserGroupInformation;
public class TestUserResolve {
Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/util/ServletUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/util/ServletUtil.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/util/ServletUtil.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/util/ServletUtil.java Fri Mar 4 04:51:32 2011
@@ -52,8 +52,8 @@ public class ServletUtil {
}
public static final String HTML_TAIL = "<hr />\n"
- + "<a href='http://hadoop.apache.org/core'>Hadoop</a>, "
- + Calendar.getInstance().get(Calendar.YEAR) + ".\n"
+ + "This release is based on the <a href='http://developer.yahoo.com/hadoop/'>Yahoo! Distribution of Hadoop</a>, "
+ + "powering the largest Hadoop clusters in the Universe!\n"
+ "</body></html>";
/**
Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java Fri Mar 4 04:51:32 2011
@@ -31,8 +31,6 @@ import java.security.PrivilegedException
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Random;
import java.util.TimeZone;
import java.util.concurrent.DelayQueue;
import java.util.concurrent.Delayed;
Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Fri Mar 4 04:51:32 2011
@@ -73,8 +73,6 @@ import org.apache.hadoop.util.StringUtil
* and its latest JobStatus, plus a set of tables for
* doing bookkeeping of its Tasks.
* ***********************************************************
- *
- * This is NOT a public interface!
*/
public class JobInProgress {
/**
Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java Fri Mar 4 04:51:32 2011
@@ -176,33 +176,6 @@ class LinuxTaskController extends TaskCo
LOG.debug("initializeJob: " + Arrays.toString(commandArray));
}
try {
- FileSystem rawFs = FileSystem.getLocal(getConf()).getRaw();
- long logSize = 0; //TODO, Ref BUG:2854624
- // get the JVM command line.
- String cmdLine =
- TaskLog.buildCommandLine(setup, jvmArguments,
- new File(stdout), new File(stderr), logSize, true);
-
- // write the command to a file in the
- // task specific cache directory
- Path p = new Path(allocator.getLocalPathForWrite(
- TaskTracker.getPrivateDirTaskScriptLocation(user, jobId, attemptId),
- getConf()), COMMAND_FILE);
- String commandFile = writeCommand(cmdLine, rawFs, p);
-
- String[] command =
- new String[]{taskControllerExe,
- user,
- Integer.toString(Commands.LAUNCH_TASK_JVM.getValue()),
- jobId,
- attemptId,
- currentWorkDirectory.toString(),
- commandFile};
- shExec = new ShellCommandExecutor(command);
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("launchTask: " + Arrays.toString(command));
- }
shExec.execute();
if (LOG.isDebugEnabled()) {
logOutput(shExec.getOutput());
Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java Fri Mar 4 04:51:32 2011
@@ -149,9 +149,9 @@ abstract public class Task implements Wr
protected org.apache.hadoop.mapreduce.OutputFormat<?,?> outputFormat;
protected org.apache.hadoop.mapreduce.OutputCommitter committer;
protected final Counters.Counter spilledRecordsCounter;
+ private int numSlotsRequired;
private String pidFile = "";
protected TaskUmbilicalProtocol umbilical;
- private int numSlotsRequired;
protected SecretKey tokenSecret;
////////////////////////////////////////////
@@ -888,27 +888,30 @@ abstract public class Task implements Wr
}
reporter.setProgressFlag();
}
- // task can Commit now
- try {
- LOG.info("Task " + taskId + " is allowed to commit now");
- committer.commitTask(taskContext);
- return;
- } catch (IOException iee) {
- LOG.warn("Failure committing: " +
- StringUtils.stringifyException(iee));
- discardOutput(taskContext);
- throw iee;
- }
+ break;
} catch (IOException ie) {
LOG.warn("Failure asking whether task can commit: " +
StringUtils.stringifyException(ie));
if (--retries == 0) {
- //if it couldn't commit a successfully then delete the output
+ //if it couldn't query successfully then delete the output
discardOutput(taskContext);
System.exit(68);
}
}
}
+
+ // task can Commit now
+ try {
+ LOG.info("Task " + taskId + " is allowed to commit now");
+ committer.commitTask(taskContext);
+ return;
+ } catch (IOException iee) {
+ LOG.warn("Failure committing: " +
+ StringUtils.stringifyException(iee));
+ //if it couldn't commit a successfully then delete the output
+ discardOutput(taskContext);
+ throw iee;
+ }
}
private
Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java Fri Mar 4 04:51:32 2011
@@ -56,12 +56,12 @@ public interface TaskUmbilicalProtocol e
* Version 13 changed the getTask method signature for HADOOP-249
* Version 14 changed the getTask method signature for HADOOP-4232
* Version 15 Adds FAILED_UNCLEAN and KILLED_UNCLEAN states for HADOOP-4759
- * Version 16 Added fatalError for child to communicate fatal errors to TT
* Version 16 Added numRequiredSlots to TaskStatus for MAPREDUCE-516
* Version 17 Change in signature of getTask() for HADOOP-5488
+ * Version 18 Added fatalError for child to communicate fatal errors to TT
* */
- public static final long versionID = 17L;
+ public static final long versionID = 18L;
/**
* Called when a child task process starts, to get its task.
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java Fri Mar 4 04:51:32 2011
@@ -69,7 +69,6 @@ public class TestTrackerDistributedCache
private static final int TEST_FILE_SIZE = 4 * 1024; // 4K
private static final int LOCAL_CACHE_LIMIT = 5 * 1024; //5K
private static final int LOCAL_CACHE_SUBDIR_LIMIT = 1;
- private static final int LOCAL_CACHE_SUBDIR = 2;
protected Configuration conf;
protected Path firstCacheFile;
protected Path firstCacheFilePublic;
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/MiniMRCluster.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/MiniMRCluster.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/MiniMRCluster.java Fri Mar 4 04:51:32 2011
@@ -706,7 +706,7 @@ public class MiniMRCluster {
/**
* Add a tasktracker to the Mini-MR cluster.
*/
- void addTaskTracker(TaskTrackerRunner taskTracker) throws IOException {
+ void addTaskTracker(TaskTrackerRunner taskTracker) {
Thread taskTrackerThread = new Thread(taskTracker);
taskTrackerList.add(taskTracker);
taskTrackerThreadList.add(taskTrackerThread);
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java?rev=1077751&r1=1077750&r2=1077751&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java Fri Mar 4 04:51:32 2011
@@ -196,7 +196,7 @@ public class TestQueueManagerForJobKillA
//write out queue-acls.xml.
UtilsForTests.setUpConfigFile(queueConfProps, queueConfigFile);
//refresh configuration
- queueManager.refreshAcls(conf);
+ queueManager.refreshQueues(conf);
//Submission should succeed
assertTrue("User Job Submission failed after refresh.",
queueManager.hasAccess("default", QueueACL.SUBMIT_JOB, ugi));
@@ -214,7 +214,7 @@ public class TestQueueManagerForJobKillA
hadoopConfProps.put(QueueManager.toFullPropertyName
("q1", submitAcl), ugi.getShortUserName());
UtilsForTests.setUpConfigFile(hadoopConfProps, hadoopConfigFile);
- queueManager.refreshAcls(conf);
+ queueManager.refreshQueues(conf);
assertTrue("User Job Submission allowed after refresh and no queue acls file.",
queueManager.hasAccess("q1", QueueACL.SUBMIT_JOB, ugi));
} finally{
@@ -235,7 +235,7 @@ public class TestQueueManagerForJobKillA
String queueConfigPath =
System.getProperty("test.build.extraconf", "build/test/extraconf");
File queueConfigFile =
- new File(queueConfigPath, QueueManager.QUEUE_ACLS_FILE_NAME);
+ new File(queueConfigPath, QueueManager.QUEUE_ACLS_FILE_NAME );
File hadoopConfigFile = new File(queueConfigPath, "hadoop-site.xml");
try {
// queue properties with which the cluster is started.
@@ -274,7 +274,7 @@ public class TestQueueManagerForJobKillA
try {
//Exception to be thrown by queue manager because configuration passed
//is invalid.
- queueManager.refreshAcls(conf);
+ queueManager.refreshQueues(conf);
fail("Refresh of ACLs should have failed with invalid conf file.");
} catch (Exception e) {
}