lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复EntityCache

Browse Source
This commit is contained in:
redkale
2023-03-28 23:31:45 +08:00
parent 3bb287b3ef
commit 3cf560f220
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/redkale/net/client/ClientCodec.java
View File

@@ -123,7 +123,7 @@ public abstract class ClientCodec<R extends ClientRequest, P> implements Complet
connection.preComplete(message, (R) request, exc); connection.preComplete(message, (R) request, exc);
if (exc != null) { if (exc != null) {
if (workThread.inIO()) { if (workThread.inIO() && workThread.getState() == Thread.State.RUNNABLE) {
workThread.execute(() -> { workThread.execute(() -> {
Traces.currTraceid(request.traceid); Traces.currTraceid(request.traceid);
respFuture.completeExceptionally(exc); respFuture.completeExceptionally(exc);
@@ -136,7 +136,7 @@ public abstract class ClientCodec<R extends ClientRequest, P> implements Complet
} }
} else { } else {
final Object rs = request.respTransfer == null ? message : request.respTransfer.apply(message); final Object rs = request.respTransfer == null ? message : request.respTransfer.apply(message);
if (workThread.inIO()) { if (workThread.inIO() && workThread.getState() == Thread.State.RUNNABLE) {
workThread.execute(() -> { workThread.execute(() -> {
Traces.currTraceid(request.traceid); Traces.currTraceid(request.traceid);
((ClientFuture) respFuture).complete(rs); ((ClientFuture) respFuture).complete(rs);
@@ -149,7 +149,7 @@ public abstract class ClientCodec<R extends ClientRequest, P> implements Complet
} }
} }
} catch (Throwable t) { } catch (Throwable t) {
if (workThread.inIO()) { if (workThread.inIO() && workThread.getState() == Thread.State.RUNNABLE) {
workThread.execute(() -> { workThread.execute(() -> {
Traces.currTraceid(request.traceid); Traces.currTraceid(request.traceid);
respFuture.completeExceptionally(t); respFuture.completeExceptionally(t);

2
src/main/java/org/redkale/net/client/ClientConnection.java
View File

@@ -90,7 +90,7 @@ public abstract class ClientConnection<R extends ClientRequest, P> implements Co
respFuture.setTimeout(client.timeoutScheduler.schedule(respFuture, rts, TimeUnit.SECONDS)); respFuture.setTimeout(client.timeoutScheduler.schedule(respFuture, rts, TimeUnit.SECONDS));
} }
respWaitingCounter.increment(); //放在writeChannelInWriteThread计数会延迟，导致不准确 respWaitingCounter.increment(); //放在writeChannelInWriteThread计数会延迟，导致不准确
if (channel.inCurrWriteThread()) { if (true || channel.inCurrWriteThread()) { //临时屏蔽
writeChannelInThread(request, respFuture); writeChannelInThread(request, respFuture);
} else { } else {
channel.executeWrite(() -> writeChannelInThread(request, respFuture)); channel.executeWrite(() -> writeChannelInThread(request, respFuture));

7
src/main/java/org/redkale/source/EntityCache.java
View File

@@ -131,12 +131,7 @@ public final class EntityCache<T> {
public void fullLoad() { public void fullLoad() {
CompletableFuture<List<T>> future = fullLoadAsync(); CompletableFuture<List<T>> future = fullLoadAsync();
if (future != null) { if (future != null) {
//future.join(); future.join();
try {
future.get(1, TimeUnit.SECONDS);
} catch (Exception e) {
e.printStackTrace();
}
} }
} }