From 44ea4e1c51b60fdc31bd47926e9dacfa79d7cb44 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 22 May 2024 20:42:11 +0200 Subject: [PATCH] Fix cds-coordinator-metadata-query-disabled (#16488) fixes the issue with the newly enabled `cds-coordiantor-metadata-query-disabled` [split](https://github.com/apache/druid/pull/16468) * configures to use `prepopulated-data` environment things to configure `S3` for access * this is needed because these tests use a [dataset which is loaded from s3](https://github.com/apache/druid/blob/master/integration-tests/docker/test-data/cds-coordinator-metadata-query-disabled-sample-data.sql) * also undoes the previous [fix](https://github.com/apache/druid/pull/16469) of setting the aws region explicitly as this is a more complete solution - and configuring `prepopulated-data` also sets the region; so that's not needed anymore --- .github/workflows/standard-its.yml | 1 + .../docker/docker-compose.cds-task-schema-publish-disabled.yml | 1 - .../docker/environment-configs/test-groups/prepopulated-data | 2 +- .../druid/metadata/IndexerSQLMetadataStorageCoordinator.java | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/standard-its.yml b/.github/workflows/standard-its.yml index c00940b0a39..0083e952ea3 100644 --- a/.github/workflows/standard-its.yml +++ b/.github/workflows/standard-its.yml @@ -54,6 +54,7 @@ jobs: build_jdk: 8 runtime_jdk: 8 testing_groups: -Dgroups=${{ matrix.testing_group }} + override_config_path: ./environment-configs/test-groups/prepopulated-data use_indexer: middleManager group: ${{ matrix.testing_group }} diff --git a/integration-tests/docker/docker-compose.cds-task-schema-publish-disabled.yml b/integration-tests/docker/docker-compose.cds-task-schema-publish-disabled.yml index 9e9bda73abf..190f4eaf8bc 100644 --- a/integration-tests/docker/docker-compose.cds-task-schema-publish-disabled.yml +++ b/integration-tests/docker/docker-compose.cds-task-schema-publish-disabled.yml @@ -63,7 +63,6 @@ services: service: druid-historical environment: - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP} - - AWS_REGION=us-west-2 depends_on: - druid-zookeeper-kafka diff --git a/integration-tests/docker/environment-configs/test-groups/prepopulated-data b/integration-tests/docker/environment-configs/test-groups/prepopulated-data index deb59dfe402..fd1c7412824 100644 --- a/integration-tests/docker/environment-configs/test-groups/prepopulated-data +++ b/integration-tests/docker/environment-configs/test-groups/prepopulated-data @@ -20,7 +20,7 @@ AWS_REGION=us-east-1 # If you are making a change in load list below, make the necessary changes in github actions too -druid_extensions_loadList=["mysql-metadata-storage","druid-s3-extensions","druid-basic-security","simple-client-sslcontext","druid-testing-tools","druid-lookups-cached-global","druid-histogram","druid-datasketches","druid-integration-tests"] +druid_extensions_loadList=["mysql-metadata-storage","druid-s3-extensions","druid-basic-security","simple-client-sslcontext","druid-testing-tools","druid-lookups-cached-global","druid-histogram","druid-datasketches","druid-integration-tests","druid-parquet-extensions","druid-avro-extensions","druid-protobuf-extensions","druid-orc-extensions","druid-kafka-indexing-service"] # Setting s3 credentials and region to use pre-populated data for testing. druid_s3_accessKey=AKIAT2GGLKKJQCMG64V4 diff --git a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java index f64c2a0f75f..2b02f09926b 100644 --- a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java +++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java @@ -129,7 +129,6 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor CentralizedDatasourceSchemaConfig centralizedDatasourceSchemaConfig ) { - this.jsonMapper = jsonMapper; this.dbTables = dbTables; this.connector = connector;