This is an automated email from the ASF dual-hosted git repository.
pifta pushed a commit to branch HDDS-5447-httpfs
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-5447-httpfs by this push:
new e93762c7b2 HDDS-7719. [HTTPFSGW] Fix secure integration tests for the
HttpFS module (#4150)
e93762c7b2 is described below
commit e93762c7b2aa2ba7d3e0f14285880fde2cb67f65
Author: Zita Dombi <[email protected]>
AuthorDate: Tue Jan 10 23:46:46 2023 +0100
HDDS-7719. [HTTPFSGW] Fix secure integration tests for the HttpFS module
(#4150)
---
hadoop-ozone/dist/pom.xml | 2 +-
hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh | 2 +-
hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozone/test.sh | 2 +-
.../dist/src/main/compose/ozonesecure-ha/docker-compose.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config | 6 +++---
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh | 3 +--
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config | 6 +++---
hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh | 3 +--
hadoop-ozone/dist/src/main/smoketest/httpfs/operations_tests.robot | 2 +-
12 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 459cb6f5bd..40a55033f9 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -28,7 +28,7 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
- <docker.ozone-runner.version>20220623-1</docker.ozone-runner.version>
+ <docker.ozone-runner.version>20230104-1</docker.ozone-runner.version>
<docker.ozone-testkr5b.image>apache/ozone-testkrb5:20211102-1</docker.ozone-testkr5b.image>
</properties>
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
index dd56471134..c6b51acbd9 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
@@ -103,7 +103,7 @@ services:
httpfs:
<<: *common-config
environment:
- OZONE_CLASSPATH:
"/opt/hadoop/share/ozone/lib/ozone-filesystem-1.3.0-SNAPSHOT.jar:/opt/hadoop/share/ozone/lib/ozone-filesystem-common-1.3.0-SNAPSHOT.jar:/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop3-1.3.0-SNAPSHOT.jar"
+ OZONE_CLASSPATH:
"/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop3-${ozone.version}.jar"
OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
${OZONE_SAFEMODE_MIN_DATANODES:-1}
<<: *replication
ports:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
b/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
index 2f10ba797a..867c6923f5 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
@@ -34,7 +34,7 @@ execute_robot_test ${SCM} basic/ozone-shell-single.robot
execute_robot_test ${SCM} basic/links.robot
execute_robot_test ${SCM} s3
execute_robot_test ${SCM} freon
-execute_robot_test ${SCM} -v SECURITY_ENABLED:${SECURITY_ENABLED} -v
USERNAME:httpfs httpfs
+execute_robot_test ${SCM} -v USERNAME:httpfs httpfs
stop_docker_env
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
index 1b6f94f381..5d73e8df7a 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -63,7 +63,7 @@ services:
httpfs:
<<: *common-config
environment:
- OZONE_CLASSPATH:
"/opt/hadoop/share/ozone/lib/ozone-filesystem-1.3.0-SNAPSHOT.jar:/opt/hadoop/share/ozone/lib/ozone-filesystem-common-1.3.0-SNAPSHOT.jar:/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop3-1.3.0-SNAPSHOT.jar"
+ OZONE_CLASSPATH:
"/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop3-${ozone.version}.jar"
OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
${OZONE_SAFEMODE_MIN_DATANODES:-1}
<<: *replication
ports:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
index 57e4b85848..f3dbe44a65 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
@@ -55,7 +55,7 @@ execute_robot_test scm freon
execute_robot_test scm cli
execute_robot_test scm admincli
-execute_robot_test scm -v SECURITY_ENABLED:${SECURITY_ENABLED} -v
USERNAME:httpfs httpfs
+execute_robot_test scm -v USERNAME:httpfs httpfs
execute_debug_tests
execute_robot_test scm -v SCHEME:ofs -v BUCKET_TYPE:link -N ozonefs-ofs-link
ozonefs/ozonefs.robot
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
index 990176cc8d..96e9c4a371 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
@@ -196,7 +196,7 @@ services:
- ./docker-config
command: [ "/opt/hadoop/bin/ozone","httpfs" ]
environment:
- OZONE_CLASSPATH:
"/opt/hadoop/share/ozone/lib/ozone-filesystem-1.3.0-SNAPSHOT.jar:/opt/hadoop/share/ozone/lib/ozone-filesystem-common-1.3.0-SNAPSHOT.jar:/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop3-1.3.0-SNAPSHOT.jar"
+ OZONE_CLASSPATH:
"/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop3-${ozone.version}.jar"
OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
${OZONE_SAFEMODE_MIN_DATANODES:-1}
OZONE_OPTS:
networks:
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
index a2be4ffaa3..ed82642df8 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
@@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# For HttpFS it is required to enable impersonating users as root, because the
httpfs is mapped to root as a result of the auth_to_local rules.
-CORE-SITE.XML_hadoop.proxyuser.root.hosts=*
-CORE-SITE.XML_hadoop.proxyuser.root.groups=*
+# For HttpFS service it is required to enable proxying users.
+CORE-SITE.XML_hadoop.proxyuser.httpfs.hosts=*
+CORE-SITE.XML_hadoop.proxyuser.httpfs.groups=*
CORE-SITE.XML_fs.defaultFS=ofs://id1
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
index 2b02452267..dcd16a802b 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
@@ -39,8 +39,7 @@ execute_robot_test ${SCM} s3
execute_robot_test ${SCM} admincli
-# commented out until httpfs user and group is added to ozone-docker-runner
-# execute_robot_test ${SCM} -v SECURITY_ENABLED:${SECURITY_ENABLED} httpfs
+execute_robot_test ${SCM} httpfs
export SCM=scm2.org
execute_robot_test ${SCM} admincli
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
index 8b4c7f60f9..884385a50c 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
@@ -76,7 +76,7 @@ services:
- ./docker-config
command: [ "/opt/hadoop/bin/ozone","httpfs" ]
environment:
- OZONE_CLASSPATH:
"/opt/hadoop/share/ozone/lib/ozone-filesystem-1.3.0-SNAPSHOT.jar:/opt/hadoop/share/ozone/lib/ozone-filesystem-common-1.3.0-SNAPSHOT.jar:/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop3-1.3.0-SNAPSHOT.jar"
+ OZONE_CLASSPATH:
"/opt/hadoop/share/ozone/lib/ozone-filesystem-hadoop3-${ozone.version}.jar"
OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
${OZONE_SAFEMODE_MIN_DATANODES:-1}
OZONE_OPTS:
s3g:
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
index 07a640cda9..ddd327cb9c 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
@@ -16,9 +16,9 @@
CORE-SITE.XML_fs.defaultFS=ofs://om
CORE-SITE.XML_fs.trash.interval=1
-# For HttpFS it is required to enable impersonating users as root, because the
httpfs is mapped to root as a result of the auth_to_local rules.
-CORE-SITE.XML_hadoop.proxyuser.root.hosts=*
-CORE-SITE.XML_hadoop.proxyuser.root.groups=*
+# For HttpFS service it is required to enable proxying users.
+CORE-SITE.XML_hadoop.proxyuser.httpfs.hosts=*
+CORE-SITE.XML_hadoop.proxyuser.httpfs.groups=*
OZONE-SITE.XML_ozone.om.address=om
OZONE-SITE.XML_ozone.om.http-address=om:9874
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
index cc6ee323f9..7e579fbd2f 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
@@ -54,8 +54,7 @@ execute_robot_test scm recon
execute_robot_test scm admincli
execute_robot_test scm spnego
-# commented out until httpfs user and group is added to ozone-docker-runner
-# execute_robot_test scm -v SECURITY_ENABLED:${SECURITY_ENABLED} httpfs
+execute_robot_test scm httpfs
# test replication
docker-compose up -d --scale datanode=2
diff --git a/hadoop-ozone/dist/src/main/smoketest/httpfs/operations_tests.robot
b/hadoop-ozone/dist/src/main/smoketest/httpfs/operations_tests.robot
index 758630fbe7..a4b19c89fa 100644
--- a/hadoop-ozone/dist/src/main/smoketest/httpfs/operations_tests.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/httpfs/operations_tests.robot
@@ -32,7 +32,7 @@ Generate volume
Set Suite Variable ${volume} ${random}
Kinit admin
- Wait Until Keyword Succeeds 2min 10sec Execute kinit
-k httpfs/[email protected] -t /etc/security/keytabs/httpfs.keytab
+ Wait Until Keyword Succeeds 2min 10sec Execute kinit
-k om/[email protected] -t /etc/security/keytabs/om.keytab
*** Test Cases ***
Kinit admin user
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
