You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/07/19 09:27:42 UTC
[31/32] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5578
Merge remote-tracking branch 'remotes/origin/master' into ignite-5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ef1dd608
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ef1dd608
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ef1dd608
Branch: refs/heads/ignite-5578
Commit: ef1dd608ad6c2f95e3bc9c94d1f256833da79bbc
Parents: 3b46d47 cde3da4
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 19 12:19:57 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 19 12:19:57 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 20 +++
.../communication/GridIoMessageFactory.java | 2 +-
.../MetaPageUpdatePartitionDataRecord.java | 2 +
.../cache/CacheObjectsReleaseFuture.java | 60 +++++++++
.../cache/GridCacheExplicitLockSpan.java | 10 +-
.../processors/cache/GridCacheMvccManager.java | 24 +++-
.../cache/GridCacheSharedContext.java | 4 +-
...idNearAtomicAbstractSingleUpdateRequest.java | 9 +-
...GridNearAtomicSingleUpdateInvokeRequest.java | 6 +
.../atomic/GridNearAtomicUpdateResponse.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 30 +++--
.../persistence/GridCacheOffheapManager.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 44 ++++++-
.../cache/transactions/IgniteTxManager.java | 5 +-
.../service/GridServiceProcessor.java | 4 +-
.../processors/service/ServiceContextImpl.java | 2 +
.../util/future/GridCompoundFuture.java | 6 +-
.../util/tostring/GridToStringBuilder.java | 2 +-
.../spi/IgniteSpiOperationTimeoutHelper.java | 8 +-
.../communication/tcp/TcpCommunicationSpi.java | 131 ++++++++++++-------
.../ignite/spi/discovery/tcp/ServerImpl.java | 72 +++++++---
.../spi/discovery/tcp/TcpDiscoverySpi.java | 16 ++-
.../ignite/internal/GridVersionSelfTest.java | 2 +
.../IgniteClientReconnectAbstractTest.java | 5 +
...UpdateNotifierPerClusterSettingSelfTest.java | 2 +
.../cache/GridCachePutAllFailoverSelfTest.java | 15 +++
.../cache/IgniteCachePutAllRestartTest.java | 15 +++
.../CacheGetInsideLockChangingTopologyTest.java | 5 +
.../GridCacheAbstractNodeRestartSelfTest.java | 12 +-
...titionEvictionDuringReadThroughSelfTest.java | 1 +
...niteBinaryMetadataUpdateNodeRestartTest.java | 10 ++
.../distributed/IgniteCacheGetRestartTest.java | 5 +
.../IgniteCacheNearRestartRollbackSelfTest.java | 15 +++
...teSynchronizationModesMultithreadedTest.java | 5 +
.../IgniteCachePutRetryAbstractSelfTest.java | 5 +
.../GridCacheReplicatedNodeRestartSelfTest.java | 2 +-
.../processors/database/BPlusTreeSelfTest.java | 4 +-
.../database/FreeListImplSelfTest.java | 4 +-
.../org/apache/ignite/spi/GridTcpForwarder.java | 26 ++++
.../tcp/TcpCommunicationSpiDropNodesTest.java | 15 +++
.../TcpCommunicationSpiFaultyClientTest.java | 20 ++-
.../IgniteCacheRestartTestSuite2.java | 2 +
.../cache/IgnitePutTxLoadBenchmark.java | 3 +-
43 files changed, 511 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef1dd608/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 003c2f0,29c89a5..97e06bf
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@@ -870,16 -869,10 +870,16 @@@ public class GridIoMessageFactory imple
break;
- // [-3..119] [124..127] [-23..-27] [-36..-55]- this
+ case 128:
+ msg = new CacheGroupAffinityMessage();
+
+ break;
+
+
+ // [-3..119] [124..128] [-23..-27] [-36..-55]- this
// [120..123] - DR
// [-4..-22, -30..-35] - SQL
- // [-54..-60] - Snapshots
+ // [2048..2053] - Snapshots
default:
if (ext != null) {
for (MessageFactory factory : ext) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef1dd608/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 3dca230,c4a4f83..3166401
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@@ -961,16 -896,18 +966,17 @@@ public class GridDhtPartitionsExchangeF
try {
long start = U.currentTimeMillis();
- IgniteInternalFuture fut = cctx.snapshot()
- .tryStartLocalSnapshotOperation(discoEvt);
+ IgniteInternalFuture fut = cctx.snapshot().tryStartLocalSnapshotOperation(discoEvt);
- if (fut != null)
+ if (fut != null) {
fut.get();
- long end = U.currentTimeMillis();
+ long end = U.currentTimeMillis();
- if (log.isInfoEnabled())
- log.info("Snapshot initialization completed [topVer=" + exchangeId().topologyVersion() +
- ", time=" + (end - start) + "ms]");
+ if (log.isInfoEnabled())
+ log.info("Snapshot initialization completed [topVer=" + exchangeId().topologyVersion() +
+ ", time=" + (end - start) + "ms]");
+ }
}
catch (IgniteCheckedException e) {
U.error(log, "Error while starting snapshot operation", e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef1dd608/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------