Skip to content

Commit a5f325a

Browse files
Boris Stoyanovyadvr
authored andcommitted
CLOUDSTACK-9782: Improve host HA tests
- All tests should pass on KVM, Simulator - Add test cases covering FSM state transitions and actions Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 9682ada commit a5f325a

File tree

8 files changed

+370
-1078
lines changed

8 files changed

+370
-1078
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ env:
4444
smoke/test_dynamicroles
4545
smoke/test_global_settings
4646
smoke/test_guest_vlan_range
47-
smoke/test_ha_for_host
48-
smoke/test_ha_kvm_agent
49-
smoke/test_ha_kvm
47+
smoke/test_hostha_kvm
5048
smoke/test_hostha_simulator
5149
smoke/test_hosts
5250
smoke/test_internal_lb

scripts/vm/hypervisor/kvm/kvmvmactivity.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ else
116116
lastUpdateTime=${arrTime[1]}
117117
echo "$SuspectTime:$latestUpdateTime:$MSTime" > $acFile
118118

119-
if [[ $lastSuspectTime -ne $SuspectTime ]]; then
119+
suspectTimeDiff=$(expr $SuspectTime - $lastSuspectTime)
120+
if [[ $suspectTimeDiff -lt 0 ]]; then
120121
if [[ $latestUpdateTime -gt $SuspectTime ]]; then
121122
echo "=====> ALIVE <====="
122123
else

server/src/org/apache/cloudstack/ha/HAManagerImpl.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -697,5 +697,10 @@ protected void runInContext() {
697697
LOG.error("Error trying to perform health checks in HA manager", t);
698698
}
699699
}
700+
701+
@Override
702+
public Long getDelay() {
703+
return null;
704+
}
700705
}
701706
}

test/integration/smoke/test_ha_for_host.py

Lines changed: 0 additions & 247 deletions
This file was deleted.

0 commit comments

Comments
 (0)