Skip to content

[HUDI-5962] Adding timeline server support to integ test suite #8248

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
nsivabalan merged 4 commits into from
Mar 22, 2023
Merged

[HUDI-5962] Adding timeline server support to integ test suite #8248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fedae6
Adding timeline server support for integ test suite
nsivabalan Mar 12, 2023
d63ef6c
Fixing closure of write client
nsivabalan Mar 20, 2023
6bd9632
Adding timeline server support to integ test suite
nsivabalan Mar 20, 2023
6b46c39
addressing comments
nsivabalan Mar 21, 2023
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 docker/demo/config/test-suite/compact-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ hoodie.bulkinsert.shuffle.parallelism=100
hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
hoodie.deltastreamer.source.test.max_unique_records=100000000
hoodie.embed.timeline.server=false

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/multi-writer-1.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ hoodie.metadata.enable=false
hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
hoodie.deltastreamer.source.test.max_unique_records=100000000
hoodie.embed.timeline.server=false

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/multi-writer-2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ hoodie.metadata.enable=false
hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
hoodie.deltastreamer.source.test.max_unique_records=100000000
hoodie.embed.timeline.server=false

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/multi-writer-local-1.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ hoodie.metadata.enable=false
hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
hoodie.deltastreamer.source.test.max_unique_records=100000000
hoodie.embed.timeline.server=false

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/multi-writer-local-2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ hoodie.metadata.enable=false
hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
hoodie.deltastreamer.source.test.max_unique_records=100000000
hoodie.embed.timeline.server=false

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/multi-writer-local-3.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ hoodie.metadata.enable=false
hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
hoodie.deltastreamer.source.test.max_unique_records=100000000
hoodie.embed.timeline.server=false

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/multi-writer-local-4.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ hoodie.metadata.enable=false
hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
hoodie.deltastreamer.source.test.max_unique_records=100000000
hoodie.embed.timeline.server=false

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/templates/test.properties.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ hoodie.bulkinsert.shuffle.parallelism=100
hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
hoodie.deltastreamer.source.test.max_unique_records=100000000
hoodie.embed.timeline.server=false

hoodie.deltastreamer.source.input.selector=org.apache.hudi.integ.testsuite.helpers.DFSTestSuitePathSelector

hoodie.datasource.hive_sync.skip_ro_suffix=true
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-aggressive-clean-archival-inline-compact.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ hoodie.keep.min.commits=12
hoodie.keep.max.commits=14

hoodie.compact.inline=true
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-aggressive-clean-archival.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ hoodie.delete.shuffle.parallelism=25
hoodie.cleaner.commits.retained=8
hoodie.keep.min.commits=12
hoodie.keep.max.commits=14
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion ...emo/config/test-suite/test-clustering-aggressive-clean-archival-inline-compact.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ hoodie.bulkinsert.shuffle.parallelism=25
hoodie.delete.shuffle.parallelism=25

hoodie.compact.inline=true
hoodie.embed.timeline.server=false


hoodie.cleaner.commits.retained=8
hoodie.keep.min.commits=12
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-clustering-aggressive-clean-archival.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ hoodie.delete.shuffle.parallelism=25
hoodie.cleaner.commits.retained=8
hoodie.keep.min.commits=12
hoodie.keep.max.commits=14
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-clustering-inline-compact.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ hoodie.upsert.shuffle.parallelism=25
hoodie.bulkinsert.shuffle.parallelism=25
hoodie.delete.shuffle.parallelism=25

hoodie.embed.timeline.server=false


hoodie.compact.inline=true
hoodie.deltastreamer.source.test.num_partitions=100
Expand Down
2 changes: 1 addition & 1 deletion ...g/test-suite/test-clustering-metadata-aggressive-clean-archival-inline-compact.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ hoodie.keep.max.commits=14

hoodie.compact.inline=true
hoodie.metadata.enable=true
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-clustering-metadata-aggressive-clean-archival.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ hoodie.cleaner.commits.retained=8
hoodie.keep.min.commits=12
hoodie.keep.max.commits=14

hoodie.embed.timeline.server=false

hoodie.metadata.enable=true

hoodie.deltastreamer.source.test.num_partitions=100
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-clustering.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ hoodie.upsert.shuffle.parallelism=25
hoodie.bulkinsert.shuffle.parallelism=25
hoodie.delete.shuffle.parallelism=25

hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-inline-compact.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ hoodie.delete.shuffle.parallelism=25

hoodie.metadata.enable=false
hoodie.compact.inline=true
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion .../demo/config/test-suite/test-metadata-aggressive-clean-archival-inline-compact.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ hoodie.cleaner.commits.retained=8
hoodie.keep.min.commits=12
hoodie.keep.max.commits=14

