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

[SPARK-20642][core] Store FsHistoryProvider listing data in a KVStore. #18887

Closed
wants to merge 14 commits into from
Closed

[SPARK-20642][core] Store FsHistoryProvider listing data in a KVStore. #18887

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
842589d
SHS-NG M2: Store FsHistoryProvider listing data in a KVStore.
Oct 13, 2016
1f08bd7
SHS-NG M2: Re-work LevelDBIterator.finalize().
Aug 8, 2017
1ec1a67
Add private where needed.
Aug 9, 2017
b696f96
Feedback.
Aug 14, 2017
519dab0
Feedback.
Aug 15, 2017
dc642bd
Feedback.
Aug 16, 2017
9020184
More feedback.
Sep 12, 2017
29da234
Cleanup.
Sep 18, 2017
1e534dd
Merge branch 'master' into SPARK-20642
Sep 18, 2017
56b68a0
Add test for CURRENT_LISTING_VERSION.
Sep 18, 2017
6755048
Feedback.
Sep 25, 2017
b2b969c
Merge branch 'master' into SPARK-20642
Sep 25, 2017
cd2172a
Run single test with in-memory store.
Sep 25, 2017
5eff2c5
Get rid of `newProvider`.
Sep 26, 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
33 changes: 24 additions & 9 deletions common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,17 +213,32 @@ public long count(Class<?> type, String index, Object indexedValue) throws Excep

@Override
public void close() throws IOException {
DB _db = this._db.getAndSet(null);
if (_db == null) {
return;
synchronized (this._db) {
DB _db = this._db.getAndSet(null);
if (_db == null) {
return;
}

try {
_db.close();
} catch (IOException ioe) {
throw ioe;
} catch (Exception e) {
throw new IOException(e.getMessage(), e);
}
}
}

try {
_db.close();
} catch (IOException ioe) {
throw ioe;
} catch (Exception e) {
throw new IOException(e.getMessage(), e);
/**
* Closes the given iterator if the DB is still open. Trying to close a JNI LevelDB handle
* with a closed DB can cause JVM crashes, so this ensures that situation does not happen.
*/
void closeIterator(LevelDBIterator it) throws IOException {
synchronized (this._db) {
DB _db = this._db.get();
if (_db != null) {
it.close();
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,16 @@ public synchronized void close() throws IOException {
}
}

/**
* Because it's tricky to expose closeable iterators through many internal APIs, especially
* when Scala wrappers are used, this makes sure that, hopefully, the JNI resources held by
* the iterator will eventually be released.
*/
@Override
protected void finalize() throws Throwable {
db.closeIterator(this);
}

private byte[] loadNext() {
if (count >= max) {
return null;
Expand Down
5 changes: 5 additions & 0 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
<artifactId>spark-launcher_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-kvstore_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-network-common_${scala.binary.version}</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions core/src/main/scala/org/apache/spark/deploy/history/ApplicationHistoryProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ private[history] case class LoadedAppUI(

private[history] abstract class ApplicationHistoryProvider {

/**
* The number of applications available for listing. Separate method in case it's cheaper
* to get a count than to calculate the whole listing.
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure I follow this reasoning, if the previous way of getting count was getListing().size then how does making a function of it speed it up? I don't mind adding a helping function like this, I just don't follow the reasoning of your comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is an interface, so this was added to allow implementations to override this method if that makes sense.

It just looks like I lost the override in one of my rebases, so let me add that back.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually it doesn't seem like this is used anymore and I can remove it...

*
* @return The number of available applications.
*/
def getAppCount(): Int = getListing().size

/**
* Returns the count of application event logs that the provider is currently still processing.
* History Server UI can use this to indicate to a user that the application listing on the UI
Expand Down
Loading