Author: todd
Date: Sat Feb 18 01:27:51 2012
New Revision: 1245834
URL: http://svn.apache.org/viewvc?rev=1245834&view=rev
Log:
Merge trunk into HA branch
Modified:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/c++/ (props
changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/block_forensics/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build-contrib.xml
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build.xml
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/data_join/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/index/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/vaidya/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/examples/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/java/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/
(props changed)
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/hadoop-mapreduce-project:1152502-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project:1152502-1245833
/hadoop/core/branches/branch-0.19/mapred:713112
Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/CHANGES.txt?rev=1245834&r1=1245833&r2=1245834&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/CHANGES.txt Sat
Feb 18 01:27:51 2012
@@ -105,6 +105,8 @@ Release 0.23.2 - UNRELEASED
OPTIMIZATIONS
BUG FIXES
+ MAPREDUCE-3862. Nodemanager can appear to hang on shutdown due to
lingering
+ DeletionService threads (Jason Lowe via bobby)
MAPREDUCE-3680. FifoScheduler web service rest API can print out invalid
JSON. (B Anil Kumar via tgraves)
@@ -121,6 +123,9 @@ Release 0.23.2 - UNRELEASED
MAPREDUCE-3856. Instances of RunningJob class givs incorrect job tracking
urls when mutiple jobs are submitted from same client jvm. (Eric Payne via
sseth)
+
+ MAPREDUCE-3583. Change pid to String and stime to BigInteger in order to
+ avoid NumberFormatException caused by overflow. (Zhihong Yu via szetszwo)
Release 0.23.1 - 2012-02-08
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:1161333-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:1161333-1245833
/hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112
/hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/conf:1152502-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/conf:1152502-1245833
/hadoop/core/branches/branch-0.19/mapred/conf:713112
/hadoop/core/trunk/conf:784664-785643
Modified:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java?rev=1245834&r1=1245833&r2=1245834&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java
Sat Feb 18 01:27:51 2012
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
+import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -91,12 +92,14 @@ public class ProcfsBasedProcessTree exte
// to a test directory.
private String procfsDir;
- private Integer pid = -1;
+ static private String deadPid = "-1";
+ private String pid = deadPid;
+ static private Pattern numberPattern = Pattern.compile("[1-9][0-9]*");
private Long cpuTime = 0L;
private boolean setsidUsed = false;
private long sleeptimeBeforeSigkill = DEFAULT_SLEEPTIME_BEFORE_SIGKILL;
- private Map<Integer, ProcessInfo> processTree = new HashMap<Integer,
ProcessInfo>();
+ private Map<String, ProcessInfo> processTree = new HashMap<String,
ProcessInfo>();
public ProcfsBasedProcessTree(String pid) {
this(pid, false, DEFAULT_SLEEPTIME_BEFORE_SIGKILL);
@@ -166,19 +169,19 @@ public class ProcfsBasedProcessTree exte
* @return the process-tree with latest state.
*/
public ProcfsBasedProcessTree getProcessTree() {
- if (pid != -1) {
+ if (!pid.equals(deadPid)) {
// Get the list of processes
- List<Integer> processList = getProcessList();
+ List<String> processList = getProcessList();
- Map<Integer, ProcessInfo> allProcessInfo = new HashMap<Integer,
ProcessInfo>();
+ Map<String, ProcessInfo> allProcessInfo = new HashMap<String,
ProcessInfo>();
// cache the processTree to get the age for processes
- Map<Integer, ProcessInfo> oldProcs =
- new HashMap<Integer, ProcessInfo>(processTree);
+ Map<String, ProcessInfo> oldProcs =
+ new HashMap<String, ProcessInfo>(processTree);
processTree.clear();
ProcessInfo me = null;
- for (Integer proc : processList) {
+ for (String proc : processList) {
// Get information for each process
ProcessInfo pInfo = new ProcessInfo(proc);
if (constructProcessInfo(pInfo, procfsDir) != null) {
@@ -195,9 +198,9 @@ public class ProcfsBasedProcessTree exte
}
// Add each process to its parent.
- for (Map.Entry<Integer, ProcessInfo> entry : allProcessInfo.entrySet()) {
- Integer pID = entry.getKey();
- if (pID != 1) {
+ for (Map.Entry<String, ProcessInfo> entry : allProcessInfo.entrySet()) {
+ String pID = entry.getKey();
+ if (!pID.equals("1")) {
ProcessInfo pInfo = entry.getValue();
ProcessInfo parentPInfo = allProcessInfo.get(pInfo.getPpid());
if (parentPInfo != null) {
@@ -218,7 +221,7 @@ public class ProcfsBasedProcessTree exte
}
// update age values and compute the number of jiffies since last update
- for (Map.Entry<Integer, ProcessInfo> procs : processTree.entrySet()) {
+ for (Map.Entry<String, ProcessInfo> procs : processTree.entrySet()) {
ProcessInfo oldInfo = oldProcs.get(procs.getKey());
if (procs.getValue() != null) {
procs.getValue().updateJiffy(oldInfo);
@@ -242,10 +245,10 @@ public class ProcfsBasedProcessTree exte
* @return true if the root-process is alive, false otherwise.
*/
public boolean isAlive() {
- if (pid == -1) {
+ if (pid.equals(deadPid)) {
return false;
} else {
- return isAlive(pid.toString());
+ return isAlive(pid);
}
}
@@ -256,8 +259,8 @@ public class ProcfsBasedProcessTree exte
* alive, false otherwise.
*/
public boolean isAnyProcessInTreeAlive() {
- for (Integer pId : processTree.keySet()) {
- if (isAlive(pId.toString())) {
+ for (String pId : processTree.keySet()) {
+ if (isAlive(pId)) {
return true;
}
}
@@ -269,9 +272,8 @@ public class ProcfsBasedProcessTree exte
* @param procfsDir Procfs root dir
*/
static boolean checkPidPgrpidForMatch(String pidStr, String procfsDir) {
- Integer pId = Integer.parseInt(pidStr);
// Get information for this process
- ProcessInfo pInfo = new ProcessInfo(pId);
+ ProcessInfo pInfo = new ProcessInfo(pidStr);
pInfo = constructProcessInfo(pInfo, procfsDir);
if (pInfo == null) {
// process group leader may have finished execution, but we still need to
@@ -279,14 +281,15 @@ public class ProcfsBasedProcessTree exte
return true;
}
+ String pgrpId = pInfo.getPgrpId().toString();
//make sure that pId and its pgrpId match
- if (!pInfo.getPgrpId().equals(pId)) {
- LOG.warn("Unexpected: Process with PID " + pId +
- " is not a process group leader.");
+ if (!pgrpId.equals(pidStr)) {
+ LOG.warn("Unexpected: Process with PID " + pidStr +
+ " is not a process group leader. pgrpId is: " +
pInfo.getPgrpId());
return false;
}
if (LOG.isDebugEnabled()) {
- LOG.debug(pId + " is a process group leader, as expected.");
+ LOG.debug(pidStr + " is a process group leader, as expected.");
}
return true;
}
@@ -324,7 +327,7 @@ public class ProcfsBasedProcessTree exte
*/
public void destroy(boolean inBackground) {
LOG.debug("Killing ProcfsBasedProcessTree of " + pid);
- if (pid == -1) {
+ if (pid.equals(deadPid)) {
return;
}
if (isAlive(pid.toString())) {
@@ -347,7 +350,7 @@ public class ProcfsBasedProcessTree exte
}
private static final String PROCESSTREE_DUMP_FORMAT =
- "\t|- %d %d %d %d %s %d %d %d %d %s\n";
+ "\t|- %s %s %d %d %s %d %d %d %d %s\n";
/**
* Get a dump of the process-tree.
@@ -458,34 +461,27 @@ public class ProcfsBasedProcessTree exte
return cpuTime;
}
- private static Integer getValidPID(String pid) {
- Integer retPid = -1;
- try {
- retPid = Integer.parseInt(pid);
- if (retPid <= 0) {
- retPid = -1;
- }
- } catch (NumberFormatException nfe) {
- retPid = -1;
- }
- return retPid;
+ private static String getValidPID(String pid) {
+ if (pid == null) return deadPid;
+ Matcher m = numberPattern.matcher(pid);
+ if (m.matches()) return pid;
+ return deadPid;
}
/**
* Get the list of all processes in the system.
*/
- private List<Integer> getProcessList() {
+ private List<String> getProcessList() {
String[] processDirs = (new File(procfsDir)).list();
- List<Integer> processList = new ArrayList<Integer>();
+ List<String> processList = new ArrayList<String>();
for (String dir : processDirs) {
+ Matcher m = numberPattern.matcher(dir);
+ if (!m.matches()) continue;
try {
- int pd = Integer.parseInt(dir);
if ((new File(procfsDir, dir)).isDirectory()) {
- processList.add(Integer.valueOf(pd));
+ processList.add(dir);
}
- } catch (NumberFormatException n) {
- // skip this directory
} catch (SecurityException s) {
// skip this process
}
@@ -511,7 +507,7 @@ public class ProcfsBasedProcessTree exte
BufferedReader in = null;
FileReader fReader = null;
try {
- File pidDir = new File(procfsDir, String.valueOf(pinfo.getPid()));
+ File pidDir = new File(procfsDir, pinfo.getPid());
fReader = new FileReader(new File(pidDir, PROCFS_STAT_FILE));
in = new BufferedReader(fReader);
} catch (FileNotFoundException f) {
@@ -528,9 +524,9 @@ public class ProcfsBasedProcessTree exte
boolean mat = m.find();
if (mat) {
// Set (name) (ppid) (pgrpId) (session) (utime) (stime) (vsize) (rss)
- pinfo.updateProcessInfo(m.group(2), Integer.parseInt(m.group(3)),
+ pinfo.updateProcessInfo(m.group(2), m.group(3),
Integer.parseInt(m.group(4)), Integer.parseInt(m.group(5)),
- Long.parseLong(m.group(7)), Long.parseLong(m.group(8)),
+ Long.parseLong(m.group(7)), new BigInteger(m.group(8)),
Long.parseLong(m.group(10)), Long.parseLong(m.group(11)));
} else {
LOG.warn("Unexpected: procfs stat file is not in the expected format"
@@ -562,7 +558,7 @@ public class ProcfsBasedProcessTree exte
*/
public String toString() {
StringBuffer pTree = new StringBuffer("[ ");
- for (Integer p : processTree.keySet()) {
+ for (String p : processTree.keySet()) {
pTree.append(p);
pTree.append(" ");
}
@@ -575,15 +571,16 @@ public class ProcfsBasedProcessTree exte
*
*/
private static class ProcessInfo {
- private Integer pid; // process-id
+ private String pid; // process-id
private String name; // command name
private Integer pgrpId; // process group-id
- private Integer ppid; // parent process-id
+ private String ppid; // parent process-id
private Integer sessionId; // session-id
private Long vmem; // virtual memory usage
private Long rssmemPage; // rss memory usage in # of pages
private Long utime = 0L; // # of jiffies in user mode
- private Long stime = 0L; // # of jiffies in kernel mode
+ private final BigInteger MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE);
+ private BigInteger stime = new BigInteger("0"); // # of jiffies in kernel
mode
// how many times has this process been seen alive
private int age;
@@ -595,13 +592,13 @@ public class ProcfsBasedProcessTree exte
private List<ProcessInfo> children = new ArrayList<ProcessInfo>(); // list
of children
- public ProcessInfo(int pid) {
- this.pid = Integer.valueOf(pid);
+ public ProcessInfo(String pid) {
+ this.pid = pid;
// seeing this the first time.
this.age = 1;
}
- public Integer getPid() {
+ public String getPid() {
return pid;
}
@@ -613,7 +610,7 @@ public class ProcfsBasedProcessTree exte
return pgrpId;
}
- public Integer getPpid() {
+ public String getPpid() {
return ppid;
}
@@ -629,7 +626,7 @@ public class ProcfsBasedProcessTree exte
return utime;
}
- public Long getStime() {
+ public BigInteger getStime() {
return stime;
}
@@ -652,8 +649,8 @@ public class ProcfsBasedProcessTree exte
return false;
}
- public void updateProcessInfo(String name, Integer ppid, Integer pgrpId,
- Integer sessionId, Long utime, Long stime, Long vmem, Long rssmem) {
+ public void updateProcessInfo(String name, String ppid, Integer pgrpId,
+ Integer sessionId, Long utime, BigInteger stime, Long vmem, Long
rssmem) {
this.name = name;
this.ppid = ppid;
this.pgrpId = pgrpId;
@@ -665,8 +662,19 @@ public class ProcfsBasedProcessTree exte
}
public void updateJiffy(ProcessInfo oldInfo) {
- this.dtime = (oldInfo == null ? this.utime + this.stime
- : (this.utime + this.stime) - (oldInfo.utime + oldInfo.stime));
+ if (oldInfo == null) {
+ BigInteger sum = this.stime.add(BigInteger.valueOf(this.utime));
+ if (sum.compareTo(MAX_LONG) > 0) {
+ this.dtime = 0L;
+ LOG.warn("Sum of stime (" + this.stime + ") and utime (" + this.utime
+ + ") is greater than " + Long.MAX_VALUE);
+ } else {
+ this.dtime = sum.longValue();
+ }
+ return;
+ }
+ this.dtime = (this.utime - oldInfo.utime +
+ this.stime.subtract(oldInfo.stime).longValue());
}
public void updateAge(ProcessInfo oldInfo) {
@@ -690,7 +698,7 @@ public class ProcfsBasedProcessTree exte
FileReader fReader = null;
try {
fReader =
- new FileReader(new File(new File(procfsDir, pid.toString()),
+ new FileReader(new File(new File(procfsDir, pid),
PROCFS_CMDLINE_FILE));
} catch (FileNotFoundException f) {
// The process vanished in the interim!
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:1166973-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:1166973-1245833
/hadoop/core/branches/branch-0.19/mapred/src/java/mapred-default.xml:713112
/hadoop/core/trunk/src/mapred/mapred-default.xml:776175-785643
Modified:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java?rev=1245834&r1=1245833&r2=1245834&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
Sat Feb 18 01:27:51 2012
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
+import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
@@ -91,12 +92,14 @@ public class ProcfsBasedProcessTree {
// to a test directory.
private String procfsDir;
- protected final Integer pid;
+ static private String deadPid = "-1";
+ private String pid = deadPid;
+ static private Pattern numberPattern = Pattern.compile("[1-9][0-9]*");
private Long cpuTime = 0L;
private boolean setsidUsed = false;
- protected Map<Integer, ProcessInfo> processTree =
- new HashMap<Integer, ProcessInfo>();
+ protected Map<String, ProcessInfo> processTree =
+ new HashMap<String, ProcessInfo>();
public ProcfsBasedProcessTree(String pid) {
this(pid, false);
@@ -150,19 +153,19 @@ public class ProcfsBasedProcessTree {
* @return the process-tree with latest state.
*/
public ProcfsBasedProcessTree getProcessTree() {
- if (pid != -1) {
+ if (!pid.equals(deadPid)) {
// Get the list of processes
- List<Integer> processList = getProcessList();
+ List<String> processList = getProcessList();
- Map<Integer, ProcessInfo> allProcessInfo = new HashMap<Integer,
ProcessInfo>();
+ Map<String, ProcessInfo> allProcessInfo = new HashMap<String,
ProcessInfo>();
// cache the processTree to get the age for processes
- Map<Integer, ProcessInfo> oldProcs =
- new HashMap<Integer, ProcessInfo>(processTree);
+ Map<String, ProcessInfo> oldProcs =
+ new HashMap<String, ProcessInfo>(processTree);
processTree.clear();
ProcessInfo me = null;
- for (Integer proc : processList) {
+ for (String proc : processList) {
// Get information for each process
ProcessInfo pInfo = new ProcessInfo(proc);
if (constructProcessInfo(pInfo, procfsDir) != null) {
@@ -179,9 +182,9 @@ public class ProcfsBasedProcessTree {
}
// Add each process to its parent.
- for (Map.Entry<Integer, ProcessInfo> entry : allProcessInfo.entrySet()) {
- Integer pID = entry.getKey();
- if (pID != 1) {
+ for (Map.Entry<String, ProcessInfo> entry : allProcessInfo.entrySet()) {
+ String pID = entry.getKey();
+ if (!pID.equals("1")) {
ProcessInfo pInfo = entry.getValue();
ProcessInfo parentPInfo = allProcessInfo.get(pInfo.getPpid());
if (parentPInfo != null) {
@@ -202,7 +205,7 @@ public class ProcfsBasedProcessTree {
}
// update age values and compute the number of jiffies since last update
- for (Map.Entry<Integer, ProcessInfo> procs : processTree.entrySet()) {
+ for (Map.Entry<String, ProcessInfo> procs : processTree.entrySet()) {
ProcessInfo oldInfo = oldProcs.get(procs.getKey());
if (procs.getValue() != null) {
procs.getValue().updateJiffy(oldInfo);
@@ -227,20 +230,22 @@ public class ProcfsBasedProcessTree {
return checkPidPgrpidForMatch(pid, PROCFS);
}
- public static boolean checkPidPgrpidForMatch(int _pid, String procfs) {
+ public static boolean checkPidPgrpidForMatch(String _pid, String procfs) {
// Get information for this process
ProcessInfo pInfo = new ProcessInfo(_pid);
pInfo = constructProcessInfo(pInfo, procfs);
// null if process group leader finished execution; issue no warning
// make sure that pid and its pgrpId match
- return pInfo == null || pInfo.getPgrpId().equals(_pid);
+ if (pInfo == null) return true;
+ String pgrpId = pInfo.getPgrpId().toString();
+ return pgrpId.equals(_pid);
}
private static final String PROCESSTREE_DUMP_FORMAT =
- "\t|- %d %d %d %d %s %d %d %d %d %s\n";
+ "\t|- %s %s %d %d %s %d %d %d %d %s\n";
- public List<Integer> getCurrentProcessIDs() {
- List<Integer> currentPIDs = new ArrayList<Integer>();
+ public List<String> getCurrentProcessIDs() {
+ List<String> currentPIDs = new ArrayList<String>();
currentPIDs.addAll(processTree.keySet());
return currentPIDs;
}
@@ -354,34 +359,27 @@ public class ProcfsBasedProcessTree {
return cpuTime;
}
- private static Integer getValidPID(String pid) {
- Integer retPid = -1;
- try {
- retPid = Integer.parseInt(pid);
- if (retPid <= 0) {
- retPid = -1;
- }
- } catch (NumberFormatException nfe) {
- retPid = -1;
- }
- return retPid;
+ private static String getValidPID(String pid) {
+ if (pid == null) return deadPid;
+ Matcher m = numberPattern.matcher(pid);
+ if (m.matches()) return pid;
+ return deadPid;
}
/**
* Get the list of all processes in the system.
*/
- private List<Integer> getProcessList() {
+ private List<String> getProcessList() {
String[] processDirs = (new File(procfsDir)).list();
- List<Integer> processList = new ArrayList<Integer>();
+ List<String> processList = new ArrayList<String>();
for (String dir : processDirs) {
+ Matcher m = numberPattern.matcher(dir);
+ if (!m.matches()) continue;
try {
- int pd = Integer.parseInt(dir);
if ((new File(procfsDir, dir)).isDirectory()) {
- processList.add(Integer.valueOf(pd));
+ processList.add(dir);
}
- } catch (NumberFormatException n) {
- // skip this directory
} catch (SecurityException s) {
// skip this process
}
@@ -407,7 +405,7 @@ public class ProcfsBasedProcessTree {
BufferedReader in = null;
FileReader fReader = null;
try {
- File pidDir = new File(procfsDir, String.valueOf(pinfo.getPid()));
+ File pidDir = new File(procfsDir, pinfo.getPid());
fReader = new FileReader(new File(pidDir, PROCFS_STAT_FILE));
in = new BufferedReader(fReader);
} catch (FileNotFoundException f) {
@@ -424,9 +422,9 @@ public class ProcfsBasedProcessTree {
boolean mat = m.find();
if (mat) {
// Set (name) (ppid) (pgrpId) (session) (utime) (stime) (vsize) (rss)
- pinfo.updateProcessInfo(m.group(2), Integer.parseInt(m.group(3)),
+ pinfo.updateProcessInfo(m.group(2), m.group(3),
Integer.parseInt(m.group(4)), Integer.parseInt(m.group(5)),
- Long.parseLong(m.group(7)), Long.parseLong(m.group(8)),
+ Long.parseLong(m.group(7)), new BigInteger(m.group(8)),
Long.parseLong(m.group(10)), Long.parseLong(m.group(11)));
} else {
LOG.warn("Unexpected: procfs stat file is not in the expected format"
@@ -458,7 +456,7 @@ public class ProcfsBasedProcessTree {
*/
public String toString() {
StringBuffer pTree = new StringBuffer("[ ");
- for (Integer p : processTree.keySet()) {
+ for (String p : processTree.keySet()) {
pTree.append(p);
pTree.append(" ");
}
@@ -471,15 +469,16 @@ public class ProcfsBasedProcessTree {
*
*/
private static class ProcessInfo {
- private Integer pid; // process-id
+ private String pid; // process-id
private String name; // command name
private Integer pgrpId; // process group-id
- private Integer ppid; // parent process-id
+ private String ppid; // parent process-id
private Integer sessionId; // session-id
private Long vmem; // virtual memory usage
private Long rssmemPage; // rss memory usage in # of pages
private Long utime = 0L; // # of jiffies in user mode
- private Long stime = 0L; // # of jiffies in kernel mode
+ private final BigInteger MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE);
+ private BigInteger stime = new BigInteger("0"); // # of jiffies in kernel
mode
// how many times has this process been seen alive
private int age;
@@ -491,13 +490,13 @@ public class ProcfsBasedProcessTree {
private List<ProcessInfo> children = new ArrayList<ProcessInfo>(); // list
of children
- public ProcessInfo(int pid) {
- this.pid = Integer.valueOf(pid);
+ public ProcessInfo(String pid) {
+ this.pid = pid;
// seeing this the first time.
this.age = 1;
}
- public Integer getPid() {
+ public String getPid() {
return pid;
}
@@ -509,7 +508,7 @@ public class ProcfsBasedProcessTree {
return pgrpId;
}
- public Integer getPpid() {
+ public String getPpid() {
return ppid;
}
@@ -525,7 +524,7 @@ public class ProcfsBasedProcessTree {
return utime;
}
- public Long getStime() {
+ public BigInteger getStime() {
return stime;
}
@@ -548,8 +547,8 @@ public class ProcfsBasedProcessTree {
return false;
}
- public void updateProcessInfo(String name, Integer ppid, Integer pgrpId,
- Integer sessionId, Long utime, Long stime, Long vmem, Long rssmem) {
+ public void updateProcessInfo(String name, String ppid, Integer pgrpId,
+ Integer sessionId, Long utime, BigInteger stime, Long vmem, Long
rssmem) {
this.name = name;
this.ppid = ppid;
this.pgrpId = pgrpId;
@@ -559,10 +558,21 @@ public class ProcfsBasedProcessTree {
this.vmem = vmem;
this.rssmemPage = rssmem;
}
-
+
public void updateJiffy(ProcessInfo oldInfo) {
- this.dtime = (oldInfo == null ? this.utime + this.stime
- : (this.utime + this.stime) - (oldInfo.utime + oldInfo.stime));
+ if (oldInfo == null) {
+ BigInteger sum = this.stime.add(BigInteger.valueOf(this.utime));
+ if (sum.compareTo(MAX_LONG) > 0) {
+ this.dtime = 0L;
+ LOG.warn("Sum of stime (" + this.stime + ") and utime (" + this.utime
+ + ") is greater than " + Long.MAX_VALUE);
+ } else {
+ this.dtime = sum.longValue();
+ }
+ return;
+ }
+ this.dtime = (this.utime - oldInfo.utime +
+ this.stime.subtract(oldInfo.stime).longValue());
}
public void updateAge(ProcessInfo oldInfo) {
Modified:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java?rev=1245834&r1=1245833&r2=1245834&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java
Sat Feb 18 01:27:51 2012
@@ -527,7 +527,7 @@ public class TestProcfsBasedProcessTree
// Let us not create stat file for pid 100.
Assert.assertTrue(ProcfsBasedProcessTree.checkPidPgrpidForMatch(
- Integer.valueOf(pid), procfsRootDir.getAbsolutePath()));
+ pid, procfsRootDir.getAbsolutePath()));
} finally {
FileUtil.fullyDelete(procfsRootDir);
}
@@ -662,8 +662,8 @@ public class TestProcfsBasedProcessTree
*/
private static boolean isAnyProcessInTreeAlive(
ProcfsBasedProcessTree processTree) {
- for (Integer pId : processTree.getCurrentProcessIDs()) {
- if (isAlive(pId.toString())) {
+ for (String pId : processTree.getCurrentProcessIDs()) {
+ if (isAlive(pId)) {
return true;
}
}
Modified:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java?rev=1245834&r1=1245833&r2=1245834&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DeletionService.java
Sat Feb 18 01:27:51 2012
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import static java.util.concurrent.TimeUnit.*;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileContext;
import org.apache.hadoop.fs.UnsupportedFileSystemException;
@@ -85,6 +86,7 @@ public class DeletionService extends Abs
sched = new
ScheduledThreadPoolExecutor(YarnConfiguration.DEFAULT_NM_DELETE_THREAD_COUNT,
tf);
}
+ sched.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
sched.setKeepAliveTime(60L, SECONDS);
super.init(conf);
}
@@ -92,14 +94,27 @@ public class DeletionService extends Abs
@Override
public void stop() {
sched.shutdown();
+ boolean terminated = false;
try {
- sched.awaitTermination(10, SECONDS);
+ terminated = sched.awaitTermination(10, SECONDS);
} catch (InterruptedException e) {
+ }
+ if (terminated != true) {
sched.shutdownNow();
}
super.stop();
}
+ /**
+ * Determine if the service has completely stopped.
+ * Used only by unit tests
+ * @return true if service has completely stopped
+ */
+ @Private
+ public boolean isTerminated() {
+ return getServiceState() == STATE.STOPPED && sched.isTerminated();
+ }
+
private class FileDeletion implements Runnable {
final String user;
final Path subDir;
Modified:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java?rev=1245834&r1=1245833&r2=1245834&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java
Sat Feb 18 01:27:51 2012
@@ -27,12 +27,15 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileContext;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.UnsupportedFileSystemException;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor;
import org.apache.hadoop.yarn.server.nodemanager.DeletionService;
import org.junit.AfterClass;
import org.junit.Test;
+import org.mockito.Mockito;
+
import static org.junit.Assert.*;
public class TestDeletionService {
@@ -107,12 +110,18 @@ public class TestDeletionService {
del.delete((Long.parseLong(p.getName()) % 2) == 0 ? null : "dingo",
p, null);
}
+
+ int msecToWait = 20 * 1000;
+ for (Path p : dirs) {
+ while (msecToWait > 0 && lfs.util().exists(p)) {
+ Thread.sleep(100);
+ msecToWait -= 100;
+ }
+ assertFalse(lfs.util().exists(p));
+ }
} finally {
del.stop();
}
- for (Path p : dirs) {
- assertFalse(lfs.util().exists(p));
- }
}
@Test
@@ -137,14 +146,35 @@ public class TestDeletionService {
del.delete((Long.parseLong(p.getName()) % 2) == 0 ? null : "dingo",
p, baseDirs.toArray(new Path[4]));
}
+
+ int msecToWait = 20 * 1000;
+ for (Path p : baseDirs) {
+ for (Path q : content) {
+ Path fp = new Path(p, q);
+ while (msecToWait > 0 && lfs.util().exists(fp)) {
+ Thread.sleep(100);
+ msecToWait -= 100;
+ }
+ assertFalse(lfs.util().exists(fp));
+ }
+ }
} finally {
del.stop();
}
- for (Path p : baseDirs) {
- for (Path q : content) {
- assertFalse(lfs.util().exists(new Path(p, q)));
- }
- }
}
+ @Test
+ public void testStopWithDelayedTasks() throws Exception {
+ DeletionService del = new
DeletionService(Mockito.mock(ContainerExecutor.class));
+ Configuration conf = new YarnConfiguration();
+ conf.setInt(YarnConfiguration.DEBUG_NM_DELETE_DELAY_SEC, 60);
+ del.init(conf);
+ del.start();
+ try {
+ del.delete("dingo", new Path("/does/not/exist"));
+ } finally {
+ del.stop();
+ }
+ assertTrue(del.isTerminated());
+ }
}
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/c++:1159757-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/c++:1159757-1245833
/hadoop/core/branches/branch-0.19/mapred/src/c++:713112
/hadoop/core/trunk/src/c++:776175-784663
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:1152502-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:1152502-1245833
/hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
/hadoop/core/trunk/src/contrib:784664-785643
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:1152502-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:1152502-1245833
/hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
/hadoop/core/branches/branch-0.19/mapred/src/contrib/block_forensics:713112
/hadoop/core/trunk/src/contrib/block_forensics:784664-785643
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:1161333-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml:1161333-1245833
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
/hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:1161333-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml:1161333-1245833
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
/hadoop/core/trunk/src/contrib/build.xml:776175-786373
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:1159757-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:1159757-1245833
/hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
/hadoop/core/trunk/src/contrib/data_join:776175-786373
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:1159757-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:1159757-1245833
/hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
/hadoop/core/branches/branch-0.19/mapred/src/contrib/eclipse-plugin:713112
/hadoop/core/trunk/src/contrib/eclipse-plugin:776175-785643
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:1159757-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:1159757-1245833
/hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
/hadoop/core/trunk/src/contrib/index:776175-786373
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:1159757-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:1159757-1245833
/hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
/hadoop/core/trunk/src/contrib/vaidya:776175-786373
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/examples:1152502-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/examples:1152502-1245833
/hadoop/core/branches/branch-0.19/mapred/src/examples:713112
/hadoop/core/trunk/src/examples:776175-784663
Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/java:1152502-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/java:1152502-1245833
/hadoop/core/branches/branch-0.19/mapred/src/java:713112
/hadoop/core/trunk/src/mapred:776175-785643
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:1152502-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:1152502-1245833
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
/hadoop/core/trunk/src/test/mapred:776175-785643
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:1159757-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:1159757-1245833
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643
/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:1152502-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:1152502-1245833
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643
/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:1159757-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:1159757-1245833
/hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs-with-mr/org/apache/hadoop/ipc:713112
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/ipc:713112
/hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 18 01:27:51 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:1152502-1245677
+/hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:1152502-1245833
/hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
/hadoop/core/trunk/src/webapps/job:776175-785643
