Skip to content

HDDS-8848. Clean up datanode memory in case of an ozone stream write error#4891

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

Merged
szetszwo merged 2 commits into from
Jun 15, 2023
Merged

HDDS-8848. Clean up datanode memory in case of an ozone stream write error #4891

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
70355c9
cleanup
guohao-rosicky Jun 14, 2023
b60cd10
cleanup code review
guohao-rosicky Jun 15, 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
37 changes: 30 additions & 7 deletions ...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -589,23 +589,46 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
if (stream == null) {
return JavaUtils.completeExceptionally(new IllegalStateException(
"DataStream is null"));
} else if (!(stream instanceof LocalStream)) {
return JavaUtils.completeExceptionally(new IllegalStateException(
"Unexpected DataStream " + stream.getClass()));
}
final DataChannel dataChannel = stream.getDataChannel();
if (dataChannel.isOpen()) {
return JavaUtils.completeExceptionally(new IllegalStateException(
"DataStream: " + stream + " is not closed properly"));
}

final ContainerCommandRequestProto request;
if (dataChannel instanceof KeyValueStreamDataChannel) {
request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
} else {
if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
return JavaUtils.completeExceptionally(new IllegalStateException(
"Unexpected DataChannel " + dataChannel.getClass()));
}
return runCommandAsync(request, entry).whenComplete(
(res, e) -> LOG.debug("link {}, entry: {}, request: {}",
res.getResult(), entry, request));

final KeyValueStreamDataChannel kvStreamDataChannel =
(KeyValueStreamDataChannel) dataChannel;

final ContainerCommandRequestProto request =
kvStreamDataChannel.getPutBlockRequest();

return runCommandAsync(request, entry).whenComplete((response, e) -> {
if (e != null) {
LOG.warn("Failed to link logEntry {} for request {}",
TermIndex.valueOf(entry), request, e);
}
if (response != null) {
final ContainerProtos.Result result = response.getResult();
if (LOG.isDebugEnabled()) {
LOG.debug("{} to link logEntry {} for request {}, response: {}",
result, TermIndex.valueOf(entry), request, response);
}
if (result == ContainerProtos.Result.SUCCESS) {
kvStreamDataChannel.setLinked();
return;
}
}
// failed to link, cleanup
kvStreamDataChannel.cleanUp();
});
}

private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down
19 changes: 9 additions & 10 deletions ...ain/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/LocalStream.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,11 @@

package org.apache.hadoop.ozone.container.common.transport.server.ratis;

import org.apache.hadoop.ozone.container.keyvalue.impl.KeyValueStreamDataChannel;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;

import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;

class LocalStream implements StateMachine.DataStream {
Expand All@@ -41,14 +41,13 @@ public StateMachine.DataChannel getDataChannel() {

@Override
public CompletableFuture<?> cleanUp() {
return CompletableFuture.supplyAsync(() -> {
try {
dataChannel.close();
return true;
} catch (IOException e) {
throw new CompletionException("Failed to close data channel", e);
}
});
if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
return JavaUtils.completeExceptionally(new IllegalStateException(
"Unexpected DataChannel " + dataChannel.getClass()));
}
return CompletableFuture
.supplyAsync(((KeyValueStreamDataChannel) dataChannel)::cleanUp,
executor);
}

@Override
Expand Down
19 changes: 18 additions & 1 deletion .../main/java/org/apache/hadoop/ozone/container/keyvalue/impl/KeyValueStreamDataChannel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,6 +131,12 @@ ReferenceCountedObject<ByteBuf> pollAll() {
refs.forEach(ReferenceCountedObject::release);
});
}

void cleanUpAll() {
while (!deque.isEmpty()) {
poll().release();
}
}
}

