You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2013/02/26 00:43:33 UTC
svn commit: r1449968 - in /incubator/ambari/trunk: ./
ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/
ambari-server/src/main/python/ ambari-server/src/main/resources/
ambari-server/src/test/resources/
Author: mahadev
Date: Mon Feb 25 23:43:32 2013
New Revision: 1449968
URL: http://svn.apache.org/r1449968
Log:
AMBARI-1495. Out of Memory Issues on Ambari Server when server is running on single core. (mahadev)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java
incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py
incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json
incubator/ambari/trunk/ambari-server/src/test/resources/hdfs_namenode_jmx.json
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1449968&r1=1449967&r2=1449968&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Feb 25 23:43:32 2013
@@ -630,6 +630,9 @@ Trunk (unreleased changes):
AMBARI-1486. Fix TestHostName to take care of issues when gethostname and
getfqdn do not match. (mahadev)
+ AMBARI-1495. Out of Memory Issues on Ambari Server when server is running on
+ single core. (mahadev)
+
AMBARI-1.2.0 branch:
INCOMPATIBLE CHANGES
Modified: incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java?rev=1449968&r1=1449967&r2=1449968&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java (original)
+++ incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java Mon Feb 25 23:43:32 2013
@@ -203,7 +203,7 @@ public class WorkflowJsonService {
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/task")
- public TaskData getTaskSummary(@QueryParam("jobId") String jobId, @QueryParam("width") int steps,
+ public TaskData getTaskSummary(@QueryParam("jobId") String jobId, @QueryParam("width") int steps, @QueryParam("workflowId") String workflowId,
@DefaultValue("-1") @QueryParam("startTime") long minFinishTime, @DefaultValue("-1") @QueryParam("endTime") long maxStartTime) {
TaskData points = new TaskData();
PostgresConnector conn = null;
@@ -222,7 +222,10 @@ public class WorkflowJsonService {
} else {
startTime = minFinishTime;
endTime = maxStartTime;
- taskAttempts = conn.fetchTaskAttempts(minFinishTime, maxStartTime);
+ if (workflowId != null)
+ taskAttempts = conn.fetchWorkflowTaskAttempts(workflowId);
+ else
+ taskAttempts = conn.fetchTaskAttempts(minFinishTime, maxStartTime);
}
if (startTime > 0 && endTime > 0 && endTime >= startTime) {
double submitTimeSecs = startTime / 1000.0;
Modified: incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py?rev=1449968&r1=1449967&r2=1449968&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py (original)
+++ incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py Mon Feb 25 23:43:32 2013
@@ -74,8 +74,9 @@ if ambari_provider_module is not None:
ambari_provider_module + " "
SERVER_START_CMD="{0}" + os.sep + "bin" + os.sep +\
- "java -server -XX:NewRatio=2 "\
+ "java -server -XX:NewRatio=3 "\
"-XX:+UseConcMarkSweepGC " +\
+ "-XX:-UseGCOverheadLimit -XX:CMSInitiatingOccupancyFraction=60" +\
ambari_provider_module_option +\
os.getenv('AMBARI_JVM_ARGS','-Xms512m -Xmx2048m') +\
" -cp {1}"+ os.pathsep + "{2}" +\
@@ -1097,7 +1098,7 @@ def main():
parser.error("No action entered")
action = args[0]
-
+
if action == UPGRADE_STACK_ACTION:
args_number_required = 2
else:
@@ -1239,4 +1240,4 @@ class Properties(object):
if __name__ == "__main__":
- main()
+ main()
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json?rev=1449968&r1=1449967&r2=1449968&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/ganglia_properties.json Mon Feb 25 23:43:32 2013
@@ -19562,4 +19562,4 @@
}
}
}
-}
+}
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-server/src/test/resources/hdfs_namenode_jmx.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/resources/hdfs_namenode_jmx.json?rev=1449968&r1=1449967&r2=1449968&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/resources/hdfs_namenode_jmx.json (original)
+++ incubator/ambari/trunk/ambari-server/src/test/resources/hdfs_namenode_jmx.json Mon Feb 25 23:43:32 2013
@@ -831,4 +831,4 @@
"ImplementationVersion" : "1.6.0_31-b04",
"ImplementationVendor" : "Sun Microsystems"
} ]
-}
+}
\ No newline at end of file