This is an automated email from the ASF dual-hosted git repository.
ChenSammi pushed a commit to branch HDDS-10685
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-10685 by this push:
new 6db4545f1da HDDS-16013. Remove HDDSLayoutFeature.SHORT_CIRCUIT_READS
layout version (#10893)
6db4545f1da is described below
commit 6db4545f1daf55d356eed0d077f62da4828e131f
Author: Sammi Chen <[email protected]>
AuthorDate: Thu Jul 30 11:41:50 2026 +0800
HDDS-16013. Remove HDDSLayoutFeature.SHORT_CIRCUIT_READS layout version
(#10893)
---
.../apache/hadoop/hdds/upgrade/HDDSLayoutFeature.java | 3 +--
.../hadoop/ozone/container/keyvalue/KeyValueHandler.java | 4 ----
.../hadoop/ozone/container/ozoneimpl/OzoneContainer.java | 16 ++++++----------
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/upgrade/HDDSLayoutFeature.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/upgrade/HDDSLayoutFeature.java
index 749b1d2e86b..0d45298da8b 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/upgrade/HDDSLayoutFeature.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/upgrade/HDDSLayoutFeature.java
@@ -42,8 +42,7 @@ public enum HDDSLayoutFeature implements LayoutFeature {
HBASE_SUPPORT(8, "Datanode RocksDB Schema Version 3 has an extra table " +
"for the last chunk of blocks to support HBase.)"),
WITNESSED_CONTAINER_DB_PROTO_VALUE(9, "ContainerID table schema to use value
type as proto"),
- STORAGE_SPACE_DISTRIBUTION(10, "Enhanced block deletion function for storage
space distribution feature."),
- SHORT_CIRCUIT_READS(11, "Short-circuit read support");
+ STORAGE_SPACE_DISTRIBUTION(10, "Enhanced block deletion function for storage
space distribution feature.");
////////////////////////////// //////////////////////////////
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
index 76c869557e8..a2ef987fad1 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
@@ -848,10 +848,6 @@ ContainerCommandResponseProto handleGetBlock(
BlockUtils.verifyReplicaIdx(kvContainer, blockID);
responseData = blockManager.getBlock(kvContainer,
blockID).getProtoBufMessage();
if (getBlock.hasRequestShortCircuitAccess() &&
getBlock.getRequestShortCircuitAccess()) {
- if
(!VersionedDatanodeFeatures.isFinalized(HDDSLayoutFeature.SHORT_CIRCUIT_READS))
{
- throw new StorageContainerException("DataNode has not finalized " +
- "upgrading to support short-circuit read.", UNSUPPORTED_REQUEST);
- }
boolean domainSocketServerEnabled = ozoneContainer != null
&& ozoneContainer.getReadDomainSocketChannel() != null
&& ozoneContainer.getReadDomainSocketChannel().isStarted();
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
index 37fee50e6a8..cd717d1e2b0 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
@@ -68,7 +68,6 @@
import org.apache.hadoop.hdds.security.symmetric.SecretKeyVerifierClient;
import org.apache.hadoop.hdds.security.token.TokenVerifier;
import
org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
-import org.apache.hadoop.hdds.upgrade.HDDSLayoutFeature;
import org.apache.hadoop.hdds.utils.HddsServerUtil;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.hdds.utils.db.TableIterator;
@@ -107,7 +106,6 @@
import org.apache.hadoop.ozone.container.replication.ContainerImporter;
import org.apache.hadoop.ozone.container.replication.ReplicationServer;
import
org.apache.hadoop.ozone.container.replication.ReplicationServer.ReplicationConfig;
-import org.apache.hadoop.ozone.container.upgrade.VersionedDatanodeFeatures;
import
org.apache.hadoop.ozone.container.upgrade.VersionedDatanodeFeatures.SchemaV3;
import org.apache.hadoop.util.DiskChecker.DiskOutOfSpaceException;
import org.apache.hadoop.util.Time;
@@ -266,14 +264,12 @@ public OzoneContainer(HddsDatanodeService
hddsDatanodeService,
.build());
readChannel = new XceiverServerGrpc(datanodeDetails, config,
readExecutors, hddsDispatcher, certClient);
- if
(VersionedDatanodeFeatures.isFinalized(HDDSLayoutFeature.SHORT_CIRCUIT_READS)) {
- domainSocketFactory = DomainSocketFactory.getInstance(config);
- if (domainSocketFactory.isServiceEnabled() &&
domainSocketFactory.isServiceReady()) {
- readDomainSocketChannel = new
XceiverServerDomainSocket(datanodeDetails, config,
- hddsDispatcher, readExecutors, metrics, domainSocketFactory);
- } else {
- readDomainSocketChannel = null;
- }
+ domainSocketFactory = DomainSocketFactory.getInstance(config);
+ if (domainSocketFactory.isServiceEnabled() &&
domainSocketFactory.isServiceReady()) {
+ readDomainSocketChannel = new XceiverServerDomainSocket(datanodeDetails,
config,
+ hddsDispatcher, readExecutors, metrics, domainSocketFactory);
+ } else {
+ readDomainSocketChannel = null;
}
Duration blockDeletingSvcInterval = conf.getObject(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