interface WriteMethod {
Expand DownExpand Up@@ -198,7 +204,18 @@ void assertOpen() throws IOException {
@Override
public void close() throws IOException {
if (closed.compareAndSet(false, true)) {
putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
try {
putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
} finally {
super.close();
}
}
}

@Override
protected void cleanupInternal() throws IOException {
buffers.cleanUpAll();
if (closed.compareAndSet(false, true)) {
super.close();
}
}
Expand Down
34 changes: 33 additions & 1 deletion .../src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,32 @@
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.ratis.statemachine.StateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil.onFailure;

/**
* For write state machine data.
*/
abstract class StreamDataChannelBase implements StateMachine.DataChannel {
abstract class StreamDataChannelBase
implements StateMachine.DataChannel {
static final Logger LOG = LoggerFactory.getLogger(
StreamDataChannelBase.class);

private final RandomAccessFile randomAccessFile;

private final File file;
private final AtomicBoolean linked = new AtomicBoolean();
private final AtomicBoolean cleaned = new AtomicBoolean();

private final ContainerData containerData;
private final ContainerMetrics metrics;
Expand DownExpand Up@@ -85,6 +94,29 @@ public final boolean isOpen() {
return getChannel().isOpen();
}

public void setLinked() {
linked.set(true);
}

/** @return true iff {@link StateMachine.DataChannel} is already linked. */
public boolean cleanUp() {
if (linked.get()) {
// already linked, nothing to do.
return true;
}
if (cleaned.compareAndSet(false, true)) {
// close and then delete the file.
try {
cleanupInternal();
} catch (IOException e) {
LOG.warn("Failed to close " + this, e);
}
}
return false;
}

protected abstract void cleanupInternal() throws IOException;

@Override
public void close() throws IOException {
try {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
HDDS-8848. Clean up datanode memory in case of an ozone stream write error by guohao-rosicky · Pull Request #4891 · apache/ozone · GitHub
Skip to content
HDDS-8848. Clean up datanode memory in case of an ozone stream write error#4891

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

 Merged

szetszwo
merged 2 commits into

from

Jun 15, 2023
 Merged


HDDS-8848. Clean up datanode memory in case of an ozone stream write error
#4891
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
70355c9

cleanup


guohao-rosicky Jun 14, 2023
b60cd10

cleanup code review


guohao-rosicky Jun 15, 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


37 changes: 30 additions & 7 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -589,23 +589,46 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 if (stream == null) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream is null"));
 } else if (!(stream instanceof LocalStream)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataStream " + stream.getClass()));
 }
 final DataChannel dataChannel = stream.getDataChannel();
 if (dataChannel.isOpen()) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream: " + stream + " is not closed properly"));
 }

 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
 request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));

 final KeyValueStreamDataChannel kvStreamDataChannel =
 (KeyValueStreamDataChannel) dataChannel;

 final ContainerCommandRequestProto request =
 kvStreamDataChannel.getPutBlockRequest();

 return runCommandAsync(request, entry).whenComplete((response, e) -> {
 if (e != null) {
 LOG.warn("Failed to link logEntry {} for request {}",
 TermIndex.valueOf(entry), request, e);
 }
 if (response != null) {
 final ContainerProtos.Result result = response.getResult();
 if (LOG.isDebugEnabled()) {
 LOG.debug("{} to link logEntry {} for request {}, response: {}",
 result, TermIndex.valueOf(entry), request, response);
 }
 if (result == ContainerProtos.Result.SUCCESS) {
 kvStreamDataChannel.setLinked();
 return;
 }
 }
 // failed to link, cleanup
 kvStreamDataChannel.cleanUp();
 });
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down

19 changes: 9 additions & 10 deletions
...ain/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/LocalStream.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,11 @@

package org.apache.hadoop.ozone.container.common.transport.server.ratis;

import org.apache.hadoop.ozone.container.keyvalue.impl.KeyValueStreamDataChannel;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;

import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;

class LocalStream implements StateMachine.DataStream {
Expand All@@ -41,14 +41,13 @@ public StateMachine.DataChannel getDataChannel() {

 @Override
 public CompletableFuture<?> cleanUp() {
 return CompletableFuture.supplyAsync(() -> {
 try {
 dataChannel.close();
 return true;
 } catch (IOException e) {
 throw new CompletionException("Failed to close data channel", e);
 }
 });
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return CompletableFuture
 .supplyAsync(((KeyValueStreamDataChannel) dataChannel)::cleanUp,
 executor);
 }

 @Override
Expand Down

19 changes: 18 additions & 1 deletion
.../main/java/org/apache/hadoop/ozone/container/keyvalue/impl/KeyValueStreamDataChannel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,6 +131,12 @@ ReferenceCountedObject<ByteBuf> pollAll() {
 refs.forEach(ReferenceCountedObject::release);
 });
 }

 void cleanUpAll() {
 while (!deque.isEmpty()) {
 poll().release();
 }
 }
 }

