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 c9956a1641 HDDS-11601. Intermittent failure in acceptance balancer
test. (#7343)
c9956a1641 is described below
commit c9956a1641ac539a41c2b2e699145831632f447e
Author: Daniil Prizva <[email protected]>
AuthorDate: Fri Nov 1 09:37:52 2024 +0300
HDDS-11601. Intermittent failure in acceptance balancer test. (#7343)
---
hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config | 1 +
hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ec.sh | 4 ++--
hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ratis.sh | 2 +-
hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot | 9 +++++----
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
index 29984d4366..10d9f5c8cf 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
@@ -43,6 +43,7 @@ OZONE-SITE.XML_hdds.node.report.interval=20s
OZONE-SITE.XML_hdds.heartbeat.interval=20s
OZONE-SITE.XML_hdds.datanode.du.refresh.period=20s
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
+OZONE-SITE.XML_hdds.datanode.container.db.dir=/data/metadata
OZONE-SITE.XML_hdds.datanode.volume.min.free.space=100MB
OZONE-SITE.XML_ozone.scm.pipeline.creation.auto.factor.one=false
OZONE-SITE.XML_ozone.datanode.pipeline.limit=1
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ec.sh
b/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ec.sh
index c812a5d0ac..bc4bf6c666 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ec.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ec.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:failing HDDS-11601
+#suite:balancer
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE0}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
@@ -28,4 +28,4 @@ export OZONE_REPLICATION_FACTOR=3
source "$COMPOSE_DIR/../testlib.sh"
start_docker_env
-execute_robot_test ${OM} -v REPLICATION:rs-3-2-1024k -v TYPE:EC -v KEYS:7 -v
LOWER_LIMIT:1.5 -v UPPER_LIMIT:2.5 -N ozone-balancer-EC
balancer/testBalancer.robot
+execute_robot_test ${OM} -v REPLICATION:rs-3-2-1024k -v TYPE:EC -v
LOWER_LIMIT:0.7 -v UPPER_LIMIT:1.5 -N ozone-balancer-EC
balancer/testBalancer.robot
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ratis.sh
b/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ratis.sh
index a358aea79a..2c5091c64f 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ratis.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ratis.sh
@@ -32,4 +32,4 @@ source "$COMPOSE_DIR/../testlib.sh"
start_docker_env
-execute_robot_test ${OM} -v REPLICATION:THREE -v TYPE:RATIS -v KEYS:3 -v
LOWER_LIMIT:3 -v UPPER_LIMIT:3.5 -N ozone-balancer-RATIS
balancer/testBalancer.robot
+execute_robot_test ${OM} -v REPLICATION:THREE -v TYPE:RATIS -v LOWER_LIMIT:3
-v UPPER_LIMIT:3.5 -N ozone-balancer-RATIS balancer/testBalancer.robot
diff --git a/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
b/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
index e7be2a2b66..343e4e68fa 100644
--- a/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
@@ -62,12 +62,13 @@ Datanode Recommission is Finished
Should Not Contain ${result}
ENTERING_MAINTENANCE
Run Container Balancer
- ${result} = Execute ozone admin
containerbalancer start -t 1 -d 100 -i 1
+ ${result} = Execute ozone admin
containerbalancer start -t 0.1 -d 100 -i 1
Should Contain ${result}
Container Balancer started successfully.
Wait Finish Of Balancing
${result} = Execute ozone admin
containerbalancer status
- Wait Until Keyword Succeeds 6min 10sec
ContainerBalancer is Not Running
+ Wait Until Keyword Succeeds 4min 10sec
ContainerBalancer is Not Running
+
Sleep 60000ms
Verify Verbose Balancer Status
@@ -154,7 +155,7 @@ Verify Container Balancer for RATIS/EC containers
${uuid} = Get Uuid
Datanode Usageinfo ${uuid}
- Create Multiple Keys ${KEYS}
+ Create Multiple Keys 3
Close All Containers
@@ -176,7 +177,7 @@ Verify Container Balancer for RATIS/EC containers
${datanodeOzoneUsedBytesInfoAfterContainerBalancing} = Get Datanode
Ozone Used Bytes Info ${uuid}
Should Not Be Equal As Integers ${datanodeOzoneUsedBytesInfo}
${datanodeOzoneUsedBytesInfoAfterContainerBalancing}
#We need to ensure that after balancing, the amount of data recorded on
each datanode falls within the following ranges:
- #{SIZE}*3 < used < {SIZE}*3.5 for RATIS containers, and {SIZE}*1.5 < used
< {SIZE}*2.5 for EC containers.
+ #{SIZE}*3 < used < {SIZE}*3.5 for RATIS containers, and {SIZE}*0.7 < used
< {SIZE}*1.5 for EC containers.
Should Be True ${datanodeOzoneUsedBytesInfoAfterContainerBalancing} <
${SIZE} * ${UPPER_LIMIT}
Should Be True ${datanodeOzoneUsedBytesInfoAfterContainerBalancing} >
${SIZE} * ${LOWER_LIMIT}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
