# GG-10576 Merge with 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/5cd5c350 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5cd5c350 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5cd5c350 Branch: refs/heads/ignite-gg-10576 Commit: 5cd5c350489ec52a76ca72ceadcf46c2ede71000 Parents: 8a20a2e 58f4822 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Sat Jul 25 00:13:31 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Sat Jul 25 00:13:31 2015 +0700 ---------------------------------------------------------------------- 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 +- modules/clients/README.txt | 16 + modules/clients/readme.md | 32 -- modules/clients/readme.pdf | Bin 47887 -> 0 bytes .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../configuration/ConnectorConfiguration.java | 32 ++ .../configuration/IgniteConfiguration.java | 63 ++- .../apache/ignite/internal/IgniteKernal.java | 44 +- .../GridClientConnectionManagerAdapter.java | 2 +- .../client/router/impl/GridTcpRouterImpl.java | 2 +- .../client/ssl/GridSslBasicContextFactory.java | 3 + .../client/ssl/GridSslContextFactory.java | 5 +- .../discovery/GridDiscoveryManager.java | 7 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 20 +- .../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 +- .../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 ++ .../ignite/testframework/GridTestUtils.java | 20 + .../ignite/testframework/junits/IgniteMock.java | 13 + .../IgniteCacheFailoverTestSuite.java | 4 +- .../IgniteSpiCommunicationSelfTestSuite.java | 3 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + modules/hadoop/docs/HADOOP_README.txt | 122 +++++ modules/hadoop/docs/hadoop_readme.md | 135 ----- modules/hadoop/docs/hadoop_readme.pdf | Bin 82219 -> 0 bytes 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 ++ .../visor/commands/open/VisorOpenCommand.scala | 29 +- .../scala/org/apache/ignite/visor/visor.scala | 3 + modules/yardstick/README.md | 85 --- modules/yardstick/README.txt | 93 ++++ parent/pom.xml | 4 +- pom.xml | 1 + 93 files changed, 6297 insertions(+), 702 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cd5c350/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/open/VisorOpenCommand.scala ---------------------------------------------------------------------- diff --cc modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/open/VisorOpenCommand.scala index 2f20cc4,7d2ee3c..2616daf --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/open/VisorOpenCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/open/VisorOpenCommand.scala @@@ -248,9 -240,12 +248,19 @@@ class VisorOpenCommand extends VisorCon if ("true".equalsIgnoreCase(sys.props.getOrElse(IGNITE_QUIET, "true"))) cfg.setGridLogger(new NullLogger) - val startedGridName = try { - Ignition.start(cfg).name + ignite = try { + // We need to stop previous daemon node before to start new one. + prevIgnite.foreach(g => Ignition.stop(g.name(), true)) + + Ignition.start(cfg).asInstanceOf[IgniteEx] + } ++ catch { ++ case e: Throwable => ++ if (X.hasCause(e, classOf[IgniteSpiException]) && joinTimedOut(X.cause(e, classOf[IgniteSpiException]).getMessage)) ++ throw new IgniteException("Visor console failed to connect to any of server nodes", e) ++ else ++ throw e + } finally { Ignition.setDaemon(daemon)
