Copilot commented on code in PR #7550:
URL: https://github.com/apache/ozone/pull/7550#discussion_r2122716523
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java:
##########
@@ -36,22 +39,29 @@
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.AllocateBlockRequest;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Tests OMAllocateBlockRequest class.
*/
public class TestOMAllocateBlockRequest extends TestOMKeyRequest {
- @Test
- public void testPreExecute() throws Exception {
+ public static Collection<Object[]> cacheEnabledValues() {
+ return Arrays.asList(new Object[][] {
+ {true},
+ {false}
+ });
+ }
Review Comment:
The `testPreExecute` method no longer has a test annotation, so it won't
run. Add `@Test` (or `@ParameterizedTest` with a `@MethodSource`) above this
method to restore execution.
```suggestion
@Test
```
##########
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/client/OMBlockPrefetchClient.java:
##########
@@ -0,0 +1,336 @@
+/*
+ * 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.hadoop.hdds.scm.client;
+
+import static org.apache.hadoop.hdds.scm.net.NetConstants.NODE_COST_DEFAULT;
+import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OM_PREFETCHED_BLOCKS_EXPIRY_INTERVAL;
+import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OM_PREFETCHED_BLOCKS_EXPIRY_INTERVAL_DEFAULT;
+import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OM_PREFETCH_MAX_BLOCKS;
+import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OM_PREFETCH_MAX_BLOCKS_DEFAULT;
+import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OM_PREFETCH_MIN_BLOCKS;
+import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OM_PREFETCH_MIN_BLOCKS_DEFAULT;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.client.ECReplicationConfig;
+import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.hadoop.hdds.conf.ConfigurationSource;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.scm.ScmConfigKeys;
+import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
+import org.apache.hadoop.hdds.scm.net.InnerNode;
+import org.apache.hadoop.hdds.scm.net.NetworkTopology;
+import org.apache.hadoop.hdds.scm.net.Node;
+import org.apache.hadoop.hdds.scm.net.NodeImpl;
+import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
+import org.apache.hadoop.net.CachedDNSToSwitchMapping;
+import org.apache.hadoop.net.DNSToSwitchMapping;
+import org.apache.hadoop.net.TableMapping;
+import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * OMBlockPrefetchClient manages block prefetching for efficient write
operations.
+ * It maintains a queue of allocated blocks per replication configuration and
removes expired blocks lazily.
+ * The client refills the queue in the background to handle high-throughput
scenarios efficiently.
+ */
+public class OMBlockPrefetchClient {
+ private static final Logger LOG =
LoggerFactory.getLogger(OMBlockPrefetchClient.class);
+ private final ScmBlockLocationProtocol scmBlockLocationProtocol;
+ private int maxBlocks;
+ private int minBlocks;
+ private boolean useHostname;
+ private DNSToSwitchMapping dnsToSwitchMapping;
+ private final Map<ReplicationConfig,
ConcurrentLinkedDeque<ExpiringAllocatedBlock>> blockQueueMap =
+ new ConcurrentHashMap<>();
+ private long expiryDuration;
+ private OMBlockPrefetchMetrics metrics;
+ private static final ReplicationConfig RATIS_THREE =
+
ReplicationConfig.fromProtoTypeAndFactor(HddsProtos.ReplicationType.RATIS,
+ HddsProtos.ReplicationFactor.THREE);
+ private static final ReplicationConfig RATIS_ONE =
+
ReplicationConfig.fromProtoTypeAndFactor(HddsProtos.ReplicationType.RATIS,
+ HddsProtos.ReplicationFactor.ONE);
+ private static final ReplicationConfig RS_3_2_1024 =
+ ReplicationConfig.fromProto(HddsProtos.ReplicationType.EC, null,
+ toProto(3, 2, ECReplicationConfig.EcCodec.RS, 1024));
+ private static final ReplicationConfig RS_6_3_1024 =
+ ReplicationConfig.fromProto(HddsProtos.ReplicationType.EC, null,
+ toProto(6, 3, ECReplicationConfig.EcCodec.RS, 1024));
+ private static final ReplicationConfig XOR_10_4_4096 =
+ ReplicationConfig.fromProto(HddsProtos.ReplicationType.EC, null,
+ toProto(10, 4, ECReplicationConfig.EcCodec.XOR, 4096));
+ private ExecutorService prefetchExecutor;
+ private final AtomicBoolean isPrefetching = new AtomicBoolean(false);
+
+ public static HddsProtos.ECReplicationConfig toProto(int data, int parity,
ECReplicationConfig.EcCodec codec,
+ int ecChunkSize) {
+ return HddsProtos.ECReplicationConfig.newBuilder()
+ .setData(data)
+ .setParity(parity)
+ .setCodec(codec.toString())
+ .setEcChunkSize(ecChunkSize)
+ .build();
+ }
+
+ public OMBlockPrefetchClient(ScmBlockLocationProtocol scmBlockClient) {
+ this.scmBlockLocationProtocol = scmBlockClient;
+ initializeBlockQueueMap();
+ }
+
+ private void initializeBlockQueueMap() {
+ blockQueueMap.put(RATIS_THREE, new ConcurrentLinkedDeque<>());
+ blockQueueMap.put(RATIS_ONE, new ConcurrentLinkedDeque<>());
+ blockQueueMap.put(RS_3_2_1024, new ConcurrentLinkedDeque<>());
+ blockQueueMap.put(RS_6_3_1024, new ConcurrentLinkedDeque<>());
+ blockQueueMap.put(XOR_10_4_4096, new ConcurrentLinkedDeque<>());
+ }
+
+ /**
+ * Tracks an allocated block to be cached with its cache expiry.
+ */
+ public static final class ExpiringAllocatedBlock {
+ private final AllocatedBlock block;
+ private final long expiryTime;
+
+ public ExpiringAllocatedBlock(AllocatedBlock block, long expiryTime) {
+ this.block = block;
+ this.expiryTime = expiryTime;
+ }
+
+ public AllocatedBlock getBlock() {
+ return block;
+ }
+
+ public long getExpiryTime() {
+ return expiryTime;
+ }
+ }
+
+ public void start(ConfigurationSource conf) throws IOException,
InterruptedException, TimeoutException {
+ maxBlocks = conf.getInt(OZONE_OM_PREFETCH_MAX_BLOCKS,
OZONE_OM_PREFETCH_MAX_BLOCKS_DEFAULT);
+ minBlocks = conf.getInt(OZONE_OM_PREFETCH_MIN_BLOCKS,
OZONE_OM_PREFETCH_MIN_BLOCKS_DEFAULT);
+ expiryDuration =
conf.getTimeDuration(OZONE_OM_PREFETCHED_BLOCKS_EXPIRY_INTERVAL,
+ OZONE_OM_PREFETCHED_BLOCKS_EXPIRY_INTERVAL_DEFAULT,
TimeUnit.MILLISECONDS);
+
+ useHostname = conf.getBoolean(HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME,
+ HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME_DEFAULT);
+ Class<? extends DNSToSwitchMapping> dnsToSwitchMappingClass =
+ conf.getClass(ScmConfigKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY,
+ TableMapping.class, DNSToSwitchMapping.class);
+ DNSToSwitchMapping newInstance = ReflectionUtils.newInstance(
+ dnsToSwitchMappingClass, OzoneConfiguration.of(conf));
+ dnsToSwitchMapping =
+ ((newInstance instanceof CachedDNSToSwitchMapping) ? newInstance
+ : new CachedDNSToSwitchMapping(newInstance));
+ metrics = OMBlockPrefetchMetrics.register();
+ prefetchExecutor = Executors.newSingleThreadExecutor(r -> {
+ Thread t = new Thread(r, "OMBlockPrefetchClient-AsyncPrefetcher");
+ t.setDaemon(true);
+ return t;
+ });
+ LOG.info("OMBlockPrefetchClient started with minBlocks={}, maxBlocks={},
expiryDuration={}ms. Prefetch executor " +
+ "initialized.", minBlocks, maxBlocks, expiryDuration);
+ }
+
+ public void stop() {
+ if (prefetchExecutor != null) {
+ prefetchExecutor.shutdown();
+ try {
+ if (prefetchExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
Review Comment:
The shutdown logic is inverted: you only call `shutdownNow()` when
`awaitTermination` returns true (i.e., it already terminated). Swap the
condition so that `shutdownNow()` is invoked when termination has *not*
completed after the timeout.
```suggestion
if (!prefetchExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
