Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 61ebc19cc -> 432e5566b
IGNITE-1649 Additional checks. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/432e5566 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/432e5566 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/432e5566 Branch: refs/heads/ignite-843-rc1 Commit: 432e5566ba5214b86b7ed8b43a9cfc38e9eaedec Parents: 61ebc19 Author: vsisko <[email protected]> Authored: Tue Oct 20 09:00:12 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Oct 20 09:00:12 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/clusters-controller.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/432e5566/modules/control-center-web/src/main/js/controllers/clusters-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 4fd4212..dc717ce 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -363,11 +363,23 @@ consoleModule.controller('clustersController', [ var c = item.communication; - if ($common.isDefined(c) && !$common.isEmptyString(c.listener) && !$common.isValidJavaClass('Communication listener', c.listener, false, 'comListener', false, $scope.panels, 'communication')) - return false; + if ($common.isDefined(c)) { + if (!$common.isEmptyString(c.listener) && !$common.isValidJavaClass('Communication listener', c.listener, false, 'comListener', false, $scope.panels, 'communication')) + return false; - if ($common.isDefined(c) && !$common.isEmptyString(c.addressResolver) && !$common.isValidJavaClass('Address resolver', c.addressResolver, false, 'comAddressResolver', false, $scope.panels, 'communication')) - return false; + if (!$common.isEmptyString(c.addressResolver) && !$common.isValidJavaClass('Address resolver', c.addressResolver, false, 'comAddressResolver', false, $scope.panels, 'communication')) + return false; + + if ($common.isDefined(c.unacknowledgedMessagesBufferSize)) { + if ($common.isDefined(c.messageQueueLimit)) + if (c.unacknowledgedMessagesBufferSize < 5 * c.messageQueueLimit) + return showPopoverMessage($scope.panels, 'communication', 'unacknowledgedMessagesBufferSize', 'Maximum number of stored unacknowledged messages should be at least 5 * message queue limit'); + + if ($common.isDefined(c.ackSendThreshold)) + if (c.unacknowledgedMessagesBufferSize < 5 * c.ackSendThreshold) + return showPopoverMessage($scope.panels, 'communication', 'unacknowledgedMessagesBufferSize', 'Maximum number of stored unacknowledged messages should be at least 5 * ack send threshold'); + } + } var d = item.discovery;
