cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [43/50] git commit: updated refs/heads/master to 3c429ee
Date Tue, 17 Mar 2015 10:26:45 GMT
Remove the priority checks from the code
  - We do not use it anymore


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8edeca17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8edeca17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8edeca17

Branch: refs/heads/master
Commit: 8edeca179bc6f2e9e736b6c1b62241d3197526af
Parents: 3cc0915
Author: wilderrodrigues <wrodrigues@schubergphilis.com>
Authored: Tue Feb 24 12:20:38 2015 +0100
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Mon Mar 16 11:40:09 2015 +0100

----------------------------------------------------------------------
 .../network/router/VirtualNetworkApplianceManagerImpl.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8edeca17/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 42537c1..383381e 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -991,7 +991,6 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine>
{
             final RedundantState prevState = router.getRedundantState();
             if (router.getState() != State.Running) {
                 router.setRedundantState(RedundantState.UNKNOWN);
-                router.setIsPriorityBumpUp(false);
                 updated = true;
             } else {
                 final String privateIP = router.getPrivateIpAddress();
@@ -1012,13 +1011,12 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine>
{
                         s_logger.warn("Unable to update router " + router.getHostName() +
"'s status");
                     }
                     RedundantState state = RedundantState.UNKNOWN;
-                    boolean isBumped = router.getIsPriorityBumpUp();
                     if (answer != null && answer.getResult()) {
                         state = answer.getState();
-                        isBumped = answer.isBumped();
+                    } else {
+                        s_logger.info("Agent response doesn't seem to be correct ==> "
+ answer.getResult());
                     }
                     router.setRedundantState(state);
-                    router.setIsPriorityBumpUp(isBumped);
                     updated = true;
                 }
             }


Mime
View raw message