You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dd...@apache.org on 2012/01/05 07:38:11 UTC
svn commit: r1227503 - in /incubator/ambari/trunk:
agent/src/main/python/ambari_agent/
client/src/main/java/org/apache/ambari/common/rest/agent/
client/src/main/java/org/apache/ambari/common/rest/entities/
controller/src/test/java/org/apache/ambari/con...
Author: ddas
Date: Thu Jan 5 06:38:11 2012
New Revision: 1227503
URL: http://svn.apache.org/viewvc?rev=1227503&view=rev
Log:
AMBARI-174. Fixes a bug in the entity that captures stdout/err
Modified:
incubator/ambari/trunk/agent/src/main/python/ambari_agent/FileUtil.py
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/NodeState.java
incubator/ambari/trunk/controller/src/test/java/org/apache/ambari/controller/TestHeartbeat.java
Modified: incubator/ambari/trunk/agent/src/main/python/ambari_agent/FileUtil.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/main/python/ambari_agent/FileUtil.py?rev=1227503&r1=1227502&r2=1227503&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/main/python/ambari_agent/FileUtil.py (original)
+++ incubator/ambari/trunk/agent/src/main/python/ambari_agent/FileUtil.py Thu Jan 5 06:38:11 2012
@@ -117,7 +117,7 @@ def writeFile(action, result, fileName="
except Exception, err:
traceback.print_exc()
result['exitCode'] = 1
- result['stderr'] = traceback.format_exc()
+ result['error'] = traceback.format_exc()
return result
def createStructure(action, result):
@@ -134,7 +134,7 @@ def createStructure(action, result):
except Exception, err:
traceback.print_exc()
result['exitCode'] = 1
- result['stderr'] = traceback.format_exc()
+ result['error'] = traceback.format_exc()
return result
def deleteStructure(action, result):
@@ -146,7 +146,7 @@ def deleteStructure(action, result):
result['exitCode'] = 0
except Exception, err:
result['exitCode'] = 1
- result['stderr'] = traceback.format_exc()
+ result['error'] = traceback.format_exc()
return result
def main():
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java?rev=1227503&r1=1227502&r2=1227503&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/CommandResult.java Thu Jan 5 06:38:11 2012
@@ -37,40 +37,40 @@ public class CommandResult {
public CommandResult() {
}
- public CommandResult(int exitCode, String stdout, String stderr) {
+ public CommandResult(int exitCode, String output, String error) {
this.exitCode = exitCode;
- this.stdout = stdout;
- this.stderr = stderr;
+ this.output = output;
+ this.error = error;
}
@XmlElement
private int exitCode;
@XmlElement
- private String stdout;
+ private String output;
@XmlElement
- private String stderr;
+ private String error;
public int getExitCode() {
return exitCode;
}
- public String getStdOut() {
- return this.stdout;
+ public String getOutput() {
+ return this.output;
}
- public String getStdErr() {
- return this.stderr;
+ public String getError() {
+ return this.error;
}
public void setExitCode(int exitCode) {
this.exitCode = exitCode;
}
- public void setStdOut(String stdout) {
- this.stdout = stdout;
+ public void setOutput(String output) {
+ this.output = output;
}
- public void setStdErr(String stderr) {
- this.stderr = stderr;
+ public void setError(String error) {
+ this.error = error;
}
}
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/NodeState.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/NodeState.java?rev=1227503&r1=1227502&r2=1227503&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/NodeState.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/entities/NodeState.java Thu Jan 5 06:38:11 2012
@@ -165,11 +165,17 @@ public class NodeState {
return;
}
for (CommandResult r : results) {
- if (r.getStdErr() != null) {
- this.failedCommandStderrs.add(r.getStdErr());
+ if (r.getError() != null) {
+ if (this.failedCommandStderrs == null) {
+ this.failedCommandStderrs = new ArrayList<String>();
+ }
+ this.failedCommandStderrs.add(r.getError());
}
- if (r.getStdOut() != null) {
- this.failedCommandStdouts.add(r.getStdOut());
+ if (r.getOutput() != null) {
+ if (this.failedCommandStdouts == null) {
+ this.failedCommandStdouts = new ArrayList<String>();
+ }
+ this.failedCommandStdouts.add(r.getOutput());
}
}
}
Modified: incubator/ambari/trunk/controller/src/test/java/org/apache/ambari/controller/TestHeartbeat.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/test/java/org/apache/ambari/controller/TestHeartbeat.java?rev=1227503&r1=1227502&r2=1227503&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/test/java/org/apache/ambari/controller/TestHeartbeat.java (original)
+++ incubator/ambari/trunk/controller/src/test/java/org/apache/ambari/controller/TestHeartbeat.java Thu Jan 5 06:38:11 2012
@@ -347,7 +347,7 @@ public class TestHeartbeat {
CommandResult failedCommandResult = new CommandResult();
final String stdout = "FAILED_COMMAND_STDOUT";
failedCommandResult.setExitCode(1);
- failedCommandResult.setStdOut(stdout);
+ failedCommandResult.setOutput(stdout);
CommandResult successCommandResult = new CommandResult();
successCommandResult.setExitCode(0);
@@ -365,7 +365,7 @@ public class TestHeartbeat {
List<CommandResult> results = (List<CommandResult>)obj;
for (CommandResult result : results) {
if (result.getExitCode() == 1) {
- if (result.getStdOut().equals(stdout)) {
+ if (result.getOutput().equals(stdout)) {
//found the match!
mUnhealthy.stdoutMatched = true;
}