You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2018/12/13 08:42:26 UTC
[GitHub] viirya commented on a change in pull request #23294:
[SPARK-26265][Core][Followup] Put freePage into a finally block
viirya commented on a change in pull request #23294: [SPARK-26265][Core][Followup] Put freePage into a finally block
URL: https://github.com/apache/spark/pull/23294#discussion_r241311302
##########
File path: core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
##########
@@ -262,36 +262,39 @@ private void advanceToNextPage() {
// reference to the page to free and free it after releasing the lock of `MapIterator`.
MemoryBlock pageToFree = null;
- synchronized (this) {
- int nextIdx = dataPages.indexOf(currentPage) + 1;
- if (destructive && currentPage != null) {
- dataPages.remove(currentPage);
- pageToFree = currentPage;
- nextIdx --;
- }
- if (dataPages.size() > nextIdx) {
- currentPage = dataPages.get(nextIdx);
- pageBaseObject = currentPage.getBaseObject();
- offsetInPage = currentPage.getBaseOffset();
- recordsInPage = UnsafeAlignedOffset.getSize(pageBaseObject, offsetInPage);
- offsetInPage += UnsafeAlignedOffset.getUaoSize();
- } else {
- currentPage = null;
- if (reader != null) {
- handleFailedDelete();
+ try {
+ synchronized (this) {
+ int nextIdx = dataPages.indexOf(currentPage) + 1;
+ if (destructive && currentPage != null) {
+ dataPages.remove(currentPage);
+ pageToFree = currentPage;
+ nextIdx--;
}
- try {
- Closeables.close(reader, /* swallowIOException = */ false);
Review comment:
In the second `try`, it accesses `spillWriters`:
```
reader = spillWriters.getFirst().getReader(serializerManager)
```
The `synchronized` `spill` will change `spillWriters`. Seems to be unsafe if we close the reader and update `reader` like above outside `synchronized`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org