Skip to content
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

Jump to bottom

Refactor statusapiv1 to trait and implement for ease of creation of these objects when we implement our own parser #248

Merged
merged 9 commits into from
May 23, 2017
Merged

Refactor statusapiv1 to trait and implement for ease of creation of these objects when we implement our own parser #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d70cc6e
Merge remote-tracking branch 'linkedin/master'
Apr 14, 2017
b6cbbe4
Fix Spark Metrics Aggregator to handle dynamic allocation. Now execut…
May 3, 2017
e7c6d09
Merge remote-tracking branch 'linkedin/master' into spark-fsfetcher-r…
May 9, 2017
9d550f4
Change formula to calculate the used and wasted metrics to handle dyn…
May 9, 2017
81f2b28
fix build errors from the merge
May 9, 2017
9b74189
refactor statusapiv1 to trait and implement for ease of creation of t…
May 15, 2017
fcd99a9
Revert "Change formula to calculate the used and wasted metrics to ha…
May 15, 2017
9a0983d
fix build errors from revert
May 15, 2017
713ca37
fix build error
May 16, 2017
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
17 changes: 9 additions & 8 deletions app/com/linkedin/drelephant/spark/fetchers/SparkRestClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import com.fasterxml.jackson.module.scala.DefaultScalaModule
import com.fasterxml.jackson.module.scala.experimental.ScalaObjectMapper
import com.linkedin.drelephant.spark.data.{SparkApplicationData, SparkLogDerivedData, SparkRestDerivedData}
import com.linkedin.drelephant.spark.fetchers.statusapiv1.{ApplicationInfo, ExecutorSummary, JobData, StageData}
import com.linkedin.drelephant.spark.fetchers.statusapiv1.{ApplicationInfoImpl, ExecutorSummaryImpl, JobDataImpl, StageDataImpl}
import com.linkedin.drelephant.util.SparkUtils
import javax.ws.rs.client.{Client, ClientBuilder, WebTarget}
import javax.ws.rs.core.MediaType
Expand Down Expand Up @@ -125,9 +126,9 @@ class SparkRestClient(sparkConf: SparkConf) {
(applicationInfo, attemptTarget)
}

private def getApplicationInfo(appTarget: WebTarget): ApplicationInfo = {
private def getApplicationInfo(appTarget: WebTarget): ApplicationInfoImpl = {
try {
get(appTarget, SparkRestObjectMapper.readValue[ApplicationInfo])
get(appTarget, SparkRestObjectMapper.readValue[ApplicationInfoImpl])
} catch {
case NonFatal(e) => {
logger.error(s"error reading applicationInfo ${appTarget.getUri}", e)
Expand Down Expand Up @@ -177,10 +178,10 @@ class SparkRestClient(sparkConf: SparkConf) {
}
}

private def getJobDatas(attemptTarget: WebTarget): Seq[JobData] = {
private def getJobDatas(attemptTarget: WebTarget): Seq[JobDataImpl] = {
val target = attemptTarget.path("jobs")
try {
get(target, SparkRestObjectMapper.readValue[Seq[JobData]])
get(target, SparkRestObjectMapper.readValue[Seq[JobDataImpl]])
} catch {
case NonFatal(e) => {
logger.error(s"error reading jobData ${target.getUri}", e)
Expand All @@ -189,10 +190,10 @@ class SparkRestClient(sparkConf: SparkConf) {
}
}

private def getStageDatas(attemptTarget: WebTarget): Seq[StageData] = {
private def getStageDatas(attemptTarget: WebTarget): Seq[StageDataImpl] = {
val target = attemptTarget.path("stages")
try {
get(target, SparkRestObjectMapper.readValue[Seq[StageData]])
get(target, SparkRestObjectMapper.readValue[Seq[StageDataImpl]])
} catch {
case NonFatal(e) => {
logger.error(s"error reading stageData ${target.getUri}", e)
Expand All @@ -201,10 +202,10 @@ class SparkRestClient(sparkConf: SparkConf) {
}
}

private def getExecutorSummaries(attemptTarget: WebTarget): Seq[ExecutorSummary] = {
private def getExecutorSummaries(attemptTarget: WebTarget): Seq[ExecutorSummaryImpl] = {
val target = attemptTarget.path("executors")
try {
get(target, SparkRestObjectMapper.readValue[Seq[ExecutorSummary]])
get(target, SparkRestObjectMapper.readValue[Seq[ExecutorSummaryImpl]])
} catch {
case NonFatal(e) => {
logger.error(s"error reading executorSummary ${target.getUri}", e)
Expand Down
Loading