Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 51B7618C11 for ; Mon, 29 Jun 2015 17:39:49 +0000 (UTC) Received: (qmail 77085 invoked by uid 500); 29 Jun 2015 17:39:49 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 77052 invoked by uid 500); 29 Jun 2015 17:39:49 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 77043 invoked by uid 99); 29 Jun 2015 17:39:49 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 17:39:49 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 75BF3D0FEB for ; Mon, 29 Jun 2015 17:39:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.21 X-Spam-Level: * X-Spam-Status: No, score=1.21 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.571, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id sVYBMWmYvcZ4 for ; Mon, 29 Jun 2015 17:39:42 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id CAF9E24DB7 for ; Mon, 29 Jun 2015 17:39:41 +0000 (UTC) Received: (qmail 77015 invoked by uid 99); 29 Jun 2015 17:39:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 17:39:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 92C20E35D7; Mon, 29 Jun 2015 17:39:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 29 Jun 2015 17:40:18 -0000 Message-Id: <9369a0babce2487e898a9468a610616d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [38/41] incubator-ignite git commit: #ignite-18: Property segmentationResolveAttempts seems to be ignored. #ignite-18: Property segmentationResolveAttempts seems to be ignored. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1d5cfbcc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1d5cfbcc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1d5cfbcc Branch: refs/heads/ignite-964 Commit: 1d5cfbcc6ef79dd8da99dc46a2797952dbcf4eab Parents: 5dff89c Author: ivasilinets Authored: Mon Jun 29 17:50:49 2015 +0300 Committer: ivasilinets Committed: Mon Jun 29 17:50:49 2015 +0300 ---------------------------------------------------------------------- .../internal/managers/discovery/GridDiscoveryManager.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d5cfbcc/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 1e4b972..5e7600f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -326,6 +326,12 @@ public class GridDiscoveryManager extends GridManagerAdapter { U.warn(log, "Configuration parameter 'segmentCheckFrequency' is too low " + "(at least 2000 ms recommended): " + segChkFreq); + int segResAttemp = ctx.config().getSegmentationResolveAttempts(); + + if (segResAttemp < 1) + throw new IgniteCheckedException( + "Segment resolve attempts cannot be negative or zero: " + segResAttemp); + checkSegmentOnStart(); }