This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 3cf721e2d7 HDDS-9264. Execute EC acceptance test in secure environment
(#5279)
3cf721e2d7 is described below
commit 3cf721e2d78a9f36598f908156b911b9ddb42306
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Sep 13 17:06:19 2023 +0200
HDDS-9264. Execute EC acceptance test in secure environment (#5279)
---
.../main/compose/{ozone/test-ec.sh => common/ec-test.sh} | 11 -----------
hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh | 14 ++------------
.../dist/src/main/compose/ozonesecure/docker-config | 3 +++
.../src/main/compose/{ozone => ozonesecure}/test-ec.sh | 16 +++-------------
hadoop-ozone/dist/src/main/smoketest/ec/lib.resource | 1 +
5 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
b/hadoop-ozone/dist/src/main/compose/common/ec-test.sh
similarity index 84%
copy from hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
copy to hadoop-ozone/dist/src/main/compose/common/ec-test.sh
index 471b496837..cfc46f058a 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/ec-test.sh
@@ -15,17 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:EC
-
-COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-export COMPOSE_DIR
-
-export SECURITY_ENABLED=false
-export OZONE_REPLICATION_FACTOR=3
-
-# shellcheck source=/dev/null
-source "$COMPOSE_DIR/../testlib.sh"
-
start_docker_env 5
execute_robot_test scm -v BUCKET:erasure s3
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
b/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
index 471b496837..e7d882f1a3 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
@@ -26,15 +26,5 @@ export OZONE_REPLICATION_FACTOR=3
# shellcheck source=/dev/null
source "$COMPOSE_DIR/../testlib.sh"
-start_docker_env 5
-
-execute_robot_test scm -v BUCKET:erasure s3
-
-prefix=${RANDOM}
-execute_robot_test scm -v PREFIX:${prefix} ec/basic.robot
-docker-compose up -d --no-recreate --scale datanode=4
-execute_robot_test scm -v PREFIX:${prefix} -N read-4-datanodes ec/read.robot
-docker-compose up -d --no-recreate --scale datanode=3
-execute_robot_test scm -v PREFIX:${prefix} -N read-3-datanodes ec/read.robot
-docker-compose up -d --no-recreate --scale datanode=5
-execute_robot_test scm -v container:1 -v count:5 -N EC-recovery
replication/wait.robot
+# shellcheck source=/dev/null
+source "$COMPOSE_DIR/../common/ec-test.sh"
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
index 3383b9e246..658ce2046a 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
@@ -75,6 +75,9 @@
OZONE-SITE.XML_ozone.httpfs.kerberos.keytab.file=/etc/security/keytabs/httpfs.ke
OZONE-SITE.XML_ozone.httpfs.kerberos.principal=httpfs/[email protected]
OZONE-SITE.XML_hdds.scm.replication.thread.interval=5s
+OZONE-SITE.XML_hdds.scm.replication.under.replicated.interval=5s
+OZONE-SITE.XML_hdds.scm.replication.over.replicated.interval=5s
+OZONE-SITE.XML_hdds.scm.wait.time.after.safemode.exit=30s
OZONE-SITE.XML_ozone.scm.stale.node.interval=30s
OZONE-SITE.XML_ozone.scm.dead.node.interval=45s
OZONE-SITE.XML_hdds.container.report.interval=60s
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-ec.sh
similarity index 63%
copy from hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
copy to hadoop-ozone/dist/src/main/compose/ozonesecure/test-ec.sh
index 471b496837..039b122f6b 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-ec.sh
@@ -20,21 +20,11 @@
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
-export SECURITY_ENABLED=false
+export SECURITY_ENABLED=true
export OZONE_REPLICATION_FACTOR=3
# shellcheck source=/dev/null
source "$COMPOSE_DIR/../testlib.sh"
-start_docker_env 5
-
-execute_robot_test scm -v BUCKET:erasure s3
-
-prefix=${RANDOM}
-execute_robot_test scm -v PREFIX:${prefix} ec/basic.robot
-docker-compose up -d --no-recreate --scale datanode=4
-execute_robot_test scm -v PREFIX:${prefix} -N read-4-datanodes ec/read.robot
-docker-compose up -d --no-recreate --scale datanode=3
-execute_robot_test scm -v PREFIX:${prefix} -N read-3-datanodes ec/read.robot
-docker-compose up -d --no-recreate --scale datanode=5
-execute_robot_test scm -v container:1 -v count:5 -N EC-recovery
replication/wait.robot
+# shellcheck source=/dev/null
+source "$COMPOSE_DIR/../common/ec-test.sh"
diff --git a/hadoop-ozone/dist/src/main/smoketest/ec/lib.resource
b/hadoop-ozone/dist/src/main/smoketest/ec/lib.resource
index 5f3021a8f7..f6a84f9e06 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ec/lib.resource
+++ b/hadoop-ozone/dist/src/main/smoketest/ec/lib.resource
@@ -30,6 +30,7 @@ Prepare For Tests
Execute dd if=/dev/urandom of=/tmp/2mb bs=1048576 count=2
Execute dd if=/dev/urandom of=/tmp/3mb bs=1048576 count=3
Execute dd if=/dev/urandom of=/tmp/100mb bs=1048576 count=100
+ Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit test user
testuser testuser.keytab
# xcompat/test.sh creates unified test data files in /tmp for client containers
Prepare Data For Xcompat Tests
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
