Repository: incubator-myriad Updated Branches: refs/heads/master f67075c46 -> 90de2552f
MYRIAD-140 Fixing issue with validating request for flexDown where pr⦠â¦ofile is null. This closes: #16 Review: https://github.com/apache/incubator-myriad/pull/16 Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/90de2552 Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/90de2552 Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/90de2552 Branch: refs/heads/master Commit: 90de2552fc5e2fc3edf5d1301af678a2c1912f78 Parents: f67075c Author: Yuliya Feldman <yfeld...@maprtech.com> Authored: Tue Oct 20 14:12:39 2015 -0700 Committer: Santosh Marella <mare...@gmail.com> Committed: Tue Oct 20 14:12:39 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/com/ebay/myriad/api/ClustersResource.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/90de2552/myriad-scheduler/src/main/java/com/ebay/myriad/api/ClustersResource.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/com/ebay/myriad/api/ClustersResource.java b/myriad-scheduler/src/main/java/com/ebay/myriad/api/ClustersResource.java index 9820848..657db76 100644 --- a/myriad-scheduler/src/main/java/com/ebay/myriad/api/ClustersResource.java +++ b/myriad-scheduler/src/main/java/com/ebay/myriad/api/ClustersResource.java @@ -163,13 +163,15 @@ public class ClustersResource { isValidRequest = isValidRequest && validateInstances(instances, response); isValidRequest = isValidRequest && validateConstraints(constraints, response); - Integer numFlexedUp = this.getNumFlexedupNMs(profile); - if (isValidRequest && numFlexedUp < instances) { + if (isValidRequest) { + Integer numFlexedUp = this.getNumFlexedupNMs(profile); + if (numFlexedUp < instances) { String message = String.format("Number of requested instances for flexdown is greater than the number of " + "Node Managers previously flexed up for profile '%s'. Requested: %d, Previously flexed Up: %d. " + "Only %d Node Managers will be flexed down.", profile, instances, numFlexedUp, numFlexedUp); response.entity(message); LOGGER.warn(message); + } } Response returnResponse = response.build();
