ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [4/5] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Date Wed, 04 Oct 2017 08:36:08 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
#	modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
#	modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc7b7e21
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc7b7e21
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc7b7e21

Branch: refs/heads/ignite-3478
Commit: fc7b7e21c87689866eee83c6e73771333ab0492e
Parents: fdfe779 62f3c4c
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Oct 4 11:35:00 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Oct 4 11:35:00 2017 +0300

----------------------------------------------------------------------
 .../FoldersReuseCompatibilityTest.java          | 224 ++++++
 ...itePersistenceCompatibilityAbstractTest.java |   3 +
 .../IgniteCompatibilityBasicTestSuite.java      |   3 +
 .../apache/ignite/IgniteSystemProperties.java   |   7 +
 .../ignite/internal/GridKernalContext.java      |   6 +
 .../ignite/internal/GridKernalContextImpl.java  |  17 +-
 .../apache/ignite/internal/IgniteKernal.java    |   4 +-
 .../discovery/GridDiscoveryManager.java         |  55 +-
 .../cache/binary/BinaryMetadataFileStore.java   |   6 +-
 .../GridCacheDatabaseSharedManager.java         |  91 ++-
 .../IgniteCacheDatabaseSharedManager.java       |  13 +-
 .../persistence/file/FilePageStoreManager.java  |  29 +-
 .../filename/PdsConsistentIdProcessor.java      | 568 +++++++++++++++
 .../persistence/filename/PdsFolderSettings.java | 138 ++++
 .../filename/PdsFoldersResolver.java            |  33 +
 .../wal/FileWriteAheadLogManager.java           |  20 +-
 .../wal/reader/StandaloneGridKernalContext.java |  32 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   4 +-
 .../tcp/internal/TcpDiscoveryNode.java          |  15 +
 .../IgniteUidAsConsistentIdMigrationTest.java   | 712 +++++++++++++++++++
 .../db/wal/IgniteWalRecoveryTest.java           |  13 +-
 .../db/wal/reader/IgniteWalReaderTest.java      | 187 +++--
 .../db/wal/reader/MockWalIteratorFactory.java   |  25 +-
 .../ignite/testsuites/IgnitePdsTestSuite2.java  |   4 +
 .../Apache.Ignite.Core.Tests/EventsTest.cs      |   2 +-
 25 files changed, 1996 insertions(+), 215 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc7b7e21/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 88251aa,210b401..184b9a7
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@@ -34,7 -34,7 +34,8 @@@ import org.apache.ignite.internal.manag
  import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
  import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
  import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
 +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor;
+ import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFoldersResolver;
  import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
  import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
  import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
@@@ -646,7 -646,7 +647,12 @@@ public interface GridKernalContext exte
      public PlatformProcessor platform();
  
      /**
 +     * @return Cache mvcc coordinator processor.
 +     */
 +    public CacheCoordinatorsProcessor coordinators();
++
++    /**
+      * @return PDS mode folder name resolver, also generates consistent ID in case new folder
naming is used
+      */
+     public PdsFoldersResolver pdsFolderResolver();
  }

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc7b7e21/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 86c0adc,1f0292c..50e1b27
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@@ -49,7 -49,7 +49,8 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.CacheConflictResolutionManager;
  import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
  import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
 +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor;
+ import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFoldersResolver;
  import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
  import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
  import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
@@@ -581,11 -580,11 +585,13 @@@ public class GridKernalContextImpl impl
          else if (comp instanceof PlatformProcessor)
              platformProc = (PlatformProcessor)comp;
          else if (comp instanceof PoolProcessor)
-             poolProc = (PoolProcessor) comp;
+             poolProc = (PoolProcessor)comp;
          else if (comp instanceof GridMarshallerMappingProcessor)
              mappingProc = (GridMarshallerMappingProcessor)comp;
 +        else if (comp instanceof CacheCoordinatorsProcessor)
 +            coordProc = (CacheCoordinatorsProcessor)comp;
+         else if (comp instanceof PdsFoldersResolver)
+             pdsFolderRslvr = (PdsFoldersResolver)comp;
          else if (!(comp instanceof DiscoveryNodeValidationProcessor
                  || comp instanceof PlatformPluginProcessor))
              assert (comp instanceof GridPluginComponent) : "Unknown manager class: " + comp.getClass();

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc7b7e21/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 2dbbb7c,759bf64..58981d5
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -114,8 -114,8 +114,9 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
  import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
  import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
 +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor;
  import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicy;
+ import org.apache.ignite.internal.processors.cache.persistence.filename.PdsConsistentIdProcessor;
  import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
  import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
  import org.apache.ignite.internal.processors.cluster.ClusterProcessor;
@@@ -938,9 -938,9 +939,10 @@@ public class IgniteKernal implements Ig
              // Start processors before discovery manager, so they will
              // be able to start receiving messages once discovery completes.
              try {
+                 startProcessor(new PdsConsistentIdProcessor(ctx));
 +                startProcessor(new CacheCoordinatorsProcessor(ctx));
                  startProcessor(createComponent(DiscoveryNodeValidationProcessor.class, ctx));
 -                startProcessor(new  GridAffinityProcessor(ctx));
 +                startProcessor(new GridAffinityProcessor(ctx));
                  startProcessor(createComponent(GridSegmentationProcessor.class, ctx));
                  startProcessor(createComponent(IgniteCacheObjectProcessor.class, ctx));
                  startProcessor(new GridClusterStateProcessor(ctx));

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc7b7e21/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc7b7e21/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java
index db575f9,e234766..f01a2b1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java
@@@ -47,7 -48,8 +48,9 @@@ import org.apache.ignite.internal.manag
  import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
  import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
  import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
 +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor;
+ import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFoldersResolver;
+ import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderSettings;
  import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
  import org.apache.ignite.internal.processors.closure.GridClosureProcessor;
  import org.apache.ignite.internal.processors.cluster.ClusterProcessor;


Mime
View raw message