From 81ba2f30006dd0b070647c10139ad5c31b54d17b Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Thu, 28 Mar 2024 16:16:59 +0800 Subject: [PATCH 1/2] bump grpc to 1.60.0 Signed-off-by: iosmanthus --- pom.xml | 18 ++---------------- src/main/java/org/tikv/common/PDClient.java | 9 +++++++-- .../region/AbstractRegionStoreClient.java | 8 +++++--- .../tikv/common/region/RegionStoreClient.java | 9 +++++++-- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index dd34f060b3f..9d95527e976 100644 --- a/pom.xml +++ b/pom.xml @@ -57,14 +57,14 @@ 3.18.0 1.2.17 1.7.16 - 1.48.0 + 1.60.0 2.0.34.Final 2.8.9 1.6.6 2.13.2 2.13.4.2 3.0.1 - 0.4.1 + 0.7.7 2.9.9 1.9.2 ${basedir}/proto @@ -188,20 +188,6 @@ io.etcd jetcd-core - - - io.etcd - jetcd-resolver - - - io.etcd - jetcd-common - - - io.grpc - grpc-grpclb - - ${jetcd.version} diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index e3695b69161..543a3b1523d 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -108,6 +108,7 @@ public class PDClient extends AbstractGRPCClient implements ReadOnlyPDClient { + private static final String TIFLASH_TABLE_SYNC_PROGRESS_PATH = "/tiflash/table/sync"; private static final long MIN_TRY_UPDATE_DURATION = 50; private static final int PAUSE_CHECKER_TIMEOUT = 300; // in seconds @@ -829,6 +830,7 @@ private void initCluster() { } static class PDClientWrapper { + private final String leaderInfo; private final PDBlockingStub blockingStub; private final PDFutureStub asyncStub; @@ -841,8 +843,11 @@ static class PDClientWrapper { Metadata header = new Metadata(); header.put(TiConfiguration.PD_FORWARD_META_DATA_KEY, addrToUri(leaderInfo).toString()); this.blockingStub = - MetadataUtils.attachHeaders(PDGrpc.newBlockingStub(clientChannel), header); - this.asyncStub = MetadataUtils.attachHeaders(PDGrpc.newFutureStub(clientChannel), header); + PDGrpc.newBlockingStub(clientChannel) + .withInterceptors(MetadataUtils.newAttachHeadersInterceptor(header)); + this.asyncStub = + PDGrpc.newFutureStub(clientChannel) + .withInterceptors(MetadataUtils.newAttachHeadersInterceptor(header)); } else { this.blockingStub = PDGrpc.newBlockingStub(clientChannel); this.asyncStub = PDGrpc.newFutureStub(clientChannel); diff --git a/src/main/java/org/tikv/common/region/AbstractRegionStoreClient.java b/src/main/java/org/tikv/common/region/AbstractRegionStoreClient.java index f848de8798d..6e5eecf565f 100644 --- a/src/main/java/org/tikv/common/region/AbstractRegionStoreClient.java +++ b/src/main/java/org/tikv/common/region/AbstractRegionStoreClient.java @@ -209,8 +209,9 @@ private void updateClientStub() { if (store.getProxyStore() != null) { Metadata header = new Metadata(); header.put(TiConfiguration.FORWARD_META_DATA_KEY, store.getStore().getAddress()); - blockingStub = MetadataUtils.attachHeaders(blockingStub, header); - asyncStub = MetadataUtils.attachHeaders(asyncStub, header); + blockingStub = + blockingStub.withInterceptors(MetadataUtils.newAttachHeadersInterceptor(header)); + asyncStub = asyncStub.withInterceptors(MetadataUtils.newAttachHeadersInterceptor(header)); } } @@ -371,7 +372,8 @@ private TiStore switchProxyStore(BackOffer backOffer) { .setKey(codec.encodeKey(key)) .build(); ListenableFuture task = - MetadataUtils.attachHeaders(stub, header).rawGet(rawGetRequest); + stub.withInterceptors(MetadataUtils.newAttachHeadersInterceptor(header)) + .rawGet(rawGetRequest); responses.add(new ForwardCheckTask(task, peerStore.getStore())); } catch (Exception e) { logger.warn( diff --git a/src/main/java/org/tikv/common/region/RegionStoreClient.java b/src/main/java/org/tikv/common/region/RegionStoreClient.java index 22607b2bdb1..aedf379cadb 100644 --- a/src/main/java/org/tikv/common/region/RegionStoreClient.java +++ b/src/main/java/org/tikv/common/region/RegionStoreClient.java @@ -127,6 +127,7 @@ /** Note that RegionStoreClient itself is not thread-safe */ public class RegionStoreClient extends AbstractRegionStoreClient { + private static final Logger logger = LoggerFactory.getLogger(RegionStoreClient.class); @VisibleForTesting public final AbstractLockResolverClient lockResolverClient; private final TiStoreType storeType; @@ -1395,8 +1396,12 @@ public RegionStoreClient build(TiRegion region, TiStore store, TiStoreType store channelFactory.getChannel(addressStr, regionManager.getPDClient().getHostMapping()); Metadata header = new Metadata(); header.put(TiConfiguration.FORWARD_META_DATA_KEY, store.getStore().getAddress()); - blockingStub = MetadataUtils.attachHeaders(TikvGrpc.newBlockingStub(channel), header); - asyncStub = MetadataUtils.attachHeaders(TikvGrpc.newFutureStub(channel), header); + blockingStub = + TikvGrpc.newBlockingStub(channel) + .withInterceptors(MetadataUtils.newAttachHeadersInterceptor(header)); + asyncStub = + TikvGrpc.newFutureStub(channel) + .withInterceptors(MetadataUtils.newAttachHeadersInterceptor(header)); } else { channel = channelFactory.getChannel(addressStr, pdClient.getHostMapping()); blockingStub = TikvGrpc.newBlockingStub(channel); From 34fde1768b55a7b40dd5395a8fb40d4a6102ee8d Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Thu, 28 Mar 2024 16:32:59 +0800 Subject: [PATCH 2/2] remove newline Signed-off-by: iosmanthus --- src/main/java/org/tikv/common/PDClient.java | 2 -- src/main/java/org/tikv/common/region/RegionStoreClient.java | 1 - 2 files changed, 3 deletions(-) diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index 543a3b1523d..e2c1f30f426 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -108,7 +108,6 @@ public class PDClient extends AbstractGRPCClient implements ReadOnlyPDClient { - private static final String TIFLASH_TABLE_SYNC_PROGRESS_PATH = "/tiflash/table/sync"; private static final long MIN_TRY_UPDATE_DURATION = 50; private static final int PAUSE_CHECKER_TIMEOUT = 300; // in seconds @@ -830,7 +829,6 @@ private void initCluster() { } static class PDClientWrapper { - private final String leaderInfo; private final PDBlockingStub blockingStub; private final PDFutureStub asyncStub; diff --git a/src/main/java/org/tikv/common/region/RegionStoreClient.java b/src/main/java/org/tikv/common/region/RegionStoreClient.java index aedf379cadb..9a4ed807503 100644 --- a/src/main/java/org/tikv/common/region/RegionStoreClient.java +++ b/src/main/java/org/tikv/common/region/RegionStoreClient.java @@ -127,7 +127,6 @@ /** Note that RegionStoreClient itself is not thread-safe */ public class RegionStoreClient extends AbstractRegionStoreClient { - private static final Logger logger = LoggerFactory.getLogger(RegionStoreClient.class); @VisibleForTesting public final AbstractLockResolverClient lockResolverClient; private final TiStoreType storeType;