This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new dc8ab71c7f0 HDDS-13560. Convert redundant fields to local var in
hdds-container-service module (#8970)
dc8ab71c7f0 is described below
commit dc8ab71c7f041e5e82fd53d9ad6719abf3e6f9e5
Author: Ivan Zlenko <[email protected]>
AuthorDate: Sat Aug 30 01:42:54 2025 +0400
HDDS-13560. Convert redundant fields to local var in hdds-container-service
module (#8970)
---
.../container/common/TestDatanodeStateMachine.java | 3 +-
.../common/TestKeyValueContainerData.java | 3 +-
.../TestSchemaTwoBackwardsCompatibility.java | 4 +--
...stStaleRecoveringContainerScrubbingService.java | 8 ++---
.../common/helpers/TestDatanodeVersionFile.java | 13 ++++---
.../impl/TestContainerDeletionChoosingPolicy.java | 12 +++----
.../container/common/interfaces/TestHandler.java | 9 ++---
.../TestClosePipelineCommandHandler.java | 5 ++-
.../TestCreatePipelineCommandHandler.java | 5 ++-
.../TestDeleteBlocksCommandHandler.java | 12 +++----
.../keyvalue/TestKeyValueBlockIterator.java | 6 ++--
.../TestKeyValueContainerMarkUnhealthy.java | 6 ++--
.../keyvalue/impl/TestBlockManagerImpl.java | 41 ++++++++++------------
.../container/ozoneimpl/TestContainerReader.java | 3 +-
.../container/ozoneimpl/TestOzoneContainer.java | 8 ++---
.../TestDownloadAndImportReplicator.java | 12 +++----
.../TestSendContainerRequestHandler.java | 4 +--
.../TestDatanodeUpgradeToContainerIdsTable.java | 5 ++-
.../upgrade/TestDatanodeUpgradeToHBaseSupport.java | 5 ++-
19 files changed, 64 insertions(+), 100 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
index 2192fc7c3c7..0d2d87e1824 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
@@ -70,7 +70,6 @@ public class TestDatanodeStateMachine {
// Changing it to 1, as current code checks for multiple scm directories,
// and fail if exists
private static final int SCM_SERVER_COUNT = 1;
- private List<String> serverAddresses;
private List<RPC.Server> scmServers;
private List<ScmTestMock> mockServers;
private ExecutorService executorService;
@@ -89,7 +88,7 @@ void setUp() throws Exception {
true);
conf.setBoolean(
OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_RANDOM_PORT, true);
- serverAddresses = new ArrayList<>();
+ List<String> serverAddresses = new ArrayList<>();
scmServers = new ArrayList<>();
mockServers = new ArrayList<>();
for (int x = 0; x < SCM_SERVER_COUNT; x++) {
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestKeyValueContainerData.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestKeyValueContainerData.java
index 5d674de7fcb..509806f4551 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestKeyValueContainerData.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestKeyValueContainerData.java
@@ -42,12 +42,11 @@ public class TestKeyValueContainerData {
private static final long MAXSIZE = (long) StorageUnit.GB.toBytes(5);
private ContainerLayoutVersion layout;
- private String schemaVersion;
private OzoneConfiguration conf;
private void initVersionInfo(ContainerTestVersionInfo versionInfo) {
this.layout = versionInfo.getLayout();
- this.schemaVersion = versionInfo.getSchemaVersion();
+ String schemaVersion = versionInfo.getSchemaVersion();
this.conf = new OzoneConfiguration();
ContainerTestVersionInfo.setTestSchemaVersion(schemaVersion, conf);
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaTwoBackwardsCompatibility.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaTwoBackwardsCompatibility.java
index e8ed6048291..e47f94981c3 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaTwoBackwardsCompatibility.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestSchemaTwoBackwardsCompatibility.java
@@ -102,7 +102,6 @@ public class TestSchemaTwoBackwardsCompatibility {
private BlockManager blockManager;
private ChunkManager chunkManager;
private ContainerSet containerSet;
- private KeyValueHandler keyValueHandler;
private OzoneContainer ozoneContainer;
private static final int BLOCKS_PER_CONTAINER = 6;
@@ -132,7 +131,8 @@ public void setup() throws Exception {
chunkManager = new FilePerBlockStrategy(true, blockManager);
containerSet = newContainerSet();
- keyValueHandler = ContainerTestUtils.getKeyValueHandler(conf,
datanodeUuid, containerSet, volumeSet);
+ KeyValueHandler keyValueHandler =
+ ContainerTestUtils.getKeyValueHandler(conf, datanodeUuid,
containerSet, volumeSet);
ozoneContainer = mock(OzoneContainer.class);
when(ozoneContainer.getContainerSet()).thenReturn(containerSet);
when(ozoneContainer.getWriteChannel()).thenReturn(null);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestStaleRecoveringContainerScrubbingService.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestStaleRecoveringContainerScrubbingService.java
index 59e662db01b..a21813956f5 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestStaleRecoveringContainerScrubbingService.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestStaleRecoveringContainerScrubbingService.java
@@ -71,10 +71,8 @@ public class TestStaleRecoveringContainerScrubbingService {
private Path tempDir;
private String datanodeUuid;
private OzoneConfiguration conf;
- private HddsVolume hddsVolume;
private ContainerLayoutVersion layout;
- private String schemaVersion;
private String clusterID;
private int containerIdNum = 0;
private MutableVolumeSet volumeSet;
@@ -85,7 +83,7 @@ public class TestStaleRecoveringContainerScrubbingService {
private void initVersionInfo(ContainerTestVersionInfo versionInfo)
throws IOException {
this.layout = versionInfo.getLayout();
- this.schemaVersion = versionInfo.getSchemaVersion();
+ String schemaVersion = versionInfo.getSchemaVersion();
conf = new OzoneConfiguration();
ContainerTestVersionInfo.setTestSchemaVersion(schemaVersion, conf);
init();
@@ -98,8 +96,8 @@ private void init() throws IOException {
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, volumeDir.getAbsolutePath());
datanodeUuid = UUID.randomUUID().toString();
clusterID = UUID.randomUUID().toString();
- hddsVolume = new HddsVolume.Builder(volumeDir.getAbsolutePath())
- .conf(conf).datanodeUuid(datanodeUuid).clusterID(clusterID).build();
+ HddsVolume hddsVolume = new HddsVolume.Builder(volumeDir.getAbsolutePath())
+
.conf(conf).datanodeUuid(datanodeUuid).clusterID(clusterID).build();
hddsVolume.format(clusterID);
hddsVolume.createWorkingDir(clusterID, null);
volumeSet = mock(MutableVolumeSet.class);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeVersionFile.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeVersionFile.java
index 2eadfd617f2..552fdf8448e 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeVersionFile.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeVersionFile.java
@@ -42,7 +42,6 @@
public class TestDatanodeVersionFile {
private File versionFile;
- private DatanodeVersionFile dnVersionFile;
private Properties properties;
private String storageID;
@@ -64,12 +63,12 @@ public void setup() throws IOException {
cTime = Time.now();
lv = HDDSVolumeLayoutVersion.getLatestVersion().getVersion();
- dnVersionFile = new DatanodeVersionFile(
+ DatanodeVersionFile dnVersionFile = new DatanodeVersionFile(
storageID, clusterID, datanodeUUID, cTime, lv);
dnVersionFile.createVersionFile(versionFile);
- properties = dnVersionFile.readFrom(versionFile);
+ properties = DatanodeVersionFile.readFrom(versionFile);
}
@Test
@@ -101,10 +100,10 @@ public void testIncorrectClusterId() {
@Test
public void testVerifyCTime() throws IOException {
long invalidCTime = -10;
- dnVersionFile = new DatanodeVersionFile(
+ DatanodeVersionFile dnVersionFile = new DatanodeVersionFile(
storageID, clusterID, datanodeUUID, invalidCTime, lv);
dnVersionFile.createVersionFile(versionFile);
- properties = dnVersionFile.readFrom(versionFile);
+ properties = DatanodeVersionFile.readFrom(versionFile);
InconsistentStorageStateException exception =
assertThrows(InconsistentStorageStateException.class,
() -> StorageVolumeUtil.getCreationTime(properties, versionFile));
@@ -114,10 +113,10 @@ public void testVerifyCTime() throws IOException {
@Test
public void testVerifyLayOut() throws IOException {
int invalidLayOutVersion = 100;
- dnVersionFile = new DatanodeVersionFile(
+ DatanodeVersionFile dnVersionFile = new DatanodeVersionFile(
storageID, clusterID, datanodeUUID, cTime, invalidLayOutVersion);
dnVersionFile.createVersionFile(versionFile);
- Properties props = dnVersionFile.readFrom(versionFile);
+ Properties props = DatanodeVersionFile.readFrom(versionFile);
InconsistentStorageStateException exception =
assertThrows(InconsistentStorageStateException.class,
() -> StorageVolumeUtil.getLayOutVersion(props, versionFile));
assertThat(exception).hasMessageContaining("Invalid layOutVersion.");
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDeletionChoosingPolicy.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDeletionChoosingPolicy.java
index 6ecc54977a2..54be2b842fa 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDeletionChoosingPolicy.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDeletionChoosingPolicy.java
@@ -60,10 +60,8 @@ public class TestContainerDeletionChoosingPolicy {
@TempDir
private File tempFile;
private String path;
- private OzoneContainer ozoneContainer;
private ContainerSet containerSet;
private OzoneConfiguration conf;
- private BlockDeletingService blockDeletingService;
// the service timeout
private static final int SERVICE_TIMEOUT_IN_MILLISECONDS = 0;
private static final int SERVICE_INTERVAL_IN_MILLISECONDS = 1000;
@@ -102,7 +100,7 @@ public void testRandomChoosingPolicy(ContainerLayoutVersion
layout)
containerSet.getContainerMapCopy())
.containsKey(data.getContainerID());
}
- blockDeletingService = getBlockDeletingService();
+ BlockDeletingService blockDeletingService = getBlockDeletingService();
int blockLimitPerInterval = 5;
ContainerDeletionChoosingPolicy deletionPolicy =
@@ -159,7 +157,7 @@ public void
testBlockDeletionAllowedAndDisallowedStates(ContainerLayoutVersion l
KeyValueContainerData closingData = createContainerWithState(layout,
ContainerProtos.ContainerDataProto.State.CLOSING);
- blockDeletingService = getBlockDeletingService();
+ BlockDeletingService blockDeletingService = getBlockDeletingService();
ContainerDeletionChoosingPolicy deletionPolicy =
new TopNOrderedContainerDeletionChoosingPolicy();
@@ -239,7 +237,7 @@ public void
testTopNOrderedChoosingPolicy(ContainerLayoutVersion layout)
}
numberOfBlocks.sort(Collections.reverseOrder());
int blockLimitPerInterval = 5;
- blockDeletingService = getBlockDeletingService();
+ BlockDeletingService blockDeletingService = getBlockDeletingService();
ContainerDeletionChoosingPolicy deletionPolicy =
new TopNOrderedContainerDeletionChoosingPolicy();
List<ContainerBlockInfo> result0 = blockDeletingService
@@ -281,10 +279,10 @@ public void
testTopNOrderedChoosingPolicy(ContainerLayoutVersion layout)
}
private BlockDeletingService getBlockDeletingService() {
- ozoneContainer = mock(OzoneContainer.class);
+ OzoneContainer ozoneContainer = mock(OzoneContainer.class);
when(ozoneContainer.getContainerSet()).thenReturn(containerSet);
when(ozoneContainer.getWriteChannel()).thenReturn(null);
- blockDeletingService = new BlockDeletingService(ozoneContainer,
+ BlockDeletingService blockDeletingService = new
BlockDeletingService(ozoneContainer,
SERVICE_INTERVAL_IN_MILLISECONDS, SERVICE_TIMEOUT_IN_MILLISECONDS,
TimeUnit.MILLISECONDS, 10, conf, new
ContainerChecksumTreeManager(conf));
return blockDeletingService;
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
index e1fb3822d9c..52b230db370 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/interfaces/TestHandler.java
@@ -46,16 +46,13 @@
*/
public class TestHandler {
- private OzoneConfiguration conf;
private HddsDispatcher dispatcher;
- private ContainerSet containerSet;
- private VolumeSet volumeSet;
@BeforeEach
public void setup() throws Exception {
- this.conf = new OzoneConfiguration();
- this.containerSet = mock(ContainerSet.class);
- this.volumeSet = mock(MutableVolumeSet.class);
+ OzoneConfiguration conf = new OzoneConfiguration();
+ ContainerSet containerSet = mock(ContainerSet.class);
+ VolumeSet volumeSet = mock(MutableVolumeSet.class);
VolumeChoosingPolicy volumeChoosingPolicy =
VolumeChoosingPolicyFactory.getPolicy(conf);
DatanodeDetails datanodeDetails = mock(DatanodeDetails.class);
StateContext context = ContainerTestUtils.getMockContext(
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestClosePipelineCommandHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestClosePipelineCommandHandler.java
index 9ee7bd0db8e..2120615081e 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestClosePipelineCommandHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestClosePipelineCommandHandler.java
@@ -59,7 +59,6 @@
public class TestClosePipelineCommandHandler {
private OzoneContainer ozoneContainer;
- private StateContext stateContext;
private SCMConnectionManager connectionManager;
private RaftClient raftClient;
private GroupManagementApi raftClientGroupManager;
@@ -83,7 +82,7 @@ void testPipelineClose() throws IOException {
final PipelineID pipelineID = PipelineID.randomId();
final SCMCommand<ClosePipelineCommandProto> command =
new ClosePipelineCommand(pipelineID);
- stateContext = ContainerTestUtils.getMockContext(currentDatanode, conf);
+ StateContext stateContext =
ContainerTestUtils.getMockContext(currentDatanode, conf);
final boolean shouldDeleteRatisLogDirectory = true;
XceiverServerRatis writeChannel = mock(XceiverServerRatis.class);
@@ -115,7 +114,7 @@ void testCommandIdempotency() throws IOException {
final PipelineID pipelineID = PipelineID.randomId();
final SCMCommand<ClosePipelineCommandProto> command =
new ClosePipelineCommand(pipelineID);
- stateContext = ContainerTestUtils.getMockContext(currentDatanode, conf);
+ StateContext stateContext =
ContainerTestUtils.getMockContext(currentDatanode, conf);
XceiverServerRatis writeChannel = mock(XceiverServerRatis.class);
when(ozoneContainer.getWriteChannel()).thenReturn(writeChannel);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCreatePipelineCommandHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCreatePipelineCommandHandler.java
index 951217e3ba4..f7f88412486 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCreatePipelineCommandHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCreatePipelineCommandHandler.java
@@ -61,7 +61,6 @@
public class TestCreatePipelineCommandHandler {
private OzoneContainer ozoneContainer;
- private StateContext stateContext;
private SCMConnectionManager connectionManager;
private RaftClient raftClient;
private GroupManagementApi raftClientGroupManager;
@@ -86,7 +85,7 @@ public void testPipelineCreation() throws IOException {
final SCMCommand<CreatePipelineCommandProto> command =
new CreatePipelineCommand(pipelineID, HddsProtos.ReplicationType.RATIS,
HddsProtos.ReplicationFactor.THREE, datanodes);
- stateContext = ContainerTestUtils.getMockContext(datanodes.get(0), conf);
+ StateContext stateContext =
ContainerTestUtils.getMockContext(datanodes.get(0), conf);
final XceiverServerSpi writeChanel = mock(XceiverServerSpi.class);
when(ozoneContainer.getWriteChannel()).thenReturn(writeChanel);
@@ -118,7 +117,7 @@ public void testCommandIdempotency() throws IOException {
HddsProtos.ReplicationFactor.THREE, datanodes);
final XceiverServerSpi writeChanel = mock(XceiverServerSpi.class);
- stateContext = ContainerTestUtils.getMockContext(datanodes.get(0), conf);
+ StateContext stateContext =
ContainerTestUtils.getMockContext(datanodes.get(0), conf);
when(ozoneContainer.getWriteChannel()).thenReturn(writeChanel);
when(writeChanel.isExist(pipelineID.getProtobuf()))
.thenReturn(true);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
index 85d20f509af..b2e1c72e487 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
@@ -90,9 +90,6 @@
public class TestDeleteBlocksCommandHandler {
@TempDir
private Path folder;
- private OzoneConfiguration conf;
- private ContainerLayoutVersion layout;
- private OzoneContainer ozoneContainer;
private ContainerSet containerSet;
private DeleteBlocksCommandHandler handler;
private String schemaVersion;
@@ -101,17 +98,16 @@ public class TestDeleteBlocksCommandHandler {
private void prepareTest(ContainerTestVersionInfo versionInfo)
throws Exception {
- this.layout = versionInfo.getLayout();
this.schemaVersion = versionInfo.getSchemaVersion();
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
ContainerTestVersionInfo.setTestSchemaVersion(schemaVersion, conf);
setup();
}
private void setup() throws Exception {
- conf = new OzoneConfiguration();
- layout = ContainerLayoutVersion.FILE_PER_BLOCK;
- ozoneContainer = mock(OzoneContainer.class);
+ OzoneConfiguration conf = new OzoneConfiguration();
+ ContainerLayoutVersion layout = ContainerLayoutVersion.FILE_PER_BLOCK;
+ OzoneContainer ozoneContainer = mock(OzoneContainer.class);
containerSet = newContainerSet();
volume1 = mock(HddsVolume.class);
when(volume1.getStorageID()).thenReturn("uuid-1");
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueBlockIterator.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueBlockIterator.java
index aa0e668c82a..4d24f199581 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueBlockIterator.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueBlockIterator.java
@@ -65,7 +65,6 @@ public class TestKeyValueBlockIterator {
private static final long CONTAINER_ID = 105L;
- private KeyValueContainer container;
private KeyValueContainerData containerData;
private MutableVolumeSet volumeSet;
private OzoneConfiguration conf;
@@ -73,14 +72,13 @@ public class TestKeyValueBlockIterator {
private File testRoot;
private DBHandle db;
private ContainerLayoutVersion layout;
- private String schemaVersion;
private String datanodeID = UUID.randomUUID().toString();
private String clusterID = UUID.randomUUID().toString();
private void initTest(ContainerTestVersionInfo versionInfo,
String keySeparator) throws Exception {
this.layout = versionInfo.getLayout();
- this.schemaVersion = versionInfo.getSchemaVersion();
+ String schemaVersion = versionInfo.getSchemaVersion();
this.conf = new OzoneConfiguration();
ContainerTestVersionInfo.setTestSchemaVersion(schemaVersion, conf);
DatanodeConfiguration dc = conf.getObject(DatanodeConfiguration.class);
@@ -116,7 +114,7 @@ public void setup() throws Exception {
(long) StorageUnit.GB.toBytes(1), UUID.randomUUID().toString(),
UUID.randomUUID().toString());
// Init the container.
- container = new KeyValueContainer(containerData, conf);
+ KeyValueContainer container = new KeyValueContainer(containerData, conf);
container.create(volumeSet, new RoundRobinVolumeChoosingPolicy(),
clusterID);
db = BlockUtils.getDB(containerData, conf);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java
index 63459f7c12f..3606f80d13f 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMarkUnhealthy.java
@@ -52,13 +52,11 @@ public class TestKeyValueContainerMarkUnhealthy {
@TempDir
private Path folder;
- private OzoneConfiguration conf;
private String scmId = UUID.randomUUID().toString();
private VolumeSet volumeSet;
private RoundRobinVolumeChoosingPolicy volumeChoosingPolicy;
private KeyValueContainerData keyValueContainerData;
private KeyValueContainer keyValueContainer;
- private UUID datanodeId;
private ContainerLayoutVersion layout;
@@ -68,8 +66,8 @@ private void initTestData(ContainerLayoutVersion
layoutVersion) throws Exception
}
public void setup() throws Exception {
- conf = new OzoneConfiguration();
- datanodeId = UUID.randomUUID();
+ OzoneConfiguration conf = new OzoneConfiguration();
+ UUID datanodeId = UUID.randomUUID();
String dataDir = Files.createDirectory(
folder.resolve("data")).toAbsolutePath().toString();
HddsVolume hddsVolume = new HddsVolume.Builder(dataDir)
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/impl/TestBlockManagerImpl.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/impl/TestBlockManagerImpl.java
index 7bbfa1f7e90..eb58ac3ce84 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/impl/TestBlockManagerImpl.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/impl/TestBlockManagerImpl.java
@@ -66,15 +66,10 @@ public class TestBlockManagerImpl {
private Path folder;
private OzoneConfiguration config;
private String scmId = UUID.randomUUID().toString();
- private VolumeSet volumeSet;
- private RoundRobinVolumeChoosingPolicy volumeChoosingPolicy;
- private KeyValueContainerData keyValueContainerData;
private KeyValueContainer keyValueContainer;
private BlockData blockData;
private BlockData blockData1;
private BlockManagerImpl blockManager;
- private BlockID blockID;
- private BlockID blockID1;
private ContainerLayoutVersion layout;
private String schemaVersion;
@@ -97,13 +92,13 @@ private void initialize() throws Exception {
StorageVolumeUtil.checkVolume(hddsVolume, scmId, scmId, config,
null, null);
- volumeSet = mock(MutableVolumeSet.class);
+ VolumeSet volumeSet = mock(MutableVolumeSet.class);
- volumeChoosingPolicy = mock(RoundRobinVolumeChoosingPolicy.class);
+ RoundRobinVolumeChoosingPolicy volumeChoosingPolicy =
mock(RoundRobinVolumeChoosingPolicy.class);
when(volumeChoosingPolicy.chooseVolume(anyList(), anyLong()))
.thenReturn(hddsVolume);
- keyValueContainerData = new KeyValueContainerData(1L,
+ KeyValueContainerData keyValueContainerData = new KeyValueContainerData(1L,
layout,
(long) StorageUnit.GB.toBytes(5), UUID.randomUUID().toString(),
datanodeId.toString());
@@ -114,7 +109,7 @@ private void initialize() throws Exception {
keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId);
// Creating BlockData
- blockID = new BlockID(1L, 1L);
+ BlockID blockID = new BlockID(1L, 1L);
blockData = new BlockData(blockID);
blockData.addMetadata(OzoneConsts.VOLUME, OzoneConsts.OZONE);
blockData.addMetadata(OzoneConsts.OWNER,
@@ -126,13 +121,13 @@ private void initialize() throws Exception {
blockData.setChunks(chunkList);
// Creating BlockData
- blockID1 = new BlockID(1L, 2L);
- blockData1 = new BlockData(blockID1);
+ blockID = new BlockID(1L, 2L);
+ blockData1 = new BlockData(blockID);
blockData1.addMetadata(OzoneConsts.VOLUME, OzoneConsts.OZONE);
blockData1.addMetadata(OzoneConsts.OWNER,
OzoneConsts.OZONE_SIMPLE_HDFS_USER);
List<ContainerProtos.ChunkInfo> chunkList1 = new ArrayList<>();
- ChunkInfo info1 = new ChunkInfo(String.format("%d.data.%d", blockID1
+ ChunkInfo info1 = new ChunkInfo(String.format("%d.data.%d", blockID
.getLocalID(), 0), 0, 1024);
chunkList1.add(info1.getProtoBufMessage());
blockData1.setChunks(chunkList1);
@@ -278,7 +273,7 @@ public void testListBlock(ContainerTestVersionInfo
versionInfo)
assertEquals(1, listBlockData.size());
for (long i = 2; i <= 10; i++) {
- blockID = new BlockID(1L, i);
+ BlockID blockID = new BlockID(1L, i);
blockData = new BlockData(blockID);
blockData.addMetadata(OzoneConsts.VOLUME, OzoneConsts.OZONE);
blockData.addMetadata(OzoneConsts.OWNER,
@@ -300,10 +295,10 @@ public void testListBlock(ContainerTestVersionInfo
versionInfo)
private BlockData createBlockData(long containerID, long blockNo,
int chunkID, long offset, long len, long bcsID)
throws IOException {
- blockID1 = new BlockID(containerID, blockNo);
- blockData = new BlockData(blockID1);
+ BlockID blockID = new BlockID(containerID, blockNo);
+ blockData = new BlockData(blockID);
List<ContainerProtos.ChunkInfo> chunkList1 = new ArrayList<>();
- ChunkInfo info1 = new ChunkInfo(String.format("%d_chunk_%d", blockID1
+ ChunkInfo info1 = new ChunkInfo(String.format("%d_chunk_%d", blockID
.getLocalID(), chunkID), offset, len);
chunkList1.add(info1.getProtoBufMessage());
blockData.setChunks(chunkList1);
@@ -316,14 +311,14 @@ private BlockData createBlockData(long containerID, long
blockNo,
private BlockData createBlockDataWithOneFullChunk(long containerID,
long blockNo, int chunkID, long offset, long len, long bcsID)
throws IOException {
- blockID1 = new BlockID(containerID, blockNo);
- blockData = new BlockData(blockID1);
+ BlockID blockID = new BlockID(containerID, blockNo);
+ blockData = new BlockData(blockID);
List<ContainerProtos.ChunkInfo> chunkList1 = new ArrayList<>();
- ChunkInfo info1 = new ChunkInfo(String.format("%d_chunk_%d", blockID1
+ ChunkInfo info1 = new ChunkInfo(String.format("%d_chunk_%d", blockID
.getLocalID(), 1), 0, 4 * 1024 * 1024);
info1.addMetadata(FULL_CHUNK, "");
- ChunkInfo info2 = new ChunkInfo(String.format("%d_chunk_%d", blockID1
+ ChunkInfo info2 = new ChunkInfo(String.format("%d_chunk_%d", blockID
.getLocalID(), chunkID), offset, len);
chunkList1.add(info1.getProtoBufMessage());
chunkList1.add(info2.getProtoBufMessage());
@@ -336,13 +331,13 @@ private BlockData createBlockDataWithOneFullChunk(long
containerID,
private BlockData createBlockDataWithThreeFullChunks(long containerID,
long blockNo, long bcsID) throws IOException {
- blockID1 = new BlockID(containerID, blockNo);
- blockData = new BlockData(blockID1);
+ BlockID blockID = new BlockID(containerID, blockNo);
+ blockData = new BlockData(blockID);
List<ContainerProtos.ChunkInfo> chunkList1 = new ArrayList<>();
long chunkLimit = 4 * 1024 * 1024;
for (int i = 1; i < 4; i++) {
ChunkInfo info1 = new ChunkInfo(
- String.format("%d_chunk_%d", blockID1.getLocalID(), i),
+ String.format("%d_chunk_%d", blockID.getLocalID(), i),
chunkLimit * i, chunkLimit);
info1.addMetadata(FULL_CHUNK, "");
chunkList1.add(info1.getProtoBufMessage());
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerReader.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerReader.java
index eb79f6472f0..0f41e0c70da 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerReader.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerReader.java
@@ -105,7 +105,6 @@ public class TestContainerReader {
private long blockLen = 1024;
private ContainerLayoutVersion layout;
- private String schemaVersion;
private KeyValueHandler keyValueHandler;
@TempDir
@@ -843,7 +842,7 @@ private long addDbEntry(KeyValueContainerData containerData)
private void setLayoutAndSchemaVersion(
ContainerTestVersionInfo versionInfo) {
layout = versionInfo.getLayout();
- schemaVersion = versionInfo.getSchemaVersion();
+ String schemaVersion = versionInfo.getSchemaVersion();
conf = new OzoneConfiguration();
ContainerTestVersionInfo.setTestSchemaVersion(schemaVersion, conf);
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
index ad40f25be60..4cca1dd21cd 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
@@ -74,17 +74,15 @@ public class TestOzoneContainer {
private String clusterId = UUID.randomUUID().toString();
private MutableVolumeSet volumeSet;
private RoundRobinVolumeChoosingPolicy volumeChoosingPolicy;
- private KeyValueContainerData keyValueContainerData;
private KeyValueContainer keyValueContainer;
private final DatanodeDetails datanodeDetails = createDatanodeDetails();
private HashMap<String, Long> commitSpaceMap; //RootDir -> committed space
private ContainerLayoutVersion layout;
- private String schemaVersion;
private void initTest(ContainerTestVersionInfo versionInfo) throws Exception
{
this.layout = versionInfo.getLayout();
- this.schemaVersion = versionInfo.getSchemaVersion();
+ String schemaVersion = versionInfo.getSchemaVersion();
this.conf = new OzoneConfiguration();
ContainerTestVersionInfo.setTestSchemaVersion(schemaVersion, conf);
setup();
@@ -133,7 +131,7 @@ public void testBuildContainerMap(ContainerTestVersionInfo
versionInfo)
HddsVolume myVolume;
- keyValueContainerData = new KeyValueContainerData(i,
+ KeyValueContainerData keyValueContainerData = new
KeyValueContainerData(i,
layout,
maxCap, UUID.randomUUID().toString(),
datanodeDetails.getUuidString());
@@ -238,7 +236,7 @@ public void
testContainerCreateDiskFull(ContainerTestVersionInfo versionInfo)
// eat up 10 bytes more, now available space is less than 1 container
volume.incCommittedBytes(10);
}
- keyValueContainerData = new KeyValueContainerData(99,
+ KeyValueContainerData keyValueContainerData = new KeyValueContainerData(99,
layout, containerSize,
UUID.randomUUID().toString(), datanodeDetails.getUuidString());
keyValueContainer = new KeyValueContainer(keyValueContainerData, conf);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestDownloadAndImportReplicator.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestDownloadAndImportReplicator.java
index 5993e43e661..c690b50d642 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestDownloadAndImportReplicator.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestDownloadAndImportReplicator.java
@@ -56,24 +56,20 @@ public class TestDownloadAndImportReplicator {
@TempDir
private File tempDir;
- private OzoneConfiguration conf;
- private VolumeChoosingPolicy volumeChoosingPolicy;
- private ContainerSet containerSet;
private MutableVolumeSet volumeSet;
- private ContainerImporter importer;
private SimpleContainerDownloader downloader;
private DownloadAndImportReplicator replicator;
private long containerMaxSize;
@BeforeEach
void setup() throws IOException {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
conf.set(ScmConfigKeys.HDDS_DATANODE_DIR_KEY, tempDir.getAbsolutePath());
- volumeChoosingPolicy = VolumeChoosingPolicyFactory.getPolicy(conf);
- containerSet = newContainerSet(0);
+ VolumeChoosingPolicy volumeChoosingPolicy =
VolumeChoosingPolicyFactory.getPolicy(conf);
+ ContainerSet containerSet = newContainerSet(0);
volumeSet = new MutableVolumeSet("test", conf, null,
StorageVolume.VolumeType.DATA_VOLUME, null);
- importer = new ContainerImporter(conf, containerSet,
+ ContainerImporter importer = new ContainerImporter(conf, containerSet,
mock(ContainerController.class), volumeSet, volumeChoosingPolicy);
downloader = mock(SimpleContainerDownloader.class);
replicator = new DownloadAndImportReplicator(conf, containerSet, importer,
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerRequestHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerRequestHandler.java
index 441bc7890b6..961ed9b48c7 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerRequestHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerRequestHandler.java
@@ -62,8 +62,6 @@ public class TestSendContainerRequestHandler {
private OzoneConfiguration conf;
- private VolumeChoosingPolicy volumeChoosingPolicy;
-
private ContainerSet containerSet;
private MutableVolumeSet volumeSet;
private ContainerImporter importer;
@@ -75,7 +73,7 @@ public class TestSendContainerRequestHandler {
void setup() throws IOException {
conf = new OzoneConfiguration();
conf.set(ScmConfigKeys.HDDS_DATANODE_DIR_KEY, tempDir.getAbsolutePath());
- volumeChoosingPolicy = VolumeChoosingPolicyFactory.getPolicy(conf);
+ VolumeChoosingPolicy volumeChoosingPolicy =
VolumeChoosingPolicyFactory.getPolicy(conf);
containerSet = newContainerSet(0);
volumeSet = new MutableVolumeSet("test", conf, null,
StorageVolume.VolumeType.DATA_VOLUME, null);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToContainerIdsTable.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToContainerIdsTable.java
index e6ddf977340..d0e6d9bb070 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToContainerIdsTable.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToContainerIdsTable.java
@@ -55,7 +55,6 @@ public class TestDatanodeUpgradeToContainerIdsTable {
private Path tempFolder;
private DatanodeStateMachine dsm;
- private ContainerDispatcher dispatcher;
private OzoneConfiguration conf;
private static final String CLUSTER_ID = "clusterID";
@@ -93,7 +92,7 @@ public void testContainerTableAccessBeforeAndAfterUpgrade()
throws Exception {
UpgradeTestHelper.addHddsVolume(conf, tempFolder);
dsm = UpgradeTestHelper.startPreFinalizedDatanode(conf, tempFolder, dsm,
address,
HDDSLayoutFeature.HBASE_SUPPORT.layoutVersion());
- dispatcher = dsm.getContainer().getDispatcher();
+ ContainerDispatcher dispatcher = dsm.getContainer().getDispatcher();
final Pipeline pipeline =
MockPipeline.createPipeline(Collections.singletonList(dsm.getDatanodeDetails()));
// add a container
@@ -129,7 +128,7 @@ public void testContainerTableFinalizeRetry() throws
Exception {
UpgradeTestHelper.addHddsVolume(conf, tempFolder);
dsm = UpgradeTestHelper.startPreFinalizedDatanode(conf, tempFolder, dsm,
address,
HDDSLayoutFeature.HBASE_SUPPORT.layoutVersion());
- dispatcher = dsm.getContainer().getDispatcher();
+ ContainerDispatcher dispatcher = dsm.getContainer().getDispatcher();
final Pipeline pipeline =
MockPipeline.createPipeline(Collections.singletonList(dsm.getDatanodeDetails()));
// add a container
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToHBaseSupport.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToHBaseSupport.java
index db71470c2f5..faee5c51e06 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToHBaseSupport.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/upgrade/TestDatanodeUpgradeToHBaseSupport.java
@@ -49,7 +49,6 @@ public class TestDatanodeUpgradeToHBaseSupport {
private Path tempFolder;
private DatanodeStateMachine dsm;
- private ContainerDispatcher dispatcher;
private OzoneConfiguration conf;
private static final String CLUSTER_ID = "clusterID";
@@ -91,7 +90,7 @@ public void testIncrementalChunkListBeforeAndAfterUpgrade()
throws Exception {
UpgradeTestHelper.addHddsVolume(conf, tempFolder);
dsm = UpgradeTestHelper.startPreFinalizedDatanode(conf, tempFolder, dsm,
address,
HDDSLayoutFeature.HADOOP_PRC_PORTS_IN_DATANODEDETAILS.layoutVersion());
- dispatcher = dsm.getContainer().getDispatcher();
+ ContainerDispatcher dispatcher = dsm.getContainer().getDispatcher();
final Pipeline pipeline = MockPipeline.createPipeline(
Collections.singletonList(dsm.getDatanodeDetails()));
@@ -126,7 +125,7 @@ public void testBlockFinalizationBeforeAndAfterUpgrade()
throws Exception {
UpgradeTestHelper.addHddsVolume(conf, tempFolder);
dsm = UpgradeTestHelper.startPreFinalizedDatanode(conf, tempFolder, dsm,
address,
HDDSLayoutFeature.HADOOP_PRC_PORTS_IN_DATANODEDETAILS.layoutVersion());
- dispatcher = dsm.getContainer().getDispatcher();
+ ContainerDispatcher dispatcher = dsm.getContainer().getDispatcher();
final Pipeline pipeline = MockPipeline.createPipeline(
Collections.singletonList(dsm.getDatanodeDetails()));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
