You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/11/03 10:22:52 UTC
[13/13] ignite git commit: Merge branches
'ignite-1.4-slow-server-debug' and 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into
ignite-1.4-slow-server-debug
Merge branches 'ignite-1.4-slow-server-debug' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4-slow-server-debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/744aa283
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/744aa283
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/744aa283
Branch: refs/heads/ignite-1.4-slow-server-debug
Commit: 744aa283c5145dd32450ebcda31f4520964aae44
Parents: b811c8d 6a22193
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Nov 3 12:19:33 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Nov 3 12:19:33 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheAffinityManager.java | 18 +-
.../distributed/dht/GridDhtLocalPartition.java | 8 +
.../service/GridServiceProcessor.java | 31 +-
.../ignite/internal/visor/cache/VisorCache.java | 5 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +
.../GridCacheAbstractRemoveFailureTest.java | 4 +-
.../cache/IgniteCacheTxNearPeekModesTest.java | 7 +-
.../CacheGetFutureHangsSelfTest.java | 3 +-
...niteCacheClientNodeChangingTopologyTest.java | 2 +
.../IgniteCacheCrossCacheTxFailoverTest.java | 4 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 5 -
...omicNearEnabledMultiNodeFullApiSelfTest.java | 5 -
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 5 -
.../near/GridCacheNearTxExceptionSelfTest.java | 4 +
.../GridServiceProcessorStopSelfTest.java | 103 ++++++
.../ignite/testframework/GridTestUtils.java | 4 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../cache/SqlFieldsQuerySelfTest.java | 2 -
.../config/benchmark-client-mode.properties | 4 +-
.../config/benchmark-failover.properties | 107 +++++++
.../config/benchmark-multicast.properties | 71 ++--
.../yardstick/config/benchmark-store.properties | 4 +-
modules/yardstick/config/benchmark.properties | 4 +-
.../config/ignite-failover-base-config.xml | 126 ++++++++
.../config/ignite-failover-localhost-config.xml | 56 ++++
modules/yardstick/pom.xml | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 2 +-
.../yardstick/IgniteBenchmarkArguments.java | 66 +++-
.../cache/IgniteCacheAbstractBenchmark.java | 8 +-
.../yardstick/cache/IgniteGetBenchmark.java | 4 +-
.../cache/IgniteJdbcSqlQueryBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutAllBenchmark.java | 4 +-
.../cache/IgnitePutAllTxBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutGetBenchmark.java | 4 +-
.../cache/IgnitePutGetTxBenchmark.java | 4 +-
.../cache/IgnitePutIndexedValue1Benchmark.java | 4 +-
.../cache/IgnitePutIndexedValue2Benchmark.java | 4 +-
.../cache/IgnitePutIndexedValue8Benchmark.java | 4 +-
.../yardstick/cache/IgnitePutTxBenchmark.java | 2 +-
.../cache/IgniteSqlQueryBenchmark.java | 4 +-
.../cache/IgniteSqlQueryJoinBenchmark.java | 4 +-
.../cache/IgniteSqlQueryPutBenchmark.java | 4 +-
.../IgniteAtomicInvokeRetryBenchmark.java | 214 +++++++++++++
...IgniteAtomicOffHeapInvokeRetryBenchmark.java | 31 ++
.../IgniteAtomicOffHeapRetriesBenchmark.java | 31 ++
.../failover/IgniteAtomicRetriesBenchmark.java | 89 ++++++
.../IgniteFailoverAbstractBenchmark.java | 320 +++++++++++++++++++
.../cache/failover/IgniteFailoverNode.java | 60 ++++
...IgniteTransactionalInvokeRetryBenchmark.java | 212 ++++++++++++
...ransactionalOffHeapInvokeRetryBenchmark.java | 33 ++
...ransactionalOffHeapWriteInvokeBenchmark.java | 37 +++
...eTransactionalOffHeapWriteReadBenchmark.java | 32 ++
...IgniteTransactionalWriteInvokeBenchmark.java | 182 +++++++++++
.../IgniteTransactionalWriteReadBenchmark.java | 141 ++++++++
57 files changed, 1996 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/744aa283/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/744aa283/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
----------------------------------------------------------------------
diff --cc modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
index e29730f,ead3a63..9c3389f
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
@@@ -26,16 -24,8 +26,16 @@@ import org.yardstickframework.Benchmark
/**
* Ignite benchmark that performs transactional put operations.
*/
- public class IgnitePutTxBenchmark extends IgniteCacheAbstractBenchmark {
+ public class IgnitePutTxBenchmark extends IgniteCacheAbstractBenchmark<Integer, Object> {
/** {@inheritDoc} */
+ @Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
+ super.setUp(cfg);
+
+ if (!IgniteSystemProperties.getBoolean("SKIP_MAP_CHECK"))
+ ignite().compute().broadcast(new WaitMapExchangeFinishCallable());
+ }
+
+ /** {@inheritDoc} */
@Override public boolean test(Map<Object, Object> ctx) throws Exception {
int key = nextRandom(args.range());