Author: szetszwo
Date: Thu Feb 23 22:59:46 2012
New Revision: 1293014
URL: http://svn.apache.org/viewvc?rev=1293014&view=rev
Log:
svn merge -c 1293012 from branch-1 for MAPREDUCE-3583.
Modified:
hadoop/common/branches/branch-1.0/ (props changed)
hadoop/common/branches/branch-1.0/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
Propchange: hadoop/common/branches/branch-1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 23 22:59:46 2012
@@ -3,6 +3,6 @@
/hadoop/common/branches/branch-0.20-security:1170042,1170087,1170997,1171137,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1174471,1175114,1176179,1176720,1177907,1179036,1179171,1179519,1179857,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733,1205148,1205655,1206180
/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
-/hadoop/common/branches/branch-1:1207579,1208143,1235107
+/hadoop/common/branches/branch-1:1207579,1208143,1235107,1293012
/hadoop/core/branches/branch-0.19:713112
/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1293014&r1=1293013&r2=1293014&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Thu Feb 23 22:59:46 2012
@@ -13,6 +13,9 @@ Release 1.0.2 - unreleased
MAPREDUCE-3824. Distributed caches are not removed properly. (Thomas Graves
via mattf)
+ MAPREDUCE-3583. Change pid to String and stime to BigInteger in order to
+ avoid NumberFormatException caused by overflow. (Zhihong Yu via szetszwo)
+
Release 1.0.1 - 2012.02.14
NEW FEATURES
Propchange: hadoop/common/branches/branch-1.0/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 23 22:59:46 2012
@@ -3,7 +3,7 @@
/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1173843,1174326,1174471,1174476,1174482,1175114,1176179,1176182,1176270,1176276,1176675,1176720,1177031,1177036,1177098,1177101,1177907,1178074,1179036,1179171,1179471,1179519,1179713,1179722,1179857,1179919,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733,1205148,1205655,1206180
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
-/hadoop/common/branches/branch-1/CHANGES.txt:1207579,1208143,1208936,1235107,1239393
+/hadoop/common/branches/branch-1/CHANGES.txt:1207579,1208143,1208936,1235107,1239393,1293012
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified:
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java?rev=1293014&r1=1293013&r2=1293014&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
(original)
+++
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
Thu Feb 23 22:59:46 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;
@@ -85,10 +86,12 @@ 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 Map<Integer, ProcessInfo> processTree = new HashMap<Integer,
ProcessInfo>();
+ private Map<String, ProcessInfo> processTree = new HashMap<String,
ProcessInfo>();
public ProcfsBasedProcessTree(String pid) {
this(pid, false);
@@ -130,19 +133,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) {
@@ -159,9 +162,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) {
@@ -182,7 +185,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);
@@ -206,10 +209,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);
}
}
@@ -220,8 +223,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;
}
}
@@ -229,7 +232,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.
@@ -340,35 +343,28 @@ public class ProcfsBasedProcessTree exte
return cpuTime;
}
- private static Integer getValidPID(String pid) {
- Integer retPid = -1;
- try {
- retPid = Integer.parseInt((String) 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>();
if (processDirs != null) {
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
}
@@ -395,7 +391,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) {
@@ -410,9 +406,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)));
}
} catch (IOException io) {
@@ -441,7 +437,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(" ");
}
@@ -454,15 +450,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;
@@ -474,13 +471,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;
}
@@ -492,7 +489,7 @@ public class ProcfsBasedProcessTree exte
return pgrpId;
}
- public Integer getPpid() {
+ public String getPpid() {
return ppid;
}
@@ -508,7 +505,7 @@ public class ProcfsBasedProcessTree exte
return utime;
}
- public Long getStime() {
+ public BigInteger getStime() {
return stime;
}
@@ -524,8 +521,8 @@ public class ProcfsBasedProcessTree exte
return age;
}
- 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;
@@ -537,8 +534,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) {
@@ -562,7 +570,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!
