storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [1/3] storm git commit: [STORM-2189] RAS_Node::freeCPU outputs incorrect info
Date Wed, 09 Nov 2016 00:36:04 GMT
Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 8f060e465 -> c333e30aa


[STORM-2189] RAS_Node::freeCPU outputs incorrect info

CPU trying to free should be ``_availCPU + amount`` rather than ``_availMemory + amount``.

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/14fa0734
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/14fa0734
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/14fa0734

Branch: refs/heads/1.0.x-branch
Commit: 14fa0734937e093c1978380c9f772d65b5e016e5
Parents: 8f060e4
Author: Li Wang <wangli1426@gmail.com>
Authored: Mon Nov 7 11:03:05 2016 +0800
Committer: Jungtaek Lim <kabhwan@gmail.com>
Committed: Wed Nov 9 09:35:37 2016 +0900

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/scheduler/resource/RAS_Node.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/14fa0734/storm-core/src/jvm/org/apache/storm/scheduler/resource/RAS_Node.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/scheduler/resource/RAS_Node.java b/storm-core/src/jvm/org/apache/storm/scheduler/resource/RAS_Node.java
index 8d37805..9e33b01 100644
--- a/storm-core/src/jvm/org/apache/storm/scheduler/resource/RAS_Node.java
+++ b/storm-core/src/jvm/org/apache/storm/scheduler/resource/RAS_Node.java
@@ -254,7 +254,7 @@ public class RAS_Node {
     private void freeCPU(double amount) {
         LOG.debug("freeing {} CPU on node...avail CPU: {}", amount, getHostname(), _availCPU);
         if ((_availCPU + amount) > getTotalCpuResources()) {
-            LOG.warn("Freeing more CPU than there exists! CPU trying to free: {} Total CPU
on Node: {}", (_availMemory + amount), getTotalCpuResources());
+            LOG.warn("Freeing more CPU than there exists! CPU trying to free: {} Total CPU
on Node: {}", (_availCPU + amount), getTotalCpuResources());
             return;
         }
         _availCPU += amount;


Mime
View raw message