HDDS-641. Fix ozone filesystem robot test. Contributed by Mukul Kumar Singh.
(cherry picked from commit 85ccab7d3f87b71170e4f71c76f5663d1fe34886) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2e34d1d7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2e34d1d7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2e34d1d7 Branch: refs/heads/ozone-0.3 Commit: 2e34d1d7db35cd854d540452d144c96e712037ae Parents: 7e09290 Author: Arpit Agarwal <[email protected]> Authored: Fri Oct 12 11:30:57 2018 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Fri Oct 12 11:31:06 2018 -0700 ---------------------------------------------------------------------- .../dist/src/main/compose/ozonefs/docker-config | 1 + .../dist/src/main/compose/ozoneperf/docker-config | 1 + .../dist/src/main/compose/ozonescripts/docker-config | 1 + .../dist/src/main/smoketest/ozonefs/ozonefs.robot | 12 ++++++++---- 4 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e34d1d7/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config ---------------------------------------------------------------------- diff --git a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config index 3171f08..4ff7f56 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config @@ -26,6 +26,7 @@ OZONE-SITE.XML_ozone.handler.type=distributed OZONE-SITE.XML_ozone.scm.client.address=scm OZONE-SITE.XML_ozone.scm.heartbeat.interval=3s HDFS-SITE.XML_rpc.metrics.quantile.enable=true +OZONE-SITE.XML_ozone.replication=1 HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300 LOG4J.PROPERTIES_log4j.rootLogger=INFO, stdout LOG4J.PROPERTIES_log4j.appender.stdout.layout=org.apache.log4j.PatternLayout http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e34d1d7/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config ---------------------------------------------------------------------- diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config index 1ed1169..f1c0147 100644 --- a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config @@ -25,6 +25,7 @@ OZONE-SITE.XML_ozone.handler.type=distributed OZONE-SITE.XML_ozone.scm.client.address=scm HDFS-SITE.XML_rpc.metrics.quantile.enable=true HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300 +OZONE-SITE.XML_ozone.replication=1 LOG4J.PROPERTIES_log4j.rootLogger=INFO, stdout LOG4J.PROPERTIES_log4j.appender.stdout=org.apache.log4j.ConsoleAppender LOG4J.PROPERTIES_log4j.appender.stdout.layout=org.apache.log4j.PatternLayout http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e34d1d7/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config ---------------------------------------------------------------------- diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config index 1afec73..ee725af 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config @@ -25,6 +25,7 @@ OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.scm.client.address=scm +OZONE-SITE.XML_ozone.replication=1 OZONE-SITE.XML_hdds.datanode.plugins=org.apache.hadoop.ozone.web.OzoneHddsDatanodeService HDFS-SITE.XML_dfs.namenode.rpc-address=namenode:9000 HDFS-SITE.XML_dfs.namenode.name.dir=/data/namenode http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e34d1d7/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot ---------------------------------------------------------------------- diff --git a/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot b/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot index 236c5b2..3720d01 100644 --- a/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot +++ b/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot @@ -80,6 +80,7 @@ Run ozoneFS tests ${result} = Execute ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName' Should not contain ${result} testdir + Execute rm -Rf localdir1 Execute mkdir localdir1 Execute cp NOTICE.txt localdir1/LOCAL.txt Execute ozone fs -mkdir -p o3://bucket1.fstest/testdir1 @@ -95,14 +96,17 @@ Run ozoneFS tests Execute ozone fs -cp o3://bucket1.fstest/testdir1/localdir1 o3://bucket2.fstest/testdir2/ - Execute ozone fs -cp o3://bucket1.fstest/testdir1/localdir1 o3://bucket3.fstest1/testdir3/ + Execute ozone fs -cp o3://bucket1.fstest/testdir1/localdir1 o3://bucket3.fstest2/testdir3/ Execute ozone sh key put o3://ozoneManager/fstest/bucket1/KEY.txt NOTICE.txt ${result} = Execute ozone fs -ls o3://bucket1.fstest/KEY.txt Should contain ${result} KEY.txt - ${result} = Execute ozone fs -copyFromLocal NOTICE.txt o3://bucket1.fstest/KEY.txt - Should contain ${result} 'File exists' + ${rc} ${result} = Run And Return Rc And Output ozone fs -copyFromLocal NOTICE.txt o3://bucket1.fstest/KEY.txt + Should Be Equal As Integers ${rc} 1 + Should contain ${result} File exists + Execute rm -Rf GET.txt Execute ozone fs -get o3://bucket1.fstest/KEY.txt GET.txt Execute ls -l GET.txt - ${result} = Execute ozone fs -ls o3://abcde.pqrs/ + ${rc} ${result} = Run And Return Rc And Output ozone fs -ls o3://abcde.pqrs/ + Should Be Equal As Integers ${rc} 1 Should contain ${result} VOLUME_NOT_FOUND --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
