diff --git a/pom.xml b/pom.xml
index dd34f060b3..9d95527e97 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 e3695b6916..e2c1f30f42 100644
--- a/src/main/java/org/tikv/common/PDClient.java
+++ b/src/main/java/org/tikv/common/PDClient.java
@@ -841,8 +841,11 @@ public class PDClient extends AbstractGRPCClient
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 f848de8798..6e5eecf565 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 @@ public abstract class AbstractRegionStoreClient
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 @@ public abstract class AbstractRegionStoreClient
.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 22607b2bdb..9a4ed80750 100644
--- a/src/main/java/org/tikv/common/region/RegionStoreClient.java
+++ b/src/main/java/org/tikv/common/region/RegionStoreClient.java
@@ -1395,8 +1395,12 @@ public class RegionStoreClient extends AbstractRegionStoreClient {
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);