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 226BE18E9F for ; Thu, 30 Jul 2015 07:26:32 +0000 (UTC) Received: (qmail 83900 invoked by uid 500); 30 Jul 2015 07:26:32 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 83829 invoked by uid 500); 30 Jul 2015 07:26:32 -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 83813 invoked by uid 99); 30 Jul 2015 07:26:32 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jul 2015 07:26:32 +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 96626D8CA2 for ; Thu, 30 Jul 2015 07:26:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.353 X-Spam-Level: X-Spam-Status: No, score=0.353 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=-1.428, 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 lOIxCQ3AqhzJ for ; Thu, 30 Jul 2015 07:26:30 +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 583A02FAB1 for ; Thu, 30 Jul 2015 07:26:22 +0000 (UTC) Received: (qmail 83091 invoked by uid 99); 30 Jul 2015 07:26:22 -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, 30 Jul 2015 07:26:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35AA6E6B10; Thu, 30 Jul 2015 07:26:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 30 Jul 2015 07:27:04 -0000 Message-Id: In-Reply-To: <19ba5b15e82c4db5b686924843ead455@git.apache.org> References: <19ba5b15e82c4db5b686924843ead455@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [44/44] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-900 Merge remote-tracking branch 'remotes/origin/master' into ignite-900 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/344b106e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/344b106e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/344b106e Branch: refs/heads/ignite-900 Commit: 344b106e91b552caa231b07390ca201f3fd0f471 Parents: 5d3617c 5288b2d Author: sevdokimov Authored: Thu Jul 30 10:26:03 2015 +0300 Committer: sevdokimov Committed: Thu Jul 30 10:26:03 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 5 + assembly/release-base.xml | 5 + config/ignite-log4j2.xml | 81 +++ config/ignite-log4j2.xml~ | 65 ++ examples/config/example-ignite.xml | 2 +- .../rest/AbstractRestProcessorSelfTest.java | 1 + .../JettyRestProcessorAbstractSelfTest.java | 657 ++++++++++++++++++- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../configuration/ConnectorConfiguration.java | 32 + .../configuration/IgniteConfiguration.java | 63 +- .../apache/ignite/internal/IgniteKernal.java | 86 ++- .../GridClientConnectionManagerAdapter.java | 2 +- .../client/router/impl/GridTcpRouterImpl.java | 2 +- .../client/ssl/GridSslBasicContextFactory.java | 3 + .../client/ssl/GridSslContextFactory.java | 5 +- .../discovery/GridDiscoveryManager.java | 7 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../datastreamer/DataStreamerImpl.java | 22 + .../datastreamer/DataStreamerUpdateJob.java | 20 +- .../processors/rest/GridRestCommand.java | 53 +- .../processors/rest/GridRestProcessor.java | 32 + .../handlers/cache/GridCacheCommandHandler.java | 373 ++++++++++- .../query/CacheQueryFieldsMetaResult.java | 133 ++++ .../rest/handlers/query/CacheQueryResult.java | 120 ++++ .../handlers/query/QueryCommandHandler.java | 292 +++++++++ .../version/GridVersionCommandHandler.java | 14 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 20 +- .../rest/request/RestSqlQueryRequest.java | 125 ++++ .../processors/task/GridTaskProcessor.java | 3 +- .../ignite/internal/util/nio/GridNioServer.java | 28 +- .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/ssl/BlockingSslHandler.java | 519 +++++++++++++++ .../internal/util/nio/ssl/GridNioSslFilter.java | 53 +- .../util/nio/ssl/GridNioSslHandler.java | 79 ++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 58 ++ .../spi/IgniteSpiOperationTimeoutException.java | 43 ++ .../spi/IgniteSpiOperationTimeoutHelper.java | 102 +++ .../communication/tcp/TcpCommunicationSpi.java | 294 +++++++-- .../ignite/spi/discovery/tcp/ClientImpl.java | 52 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 529 +++++++++------ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 11 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 169 ++++- .../tcp/internal/TcpDiscoveryNode.java | 21 + .../TcpDiscoveryConnectionCheckMessage.java | 64 ++ .../apache/ignite/ssl/SslContextFactory.java | 458 +++++++++++++ .../org/apache/ignite/ssl/package-info.java | 22 + modules/core/src/test/config/log4j2-test.xml | 57 ++ modules/core/src/test/config/log4j2-test.xml~ | 63 ++ .../src/test/config/log4j2-verbose-test.xml | 48 ++ .../IgniteClientReconnectAbstractTest.java | 4 +- .../IgniteTopologyPrintFormatSelfTest.java | 6 +- .../CacheGetFutureHangsSelfTest.java | 214 ++++++ .../internal/util/nio/GridNioSslSelfTest.java | 2 +- .../GridAbstractCommunicationSelfTest.java | 13 + .../GridTcpCommunicationSpiAbstractTest.java | 2 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...tionSpiRecoveryFailureDetectionSelfTest.java | 54 ++ ...GridTcpCommunicationSpiRecoverySelfTest.java | 23 +- .../tcp/GridTcpCommunicationSpiSslSelfTest.java | 38 ++ ...unicationSpiTcpFailureDetectionSelfTest.java | 75 +++ .../tcp/IgniteCacheSslStartStopSelfTest.java | 46 ++ .../discovery/AbstractDiscoverySelfTest.java | 36 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 205 ++++++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 116 +++- .../tcp/TcpDiscoverySpiConfigSelfTest.java | 1 + .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 402 ++++++++++++ .../tcp/TcpDiscoverySpiSslSelfTest.java | 28 + .../discovery/tcp/TcpDiscoverySslSelfTest.java | 42 ++ .../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../ignite/testframework/GridTestUtils.java | 20 + .../ignite/testframework/junits/IgniteMock.java | 13 + .../IgniteCacheFailoverTestSuite.java | 4 +- .../IgniteSpiCommunicationSelfTestSuite.java | 3 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 18 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 29 +- modules/log4j/README.txt | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 2 +- modules/log4j2/README.txt | 32 + modules/log4j2/licenses/apache-2.0.txt | 202 ++++++ modules/log4j2/pom.xml | 63 ++ modules/log4j2/pom.xml~ | 45 ++ .../ignite/logger/log4j2/Log4J2Logger.java | 486 ++++++++++++++ .../ignite/logger/log4j2/Log4J2Logger.java~ | 542 +++++++++++++++ .../ignite/logger/log4j2/Log4j2FileAware.java | 35 + .../ignite/logger/log4j2/Log4j2FileAware.java~ | 33 + .../ignite/logger/log4j2/Log4jFileAware.java~ | 13 + .../ignite/logger/log4j2/package-info.java | 22 + .../log4j2/GridLog4j2CorrectFileNameTest.java | 95 +++ .../log4j2/GridLog4j2CorrectFileNameTest.java~ | 95 +++ .../log4j2/GridLog4j2InitializedTest.java | 79 +++ .../log4j2/GridLog4j2InitializedTest.java~ | 79 +++ .../log4j2/GridLog4j2LoggingFileTest.java | 72 ++ .../log4j2/GridLog4j2LoggingFileTest.java~ | 74 +++ .../logger/log4j2/Log4j2LoggerSelfTest.java | 174 +++++ .../log4j2/Log4j2LoggerVerboseModeSelfTest.java | 117 ++++ .../ignite/logger/log4j2/package-info.java | 22 + .../testsuites/IgniteLog4j2TestSuite.java | 38 ++ .../http/jetty/GridJettyRestHandler.java | 85 ++- .../visor/commands/open/VisorOpenCommand.scala | 17 +- .../scala/org/apache/ignite/visor/visor.scala | 3 + modules/yardstick/config/benchmark.properties | 6 +- .../yardstick/IgniteBenchmarkArguments.java | 22 + .../yardstick/cache/IgnitePutAllBenchmark.java | 67 ++ .../cache/IgnitePutAllTxBenchmark.java | 68 ++ parent/pom.xml | 2 +- pom.xml | 1 + 107 files changed, 8372 insertions(+), 527 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/344b106e/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ----------------------------------------------------------------------