 interface WriteMethod {
Expand DownExpand Up@@ -198,7 +204,18 @@ void assertOpen() throws IOException {
 @Override
 public void close() throws IOException {
 if (closed.compareAndSet(false, true)) {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 try {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 } finally {
 super.close();
 }
 }
 }

 @Override
 protected void cleanupInternal() throws IOException {
 buffers.cleanUpAll();
 if (closed.compareAndSet(false, true)) {
 super.close();
 }
 }
Expand Down

34 changes: 33 additions & 1 deletion
.../src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,32 @@
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.ratis.statemachine.StateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil.onFailure;

/**
 * For write state machine data.
 */
abstract class StreamDataChannelBase implements StateMachine.DataChannel {
abstract class StreamDataChannelBase
 implements StateMachine.DataChannel {
 static final Logger LOG = LoggerFactory.getLogger(
 StreamDataChannelBase.class);

 private final RandomAccessFile randomAccessFile;

 private final File file;
 private final AtomicBoolean linked = new AtomicBoolean();
 private final AtomicBoolean cleaned = new AtomicBoolean();

 private final ContainerData containerData;
 private final ContainerMetrics metrics;
Expand DownExpand Up@@ -85,6 +94,29 @@ public final boolean isOpen() {
 return getChannel().isOpen();
 }

 public void setLinked() {
 linked.set(true);
 }

 /** @return true iff {@link StateMachine.DataChannel} is already linked. */
 public boolean cleanUp() {
 if (linked.get()) {
 // already linked, nothing to do.
 return true;
 }
 if (cleaned.compareAndSet(false, true)) {
 // close and then delete the file.
 try {
 cleanupInternal();
 } catch (IOException e) {
 LOG.warn("Failed to close " + this, e);
 }
 }
 return false;
 }

 protected abstract void cleanupInternal() throws IOException;

 @Override
 public void close() throws IOException {
 try {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HDDS-8848. Clean up datanode memory in case of an ozone stream write error by guohao-rosicky · Pull Request #4891 · apache/ozone · GitHub
Skip to content
HDDS-8848. Clean up datanode memory in case of an ozone stream write error#4891

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

 Merged

szetszwo
merged 2 commits into

from

Jun 15, 2023
 Merged


HDDS-8848. Clean up datanode memory in case of an ozone stream write error
#4891
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
70355c9

cleanup


guohao-rosicky Jun 14, 2023
b60cd10

cleanup code review


guohao-rosicky Jun 15, 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


37 changes: 30 additions & 7 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -589,23 +589,46 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 if (stream == null) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream is null"));
 } else if (!(stream instanceof LocalStream)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataStream " + stream.getClass()));
 }
 final DataChannel dataChannel = stream.getDataChannel();
 if (dataChannel.isOpen()) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream: " + stream + " is not closed properly"));
 }

 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
 request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));

 final KeyValueStreamDataChannel kvStreamDataChannel =
 (KeyValueStreamDataChannel) dataChannel;

 final ContainerCommandRequestProto request =
 kvStreamDataChannel.getPutBlockRequest();

 return runCommandAsync(request, entry).whenComplete((response, e) -> {
 if (e != null) {
 LOG.warn("Failed to link logEntry {} for request {}",
 TermIndex.valueOf(entry), request, e);
 }
 if (response != null) {
 final ContainerProtos.Result result = response.getResult();
 if (LOG.isDebugEnabled()) {
 LOG.debug("{} to link logEntry {} for request {}, response: {}",
 result, TermIndex.valueOf(entry), request, response);
 }
 if (result == ContainerProtos.Result.SUCCESS) {
 kvStreamDataChannel.setLinked();
 return;
 }
 }
 // failed to link, cleanup
 kvStreamDataChannel.cleanUp();
 });
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down

19 changes: 9 additions & 10 deletions
...ain/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/LocalStream.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,11 @@

package org.apache.hadoop.ozone.container.common.transport.server.ratis;

import org.apache.hadoop.ozone.container.keyvalue.impl.KeyValueStreamDataChannel;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;

import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;

class LocalStream implements StateMachine.DataStream {
Expand All@@ -41,14 +41,13 @@ public StateMachine.DataChannel getDataChannel() {

 @Override
 public CompletableFuture<?> cleanUp() {
 return CompletableFuture.supplyAsync(() -> {
 try {
 dataChannel.close();
 return true;
 } catch (IOException e) {
 throw new CompletionException("Failed to close data channel", e);
 }
 });
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return CompletableFuture
 .supplyAsync(((KeyValueStreamDataChannel) dataChannel)::cleanUp,
 executor);
 }

 @Override
Expand Down

19 changes: 18 additions & 1 deletion
.../main/java/org/apache/hadoop/ozone/container/keyvalue/impl/KeyValueStreamDataChannel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,6 +131,12 @@ ReferenceCountedObject<ByteBuf> pollAll() {
 refs.forEach(ReferenceCountedObject::release);
 });
 }

 void cleanUpAll() {
 while (!deque.isEmpty()) {
 poll().release();
 }
 }
 }

