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

优化client

Browse Source
This commit is contained in:
redkale
2023-10-21 08:04:53 +08:00
parent da81509157
commit cb3cb00e2b
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/redkale/net/client/Client.java
View File

@@ -13,6 +13,7 @@ import java.util.function.*;
import java.util.logging.Logger;
import org.redkale.net.*;
import org.redkale.util.*;
import static org.redkale.util.Utility.isNotEmpty;
/**
*
@@ -327,11 +328,26 @@ public abstract class Client<C extends ClientConnection<R, P>, R extends ClientR
final Queue<CompletableFuture<C>> waitQueue = this.connAcquireWaitings[connIndex];
if (!pool || this.connOpenStates[connIndex].compareAndSet(false, true)) {
CompletableFuture<C> future = group.createClient(tcp, this.address.randomAddress(), readTimeoutSeconds, writeTimeoutSeconds)
.thenApply(c -> (C) createClientConnection(connIndex, c).setMaxPipelines(maxPipelines));
.thenApply(c -> {
if (isNotEmpty(traceid)) {
Traces.computeIfAbsent(traceid);
}
return (C) createClientConnection(connIndex, c).setMaxPipelines(maxPipelines);
});
R virtualReq = createVirtualRequestAfterConnect();
if (virtualReq != null) {
virtualReq.traceid = traceid;
future = future.thenCompose(conn -> conn.writeVirtualRequest(virtualReq).thenApply(v -> conn));
future = future.thenCompose(conn -> {
if (isNotEmpty(traceid)) {
Traces.computeIfAbsent(traceid);
}
return conn.writeVirtualRequest(virtualReq).thenApply(v -> {
if (isNotEmpty(traceid)) {
Traces.computeIfAbsent(traceid);
}
return conn;
});
});
} else {
future = future.thenApply(conn -> {
conn.channel.readRegister(conn.getCodec()); //不用readRegisterInIOThread，因executeRead可能会异步
@@ -342,7 +358,9 @@ public abstract class Client<C extends ClientConnection<R, P>, R extends ClientR
future = future.thenCompose(authenticate);
}
return future.thenApply(c -> {
Traces.computeIfAbsent(traceid);
if (isNotEmpty(traceid)) {
Traces.computeIfAbsent(traceid);
}
c.setAuthenticated(true);
if (pool) {
this.connArray[connIndex] = c;
@@ -352,7 +370,9 @@ public abstract class Client<C extends ClientConnection<R, P>, R extends ClientR
if (workThread != null) {
CompletableFuture<C> fs = f;
workThread.execute(() -> {
Traces.computeIfAbsent(traceid);
if (isNotEmpty(traceid)) {
Traces.computeIfAbsent(traceid);
}
fs.complete(c);
});
} else {

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

@@ -14,7 +14,6 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.*;
import java.util.logging.Level;
import org.redkale.annotation.*;
import org.redkale.net.*;
import org.redkale.util.*;
@@ -134,7 +133,6 @@ public abstract class ClientConnection<R extends ClientRequest, P> implements Co
} else {
sendRequestInLocking(request, respFuture);
}
client.logger.log(Level.INFO, channel + ", " + request.getTraceid()+ " 发送完请求: " + request);
} finally {
writeLock.unlock();
}
@@ -321,7 +319,6 @@ public abstract class ClientConnection<R extends ClientRequest, P> implements Co
public void dispose(Throwable exc) {
channel.offerWriteBuffer(writeBuffer);
channel.dispose();
System.out.println(Thread.currentThread().getName() + ": " + channel + ", 被关闭了");
Throwable e = exc == null ? new ClosedChannelException() : exc;
CompletableFuture f;
respWaitingCounter.reset();