Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-176
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/577fdf5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/577fdf5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/577fdf5d Branch: refs/heads/ignite-194 Commit: 577fdf5d8f63634571f2fc6793cc81f49b140a97 Parents: f08a824 14efbca Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Feb 9 17:23:18 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Feb 9 17:23:18 2015 +0300 ---------------------------------------------------------------------- .../HibernateL2CacheExampleNodeStartup.java | 1 - .../singlesplit/SingleSplitsLoadTest.java | 4 - .../gridify/GridifySingleSplitLoadTest.java | 2 - .../ClientAbstractMultiNodeSelfTest.java | 26 +- .../internal/TaskEventSubjectIdSelfTest.java | 2 +- .../JettyRestProcessorAbstractSelfTest.java | 2 +- .../rest/RestProcessorMultiStartSelfTest.java | 2 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 +- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 2 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 2 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 2 +- .../src/test/resources/spring-server-node.xml | 35 +- .../test/resources/spring-server-ssl-node.xml | 35 +- .../client/impl/GridClientThreadFactory.java | 2 +- .../ComputeExecutionRejectedException.java | 2 +- .../ClientConnectionConfiguration.java | 66 +- .../configuration/IgniteConfiguration.java | 407 ++------ .../apache/ignite/internal/GridDiagnostic.java | 2 +- .../ignite/internal/GridJobContextImpl.java | 2 +- .../ignite/internal/GridKernalContext.java | 44 + .../ignite/internal/GridKernalContextImpl.java | 88 +- .../apache/ignite/internal/GridProperties.java | 4 - .../apache/ignite/internal/IgniteKernal.java | 54 +- .../org/apache/ignite/internal/IgnitionEx.java | 275 ++---- .../managers/communication/GridIoManager.java | 14 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 10 +- .../closure/GridClosureProcessor.java | 6 +- .../processors/fs/GridGgfsDataManager.java | 2 +- .../internal/processors/fs/GridGgfsImpl.java | 8 +- .../hadoop/GridHadoopJobProperty.java | 2 +- .../processors/job/GridJobProcessor.java | 2 +- .../processors/query/GridQueryProcessor.java | 2 +- .../processors/rest/GridRestProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 26 +- .../util/portscanner/GridJmxPortFinder.java | 2 +- .../node/VisorExecutorServiceConfiguration.java | 149 +-- .../jobstealing/JobStealingCollisionSpi.java | 16 +- .../spi/collision/noop/NoopCollisionSpi.java | 2 +- .../WeightedRandomLoadBalancingSpi.java | 4 +- .../test/config/default-spring-url-testing.xml | 2 - modules/core/src/test/config/example-cache.xml | 2 - .../src/test/config/io-manager-benchmark.xml | 1 - .../src/test/config/job-loadtest/client.xml | 41 +- .../src/test/config/job-loadtest/server.xml | 15 +- modules/core/src/test/config/jobs-load-base.xml | 28 +- .../src/test/config/load/cache-benchmark.xml | 2 - .../test/config/load/cache-client-benchmark.xml | 2 - .../core/src/test/config/load/dsi-load-base.xml | 28 +- .../src/test/config/load/merge-sort-base.xml | 41 +- .../test/config/loaders/grid-cfg-2-grids.xml | 4 - .../core/src/test/config/loaders/grid-cfg.xml | 5 - .../config/spring-cache-put-remove-load.xml | 2 - .../core/src/test/config/spring-multicache.xml | 39 +- .../src/test/config/spring-start-nodes-attr.xml | 2 - .../core/src/test/config/spring-start-nodes.xml | 2 - .../config/streamer/spring-streamer-base.xml | 2 - .../test/config/websession/spring-cache-1.xml | 2 - .../test/config/websession/spring-cache-2.xml | 2 - .../test/config/websession/spring-cache-3.xml | 2 - ...eJdbcStoreAbstractMultithreadedSelfTest.java | 9 +- .../internal/GridCancelUnusedJobSelfTest.java | 9 +- .../internal/GridDiscoveryEventSelfTest.java | 2 - .../internal/GridManagementJobSelfTest.java | 168 ---- .../ignite/internal/GridStartStopSelfTest.java | 6 - .../cache/GridCacheAbstractFullApiSelfTest.java | 43 +- .../GridCacheAbstractIteratorsSelfTest.java | 2 - .../GridCacheDaemonNodeAbstractSelfTest.java | 2 - .../cache/GridCacheDeploymentSelfTest.java | 2 - .../cache/GridCacheLuceneQueryIndexTest.java | 1 - ...GridCacheQueueMultiNodeAbstractSelfTest.java | 19 +- ...dCacheMultithreadedFailoverAbstractTest.java | 1 - .../GridCachePreloadLifecycleAbstractTest.java | 9 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 6 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 3 +- .../GridCacheNearReaderPreloadSelfTest.java | 1 - ...achePartitionedMultiNodeFullApiSelfTest.java | 18 +- .../local/GridCacheLocalIteratorsSelfTest.java | 80 -- .../dataload/GridDataLoaderPerformanceTest.java | 2 - ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 2 - .../processors/fs/GridGgfsAbstractSelfTest.java | 7 +- .../fs/GridGgfsDualAbstractSelfTest.java | 2 +- .../processors/fs/GridGgfsModesSelfTest.java | 138 ++- .../cache/GridCacheCommandHandlerSelfTest.java | 6 +- .../GridServiceReassignmentSelfTest.java | 17 +- ...dStartupWithUndefinedIgniteHomeSelfTest.java | 1 - .../util/future/GridFutureAdapterSelfTest.java | 8 +- .../cache/GridCacheSingleNodeLoadTest.java | 6 +- .../loadtests/colocation/spring-colocation.xml | 26 +- .../multisplit/GridMultiSplitsLoadTest.java | 2 - .../GridMultiSplitsRedeployLoadTest.java | 2 - ...ridSingleSplitsNewNodesAbstractLoadTest.java | 9 +- .../GridSingleSplitsRedeployLoadTest.java | 2 - ...SessionCancelSiblingsFromFutureSelfTest.java | 9 +- ...ridSessionCancelSiblingsFromJobSelfTest.java | 9 +- ...idSessionCancelSiblingsFromTaskSelfTest.java | 9 +- ...GridSessionJobWaitTaskAttributeSelfTest.java | 10 +- .../GridSessionSetFutureAttributeSelfTest.java | 9 +- ...nSetFutureAttributeWaitListenerSelfTest.java | 9 +- .../GridSessionSetJobAttributeSelfTest.java | 10 +- ...sionSetJobAttributeWaitListenerSelfTest.java | 9 +- .../GridSessionWaitAttributeSelfTest.java | 10 +- .../spi/GridTcpSpiForwardingSelfTest.java | 1 - .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 - .../tcp/TcpDiscoverySnapshotHistoryTest.java | 1 - .../ignite/testframework/GridTestUtils.java | 2 +- .../testframework/junits/GridAbstractTest.java | 2 - .../junits/GridTestKernalContext.java | 26 + .../IgniteCacheFullApiSelfTestSuite.java | 2 +- .../testsuites/IgniteComputeGridTestSuite.java | 1 - .../src/test/resources/load/html/index.html | 958 ------------------- .../resources/load/js/gg-loadtest-server.js | 96 -- .../client/hadoop/GridHadoopClientProtocol.java | 4 +- .../processors/hadoop/GridHadoopSetup.java | 2 +- .../processors/hadoop/GridHadoopUtils.java | 8 +- .../counter/GridHadoopFSCounterWriter.java | 2 +- .../GridHadoopExternalTaskExecutor.java | 2 +- .../GridGgfsHadoopDualAbstractSelfTest.java | 1 - ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 1 - ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 1 - .../hadoop/GridHadoopAbstractSelfTest.java | 7 +- .../hadoop/GridHadoopPopularWordsTest.java | 4 +- .../processors/hadoop/GridHadoopStartup.java | 2 +- .../log4j/GridLog4jCorrectFileNameTest.java | 1 - .../http/jetty/GridJettyRestHandler.java | 6 +- .../rest/protocols/http/jetty/rest.html | 4 +- .../ignite/internal/GridFactorySelfTest.java | 11 +- .../GridSpringBeanSerializationSelfTest.java | 2 - .../config/VisorConfigurationCommand.scala | 4 - .../scala/org/apache/ignite/visor/visor.scala | 8 +- .../yardstick/config/benchmark-store.properties | 2 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/config/ignite-store-config.xml | 2 - pom.xml | 8 +- 138 files changed, 662 insertions(+), 2754 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/577fdf5d/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/577fdf5d/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ----------------------------------------------------------------------
