From 22e84c4d224dacc7e457d221f127d8cc8aef6e88 Mon Sep 17 00:00:00 2001 From: Anu Sudarsan Date: Wed, 28 Aug 2024 15:50:38 -0400 Subject: [PATCH] Disable legacy filesystem implementation by default This means we disable all filesystem implementations by default, enforcing users to explicitly configure either legacy or native filesystem implementation --- .../test/java/io/trino/jdbc/TestJdbcConnection.java | 1 + .../java/io/trino/jdbc/TestTrinoDatabaseMetaData.java | 1 + .../io/trino/filesystem/manager/FileSystemConfig.java | 2 +- .../trino/filesystem/manager/TestFileSystemConfig.java | 6 +++--- .../BaseDeltaLakeSharedMetastoreViewsTest.java | 5 +++-- .../trino/plugin/deltalake/DeltaLakeQueryRunner.java | 4 ++++ .../TestDeltaLakeProjectionPushdownPlans.java | 1 + ...taLakeSharedFileMetastoreWithTableRedirections.java | 2 ++ ...taLakeSharedGlueMetastoreWithTableRedirections.java | 3 ++- .../metastore/glue/TestDeltaLakeGlueMetastore.java | 1 + .../java/io/trino/plugin/hive/HiveQueryRunner.java | 3 +++ .../trino/plugin/iceberg/BaseIcebergConnectorTest.java | 3 ++- .../io/trino/plugin/iceberg/IcebergQueryRunner.java | 4 ++++ .../plugin/iceberg/TestIcebergMaterializedView.java | 6 ++++-- .../iceberg/TestIcebergRegisterTableProcedure.java | 2 +- .../trino/plugin/iceberg/TestSharedHiveMetastore.java | 6 ++++-- .../glue/TestIcebergGlueCatalogMaterializedView.java | 6 ++++-- .../TestIcebergGlueTableOperationsInsertFailure.java | 2 +- .../iceberg/catalog/glue/TestSharedGlueMetastore.java | 10 ++++++---- .../env/environment/EnvSinglenodeCompatibility.java | 10 +++++++++- .../presto-product-tests/common/hadoop/hive.properties | 1 + .../common/hadoop/hive_timestamp_nanos.properties | 1 + .../common/hadoop/hive_with_external_writes.properties | 1 + .../hadoop/hive_with_run_view_as_invoker.properties | 1 + .../common/hadoop/iceberg.properties | 1 + .../conf/environment/multinode-all/hive.properties | 1 + .../environment/multinode-hive-cached/hive.properties | 1 + .../environment/multinode-tls-kerberos/hive.properties | 1 + .../multinode-tls-kerberos/iceberg.properties | 1 + .../singlenode-compatibility/hive.properties | 1 + .../singlenode-compatibility/iceberg.properties | 1 + .../singlenode-compatibility/iceberg_old.properties | 2 ++ .../delta.properties | 1 + .../singlenode-hdfs-impersonation/hive.properties | 1 + .../singlenode-hdfs-impersonation/iceberg.properties | 1 + .../singlenode-hive-hudi-redirections/hive.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../singlenode-hive-impersonation/hive.properties | 1 + .../singlenode-hive-impersonation/iceberg.properties | 1 + .../conf/environment/singlenode-hudi/hive.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../iceberg.properties | 1 + .../hive.properties | 1 + .../environment/singlenode-spark-hive/hive.properties | 1 + .../iceberg.properties | 1 + .../singlenode-spark-iceberg-nessie/iceberg.properties | 1 + .../singlenode-spark-iceberg-rest/iceberg.properties | 1 + .../singlenode-spark-iceberg/iceberg.properties | 1 + .../environment/two-kerberos-hives/hive1.properties | 1 + .../environment/two-kerberos-hives/hive2.properties | 1 + .../environment/two-kerberos-hives/iceberg1.properties | 1 + .../environment/two-kerberos-hives/iceberg2.properties | 1 + .../conf/environment/two-mixed-hives/hive1.properties | 1 + .../conf/environment/two-mixed-hives/hive2.properties | 1 + .../environment/two-mixed-hives/iceberg1.properties | 1 + .../environment/two-mixed-hives/iceberg2.properties | 1 + 78 files changed, 116 insertions(+), 21 deletions(-) create mode 100644 testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/iceberg_old.properties diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java index 650a905740b4..4e97d030feea 100644 --- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java +++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java @@ -96,6 +96,7 @@ public void setupServer() .put("hive.metastore", "file") .put("hive.metastore.catalog.dir", server.getBaseDataDir().resolve("hive").toAbsolutePath().toString()) .put("hive.security", "sql-standard") + .put("fs.hadoop.enabled", "true") .buildOrThrow()); server.installPlugin(new BlackHolePlugin()); server.createCatalog("blackhole", "blackhole", ImmutableMap.of()); diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java index d995e41cd76e..3dd9e36431b0 100644 --- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java +++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java @@ -121,6 +121,7 @@ public void setupServer() .put("hive.metastore.catalog.dir", server.getBaseDataDir().resolve("hive").toAbsolutePath().toString()) .put("hive.security", "sql-standard") .put("bootstrap.quiet", "true") + .put("fs.hadoop.enabled", "true") .buildOrThrow()); countingMockConnector = new CountingMockConnector(); diff --git a/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemConfig.java b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemConfig.java index 25edcad4bf5d..4c5b639dfff2 100644 --- a/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemConfig.java +++ b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemConfig.java @@ -17,7 +17,7 @@ public class FileSystemConfig { - private boolean hadoopEnabled = true; + private boolean hadoopEnabled; private boolean nativeAzureEnabled; private boolean nativeS3Enabled; private boolean nativeGcsEnabled; diff --git a/lib/trino-filesystem-manager/src/test/java/io/trino/filesystem/manager/TestFileSystemConfig.java b/lib/trino-filesystem-manager/src/test/java/io/trino/filesystem/manager/TestFileSystemConfig.java index 867c500f400a..9609484c0a5b 100644 --- a/lib/trino-filesystem-manager/src/test/java/io/trino/filesystem/manager/TestFileSystemConfig.java +++ b/lib/trino-filesystem-manager/src/test/java/io/trino/filesystem/manager/TestFileSystemConfig.java @@ -28,7 +28,7 @@ public class TestFileSystemConfig public void testDefaults() { assertRecordedDefaults(recordDefaults(FileSystemConfig.class) - .setHadoopEnabled(true) + .setHadoopEnabled(false) .setNativeAzureEnabled(false) .setNativeS3Enabled(false) .setNativeGcsEnabled(false) @@ -39,7 +39,7 @@ public void testDefaults() public void testExplicitPropertyMappings() { Map properties = ImmutableMap.builder() - .put("fs.hadoop.enabled", "false") + .put("fs.hadoop.enabled", "true") .put("fs.native-azure.enabled", "true") .put("fs.native-s3.enabled", "true") .put("fs.native-gcs.enabled", "true") @@ -47,7 +47,7 @@ public void testExplicitPropertyMappings() .buildOrThrow(); FileSystemConfig expected = new FileSystemConfig() - .setHadoopEnabled(false) + .setHadoopEnabled(true) .setNativeAzureEnabled(true) .setNativeS3Enabled(true) .setNativeGcsEnabled(true) diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java index 43cdcd077b46..0ea71dfae5c9 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java @@ -13,6 +13,7 @@ */ package io.trino.plugin.deltalake; +import com.google.common.collect.ImmutableMap; import io.trino.Session; import io.trino.metastore.HiveMetastore; import io.trino.plugin.deltalake.metastore.TestingDeltaLakeMetastoreModule; @@ -65,11 +66,11 @@ protected QueryRunner createQueryRunner() this.metastore = createTestMetastore(dataDirectory); queryRunner.installPlugin(new TestingDeltaLakePlugin(dataDirectory, Optional.of(new TestingDeltaLakeMetastoreModule(metastore)))); - queryRunner.createCatalog(DELTA_CATALOG_NAME, "delta_lake"); + queryRunner.createCatalog(DELTA_CATALOG_NAME, "delta_lake", ImmutableMap.of("fs.hadoop.enabled", "true")); queryRunner.installPlugin(new TestingHivePlugin(dataDirectory, metastore)); - queryRunner.createCatalog(HIVE_CATALOG_NAME, "hive"); + queryRunner.createCatalog(HIVE_CATALOG_NAME, "hive", ImmutableMap.of("fs.hadoop.enabled", "true")); queryRunner.execute("CREATE SCHEMA " + SCHEMA); return queryRunner; diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java index 0a11afa7ab51..01df1213f3d5 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java @@ -161,6 +161,10 @@ public DistributedQueryRunner build() if (!deltaProperties.containsKey("hive.metastore") && !deltaProperties.containsKey("hive.metastore.uri")) { deltaProperties.put("hive.metastore", "file"); } + + if (!deltaProperties.containsKey("fs.hadoop.enabled")) { + deltaProperties.put("fs.hadoop.enabled", "true"); + } queryRunner.createCatalog(DELTA_CATALOG, CONNECTOR_NAME, deltaProperties); String schemaName = queryRunner.getDefaultSession().getSchema().orElseThrow(); diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeProjectionPushdownPlans.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeProjectionPushdownPlans.java index bec416441d51..93f0741f7ae0 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeProjectionPushdownPlans.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeProjectionPushdownPlans.java @@ -105,6 +105,7 @@ protected PlanTester createPlanTester() planTester.createCatalog(DELTA_CATALOG, "delta_lake", ImmutableMap.builder() .put("hive.metastore", "file") .put("hive.metastore.catalog.dir", baseDir.toString()) + .put("fs.hadoop.enabled", "true") .buildOrThrow()); HiveMetastore metastore = TestingDeltaLakeUtils.getConnectorService(planTester, HiveMetastoreFactory.class) diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreWithTableRedirections.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreWithTableRedirections.java index ccb389fc51f2..bc6432ad17f8 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreWithTableRedirections.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreWithTableRedirections.java @@ -53,6 +53,7 @@ protected QueryRunner createQueryRunner() .put("hive.metastore.catalog.dir", dataDirectory.toString()) .put("delta.enable-non-concurrent-writes", "true") .put("delta.hive-catalog-name", "hive_with_redirections") + .put("fs.hadoop.enabled", "true") .buildOrThrow(); queryRunner.createCatalog("delta_with_redirections", CONNECTOR_NAME, deltaLakeProperties); @@ -67,6 +68,7 @@ protected QueryRunner createQueryRunner() .put("hive.metastore", "file") .put("hive.metastore.catalog.dir", dataDirectory.toString()) .put("hive.delta-lake-catalog-name", "delta_with_redirections") + .put("fs.hadoop.enabled", "true") .buildOrThrow()); queryRunner.execute("CREATE TABLE hive_with_redirections." + schema + ".hive_table (a_integer) WITH (format='PARQUET') AS VALUES 1, 2, 3"); diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java index 4bf2c695bed2..317956370506 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java @@ -63,6 +63,7 @@ protected QueryRunner createQueryRunner() .put("hive.metastore", "glue") .put("hive.metastore.glue.default-warehouse-dir", dataDirectory.toUri().toString()) .put("delta.hive-catalog-name", "hive_with_redirections") + .put("fs.hadoop.enabled", "true") .buildOrThrow()); this.glueMetastore = createTestingGlueHiveMetastore(dataDirectory, this::closeAfterClass); @@ -70,7 +71,7 @@ protected QueryRunner createQueryRunner() queryRunner.createCatalog( "hive_with_redirections", "hive", - ImmutableMap.of("hive.delta-lake-catalog-name", "delta_with_redirections")); + ImmutableMap.of("hive.delta-lake-catalog-name", "delta_with_redirections", "fs.hadoop.enabled", "true")); queryRunner.execute("CREATE SCHEMA " + schema + " WITH (location = '" + dataDirectory.toUri() + "')"); queryRunner.execute("CREATE TABLE hive_with_redirections." + schema + ".hive_table (a_integer) WITH (format='PARQUET') AS VALUES 1, 2, 3"); diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastore.java index 39b209875473..9ffae4586f88 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastore.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastore.java @@ -109,6 +109,7 @@ public void setUp() Map config = ImmutableMap.builder() .put("hive.metastore", "glue") .put("delta.hide-non-delta-lake-tables", "true") + .put("fs.hadoop.enabled", "true") .buildOrThrow(); ConnectorContext context = new TestingConnectorContext(); diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java index a80c3ed9c239..d5ae70b8d1aa 100644 --- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java +++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java @@ -222,6 +222,9 @@ public DistributedQueryRunner build() hiveProperties.put("hive.metastore", "file"); hiveProperties.put("hive.metastore.catalog.dir", queryRunner.getCoordinator().getBaseDataDir().resolve("hive_data").toString()); } + if (!hiveProperties.buildOrThrow().containsKey("fs.hadoop.enabled")) { + hiveProperties.put("fs.hadoop.enabled", "true"); + } queryRunner.installPlugin(new TestingHivePlugin(dataDir, metastore)); diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java index c35731b74bf6..05f5cd19aa6f 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java @@ -7626,7 +7626,8 @@ public void testDropCorruptedTableWithHiveRedirection() "iceberg", ImmutableMap.of( "iceberg.catalog.type", "TESTING_FILE_METASTORE", - "hive.metastore.catalog.dir", dataDirectory.getPath())); + "hive.metastore.catalog.dir", dataDirectory.getPath(), + "fs.hadoop.enabled", "true")); queryRunner.installPlugin(new TestingHivePlugin(dataDirectory.toPath())); queryRunner.createCatalog( diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java index 2ccd4b991b8c..274646e6ac2c 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java @@ -148,6 +148,10 @@ public DistributedQueryRunner build() queryRunner.installPlugin(new TpchPlugin()); queryRunner.createCatalog("tpch", "tpch"); + if (!icebergProperties.buildOrThrow().containsKey("fs.hadoop.enabled")) { + icebergProperties.put("fs.hadoop.enabled", "true"); + } + Path dataDir = metastoreDirectory.map(File::toPath).orElseGet(() -> queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg_data")); queryRunner.installPlugin(new TestingIcebergPlugin(dataDir)); queryRunner.createCatalog(ICEBERG_CATALOG, "iceberg", icebergProperties.buildOrThrow()); diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMaterializedView.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMaterializedView.java index c8191e08c2ce..4de05328c99c 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMaterializedView.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergMaterializedView.java @@ -49,7 +49,8 @@ protected QueryRunner createQueryRunner() queryRunner.createCatalog("iceberg2", "iceberg", Map.of( "iceberg.catalog.type", "TESTING_FILE_METASTORE", "hive.metastore.catalog.dir", queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg2-catalog").toString(), - "iceberg.hive-catalog-name", "hive")); + "iceberg.hive-catalog-name", "hive", + "fs.hadoop.enabled", "true")); secondIceberg = Session.builder(queryRunner.getDefaultSession()) .setCatalog("iceberg2") @@ -59,7 +60,8 @@ protected QueryRunner createQueryRunner() "iceberg.catalog.type", "TESTING_FILE_METASTORE", "hive.metastore.catalog.dir", queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg_data").toString(), "iceberg.hive-catalog-name", "hive", - "iceberg.materialized-views.hide-storage-table", "false")); + "iceberg.materialized-views.hide-storage-table", "false", + "fs.hadoop.enabled", "true")); queryRunner.execute(secondIceberg, "CREATE SCHEMA " + secondIceberg.getSchema().orElseThrow()); diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergRegisterTableProcedure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergRegisterTableProcedure.java index c6cb79550aa5..c860e33a49b8 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergRegisterTableProcedure.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergRegisterTableProcedure.java @@ -94,7 +94,7 @@ protected QueryRunner createQueryRunner() dataDir = queryRunner.getCoordinator().getBaseDataDir().resolve("iceberg_data"); queryRunner.installPlugin(new TestingIcebergPlugin(dataDir, Optional.of(new TestingIcebergFileMetastoreCatalogModule(metastore)))); - queryRunner.createCatalog(ICEBERG_CATALOG, "iceberg", ImmutableMap.of("iceberg.register-table-procedure.enabled", "true")); + queryRunner.createCatalog(ICEBERG_CATALOG, "iceberg", ImmutableMap.of("fs.hadoop.enabled", "true", "iceberg.register-table-procedure.enabled", "true")); queryRunner.execute("CREATE SCHEMA iceberg.tpch"); return queryRunner; } diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSharedHiveMetastore.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSharedHiveMetastore.java index 8c2fa17c3749..7a1151d9007f 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSharedHiveMetastore.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestSharedHiveMetastore.java @@ -70,14 +70,16 @@ protected QueryRunner createQueryRunner() "iceberg", ImmutableMap.of( "iceberg.catalog.type", "TESTING_FILE_METASTORE", - "hive.metastore.catalog.dir", dataDirectory.toString())); + "hive.metastore.catalog.dir", dataDirectory.toString(), + "fs.hadoop.enabled", "true")); queryRunner.createCatalog( "iceberg_with_redirections", "iceberg", ImmutableMap.of( "iceberg.catalog.type", "TESTING_FILE_METASTORE", "hive.metastore.catalog.dir", dataDirectory.toString(), - "iceberg.hive-catalog-name", "hive")); + "iceberg.hive-catalog-name", "hive", + "fs.hadoop.enabled", "true")); queryRunner.installPlugin(new TestingHivePlugin(dataDirectory)); queryRunner.createCatalog(HIVE_CATALOG, "hive"); diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogMaterializedView.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogMaterializedView.java index e19acde5527b..9f3eeceab96d 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogMaterializedView.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCatalogMaterializedView.java @@ -62,7 +62,8 @@ protected QueryRunner createQueryRunner() .setIcebergProperties( ImmutableMap.of( "iceberg.catalog.type", "glue", - "hive.metastore.glue.default-warehouse-dir", schemaDirectory.getAbsolutePath())) + "hive.metastore.glue.default-warehouse-dir", schemaDirectory.getAbsolutePath(), + "fs.hadoop.enabled", "true")) .setSchemaInitializer( SchemaInitializer.builder() .withClonedTpchTables(ImmutableList.of()) @@ -73,7 +74,8 @@ protected QueryRunner createQueryRunner() queryRunner.createCatalog("iceberg_legacy_mv", "iceberg", Map.of( "iceberg.catalog.type", "glue", "hive.metastore.glue.default-warehouse-dir", schemaDirectory.getAbsolutePath(), - "iceberg.materialized-views.hide-storage-table", "false")); + "iceberg.materialized-views.hide-storage-table", "false", + "fs.hadoop.enabled", "true")); queryRunner.installPlugin(createMockConnectorPlugin()); queryRunner.createCatalog("mock", "mock"); diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java index f5c7fefcb09e..d5b88ed86efe 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java @@ -89,7 +89,7 @@ protected QueryRunner createQueryRunner() dataDirectory.toFile().deleteOnExit(); queryRunner.installPlugin(new TestingIcebergPlugin(dataDirectory, Optional.of(new TestingIcebergGlueCatalogModule(awsGlueAsyncAdapterProvider)))); - queryRunner.createCatalog(ICEBERG_CATALOG, "iceberg", ImmutableMap.of()); + queryRunner.createCatalog(ICEBERG_CATALOG, "iceberg", ImmutableMap.of("fs.hadoop.enabled", "true")); glueHiveMetastore = createTestingGlueHiveMetastore(dataDirectory, this::closeAfterClass); diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestSharedGlueMetastore.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestSharedGlueMetastore.java index 2ffb7ca5dc3f..cf94522765dc 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestSharedGlueMetastore.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestSharedGlueMetastore.java @@ -84,22 +84,24 @@ protected QueryRunner createQueryRunner() "iceberg", ImmutableMap.of( "iceberg.catalog.type", "glue", - "hive.metastore.glue.default-warehouse-dir", dataDirectory.toString())); + "hive.metastore.glue.default-warehouse-dir", dataDirectory.toString(), + "fs.hadoop.enabled", "true")); queryRunner.createCatalog( "iceberg_with_redirections", "iceberg", ImmutableMap.of( "iceberg.catalog.type", "glue", "hive.metastore.glue.default-warehouse-dir", dataDirectory.toString(), - "iceberg.hive-catalog-name", "hive")); + "iceberg.hive-catalog-name", "hive", + "fs.hadoop.enabled", "true")); this.glueMetastore = createTestingGlueHiveMetastore(dataDirectory, this::closeAfterClass); queryRunner.installPlugin(new TestingHivePlugin(queryRunner.getCoordinator().getBaseDataDir().resolve("hive_data"), glueMetastore)); - queryRunner.createCatalog(HIVE_CATALOG, "hive"); + queryRunner.createCatalog(HIVE_CATALOG, "hive", ImmutableMap.of("fs.hadoop.enabled", "true")); queryRunner.createCatalog( "hive_with_redirections", "hive", - ImmutableMap.of("hive.iceberg-catalog-name", "iceberg")); + ImmutableMap.of("hive.iceberg-catalog-name", "iceberg", "fs.hadoop.enabled", "true")); queryRunner.execute("CREATE SCHEMA " + tpchSchema + " WITH (location = '" + dataDirectory.toUri() + "')"); copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, icebergSession, ImmutableList.of(TpchTable.NATION)); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java index 0e55d34726b7..7ffb510e4b43 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java @@ -77,7 +77,7 @@ private void configureCompatibilityTestContainer(Environment.Builder builder, Co .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath(jvmConfig)), containerConfigDir + "jvm.config") .withCopyFileToContainer(forHostPath(configDir.getPath(getConfigFileFor(dockerImage))), containerConfigDir + "config.properties") .withCopyFileToContainer(forHostPath(configDir.getPath(getHiveConfigFor(dockerImage))), containerConfigDir + "catalog/hive.properties") - .withCopyFileToContainer(forHostPath(configDir.getPath("iceberg.properties")), containerConfigDir + "catalog/iceberg.properties") + .withCopyFileToContainer(forHostPath(configDir.getPath(getIcebergConfigFor(dockerImage))), containerConfigDir + "catalog/iceberg.properties") .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/presto-product-tests") .withStartupCheckStrategy(new IsRunningStartupCheckStrategy()) .waitingForAll(forLogMessage(".*======== SERVER STARTED ========.*", 1), forHealthcheck()) @@ -120,6 +120,14 @@ private String getHiveConfigFor(String dockerImage) return "hive.properties"; } + private String getIcebergConfigFor(String dockerImage) + { + if (getVersionFromDockerImageName(dockerImage) < 359) { + return "iceberg_old.properties"; + } + return "iceberg.properties"; + } + private void configureTestsContainer(Environment.Builder builder, Config config) { int version = getVersionFromDockerImageName(config.getCompatibilityTestDockerImage()); diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties index cae4eb3ad0b6..8365950696c4 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive.properties @@ -11,3 +11,4 @@ hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC # Using smaller than default parquet.small-file-threshold to get better code coverage in tests parquet.small-file-threshold=100kB +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties index 9c15bc1f9adf..6066079835f1 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_timestamp_nanos.properties @@ -6,3 +6,4 @@ hive.hive-views.enabled=true hive.timestamp-precision=NANOSECONDS hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties index 2aa760417fe4..daef040a34c1 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_external_writes.properties @@ -10,3 +10,4 @@ hive.hive-views.enabled=true hive.non-managed-table-writes-enabled=true hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties index e094cbcf1c2a..37174c20c55b 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/hive_with_run_view_as_invoker.properties @@ -8,3 +8,4 @@ hive.hive-views.run-as-invoker=true hive.security=sql-standard hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/iceberg.properties index 87969a44c64e..06053e022ffb 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/hadoop/iceberg.properties @@ -3,3 +3,4 @@ hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml iceberg.file-format=PARQUET iceberg.register-table-procedure.enabled=true +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/hive.properties index ec83374b6dd7..fad2392ea429 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-all/hive.properties @@ -1,2 +1,3 @@ connector.name=hive hive.metastore.uri=thrift://host1.invalid:9083 +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-hive-cached/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-hive-cached/hive.properties index 2fb31cb8a8e3..3a9d689ab7ad 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-hive-cached/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-hive-cached/hive.properties @@ -1,6 +1,7 @@ connector.name=hive hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml hive.metastore.uri=thrift://hadoop-master:9083 +fs.hadoop.enabled=true fs.cache.enabled=true fs.cache.directories=/tmp/cache/hive fs.cache.max-disk-usage-percentages=90 diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/hive.properties index bd60fe4e374e..a6d05354be81 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/hive.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/iceberg.properties index f4ec408b5a07..3006f0b640cc 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/multinode-tls-kerberos/iceberg.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive.properties index 934cffb83c6e..7bb55829ecf0 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/hive.properties @@ -2,3 +2,4 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/iceberg.properties index 7ce5303954a3..2aaf16aa2fb8 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/iceberg.properties @@ -1,2 +1,3 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/iceberg_old.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/iceberg_old.properties new file mode 100644 index 000000000000..7ce5303954a3 --- /dev/null +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-compatibility/iceberg_old.properties @@ -0,0 +1,2 @@ +connector.name=iceberg +hive.metastore.uri=thrift://hadoop-master:9083 diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-kerberized-hdfs/delta.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-kerberized-hdfs/delta.properties index 58c1ed53f277..93faae13891d 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-kerberized-hdfs/delta.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-delta-lake-kerberized-hdfs/delta.properties @@ -1,5 +1,6 @@ connector.name=delta_lake hive.metastore.uri=thrift://hadoop-master:9083 +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/hive.properties index 060b7e931b9c..e2d1cf1da63e 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/hive.properties @@ -10,3 +10,4 @@ hive.max-partitions-for-eager-load=100 hive.non-managed-table-writes-enabled=true hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/iceberg.properties index 6cfd95f0a6eb..1e1f21d68867 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hdfs-impersonation/iceberg.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.hdfs.authentication.type=NONE hive.hdfs.impersonation.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-hudi-redirections/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-hudi-redirections/hive.properties index cbfa0ee99cd6..190b3b30d5e3 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-hudi-redirections/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-hudi-redirections/hive.properties @@ -5,3 +5,4 @@ hive.hudi-catalog-name=hudi hive.hive-views.enabled=true hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/hive.properties index 896c3336f9ec..50da0df6e819 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/hive.properties @@ -5,3 +5,4 @@ hive.iceberg-catalog-name=iceberg hive.hive-views.enabled=true hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/iceberg.properties index 13657dff5572..5c98dc251dfb 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-iceberg-redirections/iceberg.properties @@ -2,3 +2,4 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml iceberg.hive-catalog-name=hive +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/hive.properties index 022a195a01ba..548cafafc470 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/hive.properties @@ -13,3 +13,4 @@ hive.max-partitions-for-eager-load=100 hive.non-managed-table-writes-enabled=true hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/iceberg.properties index 9230951cec25..f9723abeb8fe 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hive-impersonation/iceberg.properties @@ -4,5 +4,6 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore.thrift.impersonation.enabled=true hive.hdfs.authentication.type=NONE hive.hdfs.impersonation.enabled=true +fs.hadoop.enabled=true iceberg.file-format=PARQUET diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hudi/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hudi/hive.properties index 1a214e8a43d3..16e1f433be19 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hudi/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-hudi/hive.properties @@ -3,3 +3,4 @@ hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/hive.properties index 9aeebdc4f0e6..753c4406ddc4 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/hive.properties @@ -10,6 +10,7 @@ hive.metastore.uri=thrift://hadoop-master:9083 hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/iceberg.properties index 5b25620f7972..7ea2db8bcbfd 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-cross-realm/iceberg.properties @@ -7,6 +7,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive.properties index b580e2c05fd4..a88b75af75ba 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-data-protection/hive.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hive.properties index 1a9a43cef24b..71ff8481e0ca 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/hive.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/iceberg.properties index 6939007dd153..a598a3bb79ae 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation-with-wire-encryption/iceberg.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/hive.properties index b55e8077bc12..acf79b1f6007 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/hive.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/iceberg.properties index 3661d9af9a68..6dc64414fd11 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-impersonation/iceberg.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/hive.properties index 4ffb57ff3067..228a1a77dc1f 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/hive.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/iceberg.properties index f4ec408b5a07..3006f0b640cc 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hdfs-no-impersonation/iceberg.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/hive.properties index 17e2033e5e7d..a3659b13bf1f 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/hive.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.thrift.impersonation.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/iceberg.properties index c376c7179c0c..b8017121d8f7 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation-with-credential-cache/iceberg.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.thrift.impersonation.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/hive.properties index e81984f40414..bb771f4b5370 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/hive.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.thrift.impersonation.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/iceberg.properties index 8c167a711059..1b53097ef79d 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-impersonation/iceberg.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.thrift.impersonation.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/hive.properties index 4569319474c5..706c79896e08 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/hive.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/iceberg.properties index 8182b53463f6..b1c421a29c9b 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-hive-no-impersonation-with-credential-cache/iceberg.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/hive.properties index 08be99d00553..4cf68b892ee9 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/hive.properties @@ -2,6 +2,7 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/iceberg.properties index ea0a276ecfb2..4d42a69f33ed 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation-with-credential-cache/iceberg.properties @@ -1,5 +1,6 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/hive.properties index e85df09c9cd0..42f71332f5ad 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/hive.properties @@ -2,6 +2,7 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/iceberg.properties index a28673fe20ac..3c71782fa722 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-impersonation/iceberg.properties @@ -1,5 +1,6 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/hive.properties index 00cb9b2adc6b..390ebb8aee73 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/hive.properties @@ -2,6 +2,7 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/iceberg.properties index 76308bbc3125..44b1b48266f7 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation-with-credential-cache/iceberg.properties @@ -1,5 +1,6 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/hive.properties index 99a6e632a060..9207a17952e8 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/hive.properties @@ -2,6 +2,7 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/iceberg.properties index 86b095744f94..c96432d9e528 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-kerberos-kms-hdfs-no-impersonation/iceberg.properties @@ -1,5 +1,6 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/_HOST@LABS.TERADATA.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive-no-stats-fallback/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive-no-stats-fallback/hive.properties index d1ffd1314651..7c43c573718a 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive-no-stats-fallback/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive-no-stats-fallback/hive.properties @@ -2,6 +2,7 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 hive.metastore.thrift.use-spark-table-statistics-fallback=false hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true # Note: it's currently unclear why this one is needed, while also hive.orc.time-zone=UTC is not needed. hive.parquet.time-zone=UTC diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive/hive.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive/hive.properties index 4cc6831b0b44..fec90fd89434 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive/hive.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-hive/hive.properties @@ -2,6 +2,7 @@ connector.name=hive hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml hive.non-managed-table-writes-enabled=true +fs.hadoop.enabled=true # Note: it's currently unclear why this one is needed, while also hive.orc.time-zone=UTC is not needed. hive.parquet.time-zone=UTC diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/iceberg.properties index 22d134637743..931c63cc46e9 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-jdbc-catalog/iceberg.properties @@ -7,3 +7,4 @@ iceberg.jdbc-catalog.connection-password=test iceberg.jdbc-catalog.catalog-name=iceberg_test iceberg.jdbc-catalog.default-warehouse-dir=hdfs://hadoop-master:9000/user/hive/warehouse hive.hdfs.socks-proxy=hadoop-master:1180 +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/iceberg.properties index 6e398b595dc2..2dd9d6cfd121 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-nessie/iceberg.properties @@ -2,3 +2,4 @@ connector.name=iceberg iceberg.catalog.type=nessie iceberg.nessie-catalog.uri=http://nessie-server:19120/api/v2 iceberg.nessie-catalog.default-warehouse-dir=hdfs://hadoop-master:9000/user/hive/warehouse +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-rest/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-rest/iceberg.properties index 9815b34dfee4..8df4036baa14 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-rest/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg-rest/iceberg.properties @@ -1,3 +1,4 @@ connector.name=iceberg iceberg.catalog.type=rest iceberg.rest-catalog.uri=http://iceberg-with-rest:8181/ +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg/iceberg.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg/iceberg.properties index d474be71dcd4..de03d40b2239 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg/iceberg.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/singlenode-spark-iceberg/iceberg.properties @@ -1,3 +1,4 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 iceberg.register-table-procedure.enabled=true +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive1.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive1.properties index a4f1d8374acc..f423d796d0ee 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive1.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive1.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.thrift.impersonation.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2.properties index bd2616ce9ba2..42021f8c5e7b 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2.properties @@ -5,6 +5,7 @@ hive.config.resources=/docker/presto-product-tests/conf/environment/two-kerberos hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master-2@OTHERREALM.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/iceberg1.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/iceberg1.properties index 8c167a711059..1b53097ef79d 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/iceberg1.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/iceberg1.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.thrift.impersonation.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/iceberg2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/iceberg2.properties index ced31eb4c063..aa85a6b532a1 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/iceberg2.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-kerberos-hives/iceberg2.properties @@ -2,6 +2,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master-2:9083 hive.config.resources=/docker/presto-product-tests/conf/environment/two-kerberos-hives/hive2-default-fs-site.xml,\ /docker/presto-product-tests/conf/environment/two-kerberos-hives/auth-to-local.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.service.principal=hive/hadoop-master-2@OTHERREALM.COM diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive1.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive1.properties index a4f1d8374acc..f423d796d0ee 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive1.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive1.properties @@ -4,6 +4,7 @@ hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default- hive.metastore-cache-ttl=0s hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.thrift.impersonation.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive2.properties index 060320669f5c..8cbcc64b1d01 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive2.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/hive2.properties @@ -7,3 +7,4 @@ hive.max-partitions-per-scan=100 hive.max-partitions-for-eager-load=100 hive.parquet.time-zone=UTC hive.rcfile.time-zone=UTC +fs.hadoop.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/iceberg1.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/iceberg1.properties index 8c167a711059..1b53097ef79d 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/iceberg1.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/iceberg1.properties @@ -1,6 +1,7 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master:9083 hive.config.resources=/docker/presto-product-tests/conf/presto/etc/hive-default-fs-site.xml +fs.hadoop.enabled=true hive.metastore.authentication.type=KERBEROS hive.metastore.thrift.impersonation.enabled=true diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/iceberg2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/iceberg2.properties index 318b918a4a61..f80e7d71c8cd 100644 --- a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/iceberg2.properties +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/conf/environment/two-mixed-hives/iceberg2.properties @@ -1,5 +1,6 @@ connector.name=iceberg hive.metastore.uri=thrift://hadoop-master-2:9083 hive.config.resources=/docker/presto-product-tests/conf/environment/two-mixed-hives/hive2-default-fs-site.xml +fs.hadoop.enabled=true iceberg.file-format=PARQUET