Skip to content

HDDS-14591. Cache HBASE_SUPPORT finalization status for putBlock #9892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weimingdiit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HDDS-14591. Cache HBASE_SUPPORT finalization status for putBlock #9892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions ...rvice/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.UNSUPPORTED_REQUEST;
import static org.apache.hadoop.ozone.OzoneConsts.INCREMENTAL_CHUNK_LIST;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
Expand Down Expand Up @@ -63,6 +65,7 @@ public class BlockManagerImpl implements BlockManager {
private final int readMappedBufferThreshold;
private final int readMappedBufferMaxCount;
private final boolean readNettyChunkedNioFile;
private final AtomicBoolean hbaseSupportFinalized;

/**
* Constructs a Block Manager.
Expand All @@ -84,6 +87,8 @@ public BlockManagerImpl(ConfigurationSource conf) {
this.readNettyChunkedNioFile = config.getBoolean(
ScmConfigKeys.OZONE_CHUNK_READ_NETTY_CHUNKED_NIO_FILE_KEY,
ScmConfigKeys.OZONE_CHUNK_READ_NETTY_CHUNKED_NIO_FILE_DEFAULT);
this.hbaseSupportFinalized = new AtomicBoolean(
VersionedDatanodeFeatures.isFinalized(HDDSLayoutFeature.HBASE_SUPPORT));
}

@Override
Expand Down Expand Up @@ -227,13 +232,12 @@ public long persistPutBlock(KeyValueContainer container,
}
}

boolean incrementalEnabled = true;
if (!VersionedDatanodeFeatures.isFinalized(HDDSLayoutFeature.HBASE_SUPPORT)) {
boolean incrementalEnabled = isIncrementalChunkListFeatureFinalized();
if (!incrementalEnabled) {
if (isPartialChunkList(data)) {
throw new StorageContainerException("DataNode has not finalized " +
"upgrading to a version that supports incremental chunk list.", UNSUPPORTED_REQUEST);
}
incrementalEnabled = false;
}
db.getStore().putBlockByID(batch, incrementalEnabled, localID, data,
containerData, endOfBlock);
Expand Down Expand Up @@ -461,6 +465,22 @@ private BlockData getBlockByID(DBHandle db, BlockID blockID,
return db.getStore().getBlockByID(blockID, blockKey);
}

@VisibleForTesting
boolean isIncrementalChunkListFeatureFinalized() {
if (hbaseSupportFinalized.get()) {
return true;
}
if (VersionedDatanodeFeatures.isFinalized(HDDSLayoutFeature.HBASE_SUPPORT)) {
if (hbaseSupportFinalized.compareAndSet(false, true)) {
LOG.info("Layout feature {} is finalized. Skipping finalization checks "
+ "for incremental chunk list on subsequent putBlock requests.",
HDDSLayoutFeature.HBASE_SUPPORT);
}
return true;
}
return false;
}

private static boolean isPartialChunkList(BlockData data) {
return data.getMetadata().containsKey(INCREMENTAL_CHUNK_LIST);
}
Expand Down
27 changes: 27 additions & 0 deletions ...e/src/test/java/org/apache/hadoop/ozone/container/keyvalue/impl/TestBlockManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@
import static org.apache.hadoop.ozone.container.keyvalue.helpers.KeyValueContainerUtil.isSameSchemaVersion;
import static org.apache.hadoop.ozone.container.keyvalue.impl.BlockManagerImpl.FULL_CHUNK;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;

import java.io.IOException;
Expand All @@ -39,6 +43,7 @@
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
import org.apache.hadoop.hdds.upgrade.HDDSLayoutFeature;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.container.common.helpers.BlockData;
import org.apache.hadoop.ozone.container.common.helpers.ChunkInfo;
Expand All @@ -53,9 +58,12 @@
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
import org.apache.hadoop.ozone.container.keyvalue.helpers.BlockUtils;
import org.apache.hadoop.ozone.container.upgrade.VersionedDatanodeFeatures;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.MockedStatic;

/**
* This class is used to test key related operations on the container.
Expand Down Expand Up @@ -143,6 +151,25 @@ public void cleanup() {
BlockUtils.shutdownCache(config);
}

@Test
public void testFinalizationStatusCachedForIncrementalChunkListChecks() {
config = new OzoneConfiguration();
try (MockedStatic<VersionedDatanodeFeatures> mockedFeatures =
mockStatic(VersionedDatanodeFeatures.class)) {
mockedFeatures.when(() -> VersionedDatanodeFeatures.isFinalized(
HDDSLayoutFeature.HBASE_SUPPORT))
.thenReturn(false, false, true);

BlockManagerImpl manager = new BlockManagerImpl(config);
assertFalse(manager.isIncrementalChunkListFeatureFinalized());
assertTrue(manager.isIncrementalChunkListFeatureFinalized());
assertTrue(manager.isIncrementalChunkListFeatureFinalized());

mockedFeatures.verify(() -> VersionedDatanodeFeatures.isFinalized(
HDDSLayoutFeature.HBASE_SUPPORT), times(3));
}
}

@ContainerTestVersionInfo.ContainerTest
public void testPutBlock(ContainerTestVersionInfo versionInfo)
throws Exception {
Expand Down