 interface WriteMethod {
Expand DownExpand Up@@ -198,7 +204,18 @@ void assertOpen() throws IOException {
 @Override
 public void close() throws IOException {
 if (closed.compareAndSet(false, true)) {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 try {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 } finally {
 super.close();
 }
 }
 }

 @Override
 protected void cleanupInternal() throws IOException {
 buffers.cleanUpAll();
 if (closed.compareAndSet(false, true)) {
 super.close();
 }
 }
Expand Down

34 changes: 33 additions & 1 deletion
.../src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,32 @@
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.ratis.statemachine.StateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil.onFailure;

/**
 * For write state machine data.
 */
abstract class StreamDataChannelBase implements StateMachine.DataChannel {
abstract class StreamDataChannelBase
 implements StateMachine.DataChannel {
 static final Logger LOG = LoggerFactory.getLogger(
 StreamDataChannelBase.class);

 private final RandomAccessFile randomAccessFile;

 private final File file;
 private final AtomicBoolean linked = new AtomicBoolean();
 private final AtomicBoolean cleaned = new AtomicBoolean();

 private final ContainerData containerData;
 private final ContainerMetrics metrics;
Expand DownExpand Up@@ -85,6 +94,29 @@ public final boolean isOpen() {
 return getChannel().isOpen();
 }

 public void setLinked() {
 linked.set(true);
 }

 /** @return true iff {@link StateMachine.DataChannel} is already linked. */
 public boolean cleanUp() {
 if (linked.get()) {
 // already linked, nothing to do.
 return true;
 }
 if (cleaned.compareAndSet(false, true)) {
 // close and then delete the file.
 try {
 cleanupInternal();
 } catch (IOException e) {
 LOG.warn("Failed to close " + this, e);
 }
 }
 return false;
 }

 protected abstract void cleanupInternal() throws IOException;

 @Override
 public void close() throws IOException {
 try {
Expand Down

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

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

 Merged

szetszwo
merged 2 commits into

from

Jun 15, 2023
 Merged


HDDS-8848. Clean up datanode memory in case of an ozone stream write error
#4891
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
70355c9

cleanup


guohao-rosicky Jun 14, 2023
b60cd10

cleanup code review


guohao-rosicky Jun 15, 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


37 changes: 30 additions & 7 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -589,23 +589,46 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 if (stream == null) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream is null"));
 } else if (!(stream instanceof LocalStream)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataStream " + stream.getClass()));
 }
 final DataChannel dataChannel = stream.getDataChannel();
 if (dataChannel.isOpen()) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream: " + stream + " is not closed properly"));
 }

 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
 request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));

 final KeyValueStreamDataChannel kvStreamDataChannel =
 (KeyValueStreamDataChannel) dataChannel;

 final ContainerCommandRequestProto request =
 kvStreamDataChannel.getPutBlockRequest();

 return runCommandAsync(request, entry).whenComplete((response, e) -> {
 if (e != null) {
 LOG.warn("Failed to link logEntry {} for request {}",
 TermIndex.valueOf(entry), request, e);
 }
 if (response != null) {
 final ContainerProtos.Result result = response.getResult();
 if (LOG.isDebugEnabled()) {
 LOG.debug("{} to link logEntry {} for request {}, response: {}",
 result, TermIndex.valueOf(entry), request, response);
 }
 if (result == ContainerProtos.Result.SUCCESS) {
 kvStreamDataChannel.setLinked();
 return;
 }
 }
 // failed to link, cleanup
 kvStreamDataChannel.cleanUp();
 });
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down

19 changes: 9 additions & 10 deletions
...ain/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/LocalStream.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,11 @@

package org.apache.hadoop.ozone.container.common.transport.server.ratis;

import org.apache.hadoop.ozone.container.keyvalue.impl.KeyValueStreamDataChannel;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;

import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;

class LocalStream implements StateMachine.DataStream {
Expand All@@ -41,14 +41,13 @@ public StateMachine.DataChannel getDataChannel() {

 @Override
 public CompletableFuture<?> cleanUp() {
 return CompletableFuture.supplyAsync(() -> {
 try {
 dataChannel.close();
 return true;
 } catch (IOException e) {
 throw new CompletionException("Failed to close data channel", e);
 }
 });
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return CompletableFuture
 .supplyAsync(((KeyValueStreamDataChannel) dataChannel)::cleanUp,
 executor);
 }

 @Override
Expand Down

19 changes: 18 additions & 1 deletion
.../main/java/org/apache/hadoop/ozone/container/keyvalue/impl/KeyValueStreamDataChannel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,6 +131,12 @@ ReferenceCountedObject<ByteBuf> pollAll() {
 refs.forEach(ReferenceCountedObject::release);
 });
 }

 void cleanUpAll() {
 while (!deque.isEmpty()) {
 poll().release();
 }
 }
 }

