Skip to content

Commit

Permalink
SAMZA-2683: Bump Scalatra Version (apache#1527)
Browse files Browse the repository at this point in the history
dxichen authored Aug 30, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent a7cb039 commit e3ab00d
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion gradle/dependency-versions-scala-2.11.gradle
Original file line number Diff line number Diff line change
@@ -24,5 +24,5 @@ ext {
// -language:implicitConversions: Allow the use of implicit conversions without warning or library import
// -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import
scalaOptions = ["-feature", "-language:implicitConversions", "-language:reflectiveCalls"]
scalatraVersion = "2.5.0"
scalatraVersion = "2.7.1"
}
2 changes: 1 addition & 1 deletion gradle/dependency-versions-scala-2.12.gradle
Original file line number Diff line number Diff line change
@@ -24,5 +24,5 @@ ext {
// -language:implicitConversions: Allow the use of implicit conversions without warning or library import
// -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import
scalaOptions = ["-feature", "-language:implicitConversions", "-language:reflectiveCalls"]
scalatraVersion = "2.5.0"
scalatraVersion = "2.7.1"
}
12 changes: 6 additions & 6 deletions samza-yarn/src/main/resources/scalate/WEB-INF/views/index.scaml
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@
%th Up Time
%th JMX access
%tbody
- for((processorId, container) <- state.runningProcessors)
- for((processorId, container) <- state.runningProcessors.asScala)
%tr
%td #{processorId.toString}
%td
@@ -147,7 +147,7 @@
%th Exit code
%th Message
%tbody
- for((containerId, containerStatus) <- state.failedContainersStatus)
- for((containerId, containerStatus) <- state.failedContainersStatus.asScala)
%tr
%td
#{containerId}
@@ -176,13 +176,13 @@
%th SystemStreamPartitions
%th Container
%tbody
- for((processorId, container) <- state.runningProcessors)
- for((processorId, container) <- state.runningProcessors.asScala)
- val containerModel = samzaAppState.jobModelManager.jobModel.getContainers.get(processorId)
- for((taskName, taskModel) <- containerModel.getTasks)
- for((taskName, taskModel) <- containerModel.getTasks.asScala)
%tr
%td= processorId
%td= taskName
%td= taskModel.getSystemStreamPartitions.map(_.toString).toList.sorted.mkString(", ")
%td= taskModel.getSystemStreamPartitions.asScala.map(_.toString).toList.sorted.mkString(", ")
%td
%a(target="_blank" href="http://#{container.nodeHttpAddress}/node/containerlogs/#{container.id.toString}/#{username}")= container.id.toString

@@ -197,7 +197,7 @@
%th Key
%th Value
%tbody.searchable
- for(entrySet <- new java.util.TreeMap[String, String](config.asInstanceOf[Map[String, String]]).entrySet)
- for(entrySet <- config.asInstanceOf[Map[String, String]])
%tr
%td.key= entrySet.getKey
%td= entrySet.getValue

0 comments on commit e3ab00d

Please sign in to comment.