smengcl commented on a change in pull request #1667: URL: https://github.com/apache/ozone/pull/1667#discussion_r544477763
########## File path: hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-config ########## @@ -18,4 +18,7 @@ CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/[email protected]@.jar +HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/[email protected]@.jar +OZONE_CLASSPATH= Review comment: Is `OZONE_CLASSPATH` a placeholder here? Or we are setting it to empty on purpose. ########## File path: hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml ########## @@ -24,7 +24,7 @@ services: env_file: - docker-config environment: - HADOOP_OPTS: ${HADOOP_OPTS} + OZONE_OPTS: Review comment: neat! ########## File path: hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-config ########## @@ -18,4 +18,7 @@ CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/[email protected]@.jar +HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/[email protected]@.jar +OZONE_CLASSPATH= Review comment: Same here. ########## File path: hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot ########## @@ -0,0 +1,46 @@ +# 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. + +*** Settings *** +Documentation Test ozone classpath command +Library BuiltIn +Resource ../lib/os.robot +Resource ../ozone-lib/shell.robot +Test Timeout 5 minutes +Suite Setup Find Jars Dir + +*** Test Cases *** +Ignores HADOOP_CLASSPATH if OZONE_CLASSPATH is set Review comment: nice. btw do we pick up `HADOOP_OPTS` when `OZONE_OPTS` is not set as well? ########## File path: hadoop-ozone/dist/dev-support/bin/dist-layout-stitching ########## @@ -103,10 +93,8 @@ run cp -r "${ROOT}/hadoop-ozone/dist/src/main/dockerlibexec/." "libexec/" run cp "${ROOT}/hadoop-ozone/dist/src/shell/ozone/ozone" "bin/" -run cp "${ROOT}/hadoop-ozone/dist/src/shell/hdds/hadoop-config.sh" "libexec/" -run cp "${ROOT}/hadoop-ozone/dist/src/shell/hdds/hadoop-config.cmd" "libexec/" -run cp "${ROOT}/hadoop-ozone/dist/src/shell/hdds/hadoop-functions.sh" "libexec/" Review comment: Does `hadoop-config.sh` and `hadoop-functions.sh` have any useful env variables? (e.g. `HADOOP_OPTS`) TODO: Check `ozone-config.sh` and `ozone-functions.sh` later. ########## File path: hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-config ########## @@ -18,4 +18,7 @@ CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/[email protected]@.jar +HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/[email protected]@.jar +OZONE_CLASSPATH= Review comment: Same ########## File path: hadoop-ozone/dist/src/test/shell/gc_opts.bats ########## @@ -19,24 +19,32 @@ # bats gc_opts.bats # -load ../../shell/hdds/hadoop-functions.sh -@test "Setting Hadoop GC parameters: add GC params for server" { - export HADOOP_SUBCMD_SUPPORTDAEMONIZATION=true - export HADOOP_OPTS="Test" - hadoop_add_default_gc_opts - [[ "$HADOOP_OPTS" =~ "UseConcMarkSweepGC" ]] +load ozone-functions_test_helper + +@test "Setting GC parameters: add GC params for server" { + export OZONE_SUBCMD_SUPPORTDAEMONIZATION=true + export OZONE_OPTS="Test" + + ozone_add_default_gc_opts + + echo $OZONE_OPTS + [[ "$OZONE_OPTS" =~ "UseConcMarkSweepGC" ]] } -@test "Setting Hadoop GC parameters: disabled for client" { - export HADOOP_SUBCMD_SUPPORTDAEMONIZATION=false - export HADOOP_OPTS="Test" - hadoop_add_default_gc_opts - [[ ! "$HADOOP_OPTS" =~ "UseConcMarkSweepGC" ]] +@test "Setting GC parameters: disabled for client" { + export OZONE_SUBCMD_SUPPORTDAEMONIZATION=false + export OZONE_OPTS="Test" + + ozone_add_default_gc_opts + + [[ ! "$OZONE_OPTS" =~ "UseConcMarkSweepGC" ]] } -@test "Setting Hadoop GC parameters: disabled if GC params are customized" { - export HADOOP_SUBCMD_SUPPORTDAEMONIZATION=true - export HADOOP_OPTS="-XX:++UseG1GC -Xmx512" - hadoop_add_default_gc_opts - [[ ! "$HADOOP_OPTS" =~ "UseConcMarkSweepGC" ]] +@test "Setting GC parameters: disabled if GC params are customized" { + export OZONE_SUBCMD_SUPPORTDAEMONIZATION=true + export OZONE_OPTS="-XX:++UseG1GC -Xmx512" + + ozone_add_default_gc_opts + + [[ ! "$OZONE_OPTS" =~ "UseConcMarkSweepGC" ]] Review comment: Unrelated to this patch but CMS is removed in JDK 14 and on and `UseConcMarkSweepGC` will be ignored by those higher version JVMs. We might want to come up with a new set of GC params soon. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
