From 3153693390288c83f43e72138b12fe21a375e248 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Tue, 23 Nov 2021 16:55:32 +0800 Subject: [PATCH 1/8] fix TLS Signed-off-by: marsishandsome --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 4aa8c968931..b5bb32e8dc2 100644 --- a/pom.xml +++ b/pom.xml @@ -450,10 +450,12 @@ com.google org.tikv.shade.com.google + io.opencensus org.tikv.shade.io.opencensus From bcdff1e66c577f8757ce13ae399a0a100f4b89f6 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 24 Nov 2021 09:50:20 +0800 Subject: [PATCH 2/8] shade netty without tcnative Signed-off-by: marsishandsome --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b5bb32e8dc2..a38b1107aaf 100644 --- a/pom.xml +++ b/pom.xml @@ -450,12 +450,13 @@ com.google org.tikv.shade.com.google - io.opencensus org.tikv.shade.io.opencensus From 69b05e37fa60746cb70628f5ac3ae57e20cafa75 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 24 Nov 2021 10:34:54 +0800 Subject: [PATCH 3/8] use grpc-netty-shaded Signed-off-by: marsishandsome --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a38b1107aaf..e6ce056f7ae 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ io.grpc - grpc-netty + grpc-netty-shaded ${grpc.version} @@ -140,11 +140,13 @@ grpc-services ${grpc.version} + io.grpc grpc-testing @@ -442,14 +444,17 @@ + com.google org.tikv.shade.com.google + io.opencensus org.tikv.shade.io.opencensus From a4ca2e6fc4676a871fa41c75929afbe532dd3a2b Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 24 Nov 2021 13:03:16 +0800 Subject: [PATCH 4/8] use grpc-netty-shaded 2 Signed-off-by: marsishandsome --- pom.xml | 2 +- src/main/java/org/tikv/common/util/ChannelFactory.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e6ce056f7ae..484cf133539 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ io.grpc - grpc-grpclb + grpc-netty ${jetcd.version} diff --git a/src/main/java/org/tikv/common/util/ChannelFactory.java b/src/main/java/org/tikv/common/util/ChannelFactory.java index a517473089f..4ee59896587 100644 --- a/src/main/java/org/tikv/common/util/ChannelFactory.java +++ b/src/main/java/org/tikv/common/util/ChannelFactory.java @@ -16,10 +16,10 @@ package org.tikv.common.util; import io.grpc.ManagedChannel; -import io.grpc.netty.GrpcSslContexts; -import io.grpc.netty.NettyChannelBuilder; -import io.netty.handler.ssl.SslContext; -import io.netty.handler.ssl.SslContextBuilder; +import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts; +import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder; +import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext; +import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder; import java.io.File; import java.net.URI; import java.util.concurrent.ConcurrentHashMap; From e22508817c1aa40fe72b65bdeb49612fd1235b61 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 24 Nov 2021 13:07:44 +0800 Subject: [PATCH 5/8] use grpc-netty-shaded 3 Signed-off-by: marsishandsome --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 484cf133539..c22102d637a 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ io.grpc - grpc-netty + grpc-grpclb ${jetcd.version} @@ -444,12 +444,10 @@ - com.google org.tikv.shade.com.google From 1fcba6afd68af55caae7424587350dc6f98bb1a3 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 24 Nov 2021 13:11:46 +0800 Subject: [PATCH 6/8] use grpc-netty-shaded 4 Signed-off-by: marsishandsome --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index c22102d637a..59587b788f2 100644 --- a/pom.xml +++ b/pom.xml @@ -452,15 +452,10 @@ com.google org.tikv.shade.com.google - io.opencensus org.tikv.shade.io.opencensus From 7700b19978109a22af0d23844f5316b8e020bcdf Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 24 Nov 2021 13:24:08 +0800 Subject: [PATCH 7/8] use grpc-netty-shaded 5 Signed-off-by: marsishandsome --- pom.xml | 2 +- src/main/java/org/tikv/common/DefaultHostMapping.java | 5 +++-- src/main/java/org/tikv/common/PDClient.java | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 59587b788f2..0cd83263edd 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ io.grpc - grpc-grpclb + grpc-netty ${jetcd.version} diff --git a/src/main/java/org/tikv/common/DefaultHostMapping.java b/src/main/java/org/tikv/common/DefaultHostMapping.java index 2e53fff37fd..7f5a94656b7 100644 --- a/src/main/java/org/tikv/common/DefaultHostMapping.java +++ b/src/main/java/org/tikv/common/DefaultHostMapping.java @@ -52,7 +52,7 @@ private ByteSequence hostToNetworkMappingKey(String host) { @Beta private String getMappedHostFromPD(String host) { - ByteSequence hostKey = hostToNetworkMappingKey(host); + /*ByteSequence hostKey = hostToNetworkMappingKey(host); for (int i = 0; i < 5; i++) { CompletableFuture future = etcdClient.getKVClient().get(hostKey); try { @@ -72,7 +72,8 @@ private String getMappedHostFromPD(String host) { break; } } - return host; + return host;*/ + return ""; } public URI getMappedURI(URI uri) { diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index d86363f3c66..e2f188418a3 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -378,7 +378,7 @@ public TiConfiguration.ReplicaRead getReplicaRead() { @Override public void close() throws InterruptedException { - etcdClient.close(); + //etcdClient.close(); if (service != null) { service.shutdownNow(); } @@ -635,8 +635,8 @@ private void initCluster() { GetMembersResponse resp = null; List pdAddrs = getConf().getPdAddrs(); this.pdAddrs = pdAddrs; - this.etcdClient = - Client.builder() + this.etcdClient = null; + /*Client.builder() .endpoints(pdAddrs) .executorService( Executors.newCachedThreadPool( @@ -644,7 +644,7 @@ private void initCluster() { .setNameFormat("etcd-conn-manager-pool-%d") .setDaemon(true) .build())) - .build(); + .build();*/ this.hostMapping = Optional.ofNullable(getConf().getHostMapping()) .orElseGet(() -> new DefaultHostMapping(this.etcdClient, conf.getNetworkMappingName())); From 293daeb6dda2260679dc08bde0d560d795a2c4bd Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Wed, 24 Nov 2021 13:37:23 +0800 Subject: [PATCH 8/8] use grpc-netty-shaded 6 Signed-off-by: marsishandsome --- pom.xml | 7 +++++++ .../org/tikv/common/DefaultHostMapping.java | 5 ----- src/main/java/org/tikv/common/PDClient.java | 20 +++++++++---------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 0cd83263edd..04d44061077 100644 --- a/pom.xml +++ b/pom.xml @@ -444,18 +444,25 @@ + com.google org.tikv.shade.com.google + io.opencensus org.tikv.shade.io.opencensus diff --git a/src/main/java/org/tikv/common/DefaultHostMapping.java b/src/main/java/org/tikv/common/DefaultHostMapping.java index 7f5a94656b7..a1d843588fe 100644 --- a/src/main/java/org/tikv/common/DefaultHostMapping.java +++ b/src/main/java/org/tikv/common/DefaultHostMapping.java @@ -20,15 +20,10 @@ import com.google.common.annotations.Beta; import io.etcd.jetcd.ByteSequence; import io.etcd.jetcd.Client; -import io.etcd.jetcd.KeyValue; -import io.etcd.jetcd.kv.GetResponse; import java.net.URI; import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index e2f188418a3..70c6ba9bc32 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -378,7 +378,7 @@ public TiConfiguration.ReplicaRead getReplicaRead() { @Override public void close() throws InterruptedException { - //etcdClient.close(); + // etcdClient.close(); if (service != null) { service.shutdownNow(); } @@ -636,15 +636,15 @@ private void initCluster() { List pdAddrs = getConf().getPdAddrs(); this.pdAddrs = pdAddrs; this.etcdClient = null; - /*Client.builder() - .endpoints(pdAddrs) - .executorService( - Executors.newCachedThreadPool( - new ThreadFactoryBuilder() - .setNameFormat("etcd-conn-manager-pool-%d") - .setDaemon(true) - .build())) - .build();*/ + /*Client.builder() + .endpoints(pdAddrs) + .executorService( + Executors.newCachedThreadPool( + new ThreadFactoryBuilder() + .setNameFormat("etcd-conn-manager-pool-%d") + .setDaemon(true) + .build())) + .build();*/ this.hostMapping = Optional.ofNullable(getConf().getHostMapping()) .orElseGet(() -> new DefaultHostMapping(this.etcdClient, conf.getNetworkMappingName()));