 interface WriteMethod {
Expand DownExpand Up@@ -198,7 +204,18 @@ void assertOpen() throws IOException {
 @Override
 public void close() throws IOException {
 if (closed.compareAndSet(false, true)) {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 try {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 } finally {
 super.close();
 }
 }
 }

 @Override
 protected void cleanupInternal() throws IOException {
 buffers.cleanUpAll();
 if (closed.compareAndSet(false, true)) {
 super.close();
 }
 }
Expand Down

34 changes: 33 additions & 1 deletion
.../src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,32 @@
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.ratis.statemachine.StateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil.onFailure;

/**
 * For write state machine data.
 */
abstract class StreamDataChannelBase implements StateMachine.DataChannel {
abstract class StreamDataChannelBase
 implements StateMachine.DataChannel {
 static final Logger LOG = LoggerFactory.getLogger(
 StreamDataChannelBase.class);

 private final RandomAccessFile randomAccessFile;

 private final File file;
 private final AtomicBoolean linked = new AtomicBoolean();
 private final AtomicBoolean cleaned = new AtomicBoolean();

 private final ContainerData containerData;
 private final ContainerMetrics metrics;
Expand DownExpand Up@@ -85,6 +94,29 @@ public final boolean isOpen() {
 return getChannel().isOpen();
 }

 public void setLinked() {
 linked.set(true);
 }

 /** @return true iff {@link StateMachine.DataChannel} is already linked. */
 public boolean cleanUp() {
 if (linked.get()) {
 // already linked, nothing to do.
 return true;
 }
 if (cleaned.compareAndSet(false, true)) {
 // close and then delete the file.
 try {
 cleanupInternal();
 } catch (IOException e) {
 LOG.warn("Failed to close " + this, e);
 }
 }
 return false;
 }

 protected abstract void cleanupInternal() throws IOException;

 @Override
 public void close() throws IOException {
 try {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
HDDS-8848. Clean up datanode memory in case of an ozone stream write error by guohao-rosicky · Pull Request #4891 · apache/ozone · GitHub
Skip to content
HDDS-8848. Clean up datanode memory in case of an ozone stream write error#4891

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

 Merged

szetszwo
merged 2 commits into

from

Jun 15, 2023
 Merged


HDDS-8848. Clean up datanode memory in case of an ozone stream write error
#4891
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
70355c9

cleanup


guohao-rosicky Jun 14, 2023
b60cd10

cleanup code review


guohao-rosicky Jun 15, 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


37 changes: 30 additions & 7 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -589,23 +589,46 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 if (stream == null) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream is null"));
 } else if (!(stream instanceof LocalStream)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataStream " + stream.getClass()));
 }
 final DataChannel dataChannel = stream.getDataChannel();
 if (dataChannel.isOpen()) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream: " + stream + " is not closed properly"));
 }

 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
 request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));

 final KeyValueStreamDataChannel kvStreamDataChannel =
 (KeyValueStreamDataChannel) dataChannel;

 final ContainerCommandRequestProto request =
 kvStreamDataChannel.getPutBlockRequest();

 return runCommandAsync(request, entry).whenComplete((response, e) -> {
 if (e != null) {
 LOG.warn("Failed to link logEntry {} for request {}",
 TermIndex.valueOf(entry), request, e);
 }
 if (response != null) {
 final ContainerProtos.Result result = response.getResult();
 if (LOG.isDebugEnabled()) {
 LOG.debug("{} to link logEntry {} for request {}, response: {}",
 result, TermIndex.valueOf(entry), request, response);
 }
 if (result == ContainerProtos.Result.SUCCESS) {
 kvStreamDataChannel.setLinked();
 return;
 }
 }
 // failed to link, cleanup
 kvStreamDataChannel.cleanUp();
 });
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down

19 changes: 9 additions & 10 deletions
...ain/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/LocalStream.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,11 @@

package org.apache.hadoop.ozone.container.common.transport.server.ratis;

import org.apache.hadoop.ozone.container.keyvalue.impl.KeyValueStreamDataChannel;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;

import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;

class LocalStream implements StateMachine.DataStream {
Expand All@@ -41,14 +41,13 @@ public StateMachine.DataChannel getDataChannel() {

 @Override
 public CompletableFuture<?> cleanUp() {
 return CompletableFuture.supplyAsync(() -> {
 try {
 dataChannel.close();
 return true;
 } catch (IOException e) {
 throw new CompletionException("Failed to close data channel", e);
 }
 });
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return CompletableFuture
 .supplyAsync(((KeyValueStreamDataChannel) dataChannel)::cleanUp,
 executor);
 }

 @Override
Expand Down

19 changes: 18 additions & 1 deletion
.../main/java/org/apache/hadoop/ozone/container/keyvalue/impl/KeyValueStreamDataChannel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,6 +131,12 @@ ReferenceCountedObject<ByteBuf> pollAll() {
 refs.forEach(ReferenceCountedObject::release);
 });
 }

 void cleanUpAll() {
 while (!deque.isEmpty()) {
 poll().release();
 }
 }
 }

