GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed#33744

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
zhztheplayer wants to merge 3 commits into from
Closed

GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed #33744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcc5c1f
GH-33743: [Java] Release outstanding buffers when BaseAllocator is be…
zhztheplayer Jan 18, 2023
8b99605
style
zhztheplayer Jan 18, 2023
beea317
fixup
zhztheplayer Jan 18, 2023
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
80 changes: 72 additions & 8 deletions java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,12 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
private final BaseAllocator parentAllocator;
private final Map<BaseAllocator, Object> childAllocators;
private final ArrowBuf empty;

// linked list to hold references to alive ledgers
private BufferLedger tail = null;

private final Object REF_LOCK = new Object();

// members used purely for debugging
private final IdentityHashMap<BufferLedger, Object> childLedgers;
private final IdentityHashMap<Reservation, Object> reservations;
Expand DownExpand Up@@ -177,13 +183,50 @@ public ArrowBuf getEmpty() {
return empty;
}

private void appendToRefList(BufferLedger ledger) {
synchronized (REF_LOCK) {
if (ledger.next != null || ledger.prev != null) {
throw new IllegalStateException("already linked");
}
if (tail == null) {
tail = ledger;
return;
}
tail.next = ledger;
ledger.prev = tail;
tail = ledger;
}
}

private void removeFromRefList(BufferLedger ledger) {
synchronized (REF_LOCK) {
if (ledger.next == ledger) {
return;
}
if (ledger.prev == ledger) {
throw new IllegalStateException();
}
if (ledger == tail) {
tail = ledger.prev;
}
if (ledger.prev != null) {
ledger.prev.next = ledger.next;
}
if (ledger.next != null) {
ledger.next.prev = ledger.prev;
}
ledger.prev = ledger;
ledger.next = ledger;
}
}

