From 584d15c853bf01040d5dffc17c6d436e670a8fa0 Mon Sep 17 00:00:00 2001 From: Liangliang Gu Date: Tue, 25 Jan 2022 13:01:49 +0800 Subject: [PATCH 1/2] cherry pick #496 to release-3.1 Signed-off-by: ti-srebot --- pom.xml | 42 ++++++++++++++ src/main/java/org/tikv/common/TiSession.java | 12 ++++ src/test/java/org/tikv/raw/WarmupTest.java | 60 ++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 src/test/java/org/tikv/raw/WarmupTest.java diff --git a/pom.xml b/pom.xml index dc066210875..d6f61448ce8 100644 --- a/pom.xml +++ b/pom.xml @@ -539,6 +539,48 @@ true +<<<<<<< HEAD +======= + + io.github.git-commit-id + git-commit-id-maven-plugin + 4.9.9 + + + get-the-git-infos + + revision + + initialize + + + validate-the-git-infos + + validateRevision + + package + + + + true + true + ${project.build.outputDirectory}/git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + always + + +>>>>>>> 6a6967a36... let JVM ClassLoader load gRPC error related classes during warmup (#496) diff --git a/src/main/java/org/tikv/common/TiSession.java b/src/main/java/org/tikv/common/TiSession.java index f1f9790945e..aa5c619ac95 100644 --- a/src/main/java/org/tikv/common/TiSession.java +++ b/src/main/java/org/tikv/common/TiSession.java @@ -39,6 +39,11 @@ import org.tikv.common.region.TiRegion; import org.tikv.common.region.TiStore; import org.tikv.common.util.*; +<<<<<<< HEAD +======= +import org.tikv.kvproto.Errorpb; +import org.tikv.kvproto.ImportSstpb; +>>>>>>> 6a6967a36... let JVM ClassLoader load gRPC error related classes during warmup (#496) import org.tikv.kvproto.Metapb; import org.tikv.kvproto.Pdpb; import org.tikv.raw.RawKVClient; @@ -99,6 +104,13 @@ private synchronized void warmUp() { BackOffer backOffer = ConcreteBackOffer.newRawKVBackOff(); try { + // let JVM ClassLoader load gRPC error related classes + // this operation may cost 100ms + Errorpb.Error.newBuilder() + .setNotLeader(Errorpb.NotLeader.newBuilder().build()) + .build() + .toString(); + this.client = getPDClient(); this.regionManager = getRegionManager(); List stores = this.client.getAllStores(backOffer); diff --git a/src/test/java/org/tikv/raw/WarmupTest.java b/src/test/java/org/tikv/raw/WarmupTest.java new file mode 100644 index 00000000000..a2aa6e5f3e1 --- /dev/null +++ b/src/test/java/org/tikv/raw/WarmupTest.java @@ -0,0 +1,60 @@ +/* + * Copyright 2021 TiKV Project Authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.tikv.raw; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; +import org.tikv.BaseRawKVTest; +import org.tikv.common.TiConfiguration; +import org.tikv.common.TiSession; +import org.tikv.kvproto.Errorpb; + +public class WarmupTest extends BaseRawKVTest { + + @Test + public void testErrorpbToStringEnableWarmup() throws Exception { + TiConfiguration conf = createTiConfiguration(); + TiSession session = TiSession.create(conf); + + long start = System.currentTimeMillis(); + Errorpb.Error.newBuilder() + .setNotLeader(Errorpb.NotLeader.newBuilder().build()) + .build() + .toString(); + long end = System.currentTimeMillis(); + assertTrue(end - start < 10); + session.close(); + } + + @Test + public void testErrorpbToStringDisableWarmup() throws Exception { + TiConfiguration conf = createTiConfiguration(); + conf.setWarmUpEnable(false); + TiSession session = TiSession.create(conf); + + long start = System.currentTimeMillis(); + Errorpb.Error.newBuilder() + .setNotLeader(Errorpb.NotLeader.newBuilder().build()) + .build() + .toString(); + long end = System.currentTimeMillis(); + assertTrue(end - start > 10); + session.close(); + } +} From 61d717042d39d0ac7043b719e3c7a76d46b703e5 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Tue, 25 Jan 2022 13:04:47 +0800 Subject: [PATCH 2/2] fix conflicts Signed-off-by: marsishandsome --- pom.xml | 34 -------------------- src/main/java/org/tikv/common/TiSession.java | 4 --- 2 files changed, 38 deletions(-) diff --git a/pom.xml b/pom.xml index d6f61448ce8..f50de0e1a80 100644 --- a/pom.xml +++ b/pom.xml @@ -539,39 +539,6 @@ true -<<<<<<< HEAD -======= - - io.github.git-commit-id - git-commit-id-maven-plugin - 4.9.9 - - - get-the-git-infos - - revision - - initialize - - - validate-the-git-infos - - validateRevision - - package - - - - true - true - ${project.build.outputDirectory}/git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - - org.apache.maven.plugins maven-surefire-plugin @@ -580,7 +547,6 @@ always ->>>>>>> 6a6967a36... let JVM ClassLoader load gRPC error related classes during warmup (#496) diff --git a/src/main/java/org/tikv/common/TiSession.java b/src/main/java/org/tikv/common/TiSession.java index aa5c619ac95..42eb278ee98 100644 --- a/src/main/java/org/tikv/common/TiSession.java +++ b/src/main/java/org/tikv/common/TiSession.java @@ -39,11 +39,7 @@ import org.tikv.common.region.TiRegion; import org.tikv.common.region.TiStore; import org.tikv.common.util.*; -<<<<<<< HEAD -======= import org.tikv.kvproto.Errorpb; -import org.tikv.kvproto.ImportSstpb; ->>>>>>> 6a6967a36... let JVM ClassLoader load gRPC error related classes during warmup (#496) import org.tikv.kvproto.Metapb; import org.tikv.kvproto.Pdpb; import org.tikv.raw.RawKVClient;