RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool#923

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
Sep 20, 2023
Merged

RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool #923

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c9abf3
enhance
OneSizeFitsQuorum Sep 19, 2023
e78c8b7
fix review
OneSizeFitsQuorum Sep 20, 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
36 changes: 19 additions & 17 deletions ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@
import org.apache.ratis.util.IOUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.MemoizedSupplier;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
Expand DownExpand Up@@ -120,7 +121,7 @@ public synchronized void close() {
isClosed = true;
ConcurrentUtils.parallelForEachAsync(map.entrySet(),
entry -> close(entry.getKey(), entry.getValue()),
executor);
executor.get());
}

private void close(RaftGroupId groupId, CompletableFuture<RaftServerImpl> future) {
Expand DownExpand Up@@ -192,8 +193,8 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {
private final DataStreamServerRpc dataStreamServerRpc;

private final ImplMap impls = new ImplMap();
private final ExecutorService implExecutor;
private final ExecutorService executor;
private final MemoizedSupplier<ExecutorService> implExecutor;
private final MemoizedSupplier<ExecutorService> executor;

private final JvmPauseMonitor pauseMonitor;
private final ThreadGroup threadGroup;
Expand All@@ -213,11 +214,12 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {

this.dataStreamServerRpc = new DataStreamServerImpl(this, parameters).getServerRpc();

this.implExecutor = ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement");
this.executor = ConcurrentUtils.newThreadPoolWithMax(
this.implExecutor = MemoizedSupplier.valueOf(
() -> ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement"));
this.executor = MemoizedSupplier.valueOf(() -> ConcurrentUtils.newThreadPoolWithMax(
RaftServerConfigKeys.ThreadPool.proxyCached(properties),
RaftServerConfigKeys.ThreadPool.proxySize(properties),
id + "-impl");
id + "-impl"));

final TimeDuration sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
final TimeDuration rpcSlownessTimeout = RaftServerConfigKeys.Rpc.slownessTimeout(properties);
Expand DownExpand Up@@ -253,7 +255,7 @@ void initGroups(RaftGroup group, StartupOption option) {
.map(Arrays::stream).orElse(Stream.empty())
.filter(File::isDirectory)
.forEach(sub -> initGroupDir(sub, shouldAdd)),
executor).join();
executor.get()).join();
raftGroup.ifPresent(g -> addGroup(g, option));
}

Expand DownExpand Up@@ -290,7 +292,7 @@ private CompletableFuture<RaftServerImpl> newRaftServerImpl(RaftGroup group, Sta
} catch(IOException e) {
throw new CompletionException(getId() + ": Failed to initialize server for " + group, e);
}
}, implExecutor);
}, implExecutor.get());
}

private static String getIdStringFrom(RaftServerRpc rpc) {
Expand DownExpand Up@@ -399,7 +401,7 @@ public void start() throws IOException {
}

private void startImpl() throws IOException {
ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor).join();
ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor.get()).join();

