Skip to content

HDDS-12198. Exclude Recon generated code in coverage #7962

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 6 commits into from
Feb 25, 2025
Merged

HDDS-12198. Exclude Recon generated code in coverage #7962

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
009506b
move code from org.hadoop.ozone.recon to org.apache.ozone.recon
adoroszlai Feb 24, 2025
d9f2a6f
move Recon generated code to org.apache.ozone.recon.schema.generated
adoroszlai Feb 24, 2025
f60a343
HDDS-12198. Exclude Recon generated code in coverage
adoroszlai Feb 24, 2025
1638e8f
exclude org.apache.ozone.recon.schema.generated.tables.records in fin…
adoroszlai Feb 24, 2025
33d5f4f
move utilities out of codegen package
adoroszlai Feb 25, 2025
10c51e9
replace string reference to TableNamingStrategy
adoroszlai Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hadoop-ozone/dev-support/checks/coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ find hadoop-ozone/dist/target/*/share/ozone/lib -name 'hdds-*.jar' -or -name 'oz
xargs -n1 unzip -o -q -d target/coverage-classes

#Exclude some classes from the coverage
find target/coverage-classes -type d \( -name proto -or -name proto3 -or -name generated -or -name v1 -or -name freon \) \
find target/coverage-classes -type d \( -name proto -or -name proto3 -or -name codegen -or -name generated -or -name v1 -or -name freon \) \
| xargs rm -rf

#generate the reports
Expand Down
2 changes: 1 addition & 1 deletion ...op-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
import org.apache.hadoop.ozone.s3.OzoneConfigurationHolder;
import org.apache.hadoop.ozone.s3.S3GatewayConfigKeys;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.ozone.recon.codegen.ReconSqlDbConfig;
import org.apache.ozone.test.GenericTestUtils;
import org.hadoop.ozone.recon.codegen.ReconSqlDbConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...ation-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconAndAdminContainerCLI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
import org.apache.hadoop.ozone.recon.scm.ReconStorageContainerManagerFacade;
import org.apache.hadoop.ozone.recon.spi.ReconContainerMetadataManager;
import org.apache.hadoop.ozone.recon.tasks.ReconTaskConfig;
import org.apache.ozone.recon.schema.ContainerSchemaDefinition.UnHealthyContainerStates;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.LambdaTestUtils;
import org.apache.ozone.test.tag.Flaky;
import org.hadoop.ozone.recon.schema.ContainerSchemaDefinition.UnHealthyContainerStates;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...e/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconEndpointUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import org.apache.hadoop.hdds.server.http.HttpConfig;
import org.apache.hadoop.hdfs.web.URLConnectionFactory;
import org.apache.hadoop.ozone.recon.api.types.UnhealthyContainersResponse;
import org.hadoop.ozone.recon.schema.ContainerSchemaDefinition;
import org.apache.ozone.recon.schema.ContainerSchemaDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...t/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
import org.apache.hadoop.ozone.recon.recovery.ReconOMMetadataManager;
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
import org.apache.hadoop.ozone.recon.spi.impl.ReconNamespaceSummaryManagerImpl;
import org.apache.ozone.recon.schema.generated.tables.daos.GlobalStatsDao;
import org.apache.ozone.test.GenericTestUtils;
import org.hadoop.ozone.recon.schema.tables.daos.GlobalStatsDao;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
Expand Down
4 changes: 2 additions & 2 deletions ...op-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconTasks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
import org.apache.hadoop.ozone.recon.scm.ReconStorageContainerManagerFacade;
import org.apache.hadoop.ozone.recon.spi.ReconContainerMetadataManager;
import org.apache.hadoop.ozone.recon.tasks.ReconTaskConfig;
import org.apache.ozone.recon.schema.ContainerSchemaDefinition;
import org.apache.ozone.recon.schema.generated.tables.pojos.UnhealthyContainers;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.LambdaTestUtils;
import org.hadoop.ozone.recon.schema.ContainerSchemaDefinition;
import org.hadoop.ozone.recon.schema.tables.pojos.UnhealthyContainers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down
15 changes: 6 additions & 9 deletions ...zone/recon/codegen/JooqCodeGenerator.java → ...zone/recon/codegen/JooqCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.codegen;

import static org.hadoop.ozone.recon.codegen.SqlDbUtils.DERBY_DRIVER_CLASS;
import static org.hadoop.ozone.recon.codegen.SqlDbUtils.createNewDerbyDatabase;
package org.apache.ozone.recon.codegen;

import com.google.inject.AbstractModule;
import com.google.inject.Guice;
Expand All @@ -33,7 +30,7 @@
import org.apache.commons.io.FileUtils;
import org.apache.derby.jdbc.EmbeddedDataSource;
import org.apache.hadoop.util.Time;
import org.hadoop.ozone.recon.schema.ReconSchemaDefinition;
import org.apache.ozone.recon.schema.ReconSchemaDefinition;
import org.jooq.codegen.GenerationTool;
import org.jooq.meta.jaxb.Configuration;
import org.jooq.meta.jaxb.Database;
Expand Down Expand Up @@ -86,7 +83,7 @@ private void generateSourceCode(String outputDir) throws Exception {
Configuration configuration =
new Configuration()
.withJdbc(new Jdbc()
.withDriver(DERBY_DRIVER_CLASS)
.withDriver(SqlDbUtils.DERBY_DRIVER_CLASS)
.withUrl(JDBC_URL))
.withGenerator(new Generator()
.withDatabase(new Database()
Expand All @@ -99,9 +96,9 @@ private void generateSourceCode(String outputDir) throws Exception {
.withDaos(true)
.withEmptyCatalogs(true))
.withStrategy(new Strategy().withName(
"org.hadoop.ozone.recon.codegen.TableNamingStrategy"))
"org.apache.ozone.recon.codegen.TableNamingStrategy"))
.withTarget(new Target()
.withPackageName("org.hadoop.ozone.recon.schema")
.withPackageName("org.apache.ozone.recon.schema.generated")
.withClean(true)
.withDirectory(outputDir)))
.withLogging(Logging.WARN);
Expand All @@ -115,7 +112,7 @@ static class LocalDataSourceProvider implements Provider<DataSource> {
private static EmbeddedDataSource dataSource;
static {
try {
createNewDerbyDatabase(JDBC_URL, RECON_SCHEMA_NAME);
SqlDbUtils.createNewDerbyDatabase(JDBC_URL, RECON_SCHEMA_NAME);
} catch (Exception e) {
LOG.error("Error creating Recon Derby DB.", e);
}
Expand Down
16 changes: 8 additions & 8 deletions .../codegen/ReconSchemaGenerationModule.java → .../codegen/ReconSchemaGenerationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.codegen;
package org.apache.ozone.recon.codegen;

import com.google.inject.AbstractModule;
import com.google.inject.multibindings.Multibinder;
import org.hadoop.ozone.recon.schema.ContainerSchemaDefinition;
import org.hadoop.ozone.recon.schema.ReconSchemaDefinition;
import org.hadoop.ozone.recon.schema.ReconTaskSchemaDefinition;
import org.hadoop.ozone.recon.schema.SchemaVersionTableDefinition;
import org.hadoop.ozone.recon.schema.StatsSchemaDefinition;
import org.hadoop.ozone.recon.schema.UtilizationSchemaDefinition;
import org.apache.ozone.recon.schema.ContainerSchemaDefinition;
import org.apache.ozone.recon.schema.ReconSchemaDefinition;
import org.apache.ozone.recon.schema.ReconTaskSchemaDefinition;
import org.apache.ozone.recon.schema.SchemaVersionTableDefinition;
import org.apache.ozone.recon.schema.StatsSchemaDefinition;
import org.apache.ozone.recon.schema.UtilizationSchemaDefinition;

/**
* Bindings for DDL generation and used by
* {@link org.hadoop.ozone.recon.codegen.JooqCodeGenerator}.
* {@link JooqCodeGenerator}.
*/
public class ReconSchemaGenerationModule extends AbstractModule {
@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ozone/recon/codegen/ReconSqlDbConfig.java → ...ozone/recon/codegen/ReconSqlDbConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.codegen;
package org.apache.ozone.recon.codegen;

import static java.util.concurrent.TimeUnit.SECONDS;

Expand Down
2 changes: 1 addition & 1 deletion ...adoop/ozone/recon/codegen/SqlDbUtils.java → ...pache/ozone/recon/codegen/SqlDbUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.codegen;
package org.apache.ozone.recon.codegen;

import static org.jooq.impl.DSL.count;

Expand Down
2 changes: 1 addition & 1 deletion ...ne/recon/codegen/TableNamingStrategy.java → ...ne/recon/codegen/TableNamingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.codegen;
package org.apache.ozone.recon.codegen;

import org.jooq.codegen.DefaultGeneratorStrategy;
import org.jooq.meta.Definition;
Expand Down
2 changes: 1 addition & 1 deletion ...oop/ozone/recon/codegen/package-info.java → ...che/ozone/recon/codegen/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
/**
* Recon code generation support for entities and daos.
*/
package org.hadoop.ozone.recon.codegen;
package org.apache.ozone.recon.codegen;
4 changes: 2 additions & 2 deletions ...con/schema/ContainerSchemaDefinition.java → ...con/schema/ContainerSchemaDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.schema;
package org.apache.ozone.recon.schema;

import static org.hadoop.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;
import static org.apache.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;
import static org.jooq.impl.DSL.field;
import static org.jooq.impl.DSL.name;

Expand Down
2 changes: 1 addition & 1 deletion ...e/recon/schema/ReconSchemaDefinition.java → ...e/recon/schema/ReconSchemaDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.schema;
package org.apache.ozone.recon.schema;

import java.sql.SQLException;

Expand Down
4 changes: 2 additions & 2 deletions ...con/schema/ReconTaskSchemaDefinition.java → ...con/schema/ReconTaskSchemaDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.schema;
package org.apache.ozone.recon.schema;

import static org.hadoop.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;
import static org.apache.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;

import com.google.inject.Inject;
import com.google.inject.Singleton;
Expand Down
6 changes: 3 additions & 3 deletions .../schema/SchemaVersionTableDefinition.java → .../schema/SchemaVersionTableDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.schema;
package org.apache.ozone.recon.schema;

import static org.hadoop.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;
import static org.hadoop.ozone.recon.codegen.SqlDbUtils.listAllTables;
import static org.apache.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;
import static org.apache.ozone.recon.codegen.SqlDbUtils.listAllTables;
import static org.jooq.impl.DSL.name;

import com.google.inject.Inject;
Expand Down
4 changes: 2 additions & 2 deletions ...e/recon/schema/StatsSchemaDefinition.java → ...e/recon/schema/StatsSchemaDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.schema;
package org.apache.ozone.recon.schema;

import static org.hadoop.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;
import static org.apache.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;

import com.google.inject.Inject;
import com.google.inject.Singleton;
Expand Down
4 changes: 2 additions & 2 deletions ...n/schema/UtilizationSchemaDefinition.java → ...n/schema/UtilizationSchemaDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* limitations under the License.
*/

package org.hadoop.ozone.recon.schema;
package org.apache.ozone.recon.schema;

import static org.hadoop.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;
import static org.apache.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK;

import com.google.inject.Inject;
import com.google.inject.Singleton;
Expand Down
2 changes: 1 addition & 1 deletion ...doop/ozone/recon/schema/package-info.java → ...ache/ozone/recon/schema/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
/**
* Classes in this package define the schema for Recon Sql database.
*/
package org.hadoop.ozone.recon.schema;
package org.apache.ozone.recon.schema;
12 changes: 9 additions & 3 deletions hadoop-ozone/recon/dev-support/findbugsExcludeFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,18 @@
<FindBugsFilter>
<!-- Generated Code -->
<Match>
<Package name="org.hadoop.ozone.recon.schema"/>
<Package name="org.apache.ozone.recon.schema.generated"/>
</Match>
<Match>
<Package name="org.hadoop.ozone.recon.schema.tables"/>
<Package name="org.apache.ozone.recon.schema.generated.tables"/>
</Match>
<Match>
<Package name="org.hadoop.ozone.recon.schema.tables.pojos"/>
<Package name="org.apache.ozone.recon.schema.generated.tables.daos"/>
</Match>
<Match>
<Package name="org.apache.ozone.recon.schema.generated.tables.pojos"/>
</Match>
<Match>
<Package name="org.apache.ozone.recon.schema.generated.tables.records"/>
</Match>
</FindBugsFilter>
2 changes: 1 addition & 1 deletion hadoop-ozone/recon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
<configuration>
<executable>java</executable>
<classpathScope>compile</classpathScope>
<mainClass>org.hadoop.ozone.recon.codegen.JooqCodeGenerator</mainClass>
<mainClass>org.apache.ozone.recon.codegen.JooqCodeGenerator</mainClass>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
<arguments>
<argument>${project.build.directory}/generated-sources/java</argument>
Expand Down
14 changes: 7 additions & 7 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconControllerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
import org.apache.hadoop.ozone.recon.tasks.ReconTaskControllerImpl;
import org.apache.hadoop.ozone.recon.tasks.updater.ReconTaskStatusUpdaterManager;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.ozone.recon.codegen.ReconSqlDbConfig;
import org.apache.ozone.recon.schema.generated.tables.daos.ClusterGrowthDailyDao;
import org.apache.ozone.recon.schema.generated.tables.daos.ContainerCountBySizeDao;
import org.apache.ozone.recon.schema.generated.tables.daos.FileCountBySizeDao;
import org.apache.ozone.recon.schema.generated.tables.daos.GlobalStatsDao;
import org.apache.ozone.recon.schema.generated.tables.daos.ReconTaskStatusDao;
import org.apache.ozone.recon.schema.generated.tables.daos.UnhealthyContainersDao;
import org.apache.ratis.protocol.ClientId;
import org.hadoop.ozone.recon.codegen.ReconSqlDbConfig;
import org.hadoop.ozone.recon.schema.tables.daos.ClusterGrowthDailyDao;
import org.hadoop.ozone.recon.schema.tables.daos.ContainerCountBySizeDao;
import org.hadoop.ozone.recon.schema.tables.daos.FileCountBySizeDao;
import org.hadoop.ozone.recon.schema.tables.daos.GlobalStatsDao;
import org.hadoop.ozone.recon.schema.tables.daos.ReconTaskStatusDao;
import org.hadoop.ozone.recon.schema.tables.daos.UnhealthyContainersDao;
import org.jooq.Configuration;
import org.jooq.DAO;
import org.slf4j.Logger;
Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconSchemaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import java.util.HashSet;
import java.util.Set;
import org.apache.hadoop.ozone.recon.upgrade.ReconLayoutFeature;
import org.hadoop.ozone.recon.schema.ReconSchemaDefinition;
import org.hadoop.ozone.recon.schema.SchemaVersionTableDefinition;
import org.apache.ozone.recon.schema.ReconSchemaDefinition;
import org.apache.ozone.recon.schema.SchemaVersionTableDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.ozone.recon.codegen.ReconSchemaGenerationModule;
import org.apache.ratis.util.JvmPauseMonitor;
import org.hadoop.ozone.recon.codegen.ReconSchemaGenerationModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
import org.apache.hadoop.ozone.recon.scm.ReconContainerReportQueue;
import org.apache.hadoop.ozone.recon.spi.ReconNamespaceSummaryManager;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.hadoop.ozone.recon.schema.tables.daos.GlobalStatsDao;
import org.hadoop.ozone.recon.schema.tables.pojos.GlobalStats;
import org.apache.ozone.recon.schema.generated.tables.daos.GlobalStatsDao;
import org.apache.ozone.recon.schema.generated.tables.pojos.GlobalStats;
import org.jooq.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
8 changes: 4 additions & 4 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ClusterStateEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
import org.apache.hadoop.ozone.recon.scm.ReconNodeManager;
import org.apache.hadoop.ozone.recon.scm.ReconPipelineManager;
import org.apache.hadoop.ozone.recon.tasks.OmTableInsightTask;
import org.hadoop.ozone.recon.schema.ContainerSchemaDefinition;
import org.hadoop.ozone.recon.schema.tables.daos.GlobalStatsDao;
import org.hadoop.ozone.recon.schema.tables.pojos.GlobalStats;
import org.hadoop.ozone.recon.schema.tables.pojos.UnhealthyContainers;
import org.apache.ozone.recon.schema.ContainerSchemaDefinition;
import org.apache.ozone.recon.schema.generated.tables.daos.GlobalStatsDao;
import org.apache.ozone.recon.schema.generated.tables.pojos.GlobalStats;
import org.apache.ozone.recon.schema.generated.tables.pojos.UnhealthyContainers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
import org.apache.hadoop.ozone.recon.scm.ReconContainerManager;
import org.apache.hadoop.ozone.recon.spi.ReconContainerMetadataManager;
import org.apache.hadoop.ozone.recon.spi.ReconNamespaceSummaryManager;
import org.hadoop.ozone.recon.schema.ContainerSchemaDefinition.UnHealthyContainerStates;
import org.hadoop.ozone.recon.schema.tables.pojos.UnhealthyContainers;
import org.apache.ozone.recon.schema.ContainerSchemaDefinition.UnHealthyContainerStates;
import org.apache.ozone.recon.schema.generated.tables.pojos.UnhealthyContainers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
import org.apache.hadoop.ozone.recon.recovery.ReconOMMetadataManager;
import org.apache.hadoop.ozone.recon.spi.impl.ReconNamespaceSummaryManagerImpl;
import org.apache.hadoop.ozone.recon.tasks.OmTableInsightTask;
import org.hadoop.ozone.recon.schema.tables.daos.GlobalStatsDao;
import org.hadoop.ozone.recon.schema.tables.pojos.GlobalStats;
import org.apache.ozone.recon.schema.generated.tables.daos.GlobalStatsDao;
import org.apache.ozone.recon.schema.generated.tables.pojos.GlobalStats;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/TaskStatusService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.hadoop.ozone.recon.schema.tables.daos.ReconTaskStatusDao;
import org.hadoop.ozone.recon.schema.tables.pojos.ReconTaskStatus;
import org.apache.ozone.recon.schema.generated.tables.daos.ReconTaskStatusDao;
import org.apache.ozone.recon.schema.generated.tables.pojos.ReconTaskStatus;

/**
* Endpoint for displaying the last successful run of each Recon Task.
Expand Down
Loading