Skip to content

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

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
merged 2 commits into from
Apr 15, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7af273a
HDDS-1396 : Recon start fails due to changes in Aggregate Schema defi…
Apr 5, 2019
ede3acb
Merge remote-tracking branch 'upstream/trunk' into HDDS-1396-trunk
Apr 15, 2019
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
3 changes: 1 addition & 2 deletions hadoop-ozone/ozone-recon-codegen/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions hadoop-ozone/ozone-recon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion ...-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public JooqPersistenceModule(

@Override
protected void configure() {
bind(DataSourceConfiguration.class).toProvider(configurationProvider);
bind(DataSource.class).toProvider(DefaultDataSourceProvider.class)
.in(Singleton.class);

Expand Down
8 changes: 7 additions & 1 deletion ...econ/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
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;
Expand All @@ -56,7 +57,12 @@ public static void setup() throws IOException {
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)));
}
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down