LOG.info("{}: start RPC server", getId());
getServerRpc().start();
Expand All@@ -410,12 +412,6 @@ private void startImpl() throws IOException {

@Override
public void close() {
try {
ConcurrentUtils.shutdownAndWait(implExecutor);
} catch (Exception ignored) {
LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
}

lifeCycle.checkStateAndClose(() -> {
LOG.info("{}: close", getId());
impls.close();
Expand All@@ -433,7 +429,13 @@ public void close() {
}

try {
ConcurrentUtils.shutdownAndWait(executor);
ConcurrentUtils.shutdownAndWait(implExecutor.get());
} catch (Exception ignored) {
LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
}

try {
ConcurrentUtils.shutdownAndWait(executor.get());
} catch (Exception ignored) {
LOG.warn(getId() + ": Failed to shutdown executor", ignored);
}
Expand DownExpand Up@@ -510,7 +512,7 @@ private CompletableFuture<RaftClientReply> groupAddAsync(
throw new CompletionException(e);
}
return newImpl.newSuccessReply(request);
}, implExecutor)
}, implExecutor.get())
.whenComplete((raftClientReply, throwable) -> {
if (throwable != null) {
if (!(throwable.getCause() instanceof AlreadyExistsException)) {
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" + '

Skip to content
RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool#923

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

Sep 20, 2023
 Merged


RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool
#923
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1c9abf3

enhance


OneSizeFitsQuorum Sep 19, 2023
e78c8b7

fix review


OneSizeFitsQuorum Sep 20, 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


36 changes: 19 additions & 17 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@
import org.apache.ratis.util.IOUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.MemoizedSupplier;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
Expand DownExpand Up@@ -120,7 +121,7 @@ public synchronized void close() {
 isClosed = true;
 ConcurrentUtils.parallelForEachAsync(map.entrySet(),
 entry -> close(entry.getKey(), entry.getValue()),
 executor);
 executor.get());
 }

 private void close(RaftGroupId groupId, CompletableFuture<RaftServerImpl> future) {
Expand DownExpand Up@@ -192,8 +193,8 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {
 private final DataStreamServerRpc dataStreamServerRpc;

 private final ImplMap impls = new ImplMap();
 private final ExecutorService implExecutor;
 private final ExecutorService executor;
 private final MemoizedSupplier<ExecutorService> implExecutor;
 private final MemoizedSupplier<ExecutorService> executor;

 private final JvmPauseMonitor pauseMonitor;
 private final ThreadGroup threadGroup;
Expand All@@ -213,11 +214,12 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {

 this.dataStreamServerRpc = new DataStreamServerImpl(this, parameters).getServerRpc();

 this.implExecutor = ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement");
 this.executor = ConcurrentUtils.newThreadPoolWithMax(
 this.implExecutor = MemoizedSupplier.valueOf(
 () -> ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement"));
 this.executor = MemoizedSupplier.valueOf(() -> ConcurrentUtils.newThreadPoolWithMax(
 RaftServerConfigKeys.ThreadPool.proxyCached(properties),
 RaftServerConfigKeys.ThreadPool.proxySize(properties),
 id + "-impl");
 id + "-impl"));

 final TimeDuration sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 final TimeDuration rpcSlownessTimeout = RaftServerConfigKeys.Rpc.slownessTimeout(properties);
Expand DownExpand Up@@ -253,7 +255,7 @@ void initGroups(RaftGroup group, StartupOption option) {
 .map(Arrays::stream).orElse(Stream.empty())
 .filter(File::isDirectory)
 .forEach(sub -> initGroupDir(sub, shouldAdd)),
 executor).join();
 executor.get()).join();
 raftGroup.ifPresent(g -> addGroup(g, option));
 }

Expand DownExpand Up@@ -290,7 +292,7 @@ private CompletableFuture<RaftServerImpl> newRaftServerImpl(RaftGroup group, Sta
 } catch(IOException e) {
 throw new CompletionException(getId() + ": Failed to initialize server for " + group, e);
 }
 }, implExecutor);
 }, implExecutor.get());
 }

 private static String getIdStringFrom(RaftServerRpc rpc) {
Expand DownExpand Up@@ -399,7 +401,7 @@ public void start() throws IOException {
 }

 private void startImpl() throws IOException {
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor).join();
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor.get()).join();

 LOG.info("{}: start RPC server", getId());
 getServerRpc().start();