 interface WriteMethod {
Expand DownExpand Up@@ -198,7 +204,18 @@ void assertOpen() throws IOException {
 @Override
 public void close() throws IOException {
 if (closed.compareAndSet(false, true)) {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 try {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 } finally {
 super.close();
 }
 }
 }

 @Override
 protected void cleanupInternal() throws IOException {
 buffers.cleanUpAll();
 if (closed.compareAndSet(false, true)) {
 super.close();
 }
 }
Expand Down

34 changes: 33 additions & 1 deletion
.../src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,32 @@
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.ratis.statemachine.StateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil.onFailure;

/**
 * For write state machine data.
 */
abstract class StreamDataChannelBase implements StateMachine.DataChannel {
abstract class StreamDataChannelBase
 implements StateMachine.DataChannel {
 static final Logger LOG = LoggerFactory.getLogger(
 StreamDataChannelBase.class);

 private final RandomAccessFile randomAccessFile;

 private final File file;
 private final AtomicBoolean linked = new AtomicBoolean();
 private final AtomicBoolean cleaned = new AtomicBoolean();

 private final ContainerData containerData;
 private final ContainerMetrics metrics;
Expand DownExpand Up@@ -85,6 +94,29 @@ public final boolean isOpen() {
 return getChannel().isOpen();
 }

 public void setLinked() {
 linked.set(true);
 }

 /** @return true iff {@link StateMachine.DataChannel} is already linked. */
 public boolean cleanUp() {
 if (linked.get()) {
 // already linked, nothing to do.
 return true;
 }
 if (cleaned.compareAndSet(false, true)) {
 // close and then delete the file.
 try {
 cleanupInternal();
 } catch (IOException e) {
 LOG.warn("Failed to close " + this, e);
 }
 }
 return false;
 }

 protected abstract void cleanupInternal() throws IOException;

 @Override
 public void close() throws IOException {
 try {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HDDS-8848. Clean up datanode memory in case of an ozone stream write error by guohao-rosicky · Pull Request #4891 · apache/ozone · GitHub
Skip to content
HDDS-8848. Clean up datanode memory in case of an ozone stream write error#4891

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

 Merged

szetszwo
merged 2 commits into

from

Jun 15, 2023
 Merged


HDDS-8848. Clean up datanode memory in case of an ozone stream write error
#4891
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
70355c9

cleanup


guohao-rosicky Jun 14, 2023
b60cd10

cleanup code review


guohao-rosicky Jun 15, 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


37 changes: 30 additions & 7 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -589,23 +589,46 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 if (stream == null) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream is null"));
 } else if (!(stream instanceof LocalStream)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataStream " + stream.getClass()));
 }
 final DataChannel dataChannel = stream.getDataChannel();
 if (dataChannel.isOpen()) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream: " + stream + " is not closed properly"));
 }

 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
 request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));

 final KeyValueStreamDataChannel kvStreamDataChannel =
 (KeyValueStreamDataChannel) dataChannel;

 final ContainerCommandRequestProto request =
 kvStreamDataChannel.getPutBlockRequest();

 return runCommandAsync(request, entry).whenComplete((response, e) -> {
 if (e != null) {
 LOG.warn("Failed to link logEntry {} for request {}",
 TermIndex.valueOf(entry), request, e);
 }
 if (response != null) {
 final ContainerProtos.Result result = response.getResult();
 if (LOG.isDebugEnabled()) {
 LOG.debug("{} to link logEntry {} for request {}, response: {}",
 result, TermIndex.valueOf(entry), request, response);
 }
 if (result == ContainerProtos.Result.SUCCESS) {
 kvStreamDataChannel.setLinked();
 return;
 }
 }
 // failed to link, cleanup
 kvStreamDataChannel.cleanUp();
 });
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down

19 changes: 9 additions & 10 deletions
...ain/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/LocalStream.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,11 @@

package org.apache.hadoop.ozone.container.common.transport.server.ratis;

import org.apache.hadoop.ozone.container.keyvalue.impl.KeyValueStreamDataChannel;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;

import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;

class LocalStream implements StateMachine.DataStream {
Expand All@@ -41,14 +41,13 @@ public StateMachine.DataChannel getDataChannel() {

 @Override
 public CompletableFuture<?> cleanUp() {
 return CompletableFuture.supplyAsync(() -> {
 try {
 dataChannel.close();
 return true;
 } catch (IOException e) {
 throw new CompletionException("Failed to close data channel", e);
 }
 });
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return CompletableFuture
 .supplyAsync(((KeyValueStreamDataChannel) dataChannel)::cleanUp,
 executor);
 }

 @Override
Expand Down

19 changes: 18 additions & 1 deletion
.../main/java/org/apache/hadoop/ozone/container/keyvalue/impl/KeyValueStreamDataChannel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,6 +131,12 @@ ReferenceCountedObject<ByteBuf> pollAll() {
 refs.forEach(ReferenceCountedObject::release);
 });
 }

 void cleanUpAll() {
 while (!deque.isEmpty()) {
 poll().release();
 }
 }
 }

