Skip to content

update Shell.java to avoid OOM #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
+4 −1
Open

update Shell.java to avoid OOM #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b8bbd9
Update Shell.java
huahuiyang Aug 25, 2015
db9c21c
Update Shell.java
huahuiyang Aug 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,8 @@ private static boolean isSetsidSupported() {
/** Token separator regex used to parse Shell tool outputs */
public static final String TOKEN_SEPARATOR_REGEX
= WINDOWS ? "[|\n\r]" : "[ \t\n\r\f]";

private static final int ERROR_MSG_MAX_LENGTH = 1024 * 1024;

private long interval; // refresh interval in msec
private long lastTime; // last time the command was performed
final private boolean redirectErrorStream; // merge stdout and stderr
Expand Down Expand Up @@ -528,6 +529,8 @@ public void run() {
while((line != null) && !isInterrupted()) {
errMsg.append(line);
errMsg.append(System.getProperty("line.separator"));
errMsg.delete(0, (errMsg.length() - ERROR_MSG_MAX_LENGTH < 0) ? 0
: (errMsg.length() - ERROR_MSG_MAX_LENGTH));
line = errReader.readLine();
}
} catch(IOException ioe) {
Expand Down