From 1f2704530a585038f1b92c0b54372e0d18b6d497 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 22 May 2024 09:46:39 +0200 Subject: [PATCH 1/4] fix cds-coordinator-metadata-query-disabled --- .github/workflows/standard-its.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/standard-its.yml b/.github/workflows/standard-its.yml index c00940b0a394..0083e952ea3d 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 }} From df47d96f99f5edad41996ca2f4b773b1ed06b666 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 22 May 2024 12:43:45 +0200 Subject: [PATCH 2/4] Revert "Fix cds-task-schema-publish-disabled (#16469)" This reverts commit c948201507381af661072e00de9e2bd8b808e8be. --- .../docker/docker-compose.cds-task-schema-publish-disabled.yml | 1 - .../druid/metadata/IndexerSQLMetadataStorageCoordinator.java | 1 - 2 files changed, 2 deletions(-) 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 9e9bda73abf9..190f4eaf8bc2 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/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java index f64c2a0f75f8..2b02f09926b9 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 IndexerSQLMetadataStorageCoordinator( CentralizedDatasourceSchemaConfig centralizedDatasourceSchemaConfig ) { - this.jsonMapper = jsonMapper; this.dbTables = dbTables; this.connector = connector; From 01537ec28ab8e65afa919da006bc19abc322e61c Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 22 May 2024 13:08:17 +0200 Subject: [PATCH 3/4] x --- .../docker/environment-configs/test-groups/prepopulated-data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/docker/environment-configs/test-groups/prepopulated-data b/integration-tests/docker/environment-configs/test-groups/prepopulated-data index deb59dfe4029..4518f4207995 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-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 From 1094b5afce0398acc00e7bb3c474bacb1f569b60 Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 22 May 2024 15:15:11 +0200 Subject: [PATCH 4/4] add parquet --- .../docker/environment-configs/test-groups/prepopulated-data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/docker/environment-configs/test-groups/prepopulated-data b/integration-tests/docker/environment-configs/test-groups/prepopulated-data index 4518f4207995..fd1c74128249 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-protobuf-extensions","druid-orc-extensions","druid-kafka-indexing-service"] +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