You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by hu...@apache.org on 2016/04/26 11:42:26 UTC
[16/49] incubator-gearpump git commit: GEARPUMP-9,
Clean and fix integration test
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/d092e80f/project/BuildIntegrationTest.scala
----------------------------------------------------------------------
diff --git a/project/BuildIntegrationTest.scala b/project/BuildIntegrationTest.scala
index 17c7a3a..ea95204 100644
--- a/project/BuildIntegrationTest.scala
+++ b/project/BuildIntegrationTest.scala
@@ -26,6 +26,7 @@ object BuildIntegrationTest extends sbt.Build {
"org.pegdown" % "pegdown" % "1.4.2" % "it",
"org.parboiled" % "parboiled-core" % "1.1.7" % "it",
"org.parboiled" % "parboiled-java" % "1.1.7" % "it",
+ "org.mortbay.jetty" % "jetty-util" % "6.1.26" % "it",
"org.ow2.asm" % "asm-all" % "5.0.3" % "it"
)
)
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/d092e80f/project/travis/jvmopts
----------------------------------------------------------------------
diff --git a/project/travis/jvmopts b/project/travis/jvmopts
index 03ff371..595b561 100644
--- a/project/travis/jvmopts
+++ b/project/travis/jvmopts
@@ -3,6 +3,7 @@
-Xmx2048M
-Xss6M
-XX:MaxPermSize=1024M
+-XX:MaxMetaspaceSize=1024m
-XX:ReservedCodeCacheSize=256M
-XX:+CMSPermGenSweepingEnabled
-XX:+CMSClassUnloadingEnabled
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/d092e80f/streaming/src/main/scala/io/gearpump/streaming/appmaster/AppMaster.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/io/gearpump/streaming/appmaster/AppMaster.scala b/streaming/src/main/scala/io/gearpump/streaming/appmaster/AppMaster.scala
index 6fcc47c..a3f2fc5 100644
--- a/streaming/src/main/scala/io/gearpump/streaming/appmaster/AppMaster.scala
+++ b/streaming/src/main/scala/io/gearpump/streaming/appmaster/AppMaster.scala
@@ -199,22 +199,22 @@ class AppMaster(appContext : AppMasterContext, app : AppDescription) extends Ap
}
StreamAppMasterSummary(
- appId,
- app.name,
- processors,
- graph.vertexHierarchyLevelMap(),
- graph.mapEdge {(node1, edge, node2) =>
- edge.partitionerFactory.name
- },
- address,
- clock,
- executors,
+ appId = appId,
+ appName = app.name,
+ actorPath = address,
+ clock = clock,
status = MasterToAppMaster.AppMasterActive,
startTime = startTime,
uptime = System.currentTimeMillis() - startTime,
user = username,
homeDirectory = userDir,
logFile = logFile.getAbsolutePath,
+ processors = processors,
+ processorLevels = graph.vertexHierarchyLevelMap(),
+ dag = graph.mapEdge {(node1, edge, node2) =>
+ edge.partitionerFactory.name
+ },
+ executors = executors,
historyMetricsConfig = getHistoryMetricsConfig
)
}
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/d092e80f/streaming/src/main/scala/io/gearpump/streaming/appmaster/StreamAppMasterSummary.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/io/gearpump/streaming/appmaster/StreamAppMasterSummary.scala b/streaming/src/main/scala/io/gearpump/streaming/appmaster/StreamAppMasterSummary.scala
index c253c85..cdcd3f6 100644
--- a/streaming/src/main/scala/io/gearpump/streaming/appmaster/StreamAppMasterSummary.scala
+++ b/streaming/src/main/scala/io/gearpump/streaming/appmaster/StreamAppMasterSummary.scala
@@ -28,22 +28,22 @@ import io.gearpump.util.Graph
import io.gearpump.util.HistoryMetricsService.HistoryMetricsConfig
case class StreamAppMasterSummary(
+ appType: String = "streaming",
appId: Int,
appName: String = null,
- processors: Map[ProcessorId, ProcessorSummary],
- // hiearachy level for each processor
- processorLevels: Map[ProcessorId, Int],
- dag: Graph[ProcessorId, String] = null,
actorPath: String = null,
- clock: TimeStamp = 0,
- executors: List[ExecutorBrief] = null,
+ clock: TimeStamp = 0L,
status: AppMasterStatus = MasterToAppMaster.AppMasterActive,
startTime: TimeStamp = 0L,
uptime: TimeStamp = 0L,
user: String = null,
- appType: String = "streaming",
homeDirectory: String = "",
logFile: String = "",
+ dag: Graph[ProcessorId, String] = null,
+ executors: List[ExecutorBrief] = null,
+ processors: Map[ProcessorId, ProcessorSummary] = Map.empty[ProcessorId, ProcessorSummary],
+ // hiearachy level for each processor
+ processorLevels: Map[ProcessorId, Int] = Map.empty[ProcessorId, Int],
historyMetricsConfig: HistoryMetricsConfig = null)
extends AppMasterSummary