Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1396 : Recon start fails due to changes in Aggregate Schema definition. (#700)

This commit is contained in:
avijayanhwx 2019-04-15 12:58:06 -07:00 committed by Bharat Viswanadham
parent 254efc9358
commit 62e38ea911
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-ozone/ozone-recon-codegen/pom.xml
View File

@ -21,11 +21,10 @@
<version>0.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hadoop-ozone-recon-codegen</artifactId>
<artifactId>hadoop-ozone-reconcodegen</artifactId>
<name>Apache Hadoop Ozone Recon CodeGen</name>
<properties>
<jooq.version>3.11.10</jooq.version>
<guice.version>4.1.0</guice.version>
</properties>
<dependencies>
<dependency>

3
hadoop-ozone/ozone-recon/pom.xml
View File

@ -26,7 +26,6 @@
<properties>
<jooq.version>3.11.10</jooq.version>
<spring.version>5.1.3.RELEASE</spring.version>
<guice.version>4.1.0</guice.version>
</properties>
<build>
<plugins>
@ -124,7 +123,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-recon-codegen</artifactId>
<artifactId>hadoop-ozone-reconcodegen</artifactId>
<version>${version}</version>
</dependency>
<dependency>

1
hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java
View File

@ -54,7 +54,6 @@ public class JooqPersistenceModule extends AbstractModule {
@Override
protected void configure() {
bind(DataSourceConfiguration.class).toProvider(configurationProvider);
bind(DataSource.class).toProvider(DefaultDataSourceProvider.class)
.in(Singleton.class);

8
hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java
View File

@ -31,6 +31,7 @@ import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.rules.TemporaryFolder;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Provider;
@ -56,7 +57,12 @@ public abstract class AbstractSqlDatabaseTest {
JooqPersistenceModule persistenceModule =
new JooqPersistenceModule(configurationProvider);
injector = Guice.createInjector(persistenceModule);
injector = Guice.createInjector(persistenceModule, new AbstractModule() {
@Override
public void configure() {
bind(DataSourceConfiguration.class).toProvider(configurationProvider);
}
});
dslContext = DSL.using(new DefaultConfiguration().set(
injector.getInstance(DataSource.class)));
}

1
hadoop-ozone/pom.xml
View File

@ -34,6 +34,7 @@
<ozone.release>Crater Lake</ozone.release>
<declared.ozone.version>${ozone.version}</declared.ozone.version>
<maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
<guice.version>4.0</guice.version>
</properties>
<modules>
<module>common</module>