adoroszlai commented on code in PR #7376: URL: https://github.com/apache/ozone/pull/7376#discussion_r1832118007
########## pom.xml: ########## @@ -48,6 +48,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <name>${distMgmtSnapshotsName}</name> <url>${distMgmtSnapshotsUrl}</url> </repository> + <repository> + <id>hadoop341rc3</id> + <name>Hadoop 3.4.1 RC3 repository</name> + <url>https://repository.apache.org/content/repositories/orgapachehadoop-1430</url> + </repository> Review Comment: No longer needed. ```suggestion ``` ########## hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh: ########## @@ -45,7 +45,9 @@ source "$COMPOSE_DIR/../testlib.sh" for HADOOP_VERSION in ${hadoop2.version} 3.1.2 ${hadoop.version}; do export HADOOP_VERSION export HADOOP_MAJOR_VERSION=${HADOOP_VERSION%%.*} - if [[ "${HADOOP_VERSION}" == "${hadoop2.version}" ]] || [[ "${HADOOP_VERSION}" == "${hadoop.version}" ]]; then + if [[ "${HADOOP_VERSION}" == "${hadoop2.version}" ]]; then + export HADOOP_IMAGE=apache/hadoop + elif [[ "${HADOOP_VERSION}" == "${hadoop.version}" ]]; then Review Comment: This change is no longer necessary and is causing conflicts with `master`. I suggest restoring the original to get a clean merge. ```suggestion if [[ "${HADOOP_VERSION}" == "${hadoop2.version}" ]] || [[ "${HADOOP_VERSION}" == "${hadoop.version}" ]]; then ``` ########## hadoop-ozone/ozonefs-shaded/pom.xml: ########## @@ -78,6 +78,12 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>2.5.0</version> + <scope>compile</scope> Review Comment: Version and scope are inherited / defaulted. ```suggestion ``` - Previously we could assume protobuf 2.5.0 is available in Hadoop environment. - Then we had to introduce `ozone-filesystem-hadoop3-client` for environments where Hadoop's protobuf is relocated to `org.apache.hadoop.shaded.com.google.protobuf`, but still did not include Protobuf in the fat jar. - Now Hadoop 3.4 no longer has either of these, so we need to include Protobuf in the fat jars. With that, I don't think we still need `ozone-filesystem-hadoop3-client`, do we? Also, can/should we relocate it to `org.apache.hadoop.ozone.shaded.com.google.protobuf`? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