/**
* For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
* we have a new ledger
* Allows an AllocationManager to tell the allocator that we have a new ledger
* associated with this allocator.
*/
void associateLedger(BufferLedger ledger) {
assertOpen();
appendToRefList(ledger);
if (DEBUG) {
synchronized (DEBUG_LOCK) {
childLedgers.put(ledger, null);
Expand All@@ -192,12 +235,12 @@ void associateLedger(BufferLedger ledger) {
}

/**
* For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
* we are removing a
* ledger associated with this allocator
* Allows an AllocationManager to tell the allocator that we are removing a
* ledger associated with this allocator.
*/
void dissociateLedger(BufferLedger ledger) {
assertOpen();
removeFromRefList(ledger);
if (DEBUG) {
synchronized (DEBUG_LOCK) {
if (!childLedgers.containsKey(ledger)) {
Expand DownExpand Up@@ -376,8 +419,6 @@ public synchronized void close() {
return;
}

isClosed = true;

StringBuilder outstandingChildAllocators = new StringBuilder();
if (DEBUG) {
synchronized (DEBUG_LOCK) {
Expand All@@ -401,7 +442,7 @@ public synchronized void close() {
// are there outstanding buffers?
final int allocatedCount = childLedgers.size();
if (allocatedCount > 0) {
throw new IllegalStateException(
logger.error(
String.format("Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
name, allocatedCount, toString()));
}
Expand DownExpand Up@@ -434,12 +475,35 @@ public synchronized void close() {
String msg = String.format("Memory was leaked by query. Memory leaked: (%d)\n%s%s", allocated,
outstandingChildAllocators.toString(), toString());
logger.error(msg);
}

// Release outstanding buffers
synchronized (REF_LOCK) {
int releasedLedgerCount = 0;
while (tail != null) {
final BufferLedger tmp = tail.prev;
tail.destroy();
tail = tmp;
releasedLedgerCount++;
}
if (releasedLedgerCount != 0) {
String msg = String.format("Released %d outstanding buffer ledgers.", releasedLedgerCount);
logger.warn(msg);
}
}

final long remaining = getAllocatedMemory();
if (remaining > 0) {
String msg = String.format("Memory is still leaked after final clean-up: (%d)\n%s%s", remaining,
outstandingChildAllocators.toString(), toString());
throw new IllegalStateException(msg);
}

// we need to release our memory to our parent before we tell it we've closed.
super.close();

isClosed = true;

// Inform our parent allocator that we've closed
if (parentAllocator != null) {
parentAllocator.childClosed(this);
Expand Down
16 changes: 16 additions & 0 deletions java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@ public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, Refe
private final HistoricalLog historicalLog =
BaseAllocator.DEBUG ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH,
"BufferLedger[%d]", 1) : null;

BufferLedger prev = null;

BufferLedger next = null;

private volatile long lDestructionTime = 0;

BufferLedger(final BufferAllocator allocator, final AllocationManager allocationManager) {
Expand DownExpand Up@@ -131,6 +136,17 @@ public boolean release(int decrement) {
return refCnt == 0;
}

/**
* Forcibly release the buffer ledger by setting reference count
* to zero. Used by BaseAllocator to reclaim outstanding buffers
* when being closed.
*/
void destroy() {
synchronized (allocationManager) {
release(bufRefCnt.get());
}
}

/**
* Decrement the ledger's reference count for the associated underlying
* memory chunk. If the reference count drops to 0, it implies that
Expand Down
15 changes: 14 additions & 1 deletion java/memory/memory-netty/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ public void test_privateMax() throws Exception {
}
}

@Test(expected = IllegalStateException.class)
@Test()
public void testRootAllocator_closeWithOutstanding() throws Exception {
try {
try (final RootAllocator rootAllocator =
Expand All@@ -110,6 +110,19 @@ public void testRootAllocator_closeWithOutstanding() throws Exception {
}
}

@Test()
public void testRootAllocator_closeChildWithOutstanding() throws Exception {
try (final RootAllocator parent =
new RootAllocator(MAX_ALLOCATION)) {
final ArrowBuf parentBuf = parent.buffer(512);
assertNotNull("allocation failed", parentBuf);
try (BufferAllocator child1 = parent.newChildAllocator("child1", 0L, MAX_ALLOCATION)) {
final ArrowBuf childBuf = child1.buffer(512);
assertNotNull("allocation failed", childBuf);
}
}
}

@Test
public void testRootAllocator_getEmpty() throws Exception {
try (final RootAllocator rootAllocator =
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed#33744

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

zhztheplayer
wants to merge
3
commits into

from

 Closed


GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed
#33744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
dcc5c1f

GH-33743: [Java] Release outstanding buffers when BaseAllocator is be…


zhztheplayer Jan 18, 2023
8b99605

style


zhztheplayer Jan 18, 2023
beea317

fixup


zhztheplayer Jan 18, 2023

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


80 changes: 72 additions & 8 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,12 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
 private final BaseAllocator parentAllocator;
 private final Map<BaseAllocator, Object> childAllocators;
 private final ArrowBuf empty;

 // linked list to hold references to alive ledgers
 private BufferLedger tail = null;

 private final Object REF_LOCK = new Object();

 // members used purely for debugging
 private final IdentityHashMap<BufferLedger, Object> childLedgers;
 private final IdentityHashMap<Reservation, Object> reservations;
Expand DownExpand Up@@ -177,13 +183,50 @@ public ArrowBuf getEmpty() {
 return empty;
 }

 private void appendToRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next != null || ledger.prev != null) {
 throw new IllegalStateException("already linked");
 }
 if (tail == null) {
 tail = ledger;
 return;
 }
 tail.next = ledger;
 ledger.prev = tail;
 tail = ledger;
 }
 }

 private void removeFromRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next == ledger) {
 return;
 }
 if (ledger.prev == ledger) {
 throw new IllegalStateException();
 }
 if (ledger == tail) {
 tail = ledger.prev;
 }
 if (ledger.prev != null) {
 ledger.prev.next = ledger.next;
 }
 if (ledger.next != null) {
 ledger.next.prev = ledger.prev;
 }
 ledger.prev = ledger;
 ledger.next = ledger;
 }
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we have a new ledger
 * Allows an AllocationManager to tell the allocator that we have a new ledger
 * associated with this allocator.
 */
 void associateLedger(BufferLedger ledger) {
 assertOpen();
 appendToRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 childLedgers.put(ledger, null);
Expand All@@ -192,12 +235,12 @@ void associateLedger(BufferLedger ledger) {
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we are removing a
 * ledger associated with this allocator
 * Allows an AllocationManager to tell the allocator that we are removing a
 * ledger associated with this allocator.
 */
 void dissociateLedger(BufferLedger ledger) {
 assertOpen();
 removeFromRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 if (!childLedgers.containsKey(ledger)) {
Expand DownExpand Up@@ -376,8 +419,6 @@ public synchronized void close() {
 return;
 }

 isClosed = true;

 StringBuilder outstandingChildAllocators = new StringBuilder();
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
Expand All@@ -401,7 +442,7 @@ public synchronized void close() {
 // are there outstanding buffers?
 final int allocatedCount = childLedgers.size();
 if (allocatedCount > 0) {
throw new IllegalStateException(
logger.error(
 String.format("Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
 name, allocatedCount, toString()));
 }
Expand DownExpand Up@@ -434,12 +475,35 @@ public synchronized void close() {
 String msg = String.format("Memory was leaked by query. Memory leaked: (%d)\n%s%s", allocated,
 outstandingChildAllocators.toString(), toString());
 logger.error(msg);
 }

 // Release outstanding buffers
 synchronized (REF_LOCK) {
 int releasedLedgerCount = 0;
 while (tail != null) {
 final BufferLedger tmp = tail.prev;
 tail.destroy();
 tail = tmp;
 releasedLedgerCount++;
 }
 if (releasedLedgerCount != 0) {
 String msg = String.format("Released %d outstanding buffer ledgers.", releasedLedgerCount);
 logger.warn(msg);
 }
 }

 final long remaining = getAllocatedMemory();
 if (remaining > 0) {
 String msg = String.format("Memory is still leaked after final clean-up: (%d)\n%s%s", remaining,
 outstandingChildAllocators.toString(), toString());
 throw new IllegalStateException(msg);
 }

 // we need to release our memory to our parent before we tell it we've closed.
 super.close();

 isClosed = true;

 // Inform our parent allocator that we've closed
 if (parentAllocator != null) {
 parentAllocator.childClosed(this);
Expand Down

16 changes: 16 additions & 0 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@ public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, Refe
 private final HistoricalLog historicalLog =
 BaseAllocator.DEBUG ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH,
 "BufferLedger[%d]", 1) : null;

 BufferLedger prev = null;

 BufferLedger next = null;

 private volatile long lDestructionTime = 0;

 BufferLedger(final BufferAllocator allocator, final AllocationManager allocationManager) {
Expand DownExpand Up@@ -131,6 +136,17 @@ public boolean release(int decrement) {
 return refCnt == 0;
 }

 /**
 * Forcibly release the buffer ledger by setting reference count
 * to zero. Used by BaseAllocator to reclaim outstanding buffers
 * when being closed.
 */
 void destroy() {
 synchronized (allocationManager) {
 release(bufRefCnt.get());
 }
 }

 /**
 * Decrement the ledger's reference count for the associated underlying
 * memory chunk. If the reference count drops to 0, it implies that
Expand Down

15 changes: 14 additions & 1 deletion
java/memory/memory-netty/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ public void test_privateMax() throws Exception {
 }
 }

 @Test(expected = IllegalStateException.class)
 @Test()
 public void testRootAllocator_closeWithOutstanding() throws Exception {
 try {
 try (final RootAllocator rootAllocator =
Expand All@@ -110,6 +110,19 @@ public void testRootAllocator_closeWithOutstanding() throws Exception {
 }
 }

 @Test()
 public void testRootAllocator_closeChildWithOutstanding() throws Exception {
 try (final RootAllocator parent =
 new RootAllocator(MAX_ALLOCATION)) {
 final ArrowBuf parentBuf = parent.buffer(512);
 assertNotNull("allocation failed", parentBuf);
 try (BufferAllocator child1 = parent.newChildAllocator("child1", 0L, MAX_ALLOCATION)) {
 final ArrowBuf childBuf = child1.buffer(512);
 assertNotNull("allocation failed", childBuf);
 }
 }
 }

 @Test
 public void testRootAllocator_getEmpty() throws Exception {
 try (final RootAllocator rootAllocator =
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed#33744

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

zhztheplayer
wants to merge
3
commits into

from

 Closed


GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed
#33744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
dcc5c1f

GH-33743: [Java] Release outstanding buffers when BaseAllocator is be…


zhztheplayer Jan 18, 2023
8b99605

style


zhztheplayer Jan 18, 2023
beea317

fixup


zhztheplayer Jan 18, 2023

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


80 changes: 72 additions & 8 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,12 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
 private final BaseAllocator parentAllocator;
 private final Map<BaseAllocator, Object> childAllocators;
 private final ArrowBuf empty;

 // linked list to hold references to alive ledgers
 private BufferLedger tail = null;

 private final Object REF_LOCK = new Object();

 // members used purely for debugging
 private final IdentityHashMap<BufferLedger, Object> childLedgers;
 private final IdentityHashMap<Reservation, Object> reservations;
Expand DownExpand Up@@ -177,13 +183,50 @@ public ArrowBuf getEmpty() {
 return empty;
 }

 private void appendToRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next != null || ledger.prev != null) {
 throw new IllegalStateException("already linked");
 }
 if (tail == null) {
 tail = ledger;
 return;
 }
 tail.next = ledger;
 ledger.prev = tail;
 tail = ledger;
 }
 }

 private void removeFromRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next == ledger) {
 return;
 }
 if (ledger.prev == ledger) {
 throw new IllegalStateException();
 }
 if (ledger == tail) {
 tail = ledger.prev;
 }
 if (ledger.prev != null) {
 ledger.prev.next = ledger.next;
 }
 if (ledger.next != null) {
 ledger.next.prev = ledger.prev;
 }
 ledger.prev = ledger;
 ledger.next = ledger;
 }
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we have a new ledger
 * Allows an AllocationManager to tell the allocator that we have a new ledger
 * associated with this allocator.
 */
 void associateLedger(BufferLedger ledger) {
 assertOpen();
 appendToRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 childLedgers.put(ledger, null);
Expand All@@ -192,12 +235,12 @@ void associateLedger(BufferLedger ledger) {
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we are removing a
 * ledger associated with this allocator
 * Allows an AllocationManager to tell the allocator that we are removing a
 * ledger associated with this allocator.
 */
 void dissociateLedger(BufferLedger ledger) {
 assertOpen();
 removeFromRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 if (!childLedgers.containsKey(ledger)) {
Expand DownExpand Up@@ -376,8 +419,6 @@ public synchronized void close() {
 return;
 }

 isClosed = true;

 StringBuilder outstandingChildAllocators = new StringBuilder();
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
Expand All@@ -401,7 +442,7 @@ public synchronized void close() {
 // are there outstanding buffers?
 final int allocatedCount = childLedgers.size();
 if (allocatedCount > 0) {
throw new IllegalStateException(
logger.error(
 String.format("Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
 name, allocatedCount, toString()));
 }
Expand DownExpand Up@@ -434,12 +475,35 @@ public synchronized void close() {
 String msg = String.format("Memory was leaked by query. Memory leaked: (%d)\n%s%s", allocated,
 outstandingChildAllocators.toString(), toString());
 logger.error(msg);
 }

 // Release outstanding buffers
 synchronized (REF_LOCK) {
 int releasedLedgerCount = 0;
 while (tail != null) {
 final BufferLedger tmp = tail.prev;
 tail.destroy();
 tail = tmp;
 releasedLedgerCount++;
 }
 if (releasedLedgerCount != 0) {
 String msg = String.format("Released %d outstanding buffer ledgers.", releasedLedgerCount);
 logger.warn(msg);
 }
 }

 final long remaining = getAllocatedMemory();
 if (remaining > 0) {
 String msg = String.format("Memory is still leaked after final clean-up: (%d)\n%s%s", remaining,
 outstandingChildAllocators.toString(), toString());
 throw new IllegalStateException(msg);
 }

 // we need to release our memory to our parent before we tell it we've closed.
 super.close();

 isClosed = true;

 // Inform our parent allocator that we've closed
 if (parentAllocator != null) {
 parentAllocator.childClosed(this);
Expand Down

16 changes: 16 additions & 0 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@ public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, Refe
 private final HistoricalLog historicalLog =
 BaseAllocator.DEBUG ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH,
 "BufferLedger[%d]", 1) : null;

 BufferLedger prev = null;

 BufferLedger next = null;

 private volatile long lDestructionTime = 0;

 BufferLedger(final BufferAllocator allocator, final AllocationManager allocationManager) {
Expand DownExpand Up@@ -131,6 +136,17 @@ public boolean release(int decrement) {
 return refCnt == 0;
 }

 /**
 * Forcibly release the buffer ledger by setting reference count
 * to zero. Used by BaseAllocator to reclaim outstanding buffers
 * when being closed.
 */
 void destroy() {
 synchronized (allocationManager) {
 release(bufRefCnt.get());
 }
 }

 /**
 * Decrement the ledger's reference count for the associated underlying
 * memory chunk. If the reference count drops to 0, it implies that
Expand Down

15 changes: 14 additions & 1 deletion
java/memory/memory-netty/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ public void test_privateMax() throws Exception {
 }
 }

 @Test(expected = IllegalStateException.class)
 @Test()
 public void testRootAllocator_closeWithOutstanding() throws Exception {
 try {
 try (final RootAllocator rootAllocator =
Expand All@@ -110,6 +110,19 @@ public void testRootAllocator_closeWithOutstanding() throws Exception {
 }
 }

 @Test()
 public void testRootAllocator_closeChildWithOutstanding() throws Exception {
 try (final RootAllocator parent =
 new RootAllocator(MAX_ALLOCATION)) {
 final ArrowBuf parentBuf = parent.buffer(512);
 assertNotNull("allocation failed", parentBuf);
 try (BufferAllocator child1 = parent.newChildAllocator("child1", 0L, MAX_ALLOCATION)) {
 final ArrowBuf childBuf = child1.buffer(512);
 assertNotNull("allocation failed", childBuf);
 }
 }
 }

 @Test
 public void testRootAllocator_getEmpty() throws Exception {
 try (final RootAllocator rootAllocator =
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed#33744

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

zhztheplayer
wants to merge
3
commits into

from

 Closed


GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed
#33744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
dcc5c1f

GH-33743: [Java] Release outstanding buffers when BaseAllocator is be…


zhztheplayer Jan 18, 2023
8b99605

style


zhztheplayer Jan 18, 2023
beea317

fixup


zhztheplayer Jan 18, 2023

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


80 changes: 72 additions & 8 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,12 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
 private final BaseAllocator parentAllocator;
 private final Map<BaseAllocator, Object> childAllocators;
 private final ArrowBuf empty;

 // linked list to hold references to alive ledgers
 private BufferLedger tail = null;

 private final Object REF_LOCK = new Object();

 // members used purely for debugging
 private final IdentityHashMap<BufferLedger, Object> childLedgers;
 private final IdentityHashMap<Reservation, Object> reservations;
Expand DownExpand Up@@ -177,13 +183,50 @@ public ArrowBuf getEmpty() {
 return empty;
 }

 private void appendToRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next != null || ledger.prev != null) {
 throw new IllegalStateException("already linked");
 }
 if (tail == null) {
 tail = ledger;
 return;
 }
 tail.next = ledger;
 ledger.prev = tail;
 tail = ledger;
 }
 }

 private void removeFromRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next == ledger) {
 return;
 }
 if (ledger.prev == ledger) {
 throw new IllegalStateException();
 }
 if (ledger == tail) {
 tail = ledger.prev;
 }
 if (ledger.prev != null) {
 ledger.prev.next = ledger.next;
 }
 if (ledger.next != null) {
 ledger.next.prev = ledger.prev;
 }
 ledger.prev = ledger;
 ledger.next = ledger;
 }
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we have a new ledger
 * Allows an AllocationManager to tell the allocator that we have a new ledger
 * associated with this allocator.
 */
 void associateLedger(BufferLedger ledger) {
 assertOpen();
 appendToRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 childLedgers.put(ledger, null);
Expand All@@ -192,12 +235,12 @@ void associateLedger(BufferLedger ledger) {
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we are removing a
 * ledger associated with this allocator
 * Allows an AllocationManager to tell the allocator that we are removing a
 * ledger associated with this allocator.
 */
 void dissociateLedger(BufferLedger ledger) {
 assertOpen();
 removeFromRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 if (!childLedgers.containsKey(ledger)) {
Expand DownExpand Up@@ -376,8 +419,6 @@ public synchronized void close() {
 return;
 }

 isClosed = true;

 StringBuilder outstandingChildAllocators = new StringBuilder();
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
Expand All@@ -401,7 +442,7 @@ public synchronized void close() {
 // are there outstanding buffers?
 final int allocatedCount = childLedgers.size();
 if (allocatedCount > 0) {
throw new IllegalStateException(
logger.error(
 String.format("Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
 name, allocatedCount, toString()));
 }
Expand DownExpand Up@@ -434,12 +475,35 @@ public synchronized void close() {
 String msg = String.format("Memory was leaked by query. Memory leaked: (%d)\n%s%s", allocated,
 outstandingChildAllocators.toString(), toString());
 logger.error(msg);
 }

 // Release outstanding buffers
 synchronized (REF_LOCK) {
 int releasedLedgerCount = 0;
 while (tail != null) {
 final BufferLedger tmp = tail.prev;
 tail.destroy();
 tail = tmp;
 releasedLedgerCount++;
 }
 if (releasedLedgerCount != 0) {
 String msg = String.format("Released %d outstanding buffer ledgers.", releasedLedgerCount);
 logger.warn(msg);
 }
 }

 final long remaining = getAllocatedMemory();
 if (remaining > 0) {
 String msg = String.format("Memory is still leaked after final clean-up: (%d)\n%s%s", remaining,
 outstandingChildAllocators.toString(), toString());
 throw new IllegalStateException(msg);
 }

 // we need to release our memory to our parent before we tell it we've closed.
 super.close();

 isClosed = true;

 // Inform our parent allocator that we've closed
 if (parentAllocator != null) {
 parentAllocator.childClosed(this);
Expand Down

16 changes: 16 additions & 0 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@ public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, Refe
 private final HistoricalLog historicalLog =
 BaseAllocator.DEBUG ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH,
 "BufferLedger[%d]", 1) : null;

 BufferLedger prev = null;

 BufferLedger next = null;

 private volatile long lDestructionTime = 0;

 BufferLedger(final BufferAllocator allocator, final AllocationManager allocationManager) {
Expand DownExpand Up@@ -131,6 +136,17 @@ public boolean release(int decrement) {
 return refCnt == 0;
 }

 /**
 * Forcibly release the buffer ledger by setting reference count
 * to zero. Used by BaseAllocator to reclaim outstanding buffers
 * when being closed.
 */
 void destroy() {
 synchronized (allocationManager) {
 release(bufRefCnt.get());
 }
 }

 /**
 * Decrement the ledger's reference count for the associated underlying
 * memory chunk. If the reference count drops to 0, it implies that
Expand Down

15 changes: 14 additions & 1 deletion
java/memory/memory-netty/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ public void test_privateMax() throws Exception {
 }
 }

 @Test(expected = IllegalStateException.class)
 @Test()
 public void testRootAllocator_closeWithOutstanding() throws Exception {
 try {
 try (final RootAllocator rootAllocator =
Expand All@@ -110,6 +110,19 @@ public void testRootAllocator_closeWithOutstanding() throws Exception {
 }
 }

 @Test()
 public void testRootAllocator_closeChildWithOutstanding() throws Exception {
 try (final RootAllocator parent =
 new RootAllocator(MAX_ALLOCATION)) {
 final ArrowBuf parentBuf = parent.buffer(512);
 assertNotNull("allocation failed", parentBuf);
 try (BufferAllocator child1 = parent.newChildAllocator("child1", 0L, MAX_ALLOCATION)) {
 final ArrowBuf childBuf = child1.buffer(512);
 assertNotNull("allocation failed", childBuf);
 }
 }
 }

 @Test
 public void testRootAllocator_getEmpty() throws Exception {
 try (final RootAllocator rootAllocator =
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed#33744

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

zhztheplayer
wants to merge
3
commits into

from

 Closed


GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed
#33744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
dcc5c1f

GH-33743: [Java] Release outstanding buffers when BaseAllocator is be…


zhztheplayer Jan 18, 2023
8b99605

style


zhztheplayer Jan 18, 2023
beea317

fixup


zhztheplayer Jan 18, 2023

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


80 changes: 72 additions & 8 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,12 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
 private final BaseAllocator parentAllocator;
 private final Map<BaseAllocator, Object> childAllocators;
 private final ArrowBuf empty;

 // linked list to hold references to alive ledgers
 private BufferLedger tail = null;

 private final Object REF_LOCK = new Object();

 // members used purely for debugging
 private final IdentityHashMap<BufferLedger, Object> childLedgers;
 private final IdentityHashMap<Reservation, Object> reservations;
Expand DownExpand Up@@ -177,13 +183,50 @@ public ArrowBuf getEmpty() {
 return empty;
 }

 private void appendToRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next != null || ledger.prev != null) {
 throw new IllegalStateException("already linked");
 }
 if (tail == null) {
 tail = ledger;
 return;
 }
 tail.next = ledger;
 ledger.prev = tail;
 tail = ledger;
 }
 }

 private void removeFromRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next == ledger) {
 return;
 }
 if (ledger.prev == ledger) {
 throw new IllegalStateException();
 }
 if (ledger == tail) {
 tail = ledger.prev;
 }
 if (ledger.prev != null) {
 ledger.prev.next = ledger.next;
 }
 if (ledger.next != null) {
 ledger.next.prev = ledger.prev;
 }
 ledger.prev = ledger;
 ledger.next = ledger;
 }
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we have a new ledger
 * Allows an AllocationManager to tell the allocator that we have a new ledger
 * associated with this allocator.
 */
 void associateLedger(BufferLedger ledger) {
 assertOpen();
 appendToRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 childLedgers.put(ledger, null);
Expand All@@ -192,12 +235,12 @@ void associateLedger(BufferLedger ledger) {
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we are removing a
 * ledger associated with this allocator
 * Allows an AllocationManager to tell the allocator that we are removing a
 * ledger associated with this allocator.
 */
 void dissociateLedger(BufferLedger ledger) {
 assertOpen();
 removeFromRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 if (!childLedgers.containsKey(ledger)) {
Expand DownExpand Up@@ -376,8 +419,6 @@ public synchronized void close() {
 return;
 }

 isClosed = true;

 StringBuilder outstandingChildAllocators = new StringBuilder();
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
Expand All@@ -401,7 +442,7 @@ public synchronized void close() {
 // are there outstanding buffers?
 final int allocatedCount = childLedgers.size();
 if (allocatedCount > 0) {
throw new IllegalStateException(
logger.error(
 String.format("Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
 name, allocatedCount, toString()));
 }
Expand DownExpand Up@@ -434,12 +475,35 @@ public synchronized void close() {
 String msg = String.format("Memory was leaked by query. Memory leaked: (%d)\n%s%s", allocated,
 outstandingChildAllocators.toString(), toString());
 logger.error(msg);
 }

 // Release outstanding buffers
 synchronized (REF_LOCK) {
 int releasedLedgerCount = 0;
 while (tail != null) {
 final BufferLedger tmp = tail.prev;
 tail.destroy();
 tail = tmp;
 releasedLedgerCount++;
 }
 if (releasedLedgerCount != 0) {
 String msg = String.format("Released %d outstanding buffer ledgers.", releasedLedgerCount);
 logger.warn(msg);
 }
 }

 final long remaining = getAllocatedMemory();
 if (remaining > 0) {
 String msg = String.format("Memory is still leaked after final clean-up: (%d)\n%s%s", remaining,
 outstandingChildAllocators.toString(), toString());
 throw new IllegalStateException(msg);
 }

 // we need to release our memory to our parent before we tell it we've closed.
 super.close();

 isClosed = true;

 // Inform our parent allocator that we've closed
 if (parentAllocator != null) {
 parentAllocator.childClosed(this);
Expand Down

16 changes: 16 additions & 0 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@ public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, Refe
 private final HistoricalLog historicalLog =
 BaseAllocator.DEBUG ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH,
 "BufferLedger[%d]", 1) : null;

 BufferLedger prev = null;

 BufferLedger next = null;

 private volatile long lDestructionTime = 0;

 BufferLedger(final BufferAllocator allocator, final AllocationManager allocationManager) {
Expand DownExpand Up@@ -131,6 +136,17 @@ public boolean release(int decrement) {
 return refCnt == 0;
 }

 /**
 * Forcibly release the buffer ledger by setting reference count
 * to zero. Used by BaseAllocator to reclaim outstanding buffers
 * when being closed.
 */
 void destroy() {
 synchronized (allocationManager) {
 release(bufRefCnt.get());
 }
 }

 /**
 * Decrement the ledger's reference count for the associated underlying
 * memory chunk. If the reference count drops to 0, it implies that
Expand Down

15 changes: 14 additions & 1 deletion
java/memory/memory-netty/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ public void test_privateMax() throws Exception {
 }
 }

 @Test(expected = IllegalStateException.class)
 @Test()
 public void testRootAllocator_closeWithOutstanding() throws Exception {
 try {
 try (final RootAllocator rootAllocator =
Expand All@@ -110,6 +110,19 @@ public void testRootAllocator_closeWithOutstanding() throws Exception {
 }
 }

 @Test()
 public void testRootAllocator_closeChildWithOutstanding() throws Exception {
 try (final RootAllocator parent =
 new RootAllocator(MAX_ALLOCATION)) {
 final ArrowBuf parentBuf = parent.buffer(512);
 assertNotNull("allocation failed", parentBuf);
 try (BufferAllocator child1 = parent.newChildAllocator("child1", 0L, MAX_ALLOCATION)) {
 final ArrowBuf childBuf = child1.buffer(512);
 assertNotNull("allocation failed", childBuf);
 }
 }
 }

 @Test
 public void testRootAllocator_getEmpty() throws Exception {
 try (final RootAllocator rootAllocator =
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed#33744

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

zhztheplayer
wants to merge
3
commits into

from

 Closed


GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed
#33744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
dcc5c1f

GH-33743: [Java] Release outstanding buffers when BaseAllocator is be…


zhztheplayer Jan 18, 2023
8b99605

style


zhztheplayer Jan 18, 2023
beea317

fixup


zhztheplayer Jan 18, 2023

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


80 changes: 72 additions & 8 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,12 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
 private final BaseAllocator parentAllocator;
 private final Map<BaseAllocator, Object> childAllocators;
 private final ArrowBuf empty;

 // linked list to hold references to alive ledgers
 private BufferLedger tail = null;

 private final Object REF_LOCK = new Object();

 // members used purely for debugging
 private final IdentityHashMap<BufferLedger, Object> childLedgers;
 private final IdentityHashMap<Reservation, Object> reservations;
Expand DownExpand Up@@ -177,13 +183,50 @@ public ArrowBuf getEmpty() {
 return empty;
 }

 private void appendToRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next != null || ledger.prev != null) {
 throw new IllegalStateException("already linked");
 }
 if (tail == null) {
 tail = ledger;
 return;
 }
 tail.next = ledger;
 ledger.prev = tail;
 tail = ledger;
 }
 }

 private void removeFromRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next == ledger) {
 return;
 }
 if (ledger.prev == ledger) {
 throw new IllegalStateException();
 }
 if (ledger == tail) {
 tail = ledger.prev;
 }
 if (ledger.prev != null) {
 ledger.prev.next = ledger.next;
 }
 if (ledger.next != null) {
 ledger.next.prev = ledger.prev;
 }
 ledger.prev = ledger;
 ledger.next = ledger;
 }
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we have a new ledger
 * Allows an AllocationManager to tell the allocator that we have a new ledger
 * associated with this allocator.
 */
 void associateLedger(BufferLedger ledger) {
 assertOpen();
 appendToRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 childLedgers.put(ledger, null);
Expand All@@ -192,12 +235,12 @@ void associateLedger(BufferLedger ledger) {
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we are removing a
 * ledger associated with this allocator
 * Allows an AllocationManager to tell the allocator that we are removing a
 * ledger associated with this allocator.
 */
 void dissociateLedger(BufferLedger ledger) {
 assertOpen();
 removeFromRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 if (!childLedgers.containsKey(ledger)) {
Expand DownExpand Up@@ -376,8 +419,6 @@ public synchronized void close() {
 return;
 }

 isClosed = true;

 StringBuilder outstandingChildAllocators = new StringBuilder();
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
Expand All@@ -401,7 +442,7 @@ public synchronized void close() {
 // are there outstanding buffers?
 final int allocatedCount = childLedgers.size();
 if (allocatedCount > 0) {
throw new IllegalStateException(
logger.error(
 String.format("Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
 name, allocatedCount, toString()));
 }
Expand DownExpand Up@@ -434,12 +475,35 @@ public synchronized void close() {
 String msg = String.format("Memory was leaked by query. Memory leaked: (%d)\n%s%s", allocated,
 outstandingChildAllocators.toString(), toString());
 logger.error(msg);
 }

 // Release outstanding buffers
 synchronized (REF_LOCK) {
 int releasedLedgerCount = 0;
 while (tail != null) {
 final BufferLedger tmp = tail.prev;
 tail.destroy();
 tail = tmp;
 releasedLedgerCount++;
 }
 if (releasedLedgerCount != 0) {
 String msg = String.format("Released %d outstanding buffer ledgers.", releasedLedgerCount);
 logger.warn(msg);
 }
 }

 final long remaining = getAllocatedMemory();
 if (remaining > 0) {
 String msg = String.format("Memory is still leaked after final clean-up: (%d)\n%s%s", remaining,
 outstandingChildAllocators.toString(), toString());
 throw new IllegalStateException(msg);
 }

 // we need to release our memory to our parent before we tell it we've closed.
 super.close();

 isClosed = true;

 // Inform our parent allocator that we've closed
 if (parentAllocator != null) {
 parentAllocator.childClosed(this);
Expand Down

16 changes: 16 additions & 0 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@ public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, Refe
 private final HistoricalLog historicalLog =
 BaseAllocator.DEBUG ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH,
 "BufferLedger[%d]", 1) : null;

 BufferLedger prev = null;

 BufferLedger next = null;

 private volatile long lDestructionTime = 0;

 BufferLedger(final BufferAllocator allocator, final AllocationManager allocationManager) {
Expand DownExpand Up@@ -131,6 +136,17 @@ public boolean release(int decrement) {
 return refCnt == 0;
 }

 /**
 * Forcibly release the buffer ledger by setting reference count
 * to zero. Used by BaseAllocator to reclaim outstanding buffers
 * when being closed.
 */
 void destroy() {
 synchronized (allocationManager) {
 release(bufRefCnt.get());
 }
 }

 /**
 * Decrement the ledger's reference count for the associated underlying
 * memory chunk. If the reference count drops to 0, it implies that
Expand Down

15 changes: 14 additions & 1 deletion
java/memory/memory-netty/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ public void test_privateMax() throws Exception {
 }
 }

 @Test(expected = IllegalStateException.class)
 @Test()
 public void testRootAllocator_closeWithOutstanding() throws Exception {
 try {
 try (final RootAllocator rootAllocator =
Expand All@@ -110,6 +110,19 @@ public void testRootAllocator_closeWithOutstanding() throws Exception {
 }
 }

 @Test()
 public void testRootAllocator_closeChildWithOutstanding() throws Exception {
 try (final RootAllocator parent =
 new RootAllocator(MAX_ALLOCATION)) {
 final ArrowBuf parentBuf = parent.buffer(512);
 assertNotNull("allocation failed", parentBuf);
 try (BufferAllocator child1 = parent.newChildAllocator("child1", 0L, MAX_ALLOCATION)) {
 final ArrowBuf childBuf = child1.buffer(512);
 assertNotNull("allocation failed", childBuf);
 }
 }
 }

 @Test
 public void testRootAllocator_getEmpty() throws Exception {
 try (final RootAllocator rootAllocator =
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed#33744

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

zhztheplayer
wants to merge
3
commits into

from

 Closed


GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed
#33744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
dcc5c1f

GH-33743: [Java] Release outstanding buffers when BaseAllocator is be…


zhztheplayer Jan 18, 2023
8b99605

style


zhztheplayer Jan 18, 2023
beea317

fixup


zhztheplayer Jan 18, 2023

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


80 changes: 72 additions & 8 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,12 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
 private final BaseAllocator parentAllocator;
 private final Map<BaseAllocator, Object> childAllocators;
 private final ArrowBuf empty;

 // linked list to hold references to alive ledgers
 private BufferLedger tail = null;

 private final Object REF_LOCK = new Object();

 // members used purely for debugging
 private final IdentityHashMap<BufferLedger, Object> childLedgers;
 private final IdentityHashMap<Reservation, Object> reservations;
Expand DownExpand Up@@ -177,13 +183,50 @@ public ArrowBuf getEmpty() {
 return empty;
 }

 private void appendToRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next != null || ledger.prev != null) {
 throw new IllegalStateException("already linked");
 }
 if (tail == null) {
 tail = ledger;
 return;
 }
 tail.next = ledger;
 ledger.prev = tail;
 tail = ledger;
 }
 }

 private void removeFromRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next == ledger) {
 return;
 }
 if (ledger.prev == ledger) {
 throw new IllegalStateException();
 }
 if (ledger == tail) {
 tail = ledger.prev;
 }
 if (ledger.prev != null) {
 ledger.prev.next = ledger.next;
 }
 if (ledger.next != null) {
 ledger.next.prev = ledger.prev;
 }
 ledger.prev = ledger;
 ledger.next = ledger;
 }
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we have a new ledger
 * Allows an AllocationManager to tell the allocator that we have a new ledger
 * associated with this allocator.
 */
 void associateLedger(BufferLedger ledger) {
 assertOpen();
 appendToRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 childLedgers.put(ledger, null);
Expand All@@ -192,12 +235,12 @@ void associateLedger(BufferLedger ledger) {
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we are removing a
 * ledger associated with this allocator
 * Allows an AllocationManager to tell the allocator that we are removing a
 * ledger associated with this allocator.
 */
 void dissociateLedger(BufferLedger ledger) {
 assertOpen();
 removeFromRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 if (!childLedgers.containsKey(ledger)) {
Expand DownExpand Up@@ -376,8 +419,6 @@ public synchronized void close() {
 return;
 }

 isClosed = true;

 StringBuilder outstandingChildAllocators = new StringBuilder();
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
Expand All@@ -401,7 +442,7 @@ public synchronized void close() {
 // are there outstanding buffers?
 final int allocatedCount = childLedgers.size();
 if (allocatedCount > 0) {
throw new IllegalStateException(
logger.error(
 String.format("Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
 name, allocatedCount, toString()));
 }
Expand DownExpand Up@@ -434,12 +475,35 @@ public synchronized void close() {
 String msg = String.format("Memory was leaked by query. Memory leaked: (%d)\n%s%s", allocated,
 outstandingChildAllocators.toString(), toString());
 logger.error(msg);
 }

 // Release outstanding buffers
 synchronized (REF_LOCK) {
 int releasedLedgerCount = 0;
 while (tail != null) {
 final BufferLedger tmp = tail.prev;
 tail.destroy();
 tail = tmp;
 releasedLedgerCount++;
 }
 if (releasedLedgerCount != 0) {
 String msg = String.format("Released %d outstanding buffer ledgers.", releasedLedgerCount);
 logger.warn(msg);
 }
 }

 final long remaining = getAllocatedMemory();
 if (remaining > 0) {
 String msg = String.format("Memory is still leaked after final clean-up: (%d)\n%s%s", remaining,
 outstandingChildAllocators.toString(), toString());
 throw new IllegalStateException(msg);
 }

 // we need to release our memory to our parent before we tell it we've closed.
 super.close();

 isClosed = true;

 // Inform our parent allocator that we've closed
 if (parentAllocator != null) {
 parentAllocator.childClosed(this);
Expand Down

16 changes: 16 additions & 0 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@ public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, Refe
 private final HistoricalLog historicalLog =
 BaseAllocator.DEBUG ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH,
 "BufferLedger[%d]", 1) : null;

 BufferLedger prev = null;

 BufferLedger next = null;

 private volatile long lDestructionTime = 0;

 BufferLedger(final BufferAllocator allocator, final AllocationManager allocationManager) {
Expand DownExpand Up@@ -131,6 +136,17 @@ public boolean release(int decrement) {
 return refCnt == 0;
 }

 /**
 * Forcibly release the buffer ledger by setting reference count
 * to zero. Used by BaseAllocator to reclaim outstanding buffers
 * when being closed.
 */
 void destroy() {
 synchronized (allocationManager) {
 release(bufRefCnt.get());
 }
 }

 /**
 * Decrement the ledger's reference count for the associated underlying
 * memory chunk. If the reference count drops to 0, it implies that
Expand Down

15 changes: 14 additions & 1 deletion
java/memory/memory-netty/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ public void test_privateMax() throws Exception {
 }
 }

 @Test(expected = IllegalStateException.class)
 @Test()
 public void testRootAllocator_closeWithOutstanding() throws Exception {
 try {
 try (final RootAllocator rootAllocator =
Expand All@@ -110,6 +110,19 @@ public void testRootAllocator_closeWithOutstanding() throws Exception {
 }
 }

 @Test()
 public void testRootAllocator_closeChildWithOutstanding() throws Exception {
 try (final RootAllocator parent =
 new RootAllocator(MAX_ALLOCATION)) {
 final ArrowBuf parentBuf = parent.buffer(512);
 assertNotNull("allocation failed", parentBuf);
 try (BufferAllocator child1 = parent.newChildAllocator("child1", 0L, MAX_ALLOCATION)) {
 final ArrowBuf childBuf = child1.buffer(512);
 assertNotNull("allocation failed", childBuf);
 }
 }
 }

 @Test
 public void testRootAllocator_getEmpty() throws Exception {
 try (final RootAllocator rootAllocator =
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed#33744

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

zhztheplayer
wants to merge
3
commits into

from

 Closed


GH-33743: [Java] Release outstanding buffers when BaseAllocator is being closed
#33744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
dcc5c1f

GH-33743: [Java] Release outstanding buffers when BaseAllocator is be…


zhztheplayer Jan 18, 2023
8b99605

style


zhztheplayer Jan 18, 2023
beea317

fixup


zhztheplayer Jan 18, 2023

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


80 changes: 72 additions & 8 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,12 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
 private final BaseAllocator parentAllocator;
 private final Map<BaseAllocator, Object> childAllocators;
 private final ArrowBuf empty;

 // linked list to hold references to alive ledgers
 private BufferLedger tail = null;

 private final Object REF_LOCK = new Object();

 // members used purely for debugging
 private final IdentityHashMap<BufferLedger, Object> childLedgers;
 private final IdentityHashMap<Reservation, Object> reservations;
Expand DownExpand Up@@ -177,13 +183,50 @@ public ArrowBuf getEmpty() {
 return empty;
 }

 private void appendToRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next != null || ledger.prev != null) {
 throw new IllegalStateException("already linked");
 }
 if (tail == null) {
 tail = ledger;
 return;
 }
 tail.next = ledger;
 ledger.prev = tail;
 tail = ledger;
 }
 }

 private void removeFromRefList(BufferLedger ledger) {
 synchronized (REF_LOCK) {
 if (ledger.next == ledger) {
 return;
 }
 if (ledger.prev == ledger) {
 throw new IllegalStateException();
 }
 if (ledger == tail) {
 tail = ledger.prev;
 }
 if (ledger.prev != null) {
 ledger.prev.next = ledger.next;
 }
 if (ledger.next != null) {
 ledger.next.prev = ledger.prev;
 }
 ledger.prev = ledger;
 ledger.next = ledger;
 }
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we have a new ledger
 * Allows an AllocationManager to tell the allocator that we have a new ledger
 * associated with this allocator.
 */
 void associateLedger(BufferLedger ledger) {
 assertOpen();
 appendToRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 childLedgers.put(ledger, null);
Expand All@@ -192,12 +235,12 @@ void associateLedger(BufferLedger ledger) {
 }

 /**
 * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
 * we are removing a
 * ledger associated with this allocator
 * Allows an AllocationManager to tell the allocator that we are removing a
 * ledger associated with this allocator.
 */
 void dissociateLedger(BufferLedger ledger) {
 assertOpen();
 removeFromRefList(ledger);
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
 if (!childLedgers.containsKey(ledger)) {
Expand DownExpand Up@@ -376,8 +419,6 @@ public synchronized void close() {
 return;
 }

 isClosed = true;

 StringBuilder outstandingChildAllocators = new StringBuilder();
 if (DEBUG) {
 synchronized (DEBUG_LOCK) {
Expand All@@ -401,7 +442,7 @@ public synchronized void close() {
 // are there outstanding buffers?
 final int allocatedCount = childLedgers.size();
 if (allocatedCount > 0) {
throw new IllegalStateException(
logger.error(
 String.format("Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
 name, allocatedCount, toString()));
 }
Expand DownExpand Up@@ -434,12 +475,35 @@ public synchronized void close() {
 String msg = String.format("Memory was leaked by query. Memory leaked: (%d)\n%s%s", allocated,
 outstandingChildAllocators.toString(), toString());
 logger.error(msg);
 }

 // Release outstanding buffers
 synchronized (REF_LOCK) {
 int releasedLedgerCount = 0;
 while (tail != null) {
 final BufferLedger tmp = tail.prev;
 tail.destroy();
 tail = tmp;
 releasedLedgerCount++;
 }
 if (releasedLedgerCount != 0) {
 String msg = String.format("Released %d outstanding buffer ledgers.", releasedLedgerCount);
 logger.warn(msg);
 }
 }

 final long remaining = getAllocatedMemory();
 if (remaining > 0) {
 String msg = String.format("Memory is still leaked after final clean-up: (%d)\n%s%s", remaining,
 outstandingChildAllocators.toString(), toString());
 throw new IllegalStateException(msg);
 }

 // we need to release our memory to our parent before we tell it we've closed.
 super.close();

 isClosed = true;

 // Inform our parent allocator that we've closed
 if (parentAllocator != null) {
 parentAllocator.childClosed(this);
Expand Down

16 changes: 16 additions & 0 deletions
java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@ public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, Refe
 private final HistoricalLog historicalLog =
 BaseAllocator.DEBUG ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH,
 "BufferLedger[%d]", 1) : null;

 BufferLedger prev = null;

 BufferLedger next = null;

 private volatile long lDestructionTime = 0;

 BufferLedger(final BufferAllocator allocator, final AllocationManager allocationManager) {
Expand DownExpand Up@@ -131,6 +136,17 @@ public boolean release(int decrement) {
 return refCnt == 0;
 }

 /**
 * Forcibly release the buffer ledger by setting reference count
 * to zero. Used by BaseAllocator to reclaim outstanding buffers
 * when being closed.
 */
 void destroy() {
 synchronized (allocationManager) {
 release(bufRefCnt.get());
 }
 }

 /**
 * Decrement the ledger's reference count for the associated underlying
 * memory chunk. If the reference count drops to 0, it implies that
Expand Down

15 changes: 14 additions & 1 deletion
java/memory/memory-netty/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,7 @@ public void test_privateMax() throws Exception {
 }
 }

 @Test(expected = IllegalStateException.class)
 @Test()
 public void testRootAllocator_closeWithOutstanding() throws Exception {
 try {
 try (final RootAllocator rootAllocator =
Expand All@@ -110,6 +110,19 @@ public void testRootAllocator_closeWithOutstanding() throws Exception {
 }
 }

 @Test()
 public void testRootAllocator_closeChildWithOutstanding() throws Exception {
 try (final RootAllocator parent =
 new RootAllocator(MAX_ALLOCATION)) {
 final ArrowBuf parentBuf = parent.buffer(512);
 assertNotNull("allocation failed", parentBuf);
 try (BufferAllocator child1 = parent.newChildAllocator("child1", 0L, MAX_ALLOCATION)) {
 final ArrowBuf childBuf = child1.buffer(512);
 assertNotNull("allocation failed", childBuf);
 }
 }
 }

 @Test
 public void testRootAllocator_getEmpty() throws Exception {
 try (final RootAllocator rootAllocator =
Expand Down