Browse Source
This PR makes two changes to code in the ReplicaManager.updateFollowerFetchState path, which is in the hot path for follower fetches. Although calling ReplicaManager.updateFollowerFetch state is inexpensive on its own, it is called once for each partition every time a follower fetch occurs. 1. updateFollowerFetchState no longer calls maybeExpandIsr when the follower is already in the ISR. This avoid repeated expansion checks. 2. Partition.maybeIncrementLeaderHW is also in the hot path for ReplicaManager.updateFollowerFetchState. Partition.maybeIncrementLeaderHW calls Partition.remoteReplicas four times each iteration, and it performs a toSet conversion. maybeIncrementLeaderHW now avoids generating any intermediate collections when updating the HWM. **Benchmark results for Partition.updateFollowerFetchState on a r5.xlarge:** Old: ``` 1288.633 ±(99.9%) 1.170 ns/op [Average] (min, avg, max) = (1287.343, 1288.633, 1290.398), stdev = 1.037 CI (99.9%): [1287.463, 1289.802] (assumes normal distribution) ``` New (when follower fetch offset is updated): ``` 261.727 ±(99.9%) 0.122 ns/op [Average] (min, avg, max) = (261.565, 261.727, 261.937), stdev = 0.114 CI (99.9%): [261.605, 261.848] (assumes normal distribution) ``` New (when follower fetch offset is the same): ``` 68.484 ±(99.9%) 0.025 ns/op [Average] (min, avg, max) = (68.446, 68.484, 68.520), stdev = 0.023 CI (99.9%): [68.460, 68.509] (assumes normal distribution) ``` Reviewers: Ismael Juma <ismael@juma.me.uk>, Jason Gustafson <jason@confluent.io>pull/7365/head
Lucas Bradstreet
5 years ago
committed by
Jason Gustafson
7 changed files with 306 additions and 58 deletions
@ -0,0 +1,45 @@
@@ -0,0 +1,45 @@
|
||||
<!DOCTYPE import-control PUBLIC |
||||
"-//Puppy Crawl//DTD Import Control 1.1//EN" |
||||
"http://www.puppycrawl.com/dtds/import_control_1_1.dtd"> |
||||
<!-- |
||||
// Licensed to the Apache Software Foundation (ASF) under one or more |
||||
// contributor license agreements. See the NOTICE file distributed with |
||||
// this work for additional information regarding copyright ownership. |
||||
// The ASF licenses this file to You 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. |
||||
--> |
||||
|
||||
<import-control pkg="org.apache.kafka.jmh"> |
||||
|
||||
<allow pkg="java"/> |
||||
<allow pkg="scala"/> |
||||
<allow pkg="javax.management"/> |
||||
<allow pkg="org.slf4j"/> |
||||
<allow pkg="org.openjdk.jmh.annotations"/> |
||||
<allow pkg="org.openjdk.jmh.runner"/> |
||||
<allow pkg="org.openjdk.jmh.infra"/> |
||||
<allow pkg="java.security"/> |
||||
<allow pkg="javax.net.ssl"/> |
||||
<allow pkg="javax.security"/> |
||||
<allow pkg="org.apache.kafka.common"/> |
||||
<allow pkg="org.apache.kafka.clients.producer"/> |
||||
<allow pkg="kafka.cluster"/> |
||||
<allow pkg="kafka.log"/> |
||||
<allow pkg="kafka.server"/> |
||||
<allow pkg="kafka.api"/> |
||||
<allow class="kafka.utils.KafkaScheduler"/> |
||||
<allow pkg="org.mockito"/> |
||||
|
||||
|
||||
<subpackage name="cache"> |
||||
</subpackage> |
||||
</import-control> |
||||
@ -0,0 +1,175 @@
@@ -0,0 +1,175 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You 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.apache.kafka.jmh.partition; |
||||
|
||||
import kafka.api.ApiVersion$; |
||||
import kafka.cluster.DelayedOperations; |
||||
import kafka.cluster.Partition; |
||||
import kafka.cluster.PartitionStateStore; |
||||
import kafka.log.CleanerConfig; |
||||
import kafka.log.Defaults; |
||||
import kafka.log.LogConfig; |
||||
import kafka.log.LogManager; |
||||
import kafka.server.BrokerState; |
||||
import kafka.server.BrokerTopicStats; |
||||
import kafka.server.LogDirFailureChannel; |
||||
import kafka.server.LogOffsetMetadata; |
||||
import kafka.server.MetadataCache; |
||||
import kafka.server.checkpoints.OffsetCheckpoints; |
||||
import kafka.utils.KafkaScheduler; |
||||
import org.apache.kafka.common.TopicPartition; |
||||
import org.apache.kafka.common.requests.LeaderAndIsrRequest; |
||||
import org.apache.kafka.common.utils.Time; |
||||
import org.mockito.Mockito; |
||||
import org.openjdk.jmh.annotations.Benchmark; |
||||
import org.openjdk.jmh.annotations.BenchmarkMode; |
||||
import org.openjdk.jmh.annotations.Fork; |
||||
import org.openjdk.jmh.annotations.Level; |
||||
import org.openjdk.jmh.annotations.Measurement; |
||||
import org.openjdk.jmh.annotations.Mode; |
||||
import org.openjdk.jmh.annotations.OutputTimeUnit; |
||||
import org.openjdk.jmh.annotations.Scope; |
||||
import org.openjdk.jmh.annotations.Setup; |
||||
import org.openjdk.jmh.annotations.State; |
||||
import org.openjdk.jmh.annotations.TearDown; |
||||
import org.openjdk.jmh.annotations.Warmup; |
||||
import scala.Option; |
||||
import scala.collection.JavaConverters; |
||||
|
||||
import java.io.File; |
||||
import java.util.ArrayList; |
||||
import java.util.Collections; |
||||
import java.util.HashMap; |
||||
import java.util.List; |
||||
import java.util.Properties; |
||||
import java.util.UUID; |
||||
import java.util.concurrent.TimeUnit; |
||||
|
||||
@State(Scope.Benchmark) |
||||
@Fork(value = 1) |
||||
@Warmup(iterations = 5) |
||||
@Measurement(iterations = 15) |
||||
@BenchmarkMode(Mode.AverageTime) |
||||
@OutputTimeUnit(TimeUnit.NANOSECONDS) |
||||
public class UpdateFollowerFetchStateBenchmark { |
||||
private TopicPartition topicPartition = new TopicPartition(UUID.randomUUID().toString(), 0); |
||||
private File logDir = new File(System.getProperty("java.io.tmpdir"), topicPartition.toString()); |
||||
private KafkaScheduler scheduler = new KafkaScheduler(1, "scheduler", true); |
||||
private BrokerTopicStats brokerTopicStats = new BrokerTopicStats(); |
||||
private LogDirFailureChannel logDirFailureChannel = Mockito.mock(LogDirFailureChannel.class); |
||||
private long nextOffset = 0; |
||||
private LogManager logManager; |
||||
private Partition partition; |
||||
|
||||
@Setup(Level.Trial) |
||||
public void setUp() { |
||||
scheduler.startup(); |
||||
LogConfig logConfig = createLogConfig(); |
||||
List<File> logDirs = Collections.singletonList(logDir); |
||||
logManager = new LogManager(JavaConverters.asScalaIteratorConverter(logDirs.iterator()).asScala().toSeq(), |
||||
JavaConverters.asScalaIteratorConverter(new ArrayList<File>().iterator()).asScala().toSeq(), |
||||
new scala.collection.mutable.HashMap<>(), |
||||
logConfig, |
||||
new CleanerConfig(0, 0, 0, 0, 0, 0.0, 0, false, "MD5"), |
||||
1, |
||||
1000L, |
||||
10000L, |
||||
10000L, |
||||
1000L, |
||||
60000, |
||||
scheduler, |
||||
new BrokerState(), |
||||
brokerTopicStats, |
||||
logDirFailureChannel, |
||||
Time.SYSTEM); |
||||
OffsetCheckpoints offsetCheckpoints = Mockito.mock(OffsetCheckpoints.class); |
||||
Mockito.when(offsetCheckpoints.fetch(logDir.getAbsolutePath(), topicPartition)).thenReturn(Option.apply(0L)); |
||||
DelayedOperations delayedOperations = new DelayedOperationsMock(); |
||||
|
||||
// one leader, plus two followers
|
||||
List<Integer> replicas = new ArrayList<>(); |
||||
replicas.add(0); |
||||
replicas.add(1); |
||||
replicas.add(2); |
||||
LeaderAndIsrRequest.PartitionState partitionState = new LeaderAndIsrRequest.PartitionState( |
||||
0, 0, 0, replicas, 1, replicas, true); |
||||
PartitionStateStore partitionStateStore = Mockito.mock(PartitionStateStore.class); |
||||
Mockito.when(partitionStateStore.fetchTopicConfig()).thenReturn(new Properties()); |
||||
partition = new Partition(topicPartition, 100, |
||||
ApiVersion$.MODULE$.latestVersion(), 0, Time.SYSTEM, |
||||
partitionStateStore, delayedOperations, |
||||
Mockito.mock(MetadataCache.class), logManager); |
||||
partition.makeLeader(0, partitionState, 0, offsetCheckpoints); |
||||
} |
||||
|
||||
// avoid mocked DelayedOperations to avoid mocked class affecting benchmark results
|
||||
private class DelayedOperationsMock extends DelayedOperations { |
||||
DelayedOperationsMock() { |
||||
super(topicPartition, null, null, null); |
||||
} |
||||
|
||||
@Override |
||||
public int numDelayedDelete() { |
||||
return 0; |
||||
} |
||||
} |
||||
|
||||
@TearDown(Level.Trial) |
||||
public void tearDown() { |
||||
logManager.shutdown(); |
||||
scheduler.shutdown(); |
||||
} |
||||
|
||||
private LogConfig createLogConfig() { |
||||
Properties logProps = new Properties(); |
||||
logProps.put(LogConfig.SegmentMsProp(), Defaults.SegmentMs()); |
||||
logProps.put(LogConfig.SegmentBytesProp(), Defaults.SegmentSize()); |
||||
logProps.put(LogConfig.RetentionMsProp(), Defaults.RetentionMs()); |
||||
logProps.put(LogConfig.RetentionBytesProp(), Defaults.RetentionSize()); |
||||
logProps.put(LogConfig.SegmentJitterMsProp(), Defaults.SegmentJitterMs()); |
||||
logProps.put(LogConfig.CleanupPolicyProp(), Defaults.CleanupPolicy()); |
||||
logProps.put(LogConfig.MaxMessageBytesProp(), Defaults.MaxMessageSize()); |
||||
logProps.put(LogConfig.IndexIntervalBytesProp(), Defaults.IndexInterval()); |
||||
logProps.put(LogConfig.SegmentIndexBytesProp(), Defaults.MaxIndexSize()); |
||||
logProps.put(LogConfig.MessageFormatVersionProp(), Defaults.MessageFormatVersion()); |
||||
logProps.put(LogConfig.FileDeleteDelayMsProp(), Defaults.FileDeleteDelayMs()); |
||||
return LogConfig.apply(logProps, new scala.collection.immutable.HashSet<>()); |
||||
} |
||||
|
||||
@Benchmark |
||||
@OutputTimeUnit(TimeUnit.NANOSECONDS) |
||||
public void updateFollowerFetchStateBench() { |
||||
// measure the impact of two follower fetches on the leader
|
||||
partition.updateFollowerFetchState(1, new LogOffsetMetadata(nextOffset, nextOffset, 0), |
||||
0, 1, nextOffset); |
||||
partition.updateFollowerFetchState(2, new LogOffsetMetadata(nextOffset, nextOffset, 0), |
||||
0, 1, nextOffset); |
||||
nextOffset++; |
||||
} |
||||
|
||||
@Benchmark |
||||
@OutputTimeUnit(TimeUnit.NANOSECONDS) |
||||
public void updateFollowerFetchStateBenchNoChange() { |
||||
// measure the impact of two follower fetches on the leader when the follower didn't
|
||||
// end up fetching anything
|
||||
partition.updateFollowerFetchState(1, new LogOffsetMetadata(nextOffset, nextOffset, 0), |
||||
0, 1, 100); |
||||
partition.updateFollowerFetchState(2, new LogOffsetMetadata(nextOffset, nextOffset, 0), |
||||
0, 1, 100); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue