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 5962c10a2f5 HDDS-13563. Convert redundant fields to local var in
ozone-recon module (#8992)
5962c10a2f5 is described below
commit 5962c10a2f50cca34ac51a9a59416a316cc73eab
Author: Ivan Zlenko <[email protected]>
AuthorDate: Mon Sep 8 11:08:44 2025 +0400
HDDS-13563. Convert redundant fields to local var in ozone-recon module
(#8992)
---
.../hadoop/ozone/recon/api/TestBlocksEndPoint.java | 6 +-
.../ozone/recon/api/TestClusterStateEndpoint.java | 20 ++--
.../ozone/recon/api/TestContainerEndpoint.java | 3 +-
.../recon/api/TestDeletedKeysSearchEndpoint.java | 6 +-
.../hadoop/ozone/recon/api/TestEndpoints.java | 12 +--
.../ozone/recon/api/TestFeaturesEndPoint.java | 3 +-
.../recon/api/TestNSSummaryDiskUsageOrdering.java | 6 +-
.../recon/api/TestNSSummaryEndpointWithFSO.java | 3 +-
.../recon/api/TestNSSummaryEndpointWithLegacy.java | 3 +-
.../api/TestNSSummaryEndpointWithOBSAndLegacy.java | 3 +-
.../ozone/recon/api/TestOmDBInsightEndPoint.java | 20 ++--
.../ozone/recon/api/TestOpenContainerCount.java | 16 ++-
.../recon/api/TestOpenKeysSearchEndpoint.java | 11 +-
.../ozone/recon/api/TestTriggerDBSyncEndpoint.java | 3 +-
.../ozone/recon/heatmap/TestHeatMapInfo.java | 3 +-
.../scm/AbstractReconContainerManagerTest.java | 15 +--
...TestReconIncrementalContainerReportHandler.java | 3 +-
.../ozone/recon/scm/TestReconNodeManager.java | 3 +-
.../ozone/recon/scm/TestReconPipelineManager.java | 7 +-
.../TestReconContainerMetadataManagerImpl.java | 3 +-
.../impl/TestReconNamespaceSummaryManagerImpl.java | 3 +-
.../recon/tasks/TestContainerKeyMapperTask.java | 3 +-
.../recon/tasks/TestContainerSizeCountTask.java | 13 +--
.../ozone/recon/tasks/TestFileSizeCountTask.java | 3 +-
.../ozone/recon/tasks/TestNSSummaryTask.java | 39 +++----
.../recon/tasks/TestNSSummaryTaskWithFSO.java | 115 ++++++++++----------
.../recon/tasks/TestNSSummaryTaskWithLegacy.java | 116 ++++++++++-----------
.../TestNSSummaryTaskWithLegacyOBSLayout.java | 71 ++++++-------
.../recon/tasks/TestNSSummaryTaskWithOBS.java | 71 ++++++-------
.../ozone/recon/tasks/TestOmTableInsightTask.java | 3 +-
.../upgrade/TestReconLayoutVersionManager.java | 3 +-
31 files changed, 254 insertions(+), 335 deletions(-)
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java
index 20904a9523e..f46c5345cfe 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java
@@ -65,16 +65,14 @@ public class TestBlocksEndPoint {
@TempDir
private Path temporaryFolder;
- private ReconStorageContainerManagerFacade reconStorageContainerManager;
private ReconContainerManager reconContainerManager;
private ReconPipelineManager reconPipelineManager;
private BlocksEndPoint blocksEndPoint;
private boolean isSetupDone = false;
- private ReconOMMetadataManager reconOMMetadataManager;
private DBStore scmDBStore;
private void initializeInjector() throws Exception {
- reconOMMetadataManager = getTestReconOmMetadataManager(
+ ReconOMMetadataManager reconOMMetadataManager =
getTestReconOmMetadataManager(
initializeNewOmMetadataManager(Files.createDirectory(
temporaryFolder.resolve("JunitOmDBDir")).toFile()),
Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
@@ -95,7 +93,7 @@ private void initializeInjector() throws Exception {
.addBinding(BlocksEndPoint.class)
.build();
- reconStorageContainerManager =
+ ReconStorageContainerManagerFacade reconStorageContainerManager =
reconTestInjector.getInstance(ReconStorageContainerManagerFacade.class);
reconContainerManager = (ReconContainerManager)
reconStorageContainerManager.getContainerManager();
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestClusterStateEndpoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestClusterStateEndpoint.java
index a27d33940ee..d5807b3f71b 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestClusterStateEndpoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestClusterStateEndpoint.java
@@ -60,18 +60,16 @@
* Unit test for ClusterStateEndpoint ContainerStateCounts.
*/
public class TestClusterStateEndpoint extends AbstractReconSqlDBTest {
+
+ private static final long KEY_COUNT = 5L;
+
@TempDir
private Path temporaryFolder;
- private OzoneStorageContainerManager ozoneStorageContainerManager;
- private ContainerHealthSchemaManager containerHealthSchemaManager;
private ClusterStateEndpoint clusterStateEndpoint;
private ReconContainerManager reconContainerManager;
- private ReconPipelineManager reconPipelineManager;
- private ReconOMMetadataManager reconOMMetadataManager;
private Pipeline pipeline;
private PipelineID pipelineID;
private OzoneConfiguration conf;
- private long keyCount = 5L;
private int count = 0;
private static final int NUM_OPEN_CONTAINERS = 3;
private static final int NUM_DELETED_CONTAINERS = 4;
@@ -83,7 +81,7 @@ public TestClusterStateEndpoint() {
@BeforeEach
public void setUp() throws Exception {
- reconOMMetadataManager = getTestReconOmMetadataManager(
+ ReconOMMetadataManager reconOMMetadataManager =
getTestReconOmMetadataManager(
initializeNewOmMetadataManager(Files.createDirectory(
temporaryFolder.resolve("JunitOmDBDir")).toFile()),
Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
@@ -102,13 +100,13 @@ public void setUp() throws Exception {
.addBinding(ClusterStateEndpoint.class)
.addBinding(ContainerHealthSchemaManager.class)
.build();
- ozoneStorageContainerManager =
+ OzoneStorageContainerManager ozoneStorageContainerManager =
reconTestInjector.getInstance(OzoneStorageContainerManager.class);
reconContainerManager = (ReconContainerManager)
ozoneStorageContainerManager.getContainerManager();
- reconPipelineManager = (ReconPipelineManager)
- ozoneStorageContainerManager.getPipelineManager();
- containerHealthSchemaManager =
+ ReconPipelineManager reconPipelineManager = (ReconPipelineManager)
+
ozoneStorageContainerManager.getPipelineManager();
+ ContainerHealthSchemaManager containerHealthSchemaManager =
reconTestInjector.getInstance(ContainerHealthSchemaManager.class);
GlobalStatsDao globalStatsDao = getDao(GlobalStatsDao.class);
conf = mock(OzoneConfiguration.class);
@@ -169,7 +167,7 @@ ContainerInfo newContainerInfo(long containerId,
HddsProtos.ReplicationFactor.THREE))
.setState(state)
.setOwner("owner1")
- .setNumberOfKeys(keyCount)
+ .setNumberOfKeys(KEY_COUNT)
.setPipelineID(pipelineID)
.build();
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
index a94ba618be1..4794ecf1f30 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
@@ -122,7 +122,6 @@ public class TestContainerEndpoint {
private static final Logger LOG =
LoggerFactory.getLogger(TestContainerEndpoint.class);
- private OzoneStorageContainerManager ozoneStorageContainerManager;
private ReconNamespaceSummaryManager reconNamespaceSummaryManager;
private ReconContainerManager reconContainerManager;
private ContainerStateManager containerStateManager;
@@ -190,7 +189,7 @@ private void initializeInjector() throws Exception {
.addBinding(ContainerHealthSchemaManager.class)
.build();
- ozoneStorageContainerManager =
+ OzoneStorageContainerManager ozoneStorageContainerManager =
reconTestInjector.getInstance(OzoneStorageContainerManager.class);
reconContainerManager = (ReconContainerManager)
ozoneStorageContainerManager.getContainerManager();
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestDeletedKeysSearchEndpoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestDeletedKeysSearchEndpoint.java
index 5191808df7d..66380d9b59c 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestDeletedKeysSearchEndpoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestDeletedKeysSearchEndpoint.java
@@ -79,14 +79,12 @@ public class TestDeletedKeysSearchEndpoint extends
AbstractReconSqlDBTest {
private Path temporaryFolder;
private ReconOMMetadataManager reconOMMetadataManager;
private OMDBInsightEndpoint omdbInsightEndpoint;
- private OzoneConfiguration ozoneConfiguration;
- private OMMetadataManager omMetadataManager;
@BeforeEach
public void setUp() throws Exception {
- ozoneConfiguration = new OzoneConfiguration();
+ OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.setLong(OZONE_RECON_NSSUMMARY_FLUSH_TO_DB_MAX_THRESHOLD,
100);
- omMetadataManager = initializeNewOmMetadataManager(
+ OMMetadataManager omMetadataManager = initializeNewOmMetadataManager(
Files.createDirectory(temporaryFolder.resolve("JunitOmDBDir")).toFile());
reconOMMetadataManager = getTestReconOmMetadataManager(omMetadataManager,
Files.createDirectory(temporaryFolder.resolve("OmMetataDir")).toFile());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
index d5adaa0aa26..d406e4fce72 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
@@ -183,7 +183,6 @@ public class TestEndpoints extends AbstractReconSqlDBTest {
private ExtendedDatanodeDetailsProto extendedDatanodeDetailsProto3;
private Pipeline pipeline;
private FileCountBySizeDao fileCountBySizeDao;
- private ContainerCountBySizeDao containerCountBySizeDao;
private DSLContext dslContext;
private static final String HOST1 = "host1.datanode";
private static final String HOST2 = "host2.datanode";
@@ -198,10 +197,7 @@ public class TestEndpoints extends AbstractReconSqlDBTest {
private ReconUtils reconUtilsMock;
private StorageContainerLocationProtocol mockScmClient;
- private ContainerHealthSchemaManager containerHealthSchemaManager;
private CommonUtils commonUtils;
- private PipelineManager pipelineManager;
- private ReconPipelineManager reconPipelineManager;
private List<HddsProtos.Node> nodes = getNodeDetails(2);
private Map<String, List<ContainerID>> containerOnDecom =
getContainersOnDecomNodes();
private ArrayList<String> metrics = getMetrics();
@@ -300,7 +296,7 @@ private void initializeInjector() throws Exception {
volumeEndpoint = reconTestInjector.getInstance(VolumeEndpoint.class);
bucketEndpoint = reconTestInjector.getInstance(BucketEndpoint.class);
fileCountBySizeDao = getDao(FileCountBySizeDao.class);
- containerCountBySizeDao = reconScm.getContainerCountBySizeDao();
+ ContainerCountBySizeDao containerCountBySizeDao =
reconScm.getContainerCountBySizeDao();
GlobalStatsDao globalStatsDao = getDao(GlobalStatsDao.class);
UtilizationSchemaDefinition utilizationSchemaDefinition =
getSchemaDefinition(UtilizationSchemaDefinition.class);
@@ -317,7 +313,7 @@ private void initializeInjector() throws Exception {
omTableInsightTask =
new OmTableInsightTask(globalStatsDao, sqlConfiguration,
reconOMMetadataManager);
- containerHealthSchemaManager =
+ ContainerHealthSchemaManager containerHealthSchemaManager =
reconTestInjector.getInstance(ContainerHealthSchemaManager.class);
clusterStateEndpoint =
new ClusterStateEndpoint(reconScm, globalStatsDao,
@@ -328,8 +324,8 @@ private void initializeInjector() throws Exception {
metricsProxyEndpoint =
new MetricsProxyEndpoint(metricsServiceProviderFactory);
dslContext = getDslContext();
- pipelineManager = reconScm.getPipelineManager();
- reconPipelineManager = (ReconPipelineManager) pipelineManager;
+ PipelineManager pipelineManager = reconScm.getPipelineManager();
+ ReconPipelineManager reconPipelineManager = (ReconPipelineManager)
pipelineManager;
reconPipelineManager.addPipeline(pipeline);
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
index 7181f29ba01..796ff43736c 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
@@ -52,12 +52,11 @@ public class TestFeaturesEndPoint {
private Path temporaryFolder;
private FeaturesEndpoint featuresEndPoint;
private boolean isSetupDone = false;
- private ReconOMMetadataManager reconOMMetadataManager;
private OzoneConfiguration ozoneConfiguration;
private void initializeInjector() throws Exception {
ozoneConfiguration = new OzoneConfiguration();
- reconOMMetadataManager = getTestReconOmMetadataManager(
+ ReconOMMetadataManager reconOMMetadataManager =
getTestReconOmMetadataManager(
initializeNewOmMetadataManager(Files.createDirectory(
temporaryFolder.resolve("JunitOmDBDir")).toFile()),
Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryDiskUsageOrdering.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryDiskUsageOrdering.java
index f5842131644..2d375b6fe86 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryDiskUsageOrdering.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryDiskUsageOrdering.java
@@ -69,17 +69,15 @@ public class TestNSSummaryDiskUsageOrdering {
private ReconOMMetadataManager reconOMMetadataManager;
private NSSummaryEndpoint nsSummaryEndpoint;
- private OzoneConfiguration ozoneConfiguration;
private static final String ROOT_PATH = "/";
private static final String TEST_USER = "TestUser";
- private OMMetadataManager omMetadataManager;
@BeforeEach
public void setUp() throws Exception {
- ozoneConfiguration = new OzoneConfiguration();
+ OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.setLong(OZONE_RECON_NSSUMMARY_FLUSH_TO_DB_MAX_THRESHOLD,
100);
- omMetadataManager = initializeNewOmMetadataManager(
+ OMMetadataManager omMetadataManager = initializeNewOmMetadataManager(
Files.createDirectory(temporaryFolder.resolve("JunitOmDBDir"))
.toFile());
OzoneManagerServiceProviderImpl ozoneManagerServiceProvider =
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithFSO.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithFSO.java
index 89257ba233e..b496f2225d1 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithFSO.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithFSO.java
@@ -121,7 +121,6 @@ public class TestNSSummaryEndpointWithFSO {
private ReconOMMetadataManager reconOMMetadataManager;
private ReconNamespaceSummaryManager reconNamespaceSummaryManager;
private NSSummaryEndpoint nsSummaryEndpoint;
- private OzoneConfiguration ozoneConfiguration;
private CommonUtils commonUtils;
private static final String TEST_PATH_UTILITY =
@@ -358,7 +357,7 @@ public class TestNSSummaryEndpointWithFSO {
@BeforeEach
public void setUp() throws Exception {
- ozoneConfiguration = new OzoneConfiguration();
+ OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.setLong(OZONE_RECON_NSSUMMARY_FLUSH_TO_DB_MAX_THRESHOLD,
10);
OMMetadataManager omMetadataManager = initializeNewOmMetadataManager(
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithLegacy.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithLegacy.java
index abb2869bc4e..01881221979 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithLegacy.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithLegacy.java
@@ -117,7 +117,6 @@ public class TestNSSummaryEndpointWithLegacy {
private ReconNamespaceSummaryManager reconNamespaceSummaryManager;
private ReconOMMetadataManager reconOMMetadataManager;
private NSSummaryEndpoint nsSummaryEndpoint;
- private OzoneConfiguration conf;
private CommonUtils commonUtils;
private static final String TEST_PATH_UTILITY =
@@ -356,7 +355,7 @@ public class TestNSSummaryEndpointWithLegacy {
@BeforeEach
public void setUp() throws Exception {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
OMMetadataManager omMetadataManager = initializeNewOmMetadataManager(
Files.createDirectory(temporaryFolder.resolve(
"JunitOmDBDir")).toFile(), conf);
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithOBSAndLegacy.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithOBSAndLegacy.java
index 00196d5f5e3..9a311fb07e2 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithOBSAndLegacy.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithOBSAndLegacy.java
@@ -129,7 +129,6 @@ public class TestNSSummaryEndpointWithOBSAndLegacy {
private ReconOMMetadataManager reconOMMetadataManager;
private ReconNamespaceSummaryManager reconNamespaceSummaryManager;
private NSSummaryEndpoint nsSummaryEndpoint;
- private OzoneConfiguration conf;
private CommonUtils commonUtils;
private static final String TEST_PATH_UTILITY =
@@ -340,7 +339,7 @@ public class TestNSSummaryEndpointWithOBSAndLegacy {
@BeforeEach
public void setUp() throws Exception {
- conf = new OzoneConfiguration();
+ OzoneConfiguration conf = new OzoneConfiguration();
// By setting this config our Legacy buckets will behave like OBS buckets.
conf.set(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS, "false");
OMMetadataManager omMetadataManager = initializeNewOmMetadataManager(
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
index 7cd08ff009a..7a705a52b24 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
@@ -98,15 +98,9 @@
public class TestOmDBInsightEndPoint extends AbstractReconSqlDBTest {
@TempDir
private Path temporaryFolder;
- private OzoneStorageContainerManager ozoneStorageContainerManager;
private ReconContainerMetadataManager reconContainerMetadataManager;
- private OMMetadataManager omMetadataManager;
- private ReconPipelineManager reconPipelineManager;
private ReconOMMetadataManager reconOMMetadataManager;
private ReconNamespaceSummaryManager reconNamespaceSummaryManager;
- private NSSummaryTaskWithLegacy nSSummaryTaskWithLegacy;
- private NSSummaryTaskWithOBS nsSummaryTaskWithOBS;
- private NSSummaryTaskWithFSO nsSummaryTaskWithFSO;
private OMDBInsightEndpoint omdbInsightEndpoint;
private Pipeline pipeline;
private Random random = new Random();
@@ -268,7 +262,7 @@ private long generateUniqueRandomLong() {
@BeforeEach
public void setUp() throws Exception {
- omMetadataManager = initializeNewOmMetadataManager(
+ OMMetadataManager omMetadataManager = initializeNewOmMetadataManager(
Files.createDirectory(temporaryFolder.resolve(
"JunitOmMetadata")).toFile());
reconOMMetadataManager = getTestReconOmMetadataManager(omMetadataManager,
@@ -293,23 +287,23 @@ public void setUp() throws Exception {
reconTestInjector.getInstance(ReconContainerMetadataManager.class);
omdbInsightEndpoint = reconTestInjector.getInstance(
OMDBInsightEndpoint.class);
- ozoneStorageContainerManager =
+ OzoneStorageContainerManager ozoneStorageContainerManager =
reconTestInjector.getInstance(OzoneStorageContainerManager.class);
- reconPipelineManager = (ReconPipelineManager)
- ozoneStorageContainerManager.getPipelineManager();
+ ReconPipelineManager reconPipelineManager = (ReconPipelineManager)
+
ozoneStorageContainerManager.getPipelineManager();
pipeline = getRandomPipeline();
reconPipelineManager.addPipeline(pipeline);
ozoneConfiguration = new OzoneConfiguration();
reconNamespaceSummaryManager =
reconTestInjector.getInstance(ReconNamespaceSummaryManager.class);
setUpOmData();
- nSSummaryTaskWithLegacy = new NSSummaryTaskWithLegacy(
+ NSSummaryTaskWithLegacy nSSummaryTaskWithLegacy = new
NSSummaryTaskWithLegacy(
reconNamespaceSummaryManager,
reconOMMetadataManager, ozoneConfiguration, 10);
- nsSummaryTaskWithOBS = new NSSummaryTaskWithOBS(
+ NSSummaryTaskWithOBS nsSummaryTaskWithOBS = new NSSummaryTaskWithOBS(
reconNamespaceSummaryManager,
reconOMMetadataManager, 10);
- nsSummaryTaskWithFSO = new NSSummaryTaskWithFSO(
+ NSSummaryTaskWithFSO nsSummaryTaskWithFSO = new NSSummaryTaskWithFSO(
reconNamespaceSummaryManager,
reconOMMetadataManager, 10);
reconNamespaceSummaryManager.clearNSSummaryTable();
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
index c7d3f91e447..0fa4415af18 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
@@ -92,7 +92,6 @@ public class TestOpenContainerCount {
private Path temporaryFolder;
private NodeEndpoint nodeEndpoint;
- private ReconOMMetadataManager reconOMMetadataManager;
private ReconStorageContainerManagerFacade reconScm;
private boolean isSetupDone = false;
private String pipelineId;
@@ -108,20 +107,17 @@ public class TestOpenContainerCount {
private Pipeline pipeline2;
private static final String HOST1 = "host1.datanode";
private static final String IP1 = "1.1.1.1";
- private ReconUtils reconUtilsMock;
private StorageContainerServiceProvider mockScmServiceProvider;
private List<Long> containerIDs;
private List<ContainerWithPipeline> cpw;
private CommonUtils commonUtils;
- private PipelineManager pipelineManager;
- private ReconPipelineManager reconPipelineManager;
private void initializeInjector() throws Exception {
- reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(Files.createDirectory(
- temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ ReconOMMetadataManager reconOMMetadataManager =
getTestReconOmMetadataManager(
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
datanodeDetails = randomDatanodeDetails();
datanodeDetails.setHostName(HOST1);
@@ -185,7 +181,7 @@ private void initializeInjector() throws Exception {
.getExistContainerWithPipelinesInBatch(containerIDs))
.thenReturn(cpw);
- reconUtilsMock = mock(ReconUtils.class);
+ ReconUtils reconUtilsMock = mock(ReconUtils.class);
HttpURLConnection urlConnectionMock = mock(HttpURLConnection.class);
when(urlConnectionMock.getResponseCode())
@@ -220,8 +216,8 @@ private void initializeInjector() throws Exception {
nodeEndpoint = reconTestInjector.getInstance(NodeEndpoint.class);
reconScm = (ReconStorageContainerManagerFacade)
reconTestInjector.getInstance(OzoneStorageContainerManager.class);
- pipelineManager = reconScm.getPipelineManager();
- reconPipelineManager = (ReconPipelineManager) pipelineManager;
+ PipelineManager pipelineManager = reconScm.getPipelineManager();
+ ReconPipelineManager reconPipelineManager = (ReconPipelineManager)
pipelineManager;
reconPipelineManager.addPipeline(pipeline);
reconPipelineManager.addPipeline(pipeline2);
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenKeysSearchEndpoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenKeysSearchEndpoint.java
index 024cee560ba..b59aaa3c8b8 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenKeysSearchEndpoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenKeysSearchEndpoint.java
@@ -81,18 +81,14 @@ public class TestOpenKeysSearchEndpoint extends
AbstractReconSqlDBTest {
private Path temporaryFolder;
private ReconOMMetadataManager reconOMMetadataManager;
private OMDBInsightEndpoint omdbInsightEndpoint;
- private OzoneConfiguration ozoneConfiguration;
private static final String ROOT_PATH = "/";
private static final String TEST_USER = "TestUser";
- private OMMetadataManager omMetadataManager;
-
- private ReconNamespaceSummaryManager reconNamespaceSummaryManager;
@BeforeEach
public void setUp() throws Exception {
- ozoneConfiguration = new OzoneConfiguration();
+ OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.setLong(OZONE_RECON_NSSUMMARY_FLUSH_TO_DB_MAX_THRESHOLD,
100);
- omMetadataManager = initializeNewOmMetadataManager(
+ OMMetadataManager omMetadataManager = initializeNewOmMetadataManager(
Files.createDirectory(temporaryFolder.resolve("JunitOmDBDir")).toFile());
reconOMMetadataManager = getTestReconOmMetadataManager(omMetadataManager,
Files.createDirectory(temporaryFolder.resolve("OmMetataDir")).toFile());
@@ -110,7 +106,8 @@ public void setUp() throws Exception {
.addBinding(OMDBInsightEndpoint.class)
.addBinding(ContainerHealthSchemaManager.class)
.build();
- reconNamespaceSummaryManager =
reconTestInjector.getInstance(ReconNamespaceSummaryManager.class);
+ ReconNamespaceSummaryManager reconNamespaceSummaryManager =
+ reconTestInjector.getInstance(ReconNamespaceSummaryManager.class);
omdbInsightEndpoint =
reconTestInjector.getInstance(OMDBInsightEndpoint.class);
// populate OM DB and reprocess into Recon RocksDB
populateOMDB();
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTriggerDBSyncEndpoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTriggerDBSyncEndpoint.java
index b898dd32028..fdb691df8d4 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTriggerDBSyncEndpoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTriggerDBSyncEndpoint.java
@@ -73,7 +73,6 @@ public class TestTriggerDBSyncEndpoint {
@TempDir
private Path temporaryFolder;
private ReconTestInjector reconTestInjector;
- private CommonUtils commonUtils;
@BeforeEach
public void setUp() throws IOException, AuthenticationException {
@@ -85,7 +84,7 @@ public void setUp() throws IOException,
AuthenticationException {
Files.createDirectory(temporaryFolder.resolve("ReconDb"))
.toFile().getAbsolutePath());
configuration.set(OZONE_OM_ADDRESS_KEY, "localhost:9862");
- commonUtils = new CommonUtils();
+ CommonUtils commonUtils = new CommonUtils();
OzoneManagerProtocol ozoneManagerProtocol
= mock(OzoneManagerProtocol.class);
when(ozoneManagerProtocol.getDBUpdates(any(OzoneManagerProtocolProtos
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
index 7793fb5b4a2..284fab39100 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
@@ -57,13 +57,12 @@ public class TestHeatMapInfo {
private Path temporaryFolder;
private boolean isSetupDone = false;
- private ReconOMMetadataManager reconOMMetadataManager;
private String auditRespStr;
private HeatMapUtil heatMapUtil;
@SuppressWarnings("checkstyle:methodlength")
private void initializeInjector() throws Exception {
- reconOMMetadataManager = getTestReconOmMetadataManager(
+ ReconOMMetadataManager reconOMMetadataManager =
getTestReconOmMetadataManager(
initializeNewOmMetadataManager(Files.createDirectory(
temporaryFolder.resolve("JunitOmDBDir")).toFile()),
Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java
index 159fad860de..2490d351ee0 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java
@@ -71,14 +71,9 @@
public class AbstractReconContainerManagerTest {
private OzoneConfiguration conf;
- private SCMStorageConfig scmStorageConfig;
private ReconPipelineManager pipelineManager;
private ReconContainerManager containerManager;
private DBStore store;
- private HDDSLayoutVersionManager layoutVersionManager;
- private SCMHAManager scmhaManager;
- private SCMContext scmContext;
- private SequenceIdGenerator sequenceIdGen;
@BeforeEach
public void setUp(@TempDir File tempDir) throws Exception {
@@ -86,15 +81,15 @@ public void setUp(@TempDir File tempDir) throws Exception {
conf.set(OZONE_METADATA_DIRS, tempDir.getAbsolutePath());
conf.set(OZONE_SCM_NAMES, "localhost");
store = DBStoreBuilder.createDBStore(conf, ReconSCMDBDefinition.get());
- scmhaManager = SCMHAManagerStub.getInstance(
+ SCMHAManager scmhaManager = SCMHAManagerStub.getInstance(
true, new SCMHADBTransactionBufferStub(store));
- sequenceIdGen = new SequenceIdGenerator(
+ SequenceIdGenerator sequenceIdGen = new SequenceIdGenerator(
conf, scmhaManager, ReconSCMDBDefinition.SEQUENCE_ID.getTable(store));
- scmContext = SCMContext.emptyContext();
- scmStorageConfig = new ReconStorageConfig(conf, new ReconUtils());
+ SCMContext scmContext = SCMContext.emptyContext();
+ SCMStorageConfig scmStorageConfig = new ReconStorageConfig(conf, new
ReconUtils());
NetworkTopology clusterMap = new NetworkTopologyImpl(conf);
EventQueue eventQueue = new EventQueue();
- layoutVersionManager = mock(HDDSLayoutVersionManager.class);
+ HDDSLayoutVersionManager layoutVersionManager =
mock(HDDSLayoutVersionManager.class);
when(layoutVersionManager.getSoftwareLayoutVersion())
.thenReturn(maxLayoutVersion());
when(layoutVersionManager.getMetadataLayoutVersion())
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java
index af35a1521f3..78f9bbceafc 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java
@@ -63,7 +63,6 @@
*/
public class TestReconIncrementalContainerReportHandler
extends AbstractReconContainerManagerTest {
- private HDDSLayoutVersionManager versionManager;
@Test
public void testProcessICR(@TempDir Path scmPath)
@@ -94,7 +93,7 @@ public void testProcessICR(@TempDir Path scmPath)
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())
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
index 118b5c2cc59..e0eb2f020cc 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
@@ -71,7 +71,6 @@ public class TestReconNodeManager {
private OzoneConfiguration conf;
private DBStore store;
- private ReconStorageConfig reconStorageConfig;
private HDDSLayoutVersionManager versionManager;
private ReconContext reconContext;
@@ -81,7 +80,7 @@ public void setUp() throws Exception {
conf.set(OZONE_METADATA_DIRS, temporaryFolder.toAbsolutePath().toString());
conf.set(OZONE_SCM_NAMES, "localhost");
ReconUtils reconUtils = new ReconUtils();
- reconStorageConfig = new ReconStorageConfig(conf, reconUtils);
+ ReconStorageConfig reconStorageConfig = new ReconStorageConfig(conf,
reconUtils);
versionManager = new HDDSLayoutVersionManager(
reconStorageConfig.getLayoutVersion());
store = DBStoreBuilder.createDBStore(conf, ReconSCMDBDefinition.get());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
index bb3dceb79f0..f837d1a41fd 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
@@ -79,7 +79,6 @@ public class TestReconPipelineManager {
private OzoneConfiguration conf;
private SCMStorageConfig scmStorageConfig;
private DBStore store;
- private HDDSLayoutVersionManager versionManager;
private SCMHAManager scmhaManager;
private SCMContext scmContext;
@@ -130,7 +129,7 @@ public void testInitialize() throws IOException,
TimeoutException {
NetworkTopology clusterMap = new NetworkTopologyImpl(conf);
EventQueue eventQueue = new EventQueue();
- this.versionManager = mock(HDDSLayoutVersionManager.class);
+ HDDSLayoutVersionManager versionManager =
mock(HDDSLayoutVersionManager.class);
when(versionManager.getMetadataLayoutVersion())
.thenReturn(maxLayoutVersion());
when(versionManager.getSoftwareLayoutVersion())
@@ -184,7 +183,7 @@ public void testAddPipeline() throws IOException,
TimeoutException {
Pipeline pipeline = getRandomPipeline();
NetworkTopology clusterMap = new NetworkTopologyImpl(conf);
EventQueue eventQueue = new EventQueue();
- this.versionManager = mock(HDDSLayoutVersionManager.class);
+ HDDSLayoutVersionManager versionManager =
mock(HDDSLayoutVersionManager.class);
when(versionManager.getMetadataLayoutVersion())
.thenReturn(maxLayoutVersion());
when(versionManager.getSoftwareLayoutVersion())
@@ -211,7 +210,7 @@ public void testDuplicatePipelineHandling() throws
IOException {
Pipeline pipeline = getRandomPipeline();
NetworkTopology clusterMap = new NetworkTopologyImpl(conf);
EventQueue eventQueue = new EventQueue();
- versionManager = mock(HDDSLayoutVersionManager.class);
+ HDDSLayoutVersionManager versionManager =
mock(HDDSLayoutVersionManager.class);
when(versionManager.getMetadataLayoutVersion()).thenReturn(maxLayoutVersion());
when(versionManager.getSoftwareLayoutVersion()).thenReturn(maxLayoutVersion());
NodeManager nodeManager =
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
index 693bb500495..0a3d9429a7c 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
@@ -50,7 +50,6 @@ public class TestReconContainerMetadataManagerImpl {
@TempDir()
private static Path temporaryFolder;
private static ReconContainerMetadataManager reconContainerMetadataManager;
- private static ReconOMMetadataManager reconOMMetadataManager;
private String keyPrefix1 = "V3/B1/K1";
private String keyPrefix2 = "V3/B1/K2";
@@ -58,7 +57,7 @@ public class TestReconContainerMetadataManagerImpl {
@BeforeAll
public static void setupOnce() throws Exception {
- reconOMMetadataManager = getTestReconOmMetadataManager(
+ ReconOMMetadataManager reconOMMetadataManager =
getTestReconOmMetadataManager(
initializeNewOmMetadataManager(Files.createDirectory(
temporaryFolder.resolve("JunitOmDBDir")).toFile()),
Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
index c0931ba6d35..cd5618cc9a8 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
@@ -48,14 +48,13 @@ public class TestReconNamespaceSummaryManagerImpl {
@TempDir()
private static Path temporaryFolder;
private static ReconNamespaceSummaryManagerImpl reconNamespaceSummaryManager;
- private static ReconOMMetadataManager reconOMMetadataManager;
private static int[] testBucket;
private static final Set<Long> TEST_CHILD_DIR =
new HashSet<>(Arrays.asList(new Long[]{1L, 2L, 3L}));
@BeforeAll
public static void setupOnce() throws Exception {
- reconOMMetadataManager = getTestReconOmMetadataManager(
+ ReconOMMetadataManager reconOMMetadataManager =
getTestReconOmMetadataManager(
initializeNewOmMetadataManager(Files.createDirectory(
temporaryFolder.resolve("JunitOmDBDir")).toFile()),
Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
index c30fc451b08..653de02cdbc 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
@@ -64,7 +64,6 @@ public class TestContainerKeyMapperTask {
private ReconContainerMetadataManager reconContainerMetadataManager;
private OMMetadataManager omMetadataManager;
private ReconOMMetadataManager reconOMMetadataManager;
- private OzoneManagerServiceProviderImpl ozoneManagerServiceProvider;
private OzoneConfiguration omConfiguration;
private static final String FSO_KEY_NAME = "dir1/file7";
@@ -82,7 +81,7 @@ public class TestContainerKeyMapperTask {
public void setUp() throws Exception {
omMetadataManager = initializeNewOmMetadataManager(
temporaryFolder.resolve("JunitOmDBDir").toFile());
- ozoneManagerServiceProvider = getMockOzoneManagerServiceProvider();
+ OzoneManagerServiceProviderImpl ozoneManagerServiceProvider =
getMockOzoneManagerServiceProvider();
reconOMMetadataManager = getTestReconOmMetadataManager(omMetadataManager,
temporaryFolder.resolve("JunitOmMetadataDir").toFile());
omConfiguration = new OzoneConfiguration();
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerSizeCountTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerSizeCountTask.java
index c224a8c0aa6..de00a73af7c 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerSizeCountTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerSizeCountTask.java
@@ -51,11 +51,7 @@
*/
public class TestContainerSizeCountTask extends AbstractReconSqlDBTest {
- private ContainerManager containerManager;
- private ReconTaskConfig reconTaskConfig;
- private ReconTaskStatusUpdaterManager reconTaskStatusUpdaterManager;
private ContainerCountBySizeDao containerCountBySizeDao;
- private UtilizationSchemaDefinition utilizationSchemaDefinition;
private ContainerSizeCountTask task;
private DSLContext dslContext;
@@ -65,16 +61,15 @@ public TestContainerSizeCountTask() {
@BeforeEach
public void setUp() {
- utilizationSchemaDefinition =
- getSchemaDefinition(UtilizationSchemaDefinition.class);
+ UtilizationSchemaDefinition utilizationSchemaDefinition =
getSchemaDefinition(UtilizationSchemaDefinition.class);
dslContext = utilizationSchemaDefinition.getDSLContext();
containerCountBySizeDao = getDao(ContainerCountBySizeDao.class);
- reconTaskConfig = new ReconTaskConfig();
+ ReconTaskConfig reconTaskConfig = new ReconTaskConfig();
reconTaskConfig.setContainerSizeCountTaskInterval(Duration.ofSeconds(1));
- reconTaskStatusUpdaterManager = mock(ReconTaskStatusUpdaterManager.class);
+ ReconTaskStatusUpdaterManager reconTaskStatusUpdaterManager =
mock(ReconTaskStatusUpdaterManager.class);
when(reconTaskStatusUpdaterManager.getTaskStatusUpdater(anyString())).thenReturn(new
ReconTaskStatusUpdater(
getDao(ReconTaskStatusDao.class), "mockedTask-" +
System.currentTimeMillis()));
- containerManager = mock(ContainerManager.class);
+ ContainerManager containerManager = mock(ContainerManager.class);
task = new ContainerSizeCountTask(
containerManager,
reconTaskConfig,
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java
index 5e7af183582..634ad4bb5b4 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java
@@ -62,7 +62,6 @@ public class TestFileSizeCountTask extends
AbstractReconSqlDBTest {
private FileSizeCountTaskOBS fileSizeCountTaskOBS;
private FileSizeCountTaskFSO fileSizeCountTaskFSO;
private DSLContext dslContext;
- private UtilizationSchemaDefinition utilizationSchemaDefinition;
public TestFileSizeCountTask() {
super();
@@ -71,7 +70,7 @@ public TestFileSizeCountTask() {
@BeforeEach
public void setUp() {
fileCountBySizeDao = getDao(FileCountBySizeDao.class);
- utilizationSchemaDefinition =
getSchemaDefinition(UtilizationSchemaDefinition.class);
+ UtilizationSchemaDefinition utilizationSchemaDefinition =
getSchemaDefinition(UtilizationSchemaDefinition.class);
// Create separate task instances.
fileSizeCountTaskOBS = new FileSizeCountTaskOBS(fileCountBySizeDao,
utilizationSchemaDefinition);
fileSizeCountTaskFSO = new FileSizeCountTaskFSO(fileCountBySizeDao,
utilizationSchemaDefinition);
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTask.java
index 617edc3b9b8..7de5f54b881 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTask.java
@@ -136,10 +136,6 @@ public class TestProcess {
private NSSummary nsSummaryForBucket1;
private NSSummary nsSummaryForBucket2;
- private NSSummary nsSummaryForBucket3;
-
- private OMDBUpdateEvent keyEvent1;
- private OMDBUpdateEvent keyEvent2;
@BeforeEach
public void setUp() throws IOException {
@@ -152,8 +148,7 @@ public void setUp() throws IOException {
nsSummaryForBucket2 =
getReconNamespaceSummaryManager().getNSSummary(BUCKET_TWO_OBJECT_ID);
assertNotNull(nsSummaryForBucket2);
- nsSummaryForBucket3 =
-
getReconNamespaceSummaryManager().getNSSummary(BUCKET_THREE_OBJECT_ID);
+ NSSummary nsSummaryForBucket3 =
getReconNamespaceSummaryManager().getNSSummary(BUCKET_THREE_OBJECT_ID);
assertNotNull(nsSummaryForBucket3);
}
@@ -165,28 +160,28 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OM_KEY_PREFIX + FILE_FIVE;
OmKeyInfo omPutKeyInfo = buildOmKeyInfo(VOL, BUCKET_TWO, KEY_FIVE,
FILE_FIVE, KEY_FIVE_OBJECT_ID, BUCKET_TWO_OBJECT_ID, KEY_FIVE_SIZE);
- keyEvent1 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omPutKey)
- .setValue(omPutKeyInfo)
- .setTable(getOmMetadataManager().getKeyTable(getLegacyBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
- .build();
+ OMDBUpdateEvent keyEvent1 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omPutKey)
+ .setValue(omPutKeyInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getLegacyBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+ .build();
// delete file 1 under bucket 1
String omDeleteKey = BUCKET_ONE_OBJECT_ID + OM_KEY_PREFIX + FILE_ONE;
OmKeyInfo omDeleteInfo = buildOmKeyInfo(
VOL, BUCKET_ONE, KEY_ONE, FILE_ONE,
KEY_ONE_OBJECT_ID, BUCKET_ONE_OBJECT_ID);
- keyEvent2 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omDeleteKey)
- .setValue(omDeleteInfo)
- .setTable(getOmMetadataManager().getKeyTable(getFSOBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
- .build();
+ OMDBUpdateEvent keyEvent2 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omDeleteKey)
+ .setValue(omDeleteInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getFSOBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
+ .build();
return new OMUpdateEventBatch(Arrays.asList(keyEvent1, keyEvent2), 0L);
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithFSO.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithFSO.java
index 5d8f6d365b6..fcee6893276 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithFSO.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithFSO.java
@@ -227,13 +227,6 @@ public void testDirectoryParentIdAssignment() throws
Exception {
*/
@Nested
public class TestProcess {
- private OMDBUpdateEvent keyEvent1;
- private OMDBUpdateEvent keyEvent2;
- private OMDBUpdateEvent keyEvent3;
- private OMDBUpdateEvent keyEvent4;
- private OMDBUpdateEvent keyEvent5;
- private OMDBUpdateEvent keyEvent6;
- private OMDBUpdateEvent keyEvent7;
private Pair<Integer, Boolean> result;
@@ -249,28 +242,28 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
String omPutKey = BUCKET_TWO_OBJECT_ID + OM_KEY_PREFIX + FILE_FIVE;
OmKeyInfo omPutKeyInfo = buildOmKeyInfo(VOL, BUCKET_TWO, KEY_FIVE,
FILE_FIVE, KEY_FIVE_OBJECT_ID, BUCKET_TWO_OBJECT_ID, KEY_FIVE_SIZE);
- keyEvent1 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omPutKey)
- .setValue(omPutKeyInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
- .build();
+ OMDBUpdateEvent keyEvent1 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omPutKey)
+ .setValue(omPutKeyInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+ .build();
// delete file 1 under bucket 1
String omDeleteKey = BUCKET_ONE_OBJECT_ID + OM_KEY_PREFIX + FILE_ONE;
OmKeyInfo omDeleteInfo = buildOmKeyInfo(
VOL, BUCKET_ONE, KEY_ONE, FILE_ONE,
KEY_ONE_OBJECT_ID, BUCKET_ONE_OBJECT_ID);
- keyEvent2 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omDeleteKey)
- .setValue(omDeleteInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
- .build();
+ OMDBUpdateEvent keyEvent2 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omDeleteKey)
+ .setValue(omDeleteInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
+ .build();
// update file 2's size under bucket 2
String omUpdateKey = BUCKET_TWO_OBJECT_ID + OM_KEY_PREFIX + FILE_TWO;
@@ -280,52 +273,52 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OmKeyInfo omUpdateInfo = buildOmKeyInfo(
VOL, BUCKET_TWO, KEY_TWO, FILE_TWO,
KEY_TWO_OBJECT_ID, BUCKET_TWO_OBJECT_ID, KEY_TWO_UPDATE_SIZE);
- keyEvent3 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omUpdateKey)
- .setValue(omUpdateInfo)
- .setOldValue(omOldInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
- .build();
+ OMDBUpdateEvent keyEvent3 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omUpdateKey)
+ .setValue(omUpdateInfo)
+ .setOldValue(omOldInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
+ .build();
// Events for DirectoryTable change:
// add dir 4 under bucket 1
String omDirPutKey1 = BUCKET_ONE_OBJECT_ID + OM_KEY_PREFIX + DIR_FOUR;
OmDirectoryInfo omDirPutValue1 = buildOmDirInfo(DIR_FOUR,
DIR_FOUR_OBJECT_ID, BUCKET_ONE_OBJECT_ID);
- keyEvent4 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmDirectoryInfo>()
- .setKey(omDirPutKey1)
- .setValue(omDirPutValue1)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
- .setTable(getOmMetadataManager().getDirectoryTable().getName())
- .build();
+ OMDBUpdateEvent keyEvent4 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmDirectoryInfo>()
+ .setKey(omDirPutKey1)
+ .setValue(omDirPutValue1)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+
.setTable(getOmMetadataManager().getDirectoryTable().getName())
+ .build();
// add dir 5 under bucket 2
String omDirPutKey2 = BUCKET_TWO_OBJECT_ID + OM_KEY_PREFIX + DIR_FIVE;
OmDirectoryInfo omDirPutValue2 = buildOmDirInfo(DIR_FIVE,
DIR_FIVE_OBJECT_ID, BUCKET_TWO_OBJECT_ID);
- keyEvent5 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmDirectoryInfo>()
- .setKey(omDirPutKey2)
- .setValue(omDirPutValue2)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
- .setTable(getOmMetadataManager().getDirectoryTable().getName())
- .build();
+ OMDBUpdateEvent keyEvent5 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmDirectoryInfo>()
+ .setKey(omDirPutKey2)
+ .setValue(omDirPutValue2)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+
.setTable(getOmMetadataManager().getDirectoryTable().getName())
+ .build();
// delete dir 3 under dir 1
String omDirDeleteKey = DIR_ONE_OBJECT_ID + OM_KEY_PREFIX + DIR_THREE;
OmDirectoryInfo omDirDeleteValue = buildOmDirInfo(DIR_THREE,
DIR_THREE_OBJECT_ID, DIR_ONE_OBJECT_ID);
- keyEvent6 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmDirectoryInfo>()
- .setKey(omDirDeleteKey)
- .setValue(omDirDeleteValue)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
- .setTable(getOmMetadataManager().getDirectoryTable().getName())
- .build();
+ OMDBUpdateEvent keyEvent6 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmDirectoryInfo>()
+ .setKey(omDirDeleteKey)
+ .setValue(omDirDeleteValue)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
+
.setTable(getOmMetadataManager().getDirectoryTable().getName())
+ .build();
// rename dir1
String omDirUpdateKey = BUCKET_ONE_OBJECT_ID + OM_KEY_PREFIX + DIR_ONE;
@@ -333,14 +326,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
DIR_ONE_OBJECT_ID, BUCKET_ONE_OBJECT_ID);
OmDirectoryInfo omDirUpdateValue = buildOmDirInfo(DIR_ONE_RENAME,
DIR_ONE_OBJECT_ID, BUCKET_ONE_OBJECT_ID);
- keyEvent7 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmDirectoryInfo>()
- .setKey(omDirUpdateKey)
- .setValue(omDirUpdateValue)
- .setOldValue(omDirOldValue)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
- .setTable(getOmMetadataManager().getDirectoryTable().getName())
- .build();
+ OMDBUpdateEvent keyEvent7 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmDirectoryInfo>()
+ .setKey(omDirUpdateKey)
+ .setValue(omDirUpdateValue)
+ .setOldValue(omDirOldValue)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
+
.setTable(getOmMetadataManager().getDirectoryTable().getName())
+ .build();
return new OMUpdateEventBatch(Arrays.asList(
keyEvent1, keyEvent2, keyEvent3, keyEvent4, keyEvent5,
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithLegacy.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithLegacy.java
index 623fdc1e53f..fc2425cdc4d 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithLegacy.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithLegacy.java
@@ -183,14 +183,6 @@ public class TestProcess {
private NSSummary nsSummaryForBucket1;
private NSSummary nsSummaryForBucket2;
- private OMDBUpdateEvent keyEvent1;
- private OMDBUpdateEvent keyEvent2;
- private OMDBUpdateEvent keyEvent3;
- private OMDBUpdateEvent keyEvent4;
- private OMDBUpdateEvent keyEvent5;
- private OMDBUpdateEvent keyEvent6;
- private OMDBUpdateEvent keyEvent7;
-
@BeforeEach
public void setUp() throws IOException {
nSSummaryTaskWithLegacy.reprocessWithLegacy(getReconOMMetadataManager());
@@ -212,14 +204,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OM_KEY_PREFIX + FILE_FIVE;
OmKeyInfo omPutKeyInfo = buildOmKeyInfo(VOL, BUCKET_TWO, KEY_FIVE,
FILE_FIVE, KEY_FIVE_OBJECT_ID, BUCKET_TWO_OBJECT_ID, KEY_FIVE_SIZE);
- keyEvent1 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omPutKey)
- .setValue(omPutKeyInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
- .build();
+ OMDBUpdateEvent keyEvent1 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omPutKey)
+ .setValue(omPutKeyInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+ .build();
// delete file 1 under bucket 1
String omDeleteKey =
@@ -229,14 +221,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OmKeyInfo omDeleteInfo = buildOmKeyInfo(
VOL, BUCKET_ONE, KEY_ONE,
FILE_ONE, KEY_ONE_OBJECT_ID, BUCKET_ONE_OBJECT_ID);
- keyEvent2 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omDeleteKey)
- .setValue(omDeleteInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
- .build();
+ OMDBUpdateEvent keyEvent2 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omDeleteKey)
+ .setValue(omDeleteInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
+ .build();
// update file 2's size under bucket 2
String omUpdateKey =
@@ -249,15 +241,15 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OmKeyInfo omUpdateInfo = buildOmKeyInfo(
VOL, BUCKET_TWO, KEY_TWO, FILE_TWO,
KEY_TWO_OBJECT_ID, BUCKET_TWO_OBJECT_ID, KEY_TWO_UPDATE_SIZE);
- keyEvent3 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omUpdateKey)
- .setValue(omUpdateInfo)
- .setOldValue(omOldInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
- .build();
+ OMDBUpdateEvent keyEvent3 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omUpdateKey)
+ .setValue(omUpdateInfo)
+ .setOldValue(omOldInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
+ .build();
// add dir 4 under bucket 1
String omDirPutKey1 =
@@ -267,13 +259,13 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OmKeyInfo omDirPutValue1 = buildOmDirKeyInfo(VOL, BUCKET_ONE,
(DIR_FOUR + OM_KEY_PREFIX), DIR_FOUR,
DIR_FOUR_OBJECT_ID);
- keyEvent4 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omDirPutKey1)
- .setValue(omDirPutValue1)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
-
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout()).getName())
- .build();
+ OMDBUpdateEvent keyEvent4 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omDirPutKey1)
+ .setValue(omDirPutValue1)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout()).getName())
+ .build();
// add dir 5 under bucket 2
String omDirPutKey2 =
@@ -283,13 +275,13 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OmKeyInfo omDirPutValue2 = buildOmDirKeyInfo(VOL, BUCKET_TWO,
(DIR_FIVE + OM_KEY_PREFIX), DIR_FIVE,
DIR_FIVE_OBJECT_ID);
- keyEvent5 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omDirPutKey2)
- .setValue(omDirPutValue2)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
-
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout()).getName())
- .build();
+ OMDBUpdateEvent keyEvent5 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omDirPutKey2)
+ .setValue(omDirPutValue2)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout()).getName())
+ .build();
// delete dir 3 under dir 1
String omDirDeleteKey =
@@ -300,13 +292,13 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OmKeyInfo omDirDeleteValue = buildOmKeyInfo(VOL, BUCKET_ONE,
(DIR_ONE + OM_KEY_PREFIX + DIR_THREE + OM_KEY_PREFIX),
DIR_THREE, DIR_THREE_OBJECT_ID, DIR_ONE_OBJECT_ID);
- keyEvent6 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omDirDeleteKey)
- .setValue(omDirDeleteValue)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
-
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout()).getName())
- .build();
+ OMDBUpdateEvent keyEvent6 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omDirDeleteKey)
+ .setValue(omDirDeleteValue)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout()).getName())
+ .build();
// rename dir1
String omDirUpdateKey =
@@ -319,14 +311,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OmKeyInfo omDirUpdateValue = buildOmDirKeyInfo(VOL, BUCKET_ONE,
(DIR_ONE_RENAME + OM_KEY_PREFIX), DIR_ONE_RENAME,
DIR_ONE_OBJECT_ID);
- keyEvent7 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omDirUpdateKey)
- .setValue(omDirUpdateValue)
- .setOldValue(omDirOldValue)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
-
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout()).getName())
- .build();
+ OMDBUpdateEvent keyEvent7 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omDirUpdateKey)
+ .setValue(omDirUpdateValue)
+ .setOldValue(omDirOldValue)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout()).getName())
+ .build();
return new OMUpdateEventBatch(Arrays.asList(
keyEvent1, keyEvent2, keyEvent3, keyEvent4, keyEvent5,
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithLegacyOBSLayout.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithLegacyOBSLayout.java
index 8dd2a6583d1..795e5d1da33 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithLegacyOBSLayout.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithLegacyOBSLayout.java
@@ -139,11 +139,6 @@ public class TestProcess {
private NSSummary nsSummaryForBucket1;
private NSSummary nsSummaryForBucket2;
- private OMDBUpdateEvent keyEvent1;
- private OMDBUpdateEvent keyEvent2;
- private OMDBUpdateEvent keyEvent3;
- private OMDBUpdateEvent keyEvent4;
-
@BeforeEach
public void setUp() throws IOException {
// reinit Recon RocksDB's namespace CF.
@@ -168,14 +163,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OM_KEY_PREFIX + KEY_SIX;
OmKeyInfo omPutKeyInfo = buildOmKeyInfo(VOL, BUCKET_TWO, KEY_SIX,
KEY_SIX, KEY_SIX_OBJECT_ID, BUCKET_TWO_OBJECT_ID, KEY_SIX_SIZE);
- keyEvent1 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omPutKey)
- .setValue(omPutKeyInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
- .build();
+ OMDBUpdateEvent keyEvent1 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omPutKey)
+ .setValue(omPutKeyInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+ .build();
// PUT Key7 in Bucket1.
omPutKey =
OM_KEY_PREFIX + VOL
@@ -183,14 +178,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OM_KEY_PREFIX + KEY_SEVEN;
omPutKeyInfo = buildOmKeyInfo(VOL, BUCKET_ONE, KEY_SEVEN,
KEY_SEVEN, KEY_SEVEN_OBJECT_ID, BUCKET_ONE_OBJECT_ID,
KEY_SEVEN_SIZE);
- keyEvent2 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omPutKey)
- .setValue(omPutKeyInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
- .build();
+ OMDBUpdateEvent keyEvent2 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omPutKey)
+ .setValue(omPutKeyInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+ .build();
// Test DELETE Event.
// Delete Key1 in Bucket1.
@@ -200,14 +195,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OM_KEY_PREFIX + KEY_ONE;
OmKeyInfo omDeleteKeyInfo = buildOmKeyInfo(VOL, BUCKET_ONE, KEY_ONE,
KEY_ONE, KEY_ONE_OBJECT_ID, BUCKET_ONE_OBJECT_ID, KEY_ONE_SIZE);
- keyEvent3 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omDeleteKey)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setValue(omDeleteKeyInfo)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
- .build();
+ OMDBUpdateEvent keyEvent3 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omDeleteKey)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+ .setValue(omDeleteKeyInfo)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
+ .build();
// Test UPDATE Event.
// Resize Key2 in Bucket1.
@@ -221,15 +216,15 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OmKeyInfo newOmResizeKeyInfo =
buildOmKeyInfo(VOL, BUCKET_ONE, KEY_TWO, KEY_TWO, KEY_TWO_OBJECT_ID,
BUCKET_ONE_OBJECT_ID, KEY_TWO_OLD_SIZE + 100);
- keyEvent4 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omResizeKey)
- .setOldValue(oldOmResizeKeyInfo)
- .setValue(newOmResizeKeyInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
- .build();
+ OMDBUpdateEvent keyEvent4 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omResizeKey)
+ .setOldValue(oldOmResizeKeyInfo)
+ .setValue(newOmResizeKeyInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
+ .build();
return new OMUpdateEventBatch(
Arrays.asList(keyEvent1, keyEvent2, keyEvent3, keyEvent4), 0L);
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithOBS.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithOBS.java
index d748e9c05f7..8d44633ba7f 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithOBS.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTaskWithOBS.java
@@ -139,11 +139,6 @@ public class TestProcess {
private NSSummary nsSummaryForBucket1;
private NSSummary nsSummaryForBucket2;
- private OMDBUpdateEvent keyEvent1;
- private OMDBUpdateEvent keyEvent2;
- private OMDBUpdateEvent keyEvent3;
- private OMDBUpdateEvent keyEvent4;
-
@BeforeEach
public void setUp() throws IOException {
// reinit Recon RocksDB's namespace CF.
@@ -168,14 +163,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OM_KEY_PREFIX + KEY_SIX;
OmKeyInfo omPutKeyInfo = buildOmKeyInfo(VOL, BUCKET_TWO, KEY_SIX,
KEY_SIX, KEY_SIX_OBJECT_ID, BUCKET_TWO_OBJECT_ID, KEY_SIX_SIZE);
- keyEvent1 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omPutKey)
- .setValue(omPutKeyInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
- .build();
+ OMDBUpdateEvent keyEvent1 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omPutKey)
+ .setValue(omPutKeyInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+ .build();
// PUT Key7 in Bucket1.
omPutKey =
OM_KEY_PREFIX + VOL
@@ -183,14 +178,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OM_KEY_PREFIX + KEY_SEVEN;
omPutKeyInfo = buildOmKeyInfo(VOL, BUCKET_ONE, KEY_SEVEN,
KEY_SEVEN, KEY_SEVEN_OBJECT_ID, BUCKET_ONE_OBJECT_ID,
KEY_SEVEN_SIZE);
- keyEvent2 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omPutKey)
- .setValue(omPutKeyInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
- .build();
+ OMDBUpdateEvent keyEvent2 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omPutKey)
+ .setValue(omPutKeyInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.PUT)
+ .build();
// Test DELETE Event.
// Delete Key1 in Bucket1.
@@ -200,14 +195,14 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OM_KEY_PREFIX + KEY_ONE;
OmKeyInfo omDeleteKeyInfo = buildOmKeyInfo(VOL, BUCKET_ONE, KEY_ONE,
KEY_ONE, KEY_ONE_OBJECT_ID, BUCKET_ONE_OBJECT_ID, KEY_ONE_SIZE);
- keyEvent3 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omDeleteKey)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setValue(omDeleteKeyInfo)
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
- .build();
+ OMDBUpdateEvent keyEvent3 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omDeleteKey)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+ .setValue(omDeleteKeyInfo)
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.DELETE)
+ .build();
// Test UPDATE Event.
// Resize Key2 in Bucket1.
@@ -221,15 +216,15 @@ private OMUpdateEventBatch processEventBatch() throws
IOException {
OmKeyInfo newOmResizeKeyInfo =
buildOmKeyInfo(VOL, BUCKET_ONE, KEY_TWO, KEY_TWO, KEY_TWO_OBJECT_ID,
BUCKET_ONE_OBJECT_ID, KEY_TWO_OLD_SIZE + 100);
- keyEvent4 = new OMDBUpdateEvent.
- OMUpdateEventBuilder<String, OmKeyInfo>()
- .setKey(omResizeKey)
- .setOldValue(oldOmResizeKeyInfo)
- .setValue(newOmResizeKeyInfo)
- .setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
- .getName())
- .setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
- .build();
+ OMDBUpdateEvent keyEvent4 = new OMDBUpdateEvent.
+ OMUpdateEventBuilder<String,
OmKeyInfo>()
+ .setKey(omResizeKey)
+ .setOldValue(oldOmResizeKeyInfo)
+ .setValue(newOmResizeKeyInfo)
+
.setTable(getOmMetadataManager().getKeyTable(getBucketLayout())
+ .getName())
+
.setAction(OMDBUpdateEvent.OMDBUpdateAction.UPDATE)
+ .build();
return new OMUpdateEventBatch(
Arrays.asList(keyEvent1, keyEvent2, keyEvent3, keyEvent4), 0L);
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java
index 40dd0c972e6..95ff9915929 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java
@@ -86,7 +86,6 @@ public class TestOmTableInsightTask extends
AbstractReconSqlDBTest {
private boolean isSetupDone = false;
private static ReconOMMetadataManager reconOMMetadataManager;
private static NSSummaryTaskWithFSO nSSummaryTaskWithFso;
- private static ReconNamespaceSummaryManagerImpl reconNamespaceSummaryManager;
// Object names in FSO-enabled format
private static final String VOL = "volume1";
@@ -139,7 +138,7 @@ private void initializeInjector() throws IOException {
.withReconOm(reconOMMetadataManager)
.withContainerDB()
.build();
- reconNamespaceSummaryManager = reconTestInjector.getInstance(
+ ReconNamespaceSummaryManagerImpl reconNamespaceSummaryManager =
reconTestInjector.getInstance(
ReconNamespaceSummaryManagerImpl.class);
omTableInsightTask = new OmTableInsightTask(
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/upgrade/TestReconLayoutVersionManager.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/upgrade/TestReconLayoutVersionManager.java
index 101ba3f4f6a..50507acca76 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/upgrade/TestReconLayoutVersionManager.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/upgrade/TestReconLayoutVersionManager.java
@@ -55,7 +55,6 @@ public class TestReconLayoutVersionManager {
private ReconLayoutVersionManager layoutVersionManager;
private MockedStatic<ReconLayoutFeature> mockedEnum;
private MockedStatic<ReconUpgradeAction.UpgradeActionType>
mockedEnumUpgradeActionType;
- private ReconStorageContainerManagerFacade scmFacadeMock;
private DataSource mockDataSource;
private Connection mockConnection;
@@ -81,7 +80,7 @@ public void setUp() throws SQLException {
.thenReturn(Optional.of(action2));
// Common mocks for all tests
- scmFacadeMock = mock(ReconStorageContainerManagerFacade.class);
+ ReconStorageContainerManagerFacade scmFacadeMock =
mock(ReconStorageContainerManagerFacade.class);
mockDataSource = mock(DataSource.class);
mockConnection = mock(Connection.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
