(TWILL-255) Incorrect logging after memory was adjusted. Does not show memory before adjustment
This closes #66 on Github. Signed-off-by: Terence Yim <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/twill/repo Commit: http://git-wip-us.apache.org/repos/asf/twill/commit/2f395b5b Tree: http://git-wip-us.apache.org/repos/asf/twill/tree/2f395b5b Diff: http://git-wip-us.apache.org/repos/asf/twill/diff/2f395b5b Branch: refs/heads/branch-0.12.0 Commit: 2f395b5b22044c1840612491c0bedf9a07d971b6 Parents: 36a4f11 Author: Yuliya Feldman <[email protected]> Authored: Wed Feb 28 14:52:56 2018 -0800 Committer: Terence Yim <[email protected]> Committed: Fri Mar 16 14:10:15 2018 -0700 ---------------------------------------------------------------------- .../org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java | 2 +- .../org/apache/twill/internal/yarn/Hadoop21YarnAMClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/twill/blob/2f395b5b/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java ---------------------------------------------------------------------- diff --git a/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java b/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java index 67bef3e..76de0c0 100644 --- a/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java +++ b/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java @@ -126,8 +126,8 @@ public final class Hadoop20YarnAMClient extends AbstractYarnAMClient<AMRMClient. updatedMemory = (int) Math.ceil(((double) updatedMemory / minMemory)) * minMemory; if (resource.getMemory() != updatedMemory) { - resource.setMemory(updatedMemory); LOG.info("Adjust memory requirement from {} to {} MB.", resource.getMemory(), updatedMemory); + resource.setMemory(updatedMemory); } return resource; http://git-wip-us.apache.org/repos/asf/twill/blob/2f395b5b/twill-yarn/src/main/hadoop21/org/apache/twill/internal/yarn/Hadoop21YarnAMClient.java ---------------------------------------------------------------------- diff --git a/twill-yarn/src/main/hadoop21/org/apache/twill/internal/yarn/Hadoop21YarnAMClient.java b/twill-yarn/src/main/hadoop21/org/apache/twill/internal/yarn/Hadoop21YarnAMClient.java index f349b4e..42bff62 100644 --- a/twill-yarn/src/main/hadoop21/org/apache/twill/internal/yarn/Hadoop21YarnAMClient.java +++ b/twill-yarn/src/main/hadoop21/org/apache/twill/internal/yarn/Hadoop21YarnAMClient.java @@ -165,8 +165,8 @@ public class Hadoop21YarnAMClient extends AbstractYarnAMClient<AMRMClient.Contai int updatedMemory = Math.min(resource.getMemory(), maxCapability.getMemory()); if (resource.getMemory() != updatedMemory) { - resource.setMemory(updatedMemory); LOG.info("Adjust memory requirement from {} to {} MB.", resource.getMemory(), updatedMemory); + resource.setMemory(updatedMemory); } return resource;