 interface WriteMethod {
Expand DownExpand Up@@ -198,7 +204,18 @@ void assertOpen() throws IOException {
 @Override
 public void close() throws IOException {
 if (closed.compareAndSet(false, true)) {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 try {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 } finally {
 super.close();
 }
 }
 }

 @Override
 protected void cleanupInternal() throws IOException {
 buffers.cleanUpAll();
 if (closed.compareAndSet(false, true)) {
 super.close();
 }
 }
Expand Down

34 changes: 33 additions & 1 deletion
.../src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,32 @@
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.ratis.statemachine.StateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil.onFailure;

/**
 * For write state machine data.
 */
abstract class StreamDataChannelBase implements StateMachine.DataChannel {
abstract class StreamDataChannelBase
 implements StateMachine.DataChannel {
 static final Logger LOG = LoggerFactory.getLogger(
 StreamDataChannelBase.class);

 private final RandomAccessFile randomAccessFile;

 private final File file;
 private final AtomicBoolean linked = new AtomicBoolean();
 private final AtomicBoolean cleaned = new AtomicBoolean();

 private final ContainerData containerData;
 private final ContainerMetrics metrics;
Expand DownExpand Up@@ -85,6 +94,29 @@ public final boolean isOpen() {
 return getChannel().isOpen();
 }

 public void setLinked() {
 linked.set(true);
 }

 /** @return true iff {@link StateMachine.DataChannel} is already linked. */
 public boolean cleanUp() {
 if (linked.get()) {
 // already linked, nothing to do.
 return true;
 }
 if (cleaned.compareAndSet(false, true)) {
 // close and then delete the file.
 try {
 cleanupInternal();
 } catch (IOException e) {
 LOG.warn("Failed to close " + this, e);
 }
 }
 return false;
 }

 protected abstract void cleanupInternal() throws IOException;

 @Override
 public void close() throws IOException {
 try {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HDDS-8848. Clean up datanode memory in case of an ozone stream write error by guohao-rosicky · Pull Request #4891 · apache/ozone · GitHub
Skip to content
HDDS-8848. Clean up datanode memory in case of an ozone stream write error#4891

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

 Merged

szetszwo
merged 2 commits into

from

Jun 15, 2023
 Merged


HDDS-8848. Clean up datanode memory in case of an ozone stream write error
#4891
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
70355c9

cleanup


guohao-rosicky Jun 14, 2023
b60cd10

cleanup code review


guohao-rosicky Jun 15, 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


37 changes: 30 additions & 7 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -589,23 +589,46 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 if (stream == null) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream is null"));
 } else if (!(stream instanceof LocalStream)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataStream " + stream.getClass()));
 }
 final DataChannel dataChannel = stream.getDataChannel();
 if (dataChannel.isOpen()) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream: " + stream + " is not closed properly"));
 }

 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
 request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));

 final KeyValueStreamDataChannel kvStreamDataChannel =
 (KeyValueStreamDataChannel) dataChannel;

 final ContainerCommandRequestProto request =
 kvStreamDataChannel.getPutBlockRequest();

 return runCommandAsync(request, entry).whenComplete((response, e) -> {
 if (e != null) {
 LOG.warn("Failed to link logEntry {} for request {}",
 TermIndex.valueOf(entry), request, e);
 }
 if (response != null) {
 final ContainerProtos.Result result = response.getResult();
 if (LOG.isDebugEnabled()) {
 LOG.debug("{} to link logEntry {} for request {}, response: {}",
 result, TermIndex.valueOf(entry), request, response);
 }
 if (result == ContainerProtos.Result.SUCCESS) {
 kvStreamDataChannel.setLinked();
 return;
 }
 }
 // failed to link, cleanup
 kvStreamDataChannel.cleanUp();
 });
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down

19 changes: 9 additions & 10 deletions
...ain/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/LocalStream.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,11 @@

package org.apache.hadoop.ozone.container.common.transport.server.ratis;

import org.apache.hadoop.ozone.container.keyvalue.impl.KeyValueStreamDataChannel;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;

import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;

class LocalStream implements StateMachine.DataStream {
Expand All@@ -41,14 +41,13 @@ public StateMachine.DataChannel getDataChannel() {

 @Override
 public CompletableFuture<?> cleanUp() {
 return CompletableFuture.supplyAsync(() -> {
 try {
 dataChannel.close();
 return true;
 } catch (IOException e) {
 throw new CompletionException("Failed to close data channel", e);
 }
 });
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return CompletableFuture
 .supplyAsync(((KeyValueStreamDataChannel) dataChannel)::cleanUp,
 executor);
 }

 @Override
Expand Down

19 changes: 18 additions & 1 deletion
.../main/java/org/apache/hadoop/ozone/container/keyvalue/impl/KeyValueStreamDataChannel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,6 +131,12 @@ ReferenceCountedObject<ByteBuf> pollAll() {
 refs.forEach(ReferenceCountedObject::release);
 });
 }

 void cleanUpAll() {
 while (!deque.isEmpty()) {
 poll().release();
 }
 }
 }

