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

Fixes Spark REST fetcher for client mode applications #193

Merged
merged 4 commits into from
Feb 7, 2017
Merged

Fixes Spark REST fetcher for client mode applications #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aebe878
Fixes the issue where Spark fetcher fails to fetch client mode applic…
shkhrgpt Jan 23, 2017
0ba8ce1
Removes pattern matching
shkhrgpt Jan 24, 2017
9aa7bd2
Adds unit test
shkhrgpt Jan 30, 2017
f8c9310
Adds unit test
shkhrgpt Jan 30, 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
27 changes: 11 additions & 16 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 @@ -68,22 +68,17 @@ class SparkRestClient(sparkConf: SparkConf) {

// Limit scope of async.
async {
val lastAttemptId = applicationInfo.attempts.maxBy { _.startTime }.attemptId
lastAttemptId match {
case Some(attemptId) => {
val attemptTarget = appTarget.path(attemptId)
val futureJobDatas = async { getJobDatas(attemptTarget) }
val futureStageDatas = async { getStageDatas(attemptTarget) }
val futureExecutorSummaries = async { getExecutorSummaries(attemptTarget) }
SparkRestDerivedData(
applicationInfo,
await(futureJobDatas),
await(futureStageDatas),
await(futureExecutorSummaries)
)
}
case None => throw new IllegalArgumentException("Spark REST API has no attempt information")
}
val lastAttemptId = applicationInfo.attempts.maxBy {_.startTime}.attemptId
val attemptTarget = lastAttemptId.map(appTarget.path).getOrElse(appTarget)
val futureJobDatas = async { getJobDatas(attemptTarget) }
val futureStageDatas = async { getStageDatas(attemptTarget) }
val futureExecutorSummaries = async { getExecutorSummaries(attemptTarget) }
SparkRestDerivedData(
applicationInfo,
await(futureJobDatas),
await(futureStageDatas),
await(futureExecutorSummaries)
)
}
}

Expand Down
113 changes: 103 additions & 10 deletions test/com/linkedin/drelephant/spark/fetchers/SparkRestClientTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ class SparkRestClientTest extends AsyncFunSpec with Matchers {
an[IllegalArgumentException] should be thrownBy(new SparkRestClient(new SparkConf()))
}

