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 A94AE1801A for ; Tue, 21 Jul 2015 15:01:16 +0000 (UTC) Received: (qmail 54638 invoked by uid 500); 21 Jul 2015 15:00:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 54606 invoked by uid 500); 21 Jul 2015 15:00:42 -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 54597 invoked by uid 99); 21 Jul 2015 15:00:42 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jul 2015 15:00:42 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id E2C8BC0044 for ; Tue, 21 Jul 2015 15:00:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 4cRq1X7Kyodc for ; Tue, 21 Jul 2015 15:00:26 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 8AE28343FF for ; Tue, 21 Jul 2015 15:00:21 +0000 (UTC) Received: (qmail 53927 invoked by uid 99); 21 Jul 2015 15:00:20 -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; Tue, 21 Jul 2015 15:00:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6D6B7E0F7F; Tue, 21 Jul 2015 15:00:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 21 Jul 2015 15:00:31 -0000 Message-Id: <6abe515580334b7f8e9b618dc135ba74@git.apache.org> In-Reply-To: <1b090afcafb844c8aa4715dd89c74451@git.apache.org> References: <1b090afcafb844c8aa4715dd89c74451@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/12] incubator-ignite git commit: IGNITE-323 Merge from master IGNITE-323 Merge from master Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7a057555 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7a057555 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7a057555 Branch: refs/heads/ignite-323 Commit: 7a057555aaefb157ce24798b94b8d445ca680666 Parents: 94af74d 73a2b14 Author: nikolay_tikhonov Authored: Tue Jul 21 18:00:17 2015 +0300 Committer: nikolay_tikhonov Committed: Tue Jul 21 18:00:17 2015 +0300 ---------------------------------------------------------------------- modules/apache-license-gen/pom.xml | 13 --- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../AffinityNodeAddressHashResolver.java | 8 +- .../affinity/AffinityNodeHashResolver.java | 5 + .../affinity/AffinityNodeIdHashResolver.java | 6 + .../rendezvous/RendezvousAffinityFunction.java | 22 +++- .../configuration/CacheConfiguration.java | 4 +- .../configuration/IgniteConfiguration.java | 26 +++++ .../apache/ignite/internal/IgniteKernal.java | 3 + .../ignite/internal/IgniteNodeAttributes.java | 3 + .../processors/cache/GridCacheAttributes.java | 8 +- .../processors/cache/GridCacheProcessor.java | 113 ++++++++++++------- .../processors/cache/IgniteInternalCache.java | 3 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 7 +- .../ignite/internal/util/IgniteUtils.java | 21 +++- .../ignite/internal/util/nio/GridNioServer.java | 9 ++ .../util/nio/GridSelectorNioSessionImpl.java | 8 ++ .../ignite/spi/discovery/tcp/ServerImpl.java | 58 ++++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../tcp/internal/TcpDiscoveryNode.java | 18 ++- .../cache/CacheAffinityCallSelfTest.java | 10 +- .../internal/util/nio/GridNioSelfTest.java | 88 +++++++++++++-- .../internal/util/nio/GridNioSslSelfTest.java | 16 ++- ...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 +++++++++++++ .../testframework/junits/GridAbstractTest.java | 3 +- .../IgniteSpiDiscoverySelfTestSuite.java | 1 + 26 files changed, 409 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a057555/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 73db5fe,823ddcd..bd16fbe --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@@ -401,9 -401,9 +402,12 @@@ public class IgniteConfiguration /** Cache store session listeners. */ private Factory[] storeSesLsnrs; + /** Consistent globally unique node ID which survives node restarts. */ + private Serializable consistentId; + + /** SSL connection factory. */ + private GridSslContextFactory sslCtxFactory; + /** * Creates valid grid configuration with all default values. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a057555/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a057555/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a057555/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java ----------------------------------------------------------------------