This is an automated email from the ASF dual-hosted git repository.
myskov 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 c7185528975 HDDS-13561. Convert redundant fields to local var in
hdds-server-scm module (#8971)
c7185528975 is described below
commit c7185528975d04e86f2725a2c1c01a9020bf99e1
Author: Ivan Zlenko <[email protected]>
AuthorDate: Mon Sep 8 16:33:29 2025 +0400
HDDS-13561. Convert redundant fields to local var in hdds-server-scm module
(#8971)
---
.../hadoop/hdds/scm/block/TestBlockManager.java | 19 +++++----------
.../TestSCMDeleteBlocksCommandStatusManager.java | 3 +--
.../hadoop/hdds/scm/container/MockNodeManager.java | 16 ++++---------
.../scm/container/TestContainerManagerImpl.java | 3 +--
.../scm/container/TestContainerReportHandler.java | 3 +--
.../scm/container/TestContainerStateManager.java | 6 ++---
.../TestIncrementalContainerReportHandler.java | 6 ++---
.../container/balancer/TestContainerBalancer.java | 3 +--
.../balancer/TestContainerBalancerTask.java | 28 ++++++++--------------
.../algorithms/TestContainerPlacementFactory.java | 10 ++++----
...TestQuasiClosedStuckOverReplicationHandler.java | 3 +--
...estQuasiClosedStuckUnderReplicationHandler.java | 10 ++++----
.../TestReplicationManagerScenarios.java | 3 +--
.../health/TestRatisReplicationCheckHandler.java | 3 +--
.../TestVulnerableUnhealthyReplicasHandler.java | 3 +--
.../hadoop/hdds/scm/ha/TestSCMHAMetrics.java | 13 ++++------
.../ha/TestStatefulServiceStateManagerImpl.java | 7 ++----
.../hdds/scm/node/TestContainerPlacement.java | 3 +--
.../hdds/scm/node/TestDatanodeAdminMonitor.java | 3 +--
.../hadoop/hdds/scm/node/TestDeadNodeHandler.java | 12 ++++------
.../hdds/scm/node/TestNodeDecommissionManager.java | 5 ++--
.../hdds/scm/node/TestNodeDecommissionMetrics.java | 9 +++----
.../hdds/scm/node/TestNodeReportHandler.java | 3 +--
.../hdds/scm/pipeline/TestECPipelineProvider.java | 5 ++--
.../scm/pipeline/TestPipelinePlacementFactory.java | 9 +++----
.../scm/pipeline/TestSimplePipelineProvider.java | 3 +--
.../TestPipelineChoosePolicyFactory.java | 4 +---
.../scm/safemode/TestECContainerSafeModeRule.java | 12 ++++------
.../TestOneReplicaPipelineSafeModeRule.java | 6 ++---
.../safemode/TestRatisContainerSafeModeRule.java | 12 ++++------
.../scm/security/TestRootCARotationManager.java | 15 ++++--------
.../hadoop/hdds/scm/server/TestSCMCertStore.java | 6 ++---
.../scm/server/TestSCMClientProtocolServer.java | 3 +--
.../ozone/container/common/TestEndPoint.java | 3 +--
34 files changed, 86 insertions(+), 166 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
index 12656e8a063..f7f605189d8 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
@@ -94,24 +94,18 @@
*/
public class TestBlockManager {
private StorageContainerManager scm;
- private ContainerManager mapping;
private MockNodeManager nodeManager;
private PipelineManagerImpl pipelineManager;
private BlockManagerImpl blockManager;
- private SCMHAManager scmHAManager;
- private SequenceIdGenerator sequenceIdGen;
private static final long DEFAULT_BLOCK_SIZE = 128 * MB;
private EventQueue eventQueue;
- private SCMContext scmContext;
- private SCMServiceManager serviceManager;
private int numContainerPerOwnerInPipeline;
- private OzoneConfiguration conf;
private SCMMetadataStore scmMetadataStore;
private ReplicationConfig replicationConfig;
@BeforeEach
void setUp(@TempDir File tempDir) throws Exception {
- conf = SCMTestUtils.getConf(tempDir);
+ OzoneConfiguration conf = SCMTestUtils.getConf(tempDir);
numContainerPerOwnerInPipeline = conf.getInt(
ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT,
ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT_DEFAULT);
@@ -124,16 +118,16 @@ void setUp(@TempDir File tempDir) throws Exception {
// Override the default Node Manager and SCMHAManager
// in SCM with the Mock one.
nodeManager = new MockNodeManager(true, 10);
- scmHAManager = SCMHAManagerStub.getInstance(true);
+ SCMHAManager scmHAManager = SCMHAManagerStub.getInstance(true);
eventQueue = new EventQueue();
- scmContext = SCMContext.emptyContext();
- serviceManager = new SCMServiceManager();
+ SCMContext scmContext = SCMContext.emptyContext();
+ SCMServiceManager serviceManager = new SCMServiceManager();
scmMetadataStore = new SCMMetadataStoreImpl(conf);
scmMetadataStore.start(conf);
- sequenceIdGen = new SequenceIdGenerator(
+ SequenceIdGenerator sequenceIdGen = new SequenceIdGenerator(
conf, scmHAManager, scmMetadataStore.getSequenceIdTable());
pipelineManager =
@@ -175,7 +169,7 @@ void setUp(@TempDir File tempDir) throws Exception {
configurator.getLeaseManager().start();
// Initialize these fields so that the tests can pass.
- mapping = scm.getContainerManager();
+ ContainerManager mapping = scm.getContainerManager();
blockManager = (BlockManagerImpl) scm.getScmBlockManager();
DatanodeCommandHandler handler = new DatanodeCommandHandler();
eventQueue.addHandler(SCMEvents.DATANODE_COMMAND, handler);
@@ -385,7 +379,6 @@ void testBlockDistributionWithMultipleRaftLogDisks() throws
Exception {
numContainerPerOwnerInPipeline;
int numMetaDataVolumes = 2;
nodeManager.setNumHealthyVolumes(numContainerPerOwnerInPipeline);
- nodeManager.setNumMetaDataVolumes(numMetaDataVolumes);
List<ExecutorService> executors = new ArrayList<>(threadCount);
for (int i = 0; i < threadCount; i++) {
executors.add(Executors.newSingleThreadExecutor());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestSCMDeleteBlocksCommandStatusManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestSCMDeleteBlocksCommandStatusManager.java
index 64d5c0377b7..1e61da47489 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestSCMDeleteBlocksCommandStatusManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestSCMDeleteBlocksCommandStatusManager.java
@@ -43,7 +43,6 @@
public class TestSCMDeleteBlocksCommandStatusManager {
private SCMDeleteBlocksCommandStatusManager manager;
- private ScmBlockDeletingServiceMetrics metrics;
private DatanodeID dnId1;
private DatanodeID dnId2;
private long scmCmdId1;
@@ -57,7 +56,7 @@ public class TestSCMDeleteBlocksCommandStatusManager {
@BeforeEach
public void setup() throws Exception {
- metrics = mock(ScmBlockDeletingServiceMetrics.class);
+ ScmBlockDeletingServiceMetrics metrics =
mock(ScmBlockDeletingServiceMetrics.class);
manager = new SCMDeleteBlocksCommandStatusManager(metrics);
// Create test data
dnId1 = DatanodeID.randomID();
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
index 34500919c44..ef0226e1621 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
@@ -84,6 +84,8 @@ public class MockNodeManager implements NodeManager {
private static final Logger LOG =
LoggerFactory.getLogger(MockNodeManager.class);
+ private static final int NUM_RAFT_LOG_DISKS_PER_DATANODE = 1;
+
public static final int NUM_PIPELINE_PER_METADATA_DISK = 2;
private static final NodeData[] NODES = {
new NodeData(10L * OzoneConsts.TB, OzoneConsts.GB),
@@ -109,7 +111,6 @@ public class MockNodeManager implements NodeManager {
private NetworkTopology clusterMap;
private ConcurrentMap<String, Set<String>> dnsToUuidMap;
private int numHealthyDisksPerDatanode;
- private int numRaftLogDisksPerDatanode;
private int numPipelinePerDatanode;
{
@@ -144,8 +145,7 @@ public MockNodeManager(NetworkTopologyImpl clusterMap,
}
this.commandMap = new HashMap<>();
numHealthyDisksPerDatanode = 1;
- numRaftLogDisksPerDatanode = 1;
- numPipelinePerDatanode = numRaftLogDisksPerDatanode *
+ numPipelinePerDatanode = NUM_RAFT_LOG_DISKS_PER_DATANODE *
NUM_PIPELINE_PER_METADATA_DISK;
}
@@ -170,8 +170,7 @@ public MockNodeManager(List<DatanodeUsageInfo> nodes)
this.commandMap = new HashMap<>();
numHealthyDisksPerDatanode = 1;
- numRaftLogDisksPerDatanode = 1;
- numPipelinePerDatanode = numRaftLogDisksPerDatanode *
+ numPipelinePerDatanode = NUM_RAFT_LOG_DISKS_PER_DATANODE *
NUM_PIPELINE_PER_METADATA_DISK;
}
@@ -204,8 +203,7 @@ public MockNodeManager(
this.commandMap = new HashMap<>();
numHealthyDisksPerDatanode = 1;
- numRaftLogDisksPerDatanode = 1;
- numPipelinePerDatanode = numRaftLogDisksPerDatanode *
+ numPipelinePerDatanode = NUM_RAFT_LOG_DISKS_PER_DATANODE *
NUM_PIPELINE_PER_METADATA_DISK;
}
@@ -909,10 +907,6 @@ public void setNumHealthyVolumes(int value) {
numHealthyDisksPerDatanode = value;
}
- public void setNumMetaDataVolumes(int value) {
- numRaftLogDisksPerDatanode = value;
- }
-
/**
* A class to declare some values for the nodes so that our tests
* won't fail.
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
index 826bc9055f6..dd5edf38193 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerManagerImpl.java
@@ -82,7 +82,6 @@ public class TestContainerManagerImpl {
private ContainerManager containerManager;
private SCMHAManager scmhaManager;
private SequenceIdGenerator sequenceIdGen;
- private NodeManager nodeManager;
private ContainerReplicaPendingOps pendingOpsMock;
private PipelineManager pipelineManager;
@@ -97,7 +96,7 @@ void setUp() throws Exception {
final OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
dbStore = DBStoreBuilder.createDBStore(conf, SCMDBDefinition.get());
scmhaManager = SCMHAManagerStub.getInstance(true);
- nodeManager = new MockNodeManager(true, 10);
+ NodeManager nodeManager = new MockNodeManager(true, 10);
sequenceIdGen = new SequenceIdGenerator(
conf, scmhaManager, SCMDBDefinition.SEQUENCE_ID.getTable(dbStore));
pipelineManager = new MockPipelineManager(dbStore, scmhaManager,
nodeManager);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
index a3db471334d..61001b9d38f 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
@@ -97,7 +97,6 @@ public class TestContainerReportHandler {
@TempDir
private File testDir;
private DBStore dbStore;
- private SCMHAManager scmhaManager;
private PipelineManager pipelineManager;
@BeforeEach
@@ -106,7 +105,7 @@ void setup() throws IOException,
InvalidStateTransitionException {
nodeManager = new MockNodeManager(true, 10);
containerManager = mock(ContainerManager.class);
dbStore = DBStoreBuilder.createDBStore(conf, SCMDBDefinition.get());
- scmhaManager = SCMHAManagerStub.getInstance(true);
+ SCMHAManager scmhaManager = SCMHAManagerStub.getInstance(true);
pipelineManager =
new MockPipelineManager(dbStore, scmhaManager, nodeManager);
containerStateManager = ContainerStateManagerImpl.newBuilder()
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java
index 0b3d78c73d8..0f5b3b6adcd 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java
@@ -62,8 +62,6 @@
public class TestContainerStateManager {
private ContainerStateManager containerStateManager;
- private PipelineManager pipelineManager;
- private SCMHAManager scmhaManager;
@TempDir
private File testDir;
private DBStore dbStore;
@@ -72,10 +70,10 @@ public class TestContainerStateManager {
@BeforeEach
public void init() throws IOException, TimeoutException {
OzoneConfiguration conf = new OzoneConfiguration();
- scmhaManager = SCMHAManagerStub.getInstance(true);
+ SCMHAManager scmhaManager = SCMHAManagerStub.getInstance(true);
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
dbStore = DBStoreBuilder.createDBStore(conf, SCMDBDefinition.get());
- pipelineManager = mock(PipelineManager.class);
+ PipelineManager pipelineManager = mock(PipelineManager.class);
pipeline = Pipeline.newBuilder().setState(Pipeline.PipelineState.CLOSED)
.setId(PipelineID.randomId())
.setReplicationConfig(StandaloneReplicationConfig.getInstance(
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
index 41fbe2032a7..d9ecaba4935 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
@@ -103,13 +103,11 @@ public class TestIncrementalContainerReportHandler {
private ContainerManager containerManager;
private ContainerStateManager containerStateManager;
private EventPublisher publisher;
- private HDDSLayoutVersionManager versionManager;
private SCMContext scmContext = SCMContext.emptyContext();
private PipelineManager pipelineManager;
@TempDir
private File testDir;
private DBStore dbStore;
- private SCMHAManager scmhaManager;
@BeforeEach
public void setup() throws IOException, InvalidStateTransitionException,
@@ -121,13 +119,13 @@ public void setup() throws IOException,
InvalidStateTransitionException,
NetworkTopology clusterMap = new NetworkTopologyImpl(conf);
EventQueue eventQueue = new EventQueue();
SCMStorageConfig storageConfig = new SCMStorageConfig(conf);
- this.versionManager = mock(HDDSLayoutVersionManager.class);
+ HDDSLayoutVersionManager versionManager =
mock(HDDSLayoutVersionManager.class);
when(versionManager.getMetadataLayoutVersion()).thenReturn(maxLayoutVersion());
when(versionManager.getSoftwareLayoutVersion()).thenReturn(maxLayoutVersion());
this.nodeManager =
new SCMNodeManager(conf, storageConfig, eventQueue, clusterMap,
scmContext, versionManager);
- scmhaManager = SCMHAManagerStub.getInstance(true);
+ SCMHAManager scmhaManager = SCMHAManagerStub.getInstance(true);
dbStore = DBStoreBuilder.createDBStore(conf, SCMDBDefinition.get());
pipelineManager =
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancer.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancer.java
index d7977771c07..4bd4daeab99 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancer.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancer.java
@@ -65,7 +65,6 @@ public class TestContainerBalancer {
private StorageContainerManager scm;
private ContainerBalancerConfiguration balancerConfiguration;
private Map<String, ByteString> serviceToConfigMap = new HashMap<>();
- private StatefulServiceStateManager serviceStateManager;
private OzoneConfiguration conf;
/**
@@ -79,7 +78,7 @@ public void setup() throws IOException, NodeNotFoundException,
5, TimeUnit.SECONDS);
conf.setTimeDuration(HDDS_NODE_REPORT_INTERVAL, 2, TimeUnit.SECONDS);
scm = mock(StorageContainerManager.class);
- serviceStateManager = mock(StatefulServiceStateManagerImpl.class);
+ StatefulServiceStateManager serviceStateManager =
mock(StatefulServiceStateManagerImpl.class);
balancerConfiguration =
conf.getObject(ContainerBalancerConfiguration.class);
balancerConfiguration.setThreshold(10);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java
index a8e22895ea1..85947e27d48 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerTask.java
@@ -89,17 +89,10 @@ public class TestContainerBalancerTask {
private static final Logger LOG =
LoggerFactory.getLogger(TestContainerBalancerTask.class);
- private ReplicationManager replicationManager;
private MoveManager moveManager;
- private ContainerManager containerManager;
private ContainerBalancerTask containerBalancerTask;
- private MockNodeManager mockNodeManager;
private StorageContainerManager scm;
private OzoneConfiguration conf;
- private ReplicationManagerConfiguration rmConf;
- private PlacementPolicy placementPolicy;
- private PlacementPolicy ecPlacementPolicy;
- private PlacementPolicyValidateProxy placementPolicyValidateProxy;
private ContainerBalancerConfiguration balancerConfiguration;
private List<DatanodeUsageInfo> nodesInCluster;
private List<Double> nodeUtilizations;
@@ -112,7 +105,6 @@ public class TestContainerBalancerTask {
private Map<String, ByteString> serviceToConfigMap = new HashMap<>();
private static final ThreadLocalRandom RANDOM = ThreadLocalRandom.current();
- private StatefulServiceStateManager serviceStateManager;
static final long STORAGE_UNIT = OzoneConsts.GB;
/**
@@ -122,11 +114,11 @@ public class TestContainerBalancerTask {
public void setup(TestInfo testInfo) throws IOException,
NodeNotFoundException,
TimeoutException {
conf = new OzoneConfiguration();
- rmConf = new ReplicationManagerConfiguration();
+ ReplicationManagerConfiguration rmConf = new
ReplicationManagerConfiguration();
scm = mock(StorageContainerManager.class);
- containerManager = mock(ContainerManager.class);
- replicationManager = mock(ReplicationManager.class);
- serviceStateManager = mock(StatefulServiceStateManagerImpl.class);
+ ContainerManager containerManager = mock(ContainerManager.class);
+ ReplicationManager replicationManager = mock(ReplicationManager.class);
+ StatefulServiceStateManager serviceStateManager =
mock(StatefulServiceStateManagerImpl.class);
SCMServiceManager scmServiceManager = mock(SCMServiceManager.class);
moveManager = mock(MoveManager.class);
when(moveManager.move(any(ContainerID.class),
@@ -151,17 +143,17 @@ public void setup(TestInfo testInfo) throws IOException,
NodeNotFoundException,
.map(method -> new int[]{0, 0, 0, 0, 0, 1, 2, 3, 4, 5})
.orElse(null);
createCluster(sizeArray);
- mockNodeManager = new MockNodeManager(datanodeToContainersMap);
+ MockNodeManager mockNodeManager = new
MockNodeManager(datanodeToContainersMap);
NetworkTopology clusterMap =
mockNodeManager.getClusterNetworkTopologyMap();
- placementPolicy = ContainerPlacementPolicyFactory
- .getPolicy(conf, mockNodeManager, clusterMap, true,
- SCMContainerPlacementMetrics.create());
- ecPlacementPolicy = ContainerPlacementPolicyFactory.getECPolicy(
+ PlacementPolicy placementPolicy = ContainerPlacementPolicyFactory
+ .getPolicy(conf, mockNodeManager,
clusterMap, true,
+
SCMContainerPlacementMetrics.create());
+ PlacementPolicy ecPlacementPolicy =
ContainerPlacementPolicyFactory.getECPolicy(
conf, mockNodeManager, clusterMap,
true, SCMContainerPlacementMetrics.create());
- placementPolicyValidateProxy = new PlacementPolicyValidateProxy(
+ PlacementPolicyValidateProxy placementPolicyValidateProxy = new
PlacementPolicyValidateProxy(
placementPolicy, ecPlacementPolicy);
when(replicationManager
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java
index 55dd2ac9620..d6732097491 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java
@@ -63,8 +63,6 @@
* Test for scm container placement factory.
*/
public class TestContainerPlacementFactory {
- // network topology cluster
- private NetworkTopology cluster;
// datanodes array list
private List<DatanodeDetails> datanodes = new ArrayList<>();
private List<DatanodeInfo> dnInfos = new ArrayList<>();
@@ -72,8 +70,6 @@ public class TestContainerPlacementFactory {
private static final long STORAGE_CAPACITY = 100L;
// configuration
private OzoneConfiguration conf;
- // node manager
- private NodeManager nodeManager;
@BeforeEach
public void setup() {
@@ -91,7 +87,8 @@ public void testRackAwarePolicy() throws IOException {
NodeSchema[] schemas = new NodeSchema[]
{ROOT_SCHEMA, RACK_SCHEMA, LEAF_SCHEMA};
NodeSchemaManager.getInstance().init(schemas, true);
- cluster = new NetworkTopologyImpl(NodeSchemaManager.getInstance());
+ // network topology cluster
+ NetworkTopology cluster = new
NetworkTopologyImpl(NodeSchemaManager.getInstance());
// build datanodes, and network topology
String rack = "/rack";
@@ -141,7 +138,8 @@ public void testRackAwarePolicy() throws IOException {
new ArrayList<>(Arrays.asList(storage4)));
// create mock node manager
- nodeManager = mock(NodeManager.class);
+ // node manager
+ NodeManager nodeManager = mock(NodeManager.class);
when(nodeManager.getNodes(NodeStatus.inServiceHealthy()))
.thenReturn(new ArrayList<>(datanodes));
for (DatanodeInfo dn: dnInfos) {
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestQuasiClosedStuckOverReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestQuasiClosedStuckOverReplicationHandler.java
index a65ba0446ff..ba7de78c5e3 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestQuasiClosedStuckOverReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestQuasiClosedStuckOverReplicationHandler.java
@@ -56,7 +56,6 @@ public class TestQuasiClosedStuckOverReplicationHandler {
private static final RatisReplicationConfig RATIS_REPLICATION_CONFIG =
RatisReplicationConfig.getInstance(THREE);
private ContainerInfo container;
private ReplicationManager replicationManager;
- private ReplicationManagerMetrics metrics;
private Set<Pair<DatanodeDetails, SCMCommand<?>>> commandsSent;
private QuasiClosedStuckOverReplicationHandler handler;
private final DatanodeID origin1 = DatanodeID.randomID();
@@ -74,7 +73,7 @@ void setup() throws NodeNotFoundException,
when(replicationManager.getConfig())
.thenReturn(ozoneConfiguration.getObject(
ReplicationManager.ReplicationManagerConfiguration.class));
- metrics = ReplicationManagerMetrics.create(replicationManager);
+ ReplicationManagerMetrics metrics =
ReplicationManagerMetrics.create(replicationManager);
when(replicationManager.getMetrics()).thenReturn(metrics);
/*
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestQuasiClosedStuckUnderReplicationHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestQuasiClosedStuckUnderReplicationHandler.java
index 22fee58b7c4..20731c948ad 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestQuasiClosedStuckUnderReplicationHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestQuasiClosedStuckUnderReplicationHandler.java
@@ -65,8 +65,6 @@ public class TestQuasiClosedStuckUnderReplicationHandler {
private NodeManager nodeManager;
private OzoneConfiguration conf;
private ReplicationManager replicationManager;
- private ReplicationManagerMetrics metrics;
- private PlacementPolicy policy;
private Set<Pair<DatanodeDetails, SCMCommand<?>>> commandsSent;
private QuasiClosedStuckUnderReplicationHandler handler;
@@ -78,7 +76,7 @@ void setup(@TempDir File testDir) throws
NodeNotFoundException,
nodeManager = mock(NodeManager.class);
conf = SCMTestUtils.getConf(testDir);
- policy = ReplicationTestUtil
+ PlacementPolicy policy = ReplicationTestUtil
.getSimpleTestPlacementPolicy(nodeManager, conf);
replicationManager = mock(ReplicationManager.class);
OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
@@ -86,7 +84,7 @@ void setup(@TempDir File testDir) throws
NodeNotFoundException,
when(replicationManager.getConfig())
.thenReturn(ozoneConfiguration.getObject(
ReplicationManager.ReplicationManagerConfiguration.class));
- metrics = ReplicationManagerMetrics.create(replicationManager);
+ ReplicationManagerMetrics metrics =
ReplicationManagerMetrics.create(replicationManager);
when(replicationManager.getMetrics()).thenReturn(metrics);
when(replicationManager.getContainerReplicaPendingOps()).thenReturn(mock(ContainerReplicaPendingOps.class));
@@ -178,7 +176,7 @@ public void testInsufficientNodesExceptionThrown() {
Pair.of(origin1, HddsProtos.NodeOperationalState.IN_SERVICE),
Pair.of(origin2, HddsProtos.NodeOperationalState.IN_SERVICE));
- policy = ReplicationTestUtil.getNoNodesTestPlacementPolicy(nodeManager,
conf);
+ PlacementPolicy policy =
ReplicationTestUtil.getNoNodesTestPlacementPolicy(nodeManager, conf);
handler = new QuasiClosedStuckUnderReplicationHandler(policy, conf,
replicationManager);
assertThrows(SCMException.class, () ->
@@ -193,7 +191,7 @@ public void testPartialReplicationExceptionThrown() {
StorageContainerDatanodeProtocolProtos.ContainerReplicaProto.State.QUASI_CLOSED,
Pair.of(origin1, HddsProtos.NodeOperationalState.IN_SERVICE));
- policy =
ReplicationTestUtil.getInsufficientNodesTestPlacementPolicy(nodeManager, conf,
2);
+ PlacementPolicy policy =
ReplicationTestUtil.getInsufficientNodesTestPlacementPolicy(nodeManager, conf,
2);
handler = new QuasiClosedStuckUnderReplicationHandler(policy, conf,
replicationManager);
assertThrows(InsufficientDatanodesException.class, () ->
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
index e101bf6ae59..d7d57287077 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
@@ -103,7 +103,6 @@ public class TestReplicationManagerScenarios {
private Set<Pair<DatanodeID, SCMCommand<?>>> commandsSent;
private OzoneConfiguration configuration;
- private ReplicationManager replicationManager;
private ContainerManager containerManager;
private PlacementPolicy ratisPlacementPolicy;
private PlacementPolicy ecPlacementPolicy;
@@ -269,7 +268,7 @@ public void testAllScenarios(Scenario scenario) throws
IOException {
conf.setMaintenanceRemainingRedundancy(scenario.getEcMaintenanceRedundancy());
conf.setMaintenanceReplicaMinimum(scenario.getRatisMaintenanceMinimum());
configuration.setFromObject(conf);
- replicationManager = createReplicationManager();
+ ReplicationManager replicationManager = createReplicationManager();
ContainerInfo containerInfo = scenario.buildContainerInfo();
loadPendingOps(containerInfo, scenario);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestRatisReplicationCheckHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestRatisReplicationCheckHandler.java
index 317f57234d2..59bdc87d369 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestRatisReplicationCheckHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestRatisReplicationCheckHandler.java
@@ -84,7 +84,6 @@ public class TestRatisReplicationCheckHandler {
private ReplicationQueue repQueue;
private ContainerCheckRequest.Builder requestBuilder;
private ReplicationManagerReport report;
- private ReplicationManager replicationManager;
private int maintenanceRedundancy = 2;
@BeforeEach
@@ -96,7 +95,7 @@ public void setup() throws IOException, NodeNotFoundException
{
)).thenAnswer(invocation ->
new ContainerPlacementStatusDefault(2, 2, 3));
- replicationManager = mock(ReplicationManager.class);
+ ReplicationManager replicationManager = mock(ReplicationManager.class);
when(replicationManager.getNodeStatus(any()))
.thenReturn(NodeStatus.inServiceHealthy());
healthCheck = new RatisReplicationCheckHandler(containerPlacementPolicy,
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestVulnerableUnhealthyReplicasHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestVulnerableUnhealthyReplicasHandler.java
index 61e9ab86328..f2c94619136 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestVulnerableUnhealthyReplicasHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestVulnerableUnhealthyReplicasHandler.java
@@ -60,7 +60,6 @@ public class TestVulnerableUnhealthyReplicasHandler {
private ReplicationConfig repConfig;
private ReplicationQueue repQueue;
private ContainerCheckRequest.Builder requestBuilder;
- private ReplicationManagerReport report;
private VulnerableUnhealthyReplicasHandler handler;
@BeforeEach
@@ -69,7 +68,7 @@ public void setup() throws NodeNotFoundException {
handler = new VulnerableUnhealthyReplicasHandler(replicationManager);
repConfig = RatisReplicationConfig.getInstance(THREE);
repQueue = new ReplicationQueue();
- report = new ReplicationManagerReport();
+ ReplicationManagerReport report = new ReplicationManagerReport();
requestBuilder = new ContainerCheckRequest.Builder()
.setReplicationQueue(repQueue)
.setMaintenanceRedundancy(2)
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAMetrics.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAMetrics.java
index ff8ad27bb1b..85f98a5b1e1 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAMetrics.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAMetrics.java
@@ -33,8 +33,6 @@ class TestSCMHAMetrics {
new MetricsCollectorImpl();
private static final String NODE_ID =
"scm" + RandomStringUtils.secure().nextNumeric(5);
- private String leaderId;
- private SCMHAMetrics scmhaMetrics;
@AfterEach
public void cleanup() {
@@ -43,11 +41,8 @@ public void cleanup() {
@Test
public void testGetMetricsWithLeader() {
- // GIVEN
- leaderId = NODE_ID;
-
- // WHEN
- scmhaMetrics = SCMHAMetrics.create(NODE_ID, leaderId);
+ // GIVEN AND WHEN
+ SCMHAMetrics scmhaMetrics = SCMHAMetrics.create(NODE_ID, NODE_ID);
scmhaMetrics.getMetrics(METRICS_COLLECTOR, true);
// THEN
@@ -57,10 +52,10 @@ public void testGetMetricsWithLeader() {
@Test
public void testGetMetricsWithFollower() {
// GIVEN
- leaderId = "scm" + RandomStringUtils.secure().nextNumeric(5);
+ String leaderId = "scm" + RandomStringUtils.secure().nextNumeric(5);
// WHEN
- scmhaMetrics = SCMHAMetrics.create(NODE_ID, leaderId);
+ SCMHAMetrics scmhaMetrics = SCMHAMetrics.create(NODE_ID, leaderId);
scmhaMetrics.getMetrics(METRICS_COLLECTOR, true);
// THEN
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestStatefulServiceStateManagerImpl.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestStatefulServiceStateManagerImpl.java
index e7f9b15d579..cb74b78bccc 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestStatefulServiceStateManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestStatefulServiceStateManagerImpl.java
@@ -37,18 +37,15 @@
* Tests StatefulServiceStateManagerImpl.
*/
public class TestStatefulServiceStateManagerImpl {
- private OzoneConfiguration conf;
private DBStore dbStore;
private SCMHAManager scmhaManager;
- private Table<String, ByteString> statefulServiceConfig;
private StatefulServiceStateManager stateManager;
@BeforeEach
void setup(@TempDir File testDir) throws IOException {
- conf = SCMTestUtils.getConf(testDir);
+ OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
dbStore = DBStoreBuilder.createDBStore(conf, SCMDBDefinition.get());
- statefulServiceConfig =
- SCMDBDefinition.STATEFUL_SERVICE_CONFIG.getTable(dbStore);
+ Table<String, ByteString> statefulServiceConfig =
SCMDBDefinition.STATEFUL_SERVICE_CONFIG.getTable(dbStore);
scmhaManager = SCMHAManagerStub.getInstance(true, dbStore);
stateManager =
StatefulServiceStateManagerImpl.newBuilder()
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
index eefa158a0f7..d94c54e826e 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
@@ -91,7 +91,6 @@ public class TestContainerPlacement {
private SequenceIdGenerator sequenceIdGen;
private OzoneConfiguration conf;
private PipelineManager pipelineManager;
- private NodeManager nodeManager;
@BeforeEach
public void setUp() throws Exception {
@@ -101,7 +100,7 @@ public void setUp() throws Exception {
scmhaManager = SCMHAManagerStub.getInstance(true);
sequenceIdGen = new SequenceIdGenerator(
conf, scmhaManager, SCMDBDefinition.SEQUENCE_ID.getTable(dbStore));
- nodeManager = new MockNodeManager(true, 10);
+ NodeManager nodeManager = new MockNodeManager(true, 10);
pipelineManager = new MockPipelineManager(dbStore,
scmhaManager, nodeManager);
pipelineManager.createPipeline(RatisReplicationConfig.getInstance(
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
index 755f21714b0..43bdef519f8 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
@@ -65,7 +65,6 @@
public class TestDatanodeAdminMonitor {
private SimpleMockNodeManager nodeManager;
- private OzoneConfiguration conf;
private DatanodeAdminMonitorImpl monitor;
private DatanodeAdminMonitorTestUtil
.DatanodeAdminHandler startAdminHandler;
@@ -74,7 +73,7 @@ public class TestDatanodeAdminMonitor {
@BeforeEach
public void setup() throws IOException, AuthenticationException {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
eventQueue = new EventQueue();
startAdminHandler = new DatanodeAdminMonitorTestUtil
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
index e676ae9461a..138a848dfa3 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
@@ -85,10 +85,8 @@ public class TestDeadNodeHandler {
private DeadNodeHandler deadNodeHandler;
private HealthyReadOnlyNodeHandler healthyReadOnlyNodeHandler;
private EventPublisher publisher;
- private EventQueue eventQueue;
@TempDir
private File storageDir;
- private SCMContext scmContext;
private DeletedBlockLog deletedBlockLog;
@BeforeEach
@@ -100,13 +98,13 @@ public void setup() throws IOException,
AuthenticationException {
conf.setStorageSize(OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN,
10, StorageUnit.MB);
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, storageDir.getPath());
- eventQueue = new EventQueue();
+ EventQueue eventQueue = new EventQueue();
scm = HddsTestUtils.getScm(conf);
nodeManager = (SCMNodeManager) scm.getScmNodeManager();
- scmContext = new SCMContext.Builder()
- .setSafeModeStatus(SafeModeStatus.PRE_CHECKS_PASSED)
- .setLeader(true)
- .setSCM(scm).build();
+ SCMContext scmContext = new SCMContext.Builder()
+
.setSafeModeStatus(SafeModeStatus.PRE_CHECKS_PASSED)
+ .setLeader(true)
+ .setSCM(scm).build();
pipelineManager =
(PipelineManagerImpl)scm.getPipelineManager();
pipelineManager.setScmContext(scmContext);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
index 87616aff9fa..ed66b14f445 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java
@@ -67,7 +67,6 @@
public class TestNodeDecommissionManager {
private NodeDecommissionManager decom;
- private StorageContainerManager scm;
private SCMNodeManager nodeManager;
private ContainerManager containerManager;
private OzoneConfiguration conf;
@@ -77,8 +76,8 @@ public class TestNodeDecommissionManager {
void setup(@TempDir File dir) throws Exception {
conf = new OzoneConfiguration();
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, dir.getAbsolutePath());
- scm = HddsTestUtils.getScm(conf);
- nodeManager = (SCMNodeManager)scm.getScmNodeManager();
+ StorageContainerManager scm = HddsTestUtils.getScm(conf);
+ nodeManager = (SCMNodeManager) scm.getScmNodeManager();
containerManager = mock(ContainerManager.class);
decom = new NodeDecommissionManager(conf, nodeManager, containerManager,
SCMContext.emptyContext(), new EventQueue(), null);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionMetrics.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionMetrics.java
index 3003f7452b7..5d6e39afee7 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionMetrics.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionMetrics.java
@@ -48,19 +48,16 @@
public class TestNodeDecommissionMetrics {
private NodeDecommissionMetrics metrics;
private SimpleMockNodeManager nodeManager;
- private OzoneConfiguration conf;
private DatanodeAdminMonitorImpl monitor;
- private DatanodeAdminMonitorTestUtil
- .DatanodeAdminHandler startAdminHandler;
private ReplicationManager repManager;
private EventQueue eventQueue;
@BeforeEach
public void setup() {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
eventQueue = new EventQueue();
- startAdminHandler = new DatanodeAdminMonitorTestUtil
- .DatanodeAdminHandler();
+ DatanodeAdminMonitorTestUtil.DatanodeAdminHandler startAdminHandler = new
DatanodeAdminMonitorTestUtil
+
.DatanodeAdminHandler();
eventQueue.addHandler(SCMEvents.START_ADMIN_ON_NODE, startAdminHandler);
nodeManager = new SimpleMockNodeManager();
repManager = mock(ReplicationManager.class);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java
index 467d6530829..ffeec5debe4 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java
@@ -58,7 +58,6 @@ public class TestNodeReportHandler implements EventPublisher {
private static final Logger LOG = LoggerFactory
.getLogger(TestNodeReportHandler.class);
private NodeReportHandler nodeReportHandler;
- private HDDSLayoutVersionManager versionManager;
private SCMNodeManager nodeManager;
@TempDir
private File storagePath;
@@ -72,7 +71,7 @@ public void resetEventCollector() throws IOException {
when(storageConfig.getClusterID()).thenReturn("cluster1");
NetworkTopology clusterMap = new NetworkTopologyImpl(conf);
- this.versionManager = mock(HDDSLayoutVersionManager.class);
+ HDDSLayoutVersionManager versionManager =
mock(HDDSLayoutVersionManager.class);
when(versionManager.getMetadataLayoutVersion()).thenReturn(maxLayoutVersion());
when(versionManager.getSoftwareLayoutVersion()).thenReturn(maxLayoutVersion());
nodeManager =
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestECPipelineProvider.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestECPipelineProvider.java
index c6d42ffc205..f2511e624f7 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestECPipelineProvider.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestECPipelineProvider.java
@@ -64,7 +64,6 @@
public class TestECPipelineProvider {
private PipelineProvider provider;
- private OzoneConfiguration conf;
private NodeManager nodeManager = mock(NodeManager.class);
private PipelineStateManager stateManager =
mock(PipelineStateManager.class);
@@ -73,10 +72,10 @@ public class TestECPipelineProvider {
@BeforeEach
public void setup() throws IOException, NodeNotFoundException {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
provider = new ECPipelineProvider(
nodeManager, stateManager, conf, placementPolicy);
- this.containerSizeBytes = (long) this.conf.getStorageSize(
+ this.containerSizeBytes = (long) conf.getStorageSize(
ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE,
ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE_DEFAULT,
StorageUnit.BYTES);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java
index 64555d9c11b..e548e45de84 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java
@@ -66,13 +66,10 @@
public class TestPipelinePlacementFactory {
private OzoneConfiguration conf;
private NodeManager nodeManager;
- private NodeManager nodeManagerBase;
private PipelineStateManager stateManager;
private NetworkTopologyImpl cluster;
private final List<DatanodeDetails> datanodes = new ArrayList<>();
private final List<DatanodeInfo> dnInfos = new ArrayList<>();
- private DBStore dbStore;
- private SCMHAManager scmhaManager;
private static final long STORAGE_CAPACITY = 100L;
@@ -123,7 +120,7 @@ private void setupRacks(int datanodeCount, int nodesPerRack,
new ArrayList<>(Arrays.asList(metaStorage1)));
dnInfos.add(datanodeInfo);
}
- nodeManagerBase = new MockNodeManager(cluster, datanodes,
+ NodeManager nodeManagerBase = new MockNodeManager(cluster, datanodes,
false, 10);
nodeManager = spy(nodeManagerBase);
for (DatanodeInfo dn: dnInfos) {
@@ -131,8 +128,8 @@ private void setupRacks(int datanodeCount, int nodesPerRack,
.thenReturn(dn);
}
- dbStore = DBStoreBuilder.createDBStore(conf, SCMDBDefinition.get());
- scmhaManager = SCMHAManagerStub.getInstance(true);
+ DBStore dbStore = DBStoreBuilder.createDBStore(conf,
SCMDBDefinition.get());
+ SCMHAManager scmhaManager = SCMHAManagerStub.getInstance(true);
stateManager = PipelineStateManagerImpl.newBuilder()
.setPipelineStore(SCMDBDefinition.PIPELINES.getTable(dbStore))
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java
index 8341fdfcddc..338d9129512 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSimplePipelineProvider.java
@@ -47,7 +47,6 @@
*/
public class TestSimplePipelineProvider {
- private NodeManager nodeManager;
private PipelineProvider provider;
private PipelineStateManager stateManager;
@TempDir
@@ -56,7 +55,7 @@ public class TestSimplePipelineProvider {
@BeforeEach
public void init() throws Exception {
- nodeManager = new MockNodeManager(true, 10);
+ NodeManager nodeManager = new MockNodeManager(true, 10);
final OzoneConfiguration conf = SCMTestUtils.getConf(testDir);
dbStore = DBStoreBuilder.createDBStore(conf, SCMDBDefinition.get());
SCMHAManager scmhaManager = SCMHAManagerStub.getInstance(true);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/choose/algorithms/TestPipelineChoosePolicyFactory.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/choose/algorithms/TestPipelineChoosePolicyFactory.java
index bede4413d3e..522bcf21804 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/choose/algorithms/TestPipelineChoosePolicyFactory.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/choose/algorithms/TestPipelineChoosePolicyFactory.java
@@ -39,8 +39,6 @@
*/
public class TestPipelineChoosePolicyFactory {
- private OzoneConfiguration conf;
-
private ScmConfig scmConfig;
private NodeManager nodeManager;
@@ -48,7 +46,7 @@ public class TestPipelineChoosePolicyFactory {
@BeforeEach
public void setup() {
//initialize network topology instance
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
scmConfig = conf.getObject(ScmConfig.class);
nodeManager = new MockNodeManager(true, 5);
}
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestECContainerSafeModeRule.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestECContainerSafeModeRule.java
index aceff644ec3..a720af85edd 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestECContainerSafeModeRule.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestECContainerSafeModeRule.java
@@ -49,20 +49,16 @@
*/
public class TestECContainerSafeModeRule {
private ContainerManager containerManager;
- private ConfigurationSource conf;
- private EventQueue eventQueue;
- private SCMSafeModeManager safeModeManager;
- private SafeModeMetrics metrics;
private ECContainerSafeModeRule rule;
@BeforeEach
public void setup() {
containerManager = mock(ContainerManager.class);
- conf = mock(ConfigurationSource.class);
- eventQueue = mock(EventQueue.class);
- safeModeManager = mock(SCMSafeModeManager.class);
- metrics = mock(SafeModeMetrics.class);
+ ConfigurationSource conf = mock(ConfigurationSource.class);
+ EventQueue eventQueue = mock(EventQueue.class);
+ SCMSafeModeManager safeModeManager = mock(SCMSafeModeManager.class);
+ SafeModeMetrics metrics = mock(SafeModeMetrics.class);
when(safeModeManager.getSafeModeMetrics()).thenReturn(metrics);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
index 3670b893b12..49a346660a8 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestOneReplicaPipelineSafeModeRule.java
@@ -70,8 +70,6 @@ public class TestOneReplicaPipelineSafeModeRule {
private OneReplicaPipelineSafeModeRule rule;
private PipelineManagerImpl pipelineManager;
private EventQueue eventQueue;
- private SCMServiceManager serviceManager;
- private SCMContext scmContext;
private MockNodeManager mockNodeManager;
private void setup(int nodes, int pipelineFactorThreeCount,
@@ -88,8 +86,8 @@ private void setup(int nodes, int pipelineFactorThreeCount,
ContainerManager containerManager = mock(ContainerManager.class);
when(containerManager.getContainers()).thenReturn(containers);
eventQueue = new EventQueue();
- serviceManager = new SCMServiceManager();
- scmContext = SCMContext.emptyContext();
+ SCMServiceManager serviceManager = new SCMServiceManager();
+ SCMContext scmContext = SCMContext.emptyContext();
SCMMetadataStore scmMetadataStore =
new SCMMetadataStoreImpl(ozoneConfiguration);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestRatisContainerSafeModeRule.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestRatisContainerSafeModeRule.java
index 56a1e1e8323..ee8028f4231 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestRatisContainerSafeModeRule.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestRatisContainerSafeModeRule.java
@@ -47,20 +47,16 @@
public class TestRatisContainerSafeModeRule {
private ContainerManager containerManager;
- private ConfigurationSource conf;
- private EventQueue eventQueue;
- private SCMSafeModeManager safeModeManager;
- private SafeModeMetrics metrics;
private RatisContainerSafeModeRule rule;
@BeforeEach
public void setup() {
containerManager = mock(ContainerManager.class);
- conf = mock(ConfigurationSource.class);
- eventQueue = mock(EventQueue.class);
- safeModeManager = mock(SCMSafeModeManager.class);
- metrics = mock(SafeModeMetrics.class);
+ ConfigurationSource conf = mock(ConfigurationSource.class);
+ EventQueue eventQueue = mock(EventQueue.class);
+ SCMSafeModeManager safeModeManager = mock(SCMSafeModeManager.class);
+ SafeModeMetrics metrics = mock(SafeModeMetrics.class);
when(safeModeManager.getSafeModeMetrics()).thenReturn(metrics);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
index ae1733025c7..6e6fc082eeb 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
@@ -85,12 +85,7 @@ public class TestRootCARotationManager {
private RootCARotationManager rootCARotationManager;
private StorageContainerManager scm;
private SCMCertificateClient scmCertClient;
- private SCMServiceManager scmServiceManager;
- private SCMHAManager scmhaManager;
private SCMContext scmContext;
- private SequenceIdGenerator sequenceIdGenerator;
- private SCMStorageConfig scmStorageConfig;
- private SCMSecurityProtocolServer scmSecurityProtocolServer;
private RootCARotationHandlerImpl handler;
private StatefulServiceStateManager statefulServiceStateManager;
@TempDir
@@ -112,14 +107,14 @@ public void init() throws IOException, TimeoutException,
securityConfig = new SecurityConfig(ozoneConfig);
scmCertClient = new SCMCertificateClient(securityConfig, null, scmID, cID,
certID.toString(), "localhost");
- scmServiceManager = new SCMServiceManager();
+ SCMServiceManager scmServiceManager = new SCMServiceManager();
scmContext = mock(SCMContext.class);
- scmhaManager = mock(SCMHAManager.class);
- sequenceIdGenerator = mock(SequenceIdGenerator.class);
- scmStorageConfig = new SCMStorageConfig(ozoneConfig);
+ SCMHAManager scmhaManager = mock(SCMHAManager.class);
+ SequenceIdGenerator sequenceIdGenerator = mock(SequenceIdGenerator.class);
+ SCMStorageConfig scmStorageConfig = new SCMStorageConfig(ozoneConfig);
scmStorageConfig.setScmId(scmID);
scmStorageConfig.setClusterId(cID);
- scmSecurityProtocolServer = mock(SCMSecurityProtocolServer.class);
+ SCMSecurityProtocolServer scmSecurityProtocolServer =
mock(SCMSecurityProtocolServer.class);
handler = mock(RootCARotationHandlerImpl.class);
statefulServiceStateManager = mock(StatefulServiceStateManager.class);
when(scmContext.isLeader()).thenReturn(true);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMCertStore.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMCertStore.java
index aafa1c689d3..2ed5990d46d 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMCertStore.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMCertStore.java
@@ -57,20 +57,18 @@ public class TestSCMCertStore {
private static final String COMPONENT_NAME = "scm";
- private OzoneConfiguration config;
private SCMMetadataStore scmMetadataStore;
private CertificateStore scmCertStore;
- private SecurityConfig securityConfig;
private KeyPair keyPair;
@BeforeEach
public void setUp(@TempDir Path tempDir) throws Exception {
- config = new OzoneConfiguration();
+ OzoneConfiguration config = new OzoneConfiguration();
config.set(HddsConfigKeys.OZONE_METADATA_DIRS,
tempDir.toAbsolutePath().toString());
- securityConfig = new SecurityConfig(config);
+ SecurityConfig securityConfig = new SecurityConfig(config);
keyPair = KeyStoreTestUtil.generateKeyPair("RSA");
final SCMRatisServer ratisServer = mock(SCMRatisServer.class);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
index 65ddffcbc07..9402218014c 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
@@ -57,14 +57,13 @@
* servicing commands from the scm client.
*/
public class TestSCMClientProtocolServer {
- private OzoneConfiguration config;
private SCMClientProtocolServer server;
private StorageContainerManager scm;
private StorageContainerLocationProtocolServerSideTranslatorPB service;
@BeforeEach
void setUp(@TempDir File testDir) throws Exception {
- config = SCMTestUtils.getConf(testDir);
+ OzoneConfiguration config = SCMTestUtils.getConf(testDir);
SCMConfigurator configurator = new SCMConfigurator();
configurator.setSCMHAManager(SCMHAManagerStub.getInstance(true));
configurator.setScmContext(SCMContext.emptyContext());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
index a7a105f66fe..631d14bcc56 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
@@ -101,7 +101,6 @@ public class TestEndPoint {
private static File testDir;
private static OzoneConfiguration ozoneConf;
private static VolumeChoosingPolicy volumeChoosingPolicy;
- private static DatanodeLayoutStorage layoutStorage;
private static DatanodeDetails dnDetails;
@TempDir
@@ -120,7 +119,7 @@ static void setUp() throws Exception {
ozoneConf = SCMTestUtils.getConf(testDir);
scmServerImpl = new ScmTestMock();
dnDetails = randomDatanodeDetails();
- layoutStorage = new DatanodeLayoutStorage(ozoneConf,
+ DatanodeLayoutStorage layoutStorage = new DatanodeLayoutStorage(ozoneConf,
UUID.randomUUID().toString(),
HDDSLayoutFeature.DATANODE_SCHEMA_V3.layoutVersion());
layoutStorage.initialize();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
