Skip to content

[SPARK-31235][TESTS][FOLLOWUP][test-maven][test-hadoop3.2] Fix Hadoop-3.2 profile UT failure #28550

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

Closed
dongjoon-hyun wants to merge 4 commits into from
Closed

[SPARK-31235][TESTS][FOLLOWUP][test-maven][test-hadoop3.2] Fix Hadoop-3.2 profile UT failure #28550

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e030e1
[SPARK-31235][TESTS][FOLLOWUP][TEST-HADOOP3.2] Fix Hadoop-3.2 profile…
dongjoon-hyun May 16, 2020
8b74398
Remove
dongjoon-hyun May 16, 2020
23a6a41
Revert "Remove"
dongjoon-hyun May 16, 2020
5533177
Add stop
dongjoon-hyun May 16, 2020
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
6 changes: 4 additions & 2 deletions resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/ClientSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.{ClientRMService, RMAppMana
import org.apache.hadoop.yarn.server.resourcemanager.ahs.RMApplicationHistoryWriter
import org.apache.hadoop.yarn.server.resourcemanager.metrics.SystemMetricsPublisher
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler
import org.apache.hadoop.yarn.server.security.ApplicationACLsManager
import org.apache.hadoop.yarn.util.Records
import org.mockito.ArgumentMatchers.{any, anyBoolean, anyShort, eq => meq}
Expand Down Expand Up @@ -245,7 +246,7 @@ class ClientSuite extends SparkFunSuite with Matchers {
request.setApplicationSubmissionContext(subContext)

val rmContext = mock(classOf[RMContext])
val conf = mock(classOf[Configuration])
val conf = new Configuration(false)
val map = new ConcurrentHashMap[ApplicationId, RMApp]()
when(rmContext.getRMApps).thenReturn(map)
val dispatcher = mock(classOf[Dispatcher])
Expand All @@ -262,7 +263,7 @@ class ClientSuite extends SparkFunSuite with Matchers {
when(appContext.getUnmanagedAM).thenReturn(true)

val rmAppManager = new RMAppManager(rmContext,
null,
mock(classOf[YarnScheduler]),
Copy link
Member Author

@dongjoon-hyun dongjoon-hyun May 16, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this, NPE occurs at this.scheduler of Hadoop code.

null,
mock(classOf[ApplicationACLsManager]),
conf)
Expand All @@ -272,6 +273,7 @@ class ClientSuite extends SparkFunSuite with Matchers {
null,
null,
null)
clientRMService.init(conf)
clientRMService.submitApplication(request)

assert(map.get(subContext.getApplicationId).getApplicationType === targetType)
Expand Down