Skip to content

[SPARK-31422][CORE] Fix NPE when BlockManagerSource is used after BlockManagerMaster stops #28187

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 2 commits into from
Closed

[SPARK-31422][CORE] Fix NPE when BlockManagerSource is used after BlockManagerMaster stops #28187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
438b78b
[SPARK-31422][CORE] Fix NPE when BlockManagerSource is used after Blo…
dongjoon-hyun Apr 11, 2020
82e46a8
Add JIRA id
dongjoon-hyun Apr 11, 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
2 changes: 2 additions & 0 deletions core/src/main/scala/org/apache/spark/storage/BlockManagerMaster.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,12 @@ class BlockManagerMaster(
* amount of remaining memory.
*/
def getMemoryStatus: Map[BlockManagerId, (Long, Long)] = {
if (driverEndpoint == null) return Map.empty
Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Apr 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Although only getStorageStatus is used, I added the preventive code into getMemoryStatus together.

driverEndpoint.askSync[Map[BlockManagerId, (Long, Long)]](GetMemoryStatus)
}

def getStorageStatus: Array[StorageStatus] = {
if (driverEndpoint == null) return Array.empty
driverEndpoint.askSync[Array[StorageStatus]](GetStorageStatus)
}

Expand Down
35 changes: 35 additions & 0 deletions core/src/test/scala/org/apache/spark/storage/BlockManagerMasterSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.spark.storage

import org.junit.Assert.assertTrue

import org.apache.spark.{SparkConf, SparkFunSuite}

class BlockManagerMasterSuite extends SparkFunSuite {
Copy link
Member

@Ngone51 Ngone51 Apr 11, 2020

Choose a reason for hiding this comment

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

Add tests to BlockManagerSuite should be enough?

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Apr 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

I considered that, but BlockManagerSuite looks misleading to me because this is BlockManagerManger. If there is a more broader suite, it could be a candidate.

Copy link
Member

@Ngone51 Ngone51 Apr 11, 2020

Choose a reason for hiding this comment

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

I actually think it should be ok because we always test BlockManagerMaster together with BlockManager. And there're already some tests which test BlockManagerMaster only, e.g.

  • query locations of blockIds

  • SPARK-30594: Do not post SparkListenerBlockUpdated when updateBlockInfo returns false

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Apr 11, 2020

Choose a reason for hiding this comment

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

Sorry, but I don't think so. In your example, query locations of blockIds is just do mocking instead of testing.

test("query locations of blockIds") {
    val mockBlockManagerMaster = mock(classOf[BlockManagerMaster])

Copy link
Member

@Ngone51 Ngone51 Apr 11, 2020

Choose a reason for hiding this comment

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

Ok, fine.

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Apr 11, 2020

Choose a reason for hiding this comment

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

Also, BlockManagerSuite is already large with 1805 lines. In general, we had better have a proper UT case.


test("SPARK-31422: getMemoryStatus should not fail after BlockManagerMaster stops") {
val bmm = new BlockManagerMaster(null, null, new SparkConf, true)
assertTrue(bmm.getMemoryStatus.isEmpty)
}

test("SPARK-31422: getStorageStatus should not fail after BlockManagerMaster stops") {
val bmm = new BlockManagerMaster(null, null, new SparkConf, true)
assertTrue(bmm.getStorageStatus.isEmpty)
}
}