Merge branch 'ignite-648' into ignite-648-failover
Conflicts:
modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f8be8d19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f8be8d19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f8be8d19
Branch: refs/heads/ignite-648-failover
Commit: f8be8d19b0e595f81cf273d9aa46757cb48cbab7
Parents: f336e76 f919253
Author: ashutak <ashu...@gridgain.com>
Authored: Wed Jul 8 16:17:44 2015 +0300
Committer: ashutak <ashu...@gridgain.com>
Committed: Wed Jul 8 16:17:44 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 8 +-
bin/ignite.sh | 6 +-
bin/include/parseargs.bat | 1 +
bin/include/parseargs.sh | 3 +
dev-tools/slurp.sh | 2 +-
modules/aop/pom.xml | 2 +-
modules/core/pom.xml | 44 +--
.../java/org/apache/ignite/IgniteCache.java | 5 +
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../affinity/fair/FairAffinityFunction.java | 3 +-
.../cache/eviction/fifo/FifoEvictionPolicy.java | 5 -
.../cache/eviction/lru/LruEvictionPolicy.java | 5 -
.../eviction/sorted/SortedEvictionPolicy.java | 19 +-
.../internal/interop/InteropIgnition.java | 48 ++-
.../internal/interop/InteropProcessor.java | 7 +
.../processors/cache/CacheObjectImpl.java | 1 -
.../processors/cache/CacheOperationContext.java | 44 ++-
.../processors/cache/GridCacheAdapter.java | 91 +++--
.../processors/cache/GridCacheAtomicFuture.java | 12 +-
.../processors/cache/GridCacheMvccManager.java | 8 +-
.../processors/cache/GridCacheProxyImpl.java | 10 +-
.../processors/cache/GridCacheUtils.java | 42 +++
.../processors/cache/IgniteCacheProxy.java | 36 +-
.../dht/GridPartitionedGetFuture.java | 13 +-
.../dht/atomic/GridDhtAtomicCache.java | 18 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 177 ++++++++-
.../cache/query/GridCacheQueryAdapter.java | 35 +-
.../datastructures/GridCacheAtomicLongImpl.java | 25 +-
.../GridCacheAtomicSequenceImpl.java | 11 +-
.../GridCacheAtomicStampedImpl.java | 21 +-
.../GridCacheCountDownLatchImpl.java | 16 +-
.../processors/query/GridQueryProcessor.java | 5 +
.../ignite/internal/util/IgniteUtils.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 46 +++
.../tcp/internal/TcpDiscoveryNode.java | 2 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 8 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 10 +-
.../startup/cmdline/CommandLineStartup.java | 3 +-
.../startup/cmdline/CommandLineTransformer.java | 9 +
.../cache/CacheFutureExceptionSelfTest.java | 102 +++++
.../cache/GridCacheAbstractFullApiSelfTest.java | 338 ++++++-----------
.../cache/GridCacheAbstractSelfTest.java | 2 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 147 ++++++++
.../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 ++
...gniteCachePutRetryTransactionalSelfTest.java | 74 ++++
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 10 +-
.../GridCachePartitionedFailoverSelfTest.java | 5 +
...achePartitionedMultiNodeFullApiSelfTest.java | 57 +--
.../GridCachePartitionedNodeRestartTest.java | 5 -
...ePartitionedOptimisticTxNodeRestartTest.java | 2 +-
.../GridCacheReplicatedFailoverSelfTest.java | 5 -
.../GridCacheReplicatedNodeRestartSelfTest.java | 5 -
...acheAtomicReplicatedNodeRestartSelfTest.java | 14 +-
...heConcurrentEvictionConsistencySelfTest.java | 15 +-
...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 2 +-
...AtomicClientOnlyMultiJvmFullApiSelfTest.java | 4 +-
...tOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 4 +-
...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 4 +-
...omicFairAffinityMultiJvmFullApiSelfTest.java | 4 +-
.../GridCacheAtomicMultiJvmFullApiSelfTest.java | 2 +-
...tomicMultiJvmP2PDisabledFullApiSelfTest.java | 4 +-
...bledFairAffinityMultiJvmFullApiSelfTest.java | 4 +-
...tomicNearEnabledMultiJvmFullApiSelfTest.java | 4 +-
...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 4 +-
...heAtomicNearOnlyMultiJvmFullApiSelfTest.java | 2 +-
...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 4 +-
...cheAtomicOffHeapMultiJvmFullApiSelfTest.java | 4 +-
...micOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +-
...rderFairAffinityMultiJvmFullApiSelfTest.java | 4 +-
...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 4 +-
...OrderMultiJvmP2PDisabledFullApiSelfTest.java | 4 +-
...rityOrderOffHeapMultiJvmFullApiSelfTest.java | 4 +-
...derOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +-
...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 4 +-
...ridCacheNearOnlyMultiJvmFullApiSelfTest.java | 2 +-
...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCacheNearTxMultiJvmSelfTest.java | 2 +-
...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 4 +-
...onedFairAffinityMultiJvmFullApiSelfTest.java | 4 +-
...CachePartitionedMultiJvmCounterSelfTest.java | 4 +-
...CachePartitionedMultiJvmFullApiSelfTest.java | 2 +-
...ionedMultiJvmP2PDisabledFullApiSelfTest.java | 4 +-
...micOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +-
...bledFairAffinityMultiJvmFullApiSelfTest.java | 4 +-
...onedNearDisabledMultiJvmFullApiSelfTest.java | 4 +-
...abledMultiJvmP2PDisabledFullApiSelfTest.java | 4 +-
...rDisabledOffHeapMultiJvmFullApiSelfTest.java | 4 +-
...ledOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +-
...rtitionedOffHeapMultiJvmFullApiSelfTest.java | 4 +-
...nedOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +-
...ReplicatedAtomicMultiJvmFullApiSelfTest.java | 4 +-
...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 4 +-
...dCacheReplicatedMultiJvmFullApiSelfTest.java | 2 +-
...catedMultiJvmP2PDisabledFullApiSelfTest.java | 4 +-
...plicatedNearOnlyMultiJvmFullApiSelfTest.java | 2 +-
...eplicatedOffHeapMultiJvmFullApiSelfTest.java | 4 +-
...tedOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++
.../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 ++++
.../testframework/junits/GridAbstractTest.java | 248 +++++++++++-
.../junits/common/GridCommonAbstractTest.java | 85 ++---
.../junits/multijvm/AffinityProcessProxy.java | 2 +-
.../multijvm/IgniteCacheProcessProxy.java | 4 +
.../multijvm/IgniteClusterProcessProxy.java | 2 +-
.../junits/multijvm/IgniteNodeRunner.java | 2 +-
.../junits/multijvm/IgniteProcessProxy.java | 8 +-
.../IgniteCacheFailoverTestSuite.java | 3 +
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 12 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../IgniteSpiDiscoverySelfTestSuite.java | 5 +
.../CacheAbstractQueryMetricsSelfTest.java | 157 +++++++-
.../cache/CacheLocalQueryMetricsSelfTest.java | 33 ++
...titionedQueryMetricsDistributedSelfTest.java | 33 ++
...chePartitionedQueryMetricsLocalSelfTest.java | 33 ++
.../CachePartitionedQueryMetricsSelfTest.java | 32 --
...plicatedQueryMetricsDistributedSelfTest.java | 33 ++
...acheReplicatedQueryMetricsLocalSelfTest.java | 33 ++
.../CacheReplicatedQueryMetricsSelfTest.java | 32 --
.../IgniteCacheQuerySelfTestSuite.java | 7 +-
modules/kafka/licenses/apache-2.0.txt | 202 ++++++++++
modules/kafka/pom.xml | 116 ++++++
.../ignite/stream/kafka/KafkaStreamer.java | 220 +++++++++++
.../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 ++
.../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++++++++++++
.../kafka/KafkaIgniteStreamerSelfTest.java | 227 +++++++++++
.../ignite/stream/kafka/SimplePartitioner.java | 53 +++
modules/mesos/pom.xml | 1 -
modules/rest-http/pom.xml | 14 +-
.../util/spring/IgniteSpringHelperImpl.java | 72 +++-
.../IgniteExcludeInConfigurationTest.java | 78 ++++
.../org/apache/ignite/spring/sprint-exclude.xml | 57 +++
.../testsuites/IgniteSpringTestSuite.java | 2 +
modules/urideploy/pom.xml | 8 +-
.../ignite/visor/commands/VisorConsole.scala | 3 +-
.../visor/commands/open/VisorOpenCommand.scala | 319 ++++++++++++++++
.../scala/org/apache/ignite/visor/visor.scala | 230 +----------
.../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +
.../commands/kill/VisorKillCommandSpec.scala | 1 +
.../commands/start/VisorStartCommandSpec.scala | 1 +
.../commands/tasks/VisorTasksCommandSpec.scala | 1 +
.../commands/vvm/VisorVvmCommandSpec.scala | 1 +
modules/web/pom.xml | 6 +-
.../config/benchmark-put-indexed-val.properties | 64 ++++
modules/yardstick/config/ignite-base-config.xml | 23 ++
.../cache/IgnitePutIndexedValue1Benchmark.java | 42 +++
.../cache/IgnitePutIndexedValue2Benchmark.java | 42 +++
.../cache/IgnitePutIndexedValue8Benchmark.java | 42 +++
.../ignite/yardstick/cache/model/Person1.java | 55 +++
.../ignite/yardstick/cache/model/Person2.java | 67 ++++
.../ignite/yardstick/cache/model/Person8.java | 109 ++++++
parent/pom.xml | 41 ++
pom.xml | 2 +-
scripts/git-patch-prop.sh | 2 +-
156 files changed, 4184 insertions(+), 1008 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8be8d19/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8be8d19/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------