hoodie.embed.timeline.server=false

hoodie.metadata.enable=true
hoodie.compact.inline=true

Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-metadata-aggressive-clean-archival.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ hoodie.keep.min.commits=12
hoodie.keep.max.commits=14

hoodie.metadata.enable=true
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-metadata-inline-compact.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ hoodie.delete.shuffle.parallelism=25

hoodie.metadata.enable=true
hoodie.compact.inline=true
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-metadata.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ hoodie.bulkinsert.shuffle.parallelism=25
hoodie.delete.shuffle.parallelism=25

hoodie.metadata.enable=true
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-nonpartitioned-inline-compact.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ hoodie.delete.shuffle.parallelism=25

hoodie.metadata.enable=false
hoodie.compact.inline=true
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-nonpartitioned-metadata-inline-compact.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ hoodie.delete.shuffle.parallelism=25

hoodie.metadata.enable=true
hoodie.compact.inline=true
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-nonpartitioned-metadata.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ hoodie.bulkinsert.shuffle.parallelism=25
hoodie.delete.shuffle.parallelism=25

hoodie.metadata.enable=true
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test-nonpartitioned.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ hoodie.bulkinsert.shuffle.parallelism=25
hoodie.delete.shuffle.parallelism=25

hoodie.metadata.enable=false
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ hoodie.bulkinsert.shuffle.parallelism=25
hoodie.delete.shuffle.parallelism=25

hoodie.metadata.enable=false
hoodie.embed.timeline.server=false


hoodie.deltastreamer.source.test.num_partitions=100
hoodie.deltastreamer.source.test.datagen.use_rocksdb_for_storing_existing_keys=false
Expand Down
10 changes: 0 additions & 10 deletions hudi-integ-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,6 @@
<scope>test</scope>
</dependency>

<!-- Jetty -->
<dependency>
<!-- Needs to be at the top to ensure we get the correct dependency versions for jetty-server -->
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<version>${jetty.version}</version>
<classifier>uber</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
Expand Down
10 changes: 8 additions & 2 deletions ...eg-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieContinousTestSuiteWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,14 @@ public HoodieContinousTestSuiteWriter(JavaSparkContext jsc, Properties props, Ho

@Override
public void shutdownResources() {
log.info("Shutting down deltastreamer gracefully ");
this.deltaStreamerWrapper.shutdownGracefully();
if (this.deltaStreamerWrapper != null) {
log.info("Shutting down DS wrapper gracefully ");
this.deltaStreamerWrapper.shutdownGracefully();
}
if (this.writeClient != null) {
log.info("Closing local write client");
this.writeClient.close();
}
}

@Override
Expand Down
9 changes: 8 additions & 1 deletion ...integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieInlineTestSuiteWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,14 @@ public HoodieInlineTestSuiteWriter(JavaSparkContext jsc, Properties props, Hoodi
}

public void shutdownResources() {
// no-op for non continuous mode test suite writer.
if (this.deltaStreamerWrapper != null) {
log.info("Shutting down DS wrapper gracefully ");
this.deltaStreamerWrapper.shutdownGracefully();
}
if (this.writeClient != null) {
log.info("Closing local write client");
this.writeClient.close();
}
}

public RDD<GenericRecord> getNextBatch() throws Exception {
Expand Down
7 changes: 6 additions & 1 deletion ...-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/HoodieDeltaStreamer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,12 @@ private static TypedProperties combineProperties(Config cfg, Option<TypedPropert
}

public void shutdownGracefully() {
ingestionService.ifPresent(ds -> ds.shutdown(false));
ingestionService.ifPresent(ds -> {
LOG.info("Shutting down DeltaStreamer");
ds.shutdown(false);
LOG.info("Async service shutdown complete. Closing DeltaSync ");
ds.close();
});
}

/**
Expand Down
17 changes: 11 additions & 6 deletions packaging/hudi-integ-test-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,10 @@
<pattern>org.openjdk.jol.</pattern>
<shadedPattern>org.apache.hudi.org.openjdk.jol.</shadedPattern>
</relocation>
<relocation>
<pattern>org.eclipse.jetty.</pattern>
<shadedPattern>org.apache.hudi.org.eclipse.jetty.</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
Expand Down Expand Up @@ -306,12 +310,6 @@
</repositories>

<dependencies>
<dependency>
<groupId>io.javalin</groupId>
<artifactId>javalin</artifactId>
<version>2.8.0</version>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
Expand Down Expand Up @@ -357,6 +355,13 @@
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.hudi</groupId>
<artifactId>hudi-timeline-service</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.hudi</groupId>
<artifactId>hudi-integ-test</artifactId>
Expand Down