feat: introduce hadoop mini cluster to test native scan on hdfs #1556
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,6 +58,7 @@ under the License. | |
| <protobuf.version>3.25.5</protobuf.version> | ||
| <parquet.version>1.13.1</parquet.version> | ||
| <parquet.maven.scope>provided</parquet.maven.scope> | ||
| <hadoop.version>3.3.4</hadoop.version> | ||
kazuyukitanimura marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <arrow.version>16.0.0</arrow.version> | ||
| <codehaus.jackson.version>1.9.13</codehaus.jackson.version> | ||
| <spotless.version>2.43.0</spotless.version> | ||
|
|
@@ -447,6 +448,13 @@ under the License. | |
| <version>5.1.0</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.apache.hadoop</groupId> | ||
| <artifactId>hadoop-client-minicluster</artifactId> | ||
|
There was a problem hiding this comment. Do we need this dependency instead? https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-minicluster/3.3.4 There was a problem hiding this comment. My understanding is that There was a problem hiding this comment. https://github.com/apache/hadoop/blob/trunk/hadoop-client-modules/hadoop-client-minicluster/pom.xml
There was a problem hiding this comment. Ah, I did not know that. It doesn't matter which one we use then. |
||
| <version>${hadoop.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
|
|
||
| </dependencyManagement> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.comet | ||
|
|
||
| import java.io.{File, FileWriter} | ||
| import java.net.InetAddress | ||
| import java.nio.file.Files | ||
| import java.util.UUID | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import org.apache.commons.io.FileUtils | ||
| import org.apache.hadoop.conf.Configuration | ||
| import org.apache.hadoop.fs.{FileSystem, Path} | ||
| import org.apache.hadoop.hdfs.MiniDFSCluster | ||
| import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys | ||
| import org.apache.spark.internal.Logging | ||
|
|
||
| /** | ||
| * Trait for starting and stopping a MiniDFSCluster for testing. | ||
| * | ||
| * Most copy from: | ||
| * https://github.com/apache/kyuubi/blob/master/kyuubi-server/src/test/scala/org/apache/kyuubi/server/MiniDFSService.scala | ||
| */ | ||
| trait WithHdfsCluster extends Logging { | ||
|
There was a problem hiding this comment. Let's leave a comment that this was taken from kyuubi |
||
|
|
||
| private var hadoopConfDir: File = _ | ||
| private var hdfsCluster: MiniDFSCluster = _ | ||
| private var hdfsConf: Configuration = _ | ||
| private var tmpRootDir: Path = _ | ||
| private var fileSystem: FileSystem = _ | ||
|
|
||
| def startHdfsCluster(): Unit = { | ||
| hdfsConf = new Configuration() | ||
| // before HADOOP-18206 (3.4.0), HDFS MetricsLogger strongly depends on | ||
| // commons-logging, we should disable it explicitly, otherwise, it throws | ||
| // ClassNotFound: org.apache.commons.logging.impl.Log4JLogger | ||
| hdfsConf.set("dfs.namenode.metrics.logger.period.seconds", "0") | ||
| hdfsConf.set("dfs.datanode.metrics.logger.period.seconds", "0") | ||
| // Set bind host to localhost to avoid java.net.BindException | ||
| hdfsConf.setIfUnset("dfs.namenode.rpc-bind-host", "localhost") | ||
|
|
||
| hdfsCluster = new MiniDFSCluster.Builder(hdfsConf) | ||
| .checkDataNodeAddrConfig(true) | ||
| .checkDataNodeHostConfig(true) | ||
| .build() | ||
| logInfo( | ||
| "NameNode address in configuration is " + | ||
| s"${hdfsConf.get(HdfsClientConfigKeys.DFS_NAMENODE_RPC_ADDRESS_KEY)}") | ||
| hadoopConfDir = | ||
| Files.createTempDirectory(s"comet_hdfs_conf_${UUID.randomUUID().toString}").toFile | ||
| saveHadoopConf(hadoopConfDir) | ||
|
|
||
| fileSystem = hdfsCluster.getFileSystem | ||
| tmpRootDir = new Path("/tmp") | ||
| fileSystem.mkdirs(tmpRootDir) | ||
| } | ||
|
|
||
| def stopHdfsCluster(): Unit = { | ||
| if (hdfsCluster != null) hdfsCluster.shutdown(true) | ||
| if (hadoopConfDir != null) FileUtils.deleteDirectory(hadoopConfDir) | ||
| } | ||
|
|
||
| private def saveHadoopConf(hadoopConfDir: File): Unit = { | ||
| val configToWrite = new Configuration(false) | ||
| val hostName = InetAddress.getLocalHost.getHostName | ||
| hdfsConf.iterator().asScala.foreach { kv => | ||
| val key = kv.getKey | ||
| val value = kv.getValue.replaceAll(hostName, "localhost") | ||
| configToWrite.set(key, value) | ||
| } | ||
| val file = new File(hadoopConfDir, "core-site.xml") | ||
| val writer = new FileWriter(file) | ||
| configToWrite.writeXml(writer) | ||
| writer.close() | ||
| } | ||
|
|
||
| def getHadoopConf: Configuration = hdfsConf | ||
| def getDFSPort: Int = hdfsCluster.getNameNodePort | ||
| def getHadoopConfDir: String = hadoopConfDir.getAbsolutePath | ||
| def getHadoopConfFile: Path = new Path(hadoopConfDir.toURI.toURL.toString, "core-site.xml") | ||
| def getTmpRootDir: Path = tmpRootDir | ||
| def getFileSystem: FileSystem = fileSystem | ||
|
|
||
| def withTmpHdfsDir(tmpDir: Path => Unit): Unit = { | ||
| val tempPath = new Path(tmpRootDir, UUID.randomUUID().toString) | ||
| fileSystem.mkdirs(tempPath) | ||
| try tmpDir(tempPath) | ||
| finally fileSystem.delete(tempPath, true) | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
disable
try_spawn_blockingto avoid native thread hanging