it("returns the desired data from the Spark REST API") {
it("returns the desired data from the Spark REST API for cluster mode application") {
import ExecutionContext.Implicits.global
val fakeJerseyServer = new FakeJerseyServer() {
override def configure(): Application = super.configure() match {
case resourceConfig: ResourceConfig =>
resourceConfig
.register(classOf[FetchDataFixtures.ApiResource])
.register(classOf[FetchDataFixtures.ApplicationResource])
.register(classOf[FetchDataFixtures.JobsResource])
.register(classOf[FetchDataFixtures.StagesResource])
.register(classOf[FetchDataFixtures.ExecutorsResource])
.register(classOf[FetchClusterModeDataFixtures.ApiResource])
.register(classOf[FetchClusterModeDataFixtures.ApplicationResource])
.register(classOf[FetchClusterModeDataFixtures.JobsResource])
.register(classOf[FetchClusterModeDataFixtures.StagesResource])
.register(classOf[FetchClusterModeDataFixtures.ExecutorsResource])
case config => config
}
}
Expand All @@ -67,9 +67,9 @@ class SparkRestClientTest extends AsyncFunSpec with Matchers {
val sparkConf = new SparkConf().set("spark.yarn.historyServer.address", s"${historyServerUri.getHost}:${historyServerUri.getPort}")
val sparkRestClient = new SparkRestClient(sparkConf)

sparkRestClient.fetchData(FetchDataFixtures.APP_ID) map { restDerivedData =>
restDerivedData.applicationInfo.id should be(FetchDataFixtures.APP_ID)
restDerivedData.applicationInfo.name should be(FetchDataFixtures.APP_NAME)
sparkRestClient.fetchData(FetchClusterModeDataFixtures.APP_ID) map { restDerivedData =>
restDerivedData.applicationInfo.id should be(FetchClusterModeDataFixtures.APP_ID)
restDerivedData.applicationInfo.name should be(FetchClusterModeDataFixtures.APP_NAME)
restDerivedData.jobDatas should not be(None)
restDerivedData.stageDatas should not be(None)
restDerivedData.executorSummaries should not be(None)
Expand All @@ -78,6 +78,40 @@ class SparkRestClientTest extends AsyncFunSpec with Matchers {
assertion
}
}

it("returns the desired data from the Spark REST API for client mode application") {
import ExecutionContext.Implicits.global
val fakeJerseyServer = new FakeJerseyServer() {
override def configure(): Application = super.configure() match {
case resourceConfig: ResourceConfig =>
resourceConfig
.register(classOf[FetchClientModeDataFixtures.ApiResource])
.register(classOf[FetchClientModeDataFixtures.ApplicationResource])
.register(classOf[FetchClientModeDataFixtures.JobsResource])
.register(classOf[FetchClientModeDataFixtures.StagesResource])
.register(classOf[FetchClientModeDataFixtures.ExecutorsResource])
case config => config
}
}

fakeJerseyServer.setUp()

val historyServerUri = fakeJerseyServer.target.getUri

val sparkConf = new SparkConf().set("spark.yarn.historyServer.address", s"${historyServerUri.getHost}:${historyServerUri.getPort}")
val sparkRestClient = new SparkRestClient(sparkConf)

sparkRestClient.fetchData(FetchClusterModeDataFixtures.APP_ID) map { restDerivedData =>
restDerivedData.applicationInfo.id should be(FetchClusterModeDataFixtures.APP_ID)
restDerivedData.applicationInfo.name should be(FetchClusterModeDataFixtures.APP_NAME)
restDerivedData.jobDatas should not be(None)
restDerivedData.stageDatas should not be(None)
restDerivedData.executorSummaries should not be(None)
} andThen { case assertion: Try[Assertion] =>
fakeJerseyServer.tearDown()
assertion
}
}
}
}

Expand Down Expand Up @@ -115,7 +149,7 @@ object SparkRestClientTest {
override def getContext(cls: Class[_]): ObjectMapper = objectMapper
}

object FetchDataFixtures {
object FetchClusterModeDataFixtures {
val APP_ID = "application_1"
val APP_NAME = "app"

Expand Down Expand Up @@ -174,6 +208,65 @@ object SparkRestClientTest {
}
}

object FetchClientModeDataFixtures {
val APP_ID = "application_1"
val APP_NAME = "app"

@Path("/api/v1")
class ApiResource {
@Path("applications/{appId}")
def getApplication(): ApplicationResource = new ApplicationResource()

@Path("applications/{appId}/jobs")
def getJobs(): JobsResource = new JobsResource()

@Path("applications/{appId}/stages")
def getStages(): StagesResource = new StagesResource()

@Path("applications/{appId}/executors")
def getExecutors(): ExecutorsResource = new ExecutorsResource()
}

@Produces(Array(MediaType.APPLICATION_JSON))
class ApplicationResource {
@GET
def getApplication(@PathParam("appId") appId: String): ApplicationInfo = {
val t2 = System.currentTimeMillis
val t1 = t2 - 1
val duration = 8000000L
new ApplicationInfo(
APP_ID,
APP_NAME,
Seq(
newFakeApplicationAttemptInfo(None, startTime = new Date(t2 - duration), endTime = new Date(t2)),
newFakeApplicationAttemptInfo(None, startTime = new Date(t1 - duration), endTime = new Date(t1))
)
)
}
}

@Produces(Array(MediaType.APPLICATION_JSON))
class JobsResource {
@GET
def getJobs(@PathParam("appId") appId: String): Seq[JobData] =
Seq.empty
}

@Produces(Array(MediaType.APPLICATION_JSON))
class StagesResource {
@GET
def getStages(@PathParam("appId") appId: String): Seq[StageData] =
Seq.empty
}

@Produces(Array(MediaType.APPLICATION_JSON))
class ExecutorsResource {
@GET
def getExecutors(@PathParam("appId") appId: String): Seq[ExecutorSummary] =
Seq.empty
}
}

def newFakeApplicationAttemptInfo(
attemptId: Option[String],
startTime: Date,
Expand Down