Expand All@@ -410,12 +412,6 @@ private void startImpl() throws IOException {

 @Override
 public void close() {
 try {
 ConcurrentUtils.shutdownAndWait(implExecutor);
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 lifeCycle.checkStateAndClose(() -> {
 LOG.info("{}: close", getId());
 impls.close();
Expand All@@ -433,7 +429,13 @@ public void close() {
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor);
 ConcurrentUtils.shutdownAndWait(implExecutor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown executor", ignored);
 }
Expand DownExpand Up@@ -510,7 +512,7 @@ private CompletableFuture<RaftClientReply> groupAddAsync(
 throw new CompletionException(e);
 }
 return newImpl.newSuccessReply(request);
 }, implExecutor)
 }, implExecutor.get())
 .whenComplete((raftClientReply, throwable) -> {
 if (throwable != null) {
 if (!(throwable.getCause() instanceof AlreadyExistsException)) {
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('^' + ".*" + '

Skip to content
RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool#923

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

Sep 20, 2023
 Merged


RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool
#923
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1c9abf3

enhance


OneSizeFitsQuorum Sep 19, 2023
e78c8b7

fix review


OneSizeFitsQuorum Sep 20, 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


36 changes: 19 additions & 17 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@
import org.apache.ratis.util.IOUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.MemoizedSupplier;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
Expand DownExpand Up@@ -120,7 +121,7 @@ public synchronized void close() {
 isClosed = true;
 ConcurrentUtils.parallelForEachAsync(map.entrySet(),
 entry -> close(entry.getKey(), entry.getValue()),
 executor);
 executor.get());
 }

 private void close(RaftGroupId groupId, CompletableFuture<RaftServerImpl> future) {
Expand DownExpand Up@@ -192,8 +193,8 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {
 private final DataStreamServerRpc dataStreamServerRpc;

 private final ImplMap impls = new ImplMap();
 private final ExecutorService implExecutor;
 private final ExecutorService executor;
 private final MemoizedSupplier<ExecutorService> implExecutor;
 private final MemoizedSupplier<ExecutorService> executor;

 private final JvmPauseMonitor pauseMonitor;
 private final ThreadGroup threadGroup;
Expand All@@ -213,11 +214,12 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {

 this.dataStreamServerRpc = new DataStreamServerImpl(this, parameters).getServerRpc();

 this.implExecutor = ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement");
 this.executor = ConcurrentUtils.newThreadPoolWithMax(
 this.implExecutor = MemoizedSupplier.valueOf(
 () -> ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement"));
 this.executor = MemoizedSupplier.valueOf(() -> ConcurrentUtils.newThreadPoolWithMax(
 RaftServerConfigKeys.ThreadPool.proxyCached(properties),
 RaftServerConfigKeys.ThreadPool.proxySize(properties),
 id + "-impl");
 id + "-impl"));

 final TimeDuration sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 final TimeDuration rpcSlownessTimeout = RaftServerConfigKeys.Rpc.slownessTimeout(properties);
Expand DownExpand Up@@ -253,7 +255,7 @@ void initGroups(RaftGroup group, StartupOption option) {
 .map(Arrays::stream).orElse(Stream.empty())
 .filter(File::isDirectory)
 .forEach(sub -> initGroupDir(sub, shouldAdd)),
 executor).join();
 executor.get()).join();
 raftGroup.ifPresent(g -> addGroup(g, option));
 }

Expand DownExpand Up@@ -290,7 +292,7 @@ private CompletableFuture<RaftServerImpl> newRaftServerImpl(RaftGroup group, Sta
 } catch(IOException e) {
 throw new CompletionException(getId() + ": Failed to initialize server for " + group, e);
 }
 }, implExecutor);
 }, implExecutor.get());
 }

 private static String getIdStringFrom(RaftServerRpc rpc) {
Expand DownExpand Up@@ -399,7 +401,7 @@ public void start() throws IOException {
 }

 private void startImpl() throws IOException {
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor).join();
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor.get()).join();

 LOG.info("{}: start RPC server", getId());
 getServerRpc().start();
Expand All@@ -410,12 +412,6 @@ private void startImpl() throws IOException {

 @Override
 public void close() {
 try {
 ConcurrentUtils.shutdownAndWait(implExecutor);
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 lifeCycle.checkStateAndClose(() -> {
 LOG.info("{}: close", getId());
 impls.close();
Expand All@@ -433,7 +429,13 @@ public void close() {
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor);
 ConcurrentUtils.shutdownAndWait(implExecutor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown executor", ignored);
 }
Expand DownExpand Up@@ -510,7 +512,7 @@ private CompletableFuture<RaftClientReply> groupAddAsync(
 throw new CompletionException(e);
 }
 return newImpl.newSuccessReply(request);
 }, implExecutor)
 }, implExecutor.get())
 .whenComplete((raftClientReply, throwable) -> {
 if (throwable != null) {
 if (!(throwable.getCause() instanceof AlreadyExistsException)) {
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('^' + ".*" + '

Skip to content
RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool#923

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

Sep 20, 2023
 Merged


RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool
#923
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1c9abf3

enhance


OneSizeFitsQuorum Sep 19, 2023
e78c8b7

fix review


OneSizeFitsQuorum Sep 20, 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


36 changes: 19 additions & 17 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@
import org.apache.ratis.util.IOUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.MemoizedSupplier;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
Expand DownExpand Up@@ -120,7 +121,7 @@ public synchronized void close() {
 isClosed = true;
 ConcurrentUtils.parallelForEachAsync(map.entrySet(),
 entry -> close(entry.getKey(), entry.getValue()),
 executor);
 executor.get());
 }

 private void close(RaftGroupId groupId, CompletableFuture<RaftServerImpl> future) {
Expand DownExpand Up@@ -192,8 +193,8 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {
 private final DataStreamServerRpc dataStreamServerRpc;

 private final ImplMap impls = new ImplMap();
 private final ExecutorService implExecutor;
 private final ExecutorService executor;
 private final MemoizedSupplier<ExecutorService> implExecutor;
 private final MemoizedSupplier<ExecutorService> executor;

 private final JvmPauseMonitor pauseMonitor;
 private final ThreadGroup threadGroup;
Expand All@@ -213,11 +214,12 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {

 this.dataStreamServerRpc = new DataStreamServerImpl(this, parameters).getServerRpc();

 this.implExecutor = ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement");
 this.executor = ConcurrentUtils.newThreadPoolWithMax(
 this.implExecutor = MemoizedSupplier.valueOf(
 () -> ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement"));
 this.executor = MemoizedSupplier.valueOf(() -> ConcurrentUtils.newThreadPoolWithMax(
 RaftServerConfigKeys.ThreadPool.proxyCached(properties),
 RaftServerConfigKeys.ThreadPool.proxySize(properties),
 id + "-impl");
 id + "-impl"));

 final TimeDuration sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 final TimeDuration rpcSlownessTimeout = RaftServerConfigKeys.Rpc.slownessTimeout(properties);
Expand DownExpand Up@@ -253,7 +255,7 @@ void initGroups(RaftGroup group, StartupOption option) {
 .map(Arrays::stream).orElse(Stream.empty())
 .filter(File::isDirectory)
 .forEach(sub -> initGroupDir(sub, shouldAdd)),
 executor).join();
 executor.get()).join();
 raftGroup.ifPresent(g -> addGroup(g, option));
 }

Expand DownExpand Up@@ -290,7 +292,7 @@ private CompletableFuture<RaftServerImpl> newRaftServerImpl(RaftGroup group, Sta
 } catch(IOException e) {
 throw new CompletionException(getId() + ": Failed to initialize server for " + group, e);
 }
 }, implExecutor);
 }, implExecutor.get());
 }

 private static String getIdStringFrom(RaftServerRpc rpc) {
Expand DownExpand Up@@ -399,7 +401,7 @@ public void start() throws IOException {
 }

 private void startImpl() throws IOException {
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor).join();
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor.get()).join();

 LOG.info("{}: start RPC server", getId());
 getServerRpc().start();
Expand All@@ -410,12 +412,6 @@ private void startImpl() throws IOException {

 @Override
 public void close() {
 try {
 ConcurrentUtils.shutdownAndWait(implExecutor);
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 lifeCycle.checkStateAndClose(() -> {
 LOG.info("{}: close", getId());
 impls.close();
Expand All@@ -433,7 +429,13 @@ public void close() {
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor);
 ConcurrentUtils.shutdownAndWait(implExecutor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown executor", ignored);
 }
Expand DownExpand Up@@ -510,7 +512,7 @@ private CompletableFuture<RaftClientReply> groupAddAsync(
 throw new CompletionException(e);
 }
 return newImpl.newSuccessReply(request);
 }, implExecutor)
 }, implExecutor.get())
 .whenComplete((raftClientReply, throwable) -> {
 if (throwable != null) {
 if (!(throwable.getCause() instanceof AlreadyExistsException)) {
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" + '

Skip to content
RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool#923

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

Sep 20, 2023
 Merged


RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool
#923
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1c9abf3

enhance


OneSizeFitsQuorum Sep 19, 2023
e78c8b7

fix review


OneSizeFitsQuorum Sep 20, 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


36 changes: 19 additions & 17 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@
import org.apache.ratis.util.IOUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.MemoizedSupplier;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
Expand DownExpand Up@@ -120,7 +121,7 @@ public synchronized void close() {
 isClosed = true;
 ConcurrentUtils.parallelForEachAsync(map.entrySet(),
 entry -> close(entry.getKey(), entry.getValue()),
 executor);
 executor.get());
 }

 private void close(RaftGroupId groupId, CompletableFuture<RaftServerImpl> future) {
Expand DownExpand Up@@ -192,8 +193,8 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {
 private final DataStreamServerRpc dataStreamServerRpc;

 private final ImplMap impls = new ImplMap();
 private final ExecutorService implExecutor;
 private final ExecutorService executor;
 private final MemoizedSupplier<ExecutorService> implExecutor;
 private final MemoizedSupplier<ExecutorService> executor;

 private final JvmPauseMonitor pauseMonitor;
 private final ThreadGroup threadGroup;
Expand All@@ -213,11 +214,12 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {

 this.dataStreamServerRpc = new DataStreamServerImpl(this, parameters).getServerRpc();

 this.implExecutor = ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement");
 this.executor = ConcurrentUtils.newThreadPoolWithMax(
 this.implExecutor = MemoizedSupplier.valueOf(
 () -> ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement"));
 this.executor = MemoizedSupplier.valueOf(() -> ConcurrentUtils.newThreadPoolWithMax(
 RaftServerConfigKeys.ThreadPool.proxyCached(properties),
 RaftServerConfigKeys.ThreadPool.proxySize(properties),
 id + "-impl");
 id + "-impl"));

 final TimeDuration sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 final TimeDuration rpcSlownessTimeout = RaftServerConfigKeys.Rpc.slownessTimeout(properties);
Expand DownExpand Up@@ -253,7 +255,7 @@ void initGroups(RaftGroup group, StartupOption option) {
 .map(Arrays::stream).orElse(Stream.empty())
 .filter(File::isDirectory)
 .forEach(sub -> initGroupDir(sub, shouldAdd)),
 executor).join();
 executor.get()).join();
 raftGroup.ifPresent(g -> addGroup(g, option));
 }

Expand DownExpand Up@@ -290,7 +292,7 @@ private CompletableFuture<RaftServerImpl> newRaftServerImpl(RaftGroup group, Sta
 } catch(IOException e) {
 throw new CompletionException(getId() + ": Failed to initialize server for " + group, e);
 }
 }, implExecutor);
 }, implExecutor.get());
 }

 private static String getIdStringFrom(RaftServerRpc rpc) {
Expand DownExpand Up@@ -399,7 +401,7 @@ public void start() throws IOException {
 }

 private void startImpl() throws IOException {
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor).join();
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor.get()).join();

 LOG.info("{}: start RPC server", getId());
 getServerRpc().start();
Expand All@@ -410,12 +412,6 @@ private void startImpl() throws IOException {

 @Override
 public void close() {
 try {
 ConcurrentUtils.shutdownAndWait(implExecutor);
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 lifeCycle.checkStateAndClose(() -> {
 LOG.info("{}: close", getId());
 impls.close();
Expand All@@ -433,7 +429,13 @@ public void close() {
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor);
 ConcurrentUtils.shutdownAndWait(implExecutor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown executor", ignored);
 }
Expand DownExpand Up@@ -510,7 +512,7 @@ private CompletableFuture<RaftClientReply> groupAddAsync(
 throw new CompletionException(e);
 }
 return newImpl.newSuccessReply(request);
 }, implExecutor)
 }, implExecutor.get())
 .whenComplete((raftClientReply, throwable) -> {
 if (throwable != null) {
 if (!(throwable.getCause() instanceof AlreadyExistsException)) {
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('^' + ".*" + '

Skip to content
RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool#923

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

Sep 20, 2023
 Merged


RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool
#923
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1c9abf3

enhance


OneSizeFitsQuorum Sep 19, 2023
e78c8b7

fix review


OneSizeFitsQuorum Sep 20, 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


36 changes: 19 additions & 17 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@
import org.apache.ratis.util.IOUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.MemoizedSupplier;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
Expand DownExpand Up@@ -120,7 +121,7 @@ public synchronized void close() {
 isClosed = true;
 ConcurrentUtils.parallelForEachAsync(map.entrySet(),
 entry -> close(entry.getKey(), entry.getValue()),
 executor);
 executor.get());
 }

 private void close(RaftGroupId groupId, CompletableFuture<RaftServerImpl> future) {
Expand DownExpand Up@@ -192,8 +193,8 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {
 private final DataStreamServerRpc dataStreamServerRpc;

 private final ImplMap impls = new ImplMap();
 private final ExecutorService implExecutor;
 private final ExecutorService executor;
 private final MemoizedSupplier<ExecutorService> implExecutor;
 private final MemoizedSupplier<ExecutorService> executor;

 private final JvmPauseMonitor pauseMonitor;
 private final ThreadGroup threadGroup;
Expand All@@ -213,11 +214,12 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {

 this.dataStreamServerRpc = new DataStreamServerImpl(this, parameters).getServerRpc();

 this.implExecutor = ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement");
 this.executor = ConcurrentUtils.newThreadPoolWithMax(
 this.implExecutor = MemoizedSupplier.valueOf(
 () -> ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement"));
 this.executor = MemoizedSupplier.valueOf(() -> ConcurrentUtils.newThreadPoolWithMax(
 RaftServerConfigKeys.ThreadPool.proxyCached(properties),
 RaftServerConfigKeys.ThreadPool.proxySize(properties),
 id + "-impl");
 id + "-impl"));

 final TimeDuration sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 final TimeDuration rpcSlownessTimeout = RaftServerConfigKeys.Rpc.slownessTimeout(properties);
Expand DownExpand Up@@ -253,7 +255,7 @@ void initGroups(RaftGroup group, StartupOption option) {
 .map(Arrays::stream).orElse(Stream.empty())
 .filter(File::isDirectory)
 .forEach(sub -> initGroupDir(sub, shouldAdd)),
 executor).join();
 executor.get()).join();
 raftGroup.ifPresent(g -> addGroup(g, option));
 }

Expand DownExpand Up@@ -290,7 +292,7 @@ private CompletableFuture<RaftServerImpl> newRaftServerImpl(RaftGroup group, Sta
 } catch(IOException e) {
 throw new CompletionException(getId() + ": Failed to initialize server for " + group, e);
 }
 }, implExecutor);
 }, implExecutor.get());
 }

 private static String getIdStringFrom(RaftServerRpc rpc) {
Expand DownExpand Up@@ -399,7 +401,7 @@ public void start() throws IOException {
 }

 private void startImpl() throws IOException {
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor).join();
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor.get()).join();

 LOG.info("{}: start RPC server", getId());
 getServerRpc().start();
Expand All@@ -410,12 +412,6 @@ private void startImpl() throws IOException {

 @Override
 public void close() {
 try {
 ConcurrentUtils.shutdownAndWait(implExecutor);
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 lifeCycle.checkStateAndClose(() -> {
 LOG.info("{}: close", getId());
 impls.close();
Expand All@@ -433,7 +429,13 @@ public void close() {
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor);
 ConcurrentUtils.shutdownAndWait(implExecutor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown executor", ignored);
 }
Expand DownExpand Up@@ -510,7 +512,7 @@ private CompletableFuture<RaftClientReply> groupAddAsync(
 throw new CompletionException(e);
 }
 return newImpl.newSuccessReply(request);
 }, implExecutor)
 }, implExecutor.get())
 .whenComplete((raftClientReply, throwable) -> {
 if (throwable != null) {
 if (!(throwable.getCause() instanceof AlreadyExistsException)) {
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('^' + ".*" + '

Skip to content
RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool#923

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

Sep 20, 2023
 Merged


RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool
#923
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1c9abf3

enhance


OneSizeFitsQuorum Sep 19, 2023
e78c8b7

fix review


OneSizeFitsQuorum Sep 20, 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


36 changes: 19 additions & 17 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@
import org.apache.ratis.util.IOUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.MemoizedSupplier;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
Expand DownExpand Up@@ -120,7 +121,7 @@ public synchronized void close() {
 isClosed = true;
 ConcurrentUtils.parallelForEachAsync(map.entrySet(),
 entry -> close(entry.getKey(), entry.getValue()),
 executor);
 executor.get());
 }

 private void close(RaftGroupId groupId, CompletableFuture<RaftServerImpl> future) {
Expand DownExpand Up@@ -192,8 +193,8 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {
 private final DataStreamServerRpc dataStreamServerRpc;

 private final ImplMap impls = new ImplMap();
 private final ExecutorService implExecutor;
 private final ExecutorService executor;
 private final MemoizedSupplier<ExecutorService> implExecutor;
 private final MemoizedSupplier<ExecutorService> executor;

 private final JvmPauseMonitor pauseMonitor;
 private final ThreadGroup threadGroup;
Expand All@@ -213,11 +214,12 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {

 this.dataStreamServerRpc = new DataStreamServerImpl(this, parameters).getServerRpc();

 this.implExecutor = ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement");
 this.executor = ConcurrentUtils.newThreadPoolWithMax(
 this.implExecutor = MemoizedSupplier.valueOf(
 () -> ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement"));
 this.executor = MemoizedSupplier.valueOf(() -> ConcurrentUtils.newThreadPoolWithMax(
 RaftServerConfigKeys.ThreadPool.proxyCached(properties),
 RaftServerConfigKeys.ThreadPool.proxySize(properties),
 id + "-impl");
 id + "-impl"));

 final TimeDuration sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 final TimeDuration rpcSlownessTimeout = RaftServerConfigKeys.Rpc.slownessTimeout(properties);
Expand DownExpand Up@@ -253,7 +255,7 @@ void initGroups(RaftGroup group, StartupOption option) {
 .map(Arrays::stream).orElse(Stream.empty())
 .filter(File::isDirectory)
 .forEach(sub -> initGroupDir(sub, shouldAdd)),
 executor).join();
 executor.get()).join();
 raftGroup.ifPresent(g -> addGroup(g, option));
 }

Expand DownExpand Up@@ -290,7 +292,7 @@ private CompletableFuture<RaftServerImpl> newRaftServerImpl(RaftGroup group, Sta
 } catch(IOException e) {
 throw new CompletionException(getId() + ": Failed to initialize server for " + group, e);
 }
 }, implExecutor);
 }, implExecutor.get());
 }

 private static String getIdStringFrom(RaftServerRpc rpc) {
Expand DownExpand Up@@ -399,7 +401,7 @@ public void start() throws IOException {
 }

 private void startImpl() throws IOException {
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor).join();
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor.get()).join();

 LOG.info("{}: start RPC server", getId());
 getServerRpc().start();
Expand All@@ -410,12 +412,6 @@ private void startImpl() throws IOException {

 @Override
 public void close() {
 try {
 ConcurrentUtils.shutdownAndWait(implExecutor);
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 lifeCycle.checkStateAndClose(() -> {
 LOG.info("{}: close", getId());
 impls.close();
Expand All@@ -433,7 +429,13 @@ public void close() {
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor);
 ConcurrentUtils.shutdownAndWait(implExecutor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown executor", ignored);
 }
Expand DownExpand Up@@ -510,7 +512,7 @@ private CompletableFuture<RaftClientReply> groupAddAsync(
 throw new CompletionException(e);
 }
 return newImpl.newSuccessReply(request);
 }, implExecutor)
 }, implExecutor.get())
 .whenComplete((raftClientReply, throwable) -> {
 if (throwable != null) {
 if (!(throwable.getCause() instanceof AlreadyExistsException)) {
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); }
})();
})();

Skip to content
RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool#923

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

Sep 20, 2023
 Merged


RATIS-1892 Unify the lifetime of the RaftServerProxy thread pool
#923
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1c9abf3

enhance


OneSizeFitsQuorum Sep 19, 2023
e78c8b7

fix review


OneSizeFitsQuorum Sep 20, 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


36 changes: 19 additions & 17 deletions
ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@
import org.apache.ratis.util.IOUtils;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.MemoizedSupplier;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
import org.apache.ratis.util.TimeDuration;
Expand DownExpand Up@@ -120,7 +121,7 @@ public synchronized void close() {
 isClosed = true;
 ConcurrentUtils.parallelForEachAsync(map.entrySet(),
 entry -> close(entry.getKey(), entry.getValue()),
 executor);
 executor.get());
 }

 private void close(RaftGroupId groupId, CompletableFuture<RaftServerImpl> future) {
Expand DownExpand Up@@ -192,8 +193,8 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {
 private final DataStreamServerRpc dataStreamServerRpc;

 private final ImplMap impls = new ImplMap();
 private final ExecutorService implExecutor;
 private final ExecutorService executor;
 private final MemoizedSupplier<ExecutorService> implExecutor;
 private final MemoizedSupplier<ExecutorService> executor;

 private final JvmPauseMonitor pauseMonitor;
 private final ThreadGroup threadGroup;
Expand All@@ -213,11 +214,12 @@ String toString(RaftGroupId groupId, CompletableFuture<RaftServerImpl> f) {

 this.dataStreamServerRpc = new DataStreamServerImpl(this, parameters).getServerRpc();

 this.implExecutor = ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement");
 this.executor = ConcurrentUtils.newThreadPoolWithMax(
 this.implExecutor = MemoizedSupplier.valueOf(
 () -> ConcurrentUtils.newSingleThreadExecutor(id + "-groupManagement"));
 this.executor = MemoizedSupplier.valueOf(() -> ConcurrentUtils.newThreadPoolWithMax(
 RaftServerConfigKeys.ThreadPool.proxyCached(properties),
 RaftServerConfigKeys.ThreadPool.proxySize(properties),
 id + "-impl");
 id + "-impl"));

 final TimeDuration sleepDeviationThreshold = RaftServerConfigKeys.sleepDeviationThreshold(properties);
 final TimeDuration rpcSlownessTimeout = RaftServerConfigKeys.Rpc.slownessTimeout(properties);
Expand DownExpand Up@@ -253,7 +255,7 @@ void initGroups(RaftGroup group, StartupOption option) {
 .map(Arrays::stream).orElse(Stream.empty())
 .filter(File::isDirectory)
 .forEach(sub -> initGroupDir(sub, shouldAdd)),
 executor).join();
 executor.get()).join();
 raftGroup.ifPresent(g -> addGroup(g, option));
 }

Expand DownExpand Up@@ -290,7 +292,7 @@ private CompletableFuture<RaftServerImpl> newRaftServerImpl(RaftGroup group, Sta
 } catch(IOException e) {
 throw new CompletionException(getId() + ": Failed to initialize server for " + group, e);
 }
 }, implExecutor);
 }, implExecutor.get());
 }

 private static String getIdStringFrom(RaftServerRpc rpc) {
Expand DownExpand Up@@ -399,7 +401,7 @@ public void start() throws IOException {
 }

 private void startImpl() throws IOException {
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor).join();
 ConcurrentUtils.parallelForEachAsync(getImpls(), RaftServerImpl::start, executor.get()).join();

 LOG.info("{}: start RPC server", getId());
 getServerRpc().start();
Expand All@@ -410,12 +412,6 @@ private void startImpl() throws IOException {

 @Override
 public void close() {
 try {
 ConcurrentUtils.shutdownAndWait(implExecutor);
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 lifeCycle.checkStateAndClose(() -> {
 LOG.info("{}: close", getId());
 impls.close();
Expand All@@ -433,7 +429,13 @@ public void close() {
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor);
 ConcurrentUtils.shutdownAndWait(implExecutor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown implExecutor", ignored);
 }

 try {
 ConcurrentUtils.shutdownAndWait(executor.get());
 } catch (Exception ignored) {
 LOG.warn(getId() + ": Failed to shutdown executor", ignored);
 }
Expand DownExpand Up@@ -510,7 +512,7 @@ private CompletableFuture<RaftClientReply> groupAddAsync(
 throw new CompletionException(e);
 }
 return newImpl.newSuccessReply(request);
 }, implExecutor)
 }, implExecutor.get())
 .whenComplete((raftClientReply, throwable) -> {
 if (throwable != null) {
 if (!(throwable.getCause() instanceof AlreadyExistsException)) {
Expand Down