Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5C477200BB8 for ; Thu, 29 Sep 2016 14:41:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5B54B160AE3; Thu, 29 Sep 2016 12:41:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7AB6A160AF0 for ; Thu, 29 Sep 2016 14:41:31 +0200 (CEST) Received: (qmail 37155 invoked by uid 500); 29 Sep 2016 12:41:30 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 36892 invoked by uid 99); 29 Sep 2016 12:41:30 -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; Thu, 29 Sep 2016 12:41:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4346FEEF48; Thu, 29 Sep 2016 12:41:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 29 Sep 2016 12:41:40 -0000 Message-Id: <048c631a2b9a4802a4e4120c1463cb44@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/20] ignite git commit: Merge ignite-1.6.9 into ignite-1.7.2. archived-at: Thu, 29 Sep 2016 12:41:32 -0000 Merge ignite-1.6.9 into ignite-1.7.2. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a53c399e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a53c399e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a53c399e Branch: refs/heads/ignite-comm-opts2 Commit: a53c399e10926120106379d1c764edd7d3854e6a Parents: 3f62596 89c30c8 Author: Alexey Kuznetsov Authored: Wed Sep 28 09:07:55 2016 +0700 Committer: Alexey Kuznetsov Committed: Wed Sep 28 09:07:55 2016 +0700 ---------------------------------------------------------------------- .../s3/S3CheckpointManagerSelfTest.java | 3 + .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 + .../s3/S3CheckpointSpiStartStopSelfTest.java | 7 + .../s3/S3SessionCheckpointSelfTest.java | 2 + .../s3/TcpDiscoveryS3IpFinderSelfTest.java | 7 + .../ignite/testsuites/IgniteS3TestSuite.java | 15 +- .../store/jdbc/CacheAbstractJdbcStore.java | 4 +- .../apache/ignite/compute/ComputeTaskSpis.java | 8 +- .../local/LocalIgfsSecondaryFileSystem.java | 19 +- .../ignite/internal/GridTaskSessionImpl.java | 15 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 22 ++ .../discovery/GridDiscoveryManager.java | 73 +++---- .../loadbalancer/GridLoadBalancerManager.java | 10 +- .../processors/cache/GridCacheProcessor.java | 2 + .../cache/GridCacheSharedContext.java | 24 ++- .../cache/GridCacheSharedTtlCleanupManager.java | 132 ++++++++++++ .../processors/cache/GridCacheTtlManager.java | 115 +++-------- .../processors/job/GridJobProcessor.java | 3 +- .../session/GridTaskSessionProcessor.java | 9 +- .../processors/task/GridTaskProcessor.java | 3 +- .../processors/task/GridTaskWorker.java | 2 +- .../util/GridBoundedConcurrentOrderedMap.java | 5 + .../TcpDiscoveryMulticastIpFinder.java | 3 - .../CacheJdbcPojoStoreAbstractSelfTest.java | 55 +++-- ...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 12 +- .../IgniteClientReconnectCacheTest.java | 35 ++++ .../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +- .../discovery/GridDiscoveryManagerSelfTest.java | 6 +- .../GridCacheTtlManagerNotificationTest.java | 107 +++++++++- .../IgniteCacheExpiryPolicyTestSuite.java | 2 + ...eCacheOnlyOneTtlCleanupThreadExistsTest.java | 102 ++++++++++ .../loadtests/hashmap/GridCacheTestContext.java | 2 + .../tcp/TcpClientDiscoverySpiMulticastTest.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +- .../TcpDiscoveryMulticastIpFinderSelfTest.java | 6 +- .../GridInternalTasksLoadBalancingSelfTest.java | 201 +++++++++++++++++++ .../ignite/testframework/IgniteTestSuite.java | 163 +++++++++++---- .../testframework/junits/GridAbstractTest.java | 22 +- .../apache/ignite/testsuites/IgniteIgnore.java | 11 +- .../testsuites/IgniteIgnoredTestSuite.java | 63 ------ .../IgniteSpiLoadBalancingSelfTestSuite.java | 34 ++-- modules/ignored-tests/README.txt | 4 + modules/ignored-tests/pom.xml | 107 ++++++++++ .../testsuites/IgniteIgnoredTestSuite.java | 45 +++++ .../apache/ignite/testsuites/package-info.java | 22 ++ .../Events/LocalListener.cs | 2 +- .../IgniteWebSessionSelfTestSuite.java | 68 +------ .../WebSessionReplicatedSelfTest.java | 28 +++ .../WebSessionReplicatedV1SelfTest.java | 28 +++ .../internal/websession/WebSessionSelfTest.java | 2 + .../WebSessionTransactionalSelfTest.java | 48 +++++ .../WebSessionTransactionalV1SelfTest.java | 28 +++ .../websession/WebSessionV1SelfTest.java | 28 +++ pom.xml | 7 + 55 files changed, 1340 insertions(+), 395 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a53c399e/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a53c399e/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a53c399e/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a53c399e/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a53c399e/pom.xml ----------------------------------------------------------------------