Skip to content

Commit ea2ca24

Browse files
DaanHooglandDaan Hoogland
authored andcommitted
[routers] distiction between fatal failure and warning or unknown on healthchecks
1 parent ee8fd17 commit ea2ca24

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ void startRouterForHA(VirtualMachine vm, Map<VirtualMachineProfile.Param, Object
8989
<T extends VirtualRouter> void collectNetworkStatistics(T router, Nic nic);
9090

9191
enum RouterHealthStatus{
92-
UNKNOWN, SUCCESS, WARNING, FAILURE;
92+
SUCCESS, FAILURE, WARNING, UNKNOWN;
9393
}
94-
9594
}

server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@ private boolean restartGuestNetworkInDomainRouter(DomainRouterJoinVO router, Use
12951295

12961296
/**
12971297
* Attempts recreation of router by restarting with cleanup a VPC if any or a guest network associated in case no VPC.
1298-
* @param routerId - the id of the router to be recreated.
1298+
* @param router - the router to be recreated.
12991299
* @return true if successfully restart is attempted else false.
13001300
*/
13011301
private boolean recreateRouter(DomainRouterVO router) {
@@ -1572,7 +1572,7 @@ public Pair<Boolean, String> performRouterHealthChecks(long routerId) {
15721572
List<String> failingChecks = getFailingChecks(router, answer);
15731573
handleFailingChecks(router, failingChecks);
15741574

1575-
return new Pair<Boolean, String>(success, resultDetails);
1575+
return new Pair<>(success, resultDetails);
15761576
}
15771577

15781578
protected class UpdateRouterHealthChecksConfigTask extends ManagedContextRunnable {

0 commit comments

Comments
 (0)