Skip to content

[SPARK-46389][CORE] Manually close the RocksDB/LevelDB instance when checkVersion throw Exception #44327

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
LuciferYang wants to merge 1 commit into from
Closed

[SPARK-46389][CORE] Manually close the RocksDB/LevelDB instance when checkVersion throw Exception #44327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion common/network-common/src/main/java/org/apache/spark/network/util/LevelDBProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,12 @@ public static DB initLevelDB(File dbFile, StoreVersion version, ObjectMapper map
}
}
// if there is a version mismatch, we throw an exception, which means the service is unusable
checkVersion(tmpDb, version, mapper);
try {
checkVersion(tmpDb, version, mapper);
} catch (IOException ioe) {
Copy link
Contributor Author

@LuciferYang LuciferYang Dec 13, 2023

Choose a reason for hiding this comment

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

spark/common/network-common/src/main/java/org/apache/spark/network/util/LevelDBProvider.java

Lines 110 to 111 in 83434af

public static void checkVersion(DB db, StoreVersion newversion, ObjectMapper mapper) throws
IOException {

For LevelDB, it will only throw IOException.

tmpDb.close();
throw ioe;
}
}
return tmpDb;
}
Expand Down
4 changes: 4 additions & 0 deletions common/network-common/src/main/java/org/apache/spark/network/util/RocksDBProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ public static RocksDB initRockDB(File dbFile, StoreVersion version, ObjectMapper
// is unusable
checkVersion(tmpDb, version, mapper);
} catch (RocksDBException e) {
tmpDb.close();
throw new IOException(e.getMessage(), e);
} catch (IOException ioe) {
tmpDb.close();
throw ioe;
Copy link
Contributor Author

@LuciferYang LuciferYang Dec 13, 2023

Choose a reason for hiding this comment

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

spark/common/network-common/src/main/java/org/apache/spark/network/util/RocksDBProvider.java

Lines 151 to 152 in 83434af

public static void checkVersion(RocksDB db, StoreVersion newversion, ObjectMapper mapper) throws
IOException, RocksDBException {

For RocksDB, it may throw either RocksDBException or IOException

}
}
return tmpDb;
Expand Down