 interface WriteMethod {
Expand DownExpand Up@@ -198,7 +204,18 @@ void assertOpen() throws IOException {
 @Override
 public void close() throws IOException {
 if (closed.compareAndSet(false, true)) {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 try {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 } finally {
 super.close();
 }
 }
 }

 @Override
 protected void cleanupInternal() throws IOException {
 buffers.cleanUpAll();
 if (closed.compareAndSet(false, true)) {
 super.close();
 }
 }
Expand Down

34 changes: 33 additions & 1 deletion
.../src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,32 @@
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.ratis.statemachine.StateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil.onFailure;

/**
 * For write state machine data.
 */
abstract class StreamDataChannelBase implements StateMachine.DataChannel {
abstract class StreamDataChannelBase
 implements StateMachine.DataChannel {
 static final Logger LOG = LoggerFactory.getLogger(
 StreamDataChannelBase.class);

 private final RandomAccessFile randomAccessFile;

 private final File file;
 private final AtomicBoolean linked = new AtomicBoolean();
 private final AtomicBoolean cleaned = new AtomicBoolean();

 private final ContainerData containerData;
 private final ContainerMetrics metrics;
Expand DownExpand Up@@ -85,6 +94,29 @@ public final boolean isOpen() {
 return getChannel().isOpen();
 }

 public void setLinked() {
 linked.set(true);
 }

 /** @return true iff {@link StateMachine.DataChannel} is already linked. */
 public boolean cleanUp() {
 if (linked.get()) {
 // already linked, nothing to do.
 return true;
 }
 if (cleaned.compareAndSet(false, true)) {
 // close and then delete the file.
 try {
 cleanupInternal();
 } catch (IOException e) {
 LOG.warn("Failed to close " + this, e);
 }
 }
 return false;
 }

 protected abstract void cleanupInternal() throws IOException;

 @Override
 public void close() throws IOException {
 try {
Expand Down

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

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

 Merged

szetszwo
merged 2 commits into

from

Jun 15, 2023
 Merged


HDDS-8848. Clean up datanode memory in case of an ozone stream write error
#4891
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
70355c9

cleanup


guohao-rosicky Jun 14, 2023
b60cd10

cleanup code review


guohao-rosicky Jun 15, 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


37 changes: 30 additions & 7 deletions
...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -589,23 +589,46 @@ public CompletableFuture<?> link(DataStream stream, LogEntryProto entry) {
 if (stream == null) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream is null"));
 } else if (!(stream instanceof LocalStream)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataStream " + stream.getClass()));
 }
 final DataChannel dataChannel = stream.getDataChannel();
 if (dataChannel.isOpen()) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "DataStream: " + stream + " is not closed properly"));
 }

 final ContainerCommandRequestProto request;
 if (dataChannel instanceof KeyValueStreamDataChannel) {
 request = ((KeyValueStreamDataChannel) dataChannel).getPutBlockRequest();
 } else {
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return runCommandAsync(request, entry).whenComplete(
 (res, e) -> LOG.debug("link {}, entry: {}, request: {}",
 res.getResult(), entry, request));

 final KeyValueStreamDataChannel kvStreamDataChannel =
 (KeyValueStreamDataChannel) dataChannel;

 final ContainerCommandRequestProto request =
 kvStreamDataChannel.getPutBlockRequest();

 return runCommandAsync(request, entry).whenComplete((response, e) -> {
 if (e != null) {
 LOG.warn("Failed to link logEntry {} for request {}",
 TermIndex.valueOf(entry), request, e);
 }
 if (response != null) {
 final ContainerProtos.Result result = response.getResult();
 if (LOG.isDebugEnabled()) {
 LOG.debug("{} to link logEntry {} for request {}, response: {}",
 result, TermIndex.valueOf(entry), request, response);
 }
 if (result == ContainerProtos.Result.SUCCESS) {
 kvStreamDataChannel.setLinked();
 return;
 }
 }
 // failed to link, cleanup
 kvStreamDataChannel.cleanUp();
 });
 }

 private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
Expand Down

19 changes: 9 additions & 10 deletions
...ain/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/LocalStream.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,11 @@

package org.apache.hadoop.ozone.container.common.transport.server.ratis;

import org.apache.hadoop.ozone.container.keyvalue.impl.KeyValueStreamDataChannel;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;

import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;

class LocalStream implements StateMachine.DataStream {
Expand All@@ -41,14 +41,13 @@ public StateMachine.DataChannel getDataChannel() {

 @Override
 public CompletableFuture<?> cleanUp() {
 return CompletableFuture.supplyAsync(() -> {
 try {
 dataChannel.close();
 return true;
 } catch (IOException e) {
 throw new CompletionException("Failed to close data channel", e);
 }
 });
 if (!(dataChannel instanceof KeyValueStreamDataChannel)) {
 return JavaUtils.completeExceptionally(new IllegalStateException(
 "Unexpected DataChannel " + dataChannel.getClass()));
 }
 return CompletableFuture
 .supplyAsync(((KeyValueStreamDataChannel) dataChannel)::cleanUp,
 executor);
 }

 @Override
Expand Down

19 changes: 18 additions & 1 deletion
.../main/java/org/apache/hadoop/ozone/container/keyvalue/impl/KeyValueStreamDataChannel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,6 +131,12 @@ ReferenceCountedObject<ByteBuf> pollAll() {
 refs.forEach(ReferenceCountedObject::release);
 });
 }

 void cleanUpAll() {
 while (!deque.isEmpty()) {
 poll().release();
 }
 }
 }

 interface WriteMethod {
Expand DownExpand Up@@ -198,7 +204,18 @@ void assertOpen() throws IOException {
 @Override
 public void close() throws IOException {
 if (closed.compareAndSet(false, true)) {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 try {
 putBlockRequest.set(closeBuffers(buffers, super::writeFileChannel));
 } finally {
 super.close();
 }
 }
 }

 @Override
 protected void cleanupInternal() throws IOException {
 buffers.cleanUpAll();
 if (closed.compareAndSet(false, true)) {
 super.close();
 }
 }
Expand Down

34 changes: 33 additions & 1 deletion
.../src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,32 @@
import org.apache.hadoop.ozone.container.common.helpers.ContainerMetrics;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.ratis.statemachine.StateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil.onFailure;

/**
 * For write state machine data.
 */
abstract class StreamDataChannelBase implements StateMachine.DataChannel {
abstract class StreamDataChannelBase
 implements StateMachine.DataChannel {
 static final Logger LOG = LoggerFactory.getLogger(
 StreamDataChannelBase.class);

 private final RandomAccessFile randomAccessFile;

 private final File file;
 private final AtomicBoolean linked = new AtomicBoolean();
 private final AtomicBoolean cleaned = new AtomicBoolean();

 private final ContainerData containerData;
 private final ContainerMetrics metrics;
Expand DownExpand Up@@ -85,6 +94,29 @@ public final boolean isOpen() {
 return getChannel().isOpen();
 }

 public void setLinked() {
 linked.set(true);
 }

 /** @return true iff {@link StateMachine.DataChannel} is already linked. */
 public boolean cleanUp() {
 if (linked.get()) {
 // already linked, nothing to do.
 return true;
 }
 if (cleaned.compareAndSet(false, true)) {
 // close and then delete the file.
 try {
 cleanupInternal();
 } catch (IOException e) {
 LOG.warn("Failed to close " + this, e);
 }
 }
 return false;
 }

 protected abstract void cleanupInternal() throws IOException;

 @Override
 public void close() throws IOException {
 try {
Expand Down