ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/21] ignite git commit: Merge branch 'ignite-2.1' into ignite-2.1.2-merge-ea11
Date Thu, 06 Jul 2017 08:04:23 GMT
Merge branch 'ignite-2.1' into ignite-2.1.2-merge-ea11

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java


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

Branch: refs/heads/ignite-gg-12306-1
Commit: b223076c4b5d09fadfd160f2d6db9210334fe90b
Parents: 54084f5 ee7566b
Author: Ivan Rakov <ivan.glukos@gmail.com>
Authored: Tue Jul 4 20:23:05 2017 +0300
Committer: Ivan Rakov <ivan.glukos@gmail.com>
Committed: Tue Jul 4 20:23:05 2017 +0300

----------------------------------------------------------------------
 .../jdbc2/JdbcPreparedStatementSelfTest.java    |  35 ++
 .../jdbc/JdbcPreparedStatementSelfTest.java     |  35 ++
 .../thin/JdbcThinPreparedStatementSelfTest.java |  35 ++
 .../apache/ignite/internal/IgniteKernal.java    |  11 +-
 .../internal/jdbc/JdbcPreparedStatement.java    |   6 +-
 .../jdbc/thin/JdbcThinPreparedStatement.java    |   2 -
 .../internal/jdbc2/JdbcPreparedStatement.java   |  12 +-
 .../checkpoint/GridCheckpointManager.java       |   2 +-
 .../managers/communication/GridIoManager.java   |  10 +-
 .../communication/GridMessageListener.java      |   3 +-
 .../deployment/GridDeploymentCommunication.java |   4 +-
 .../eventstorage/GridEventStorageManager.java   |   4 +-
 .../affinity/GridAffinityAssignmentCache.java   |   8 +-
 .../cache/CacheAffinitySharedManager.java       |  26 +-
 .../processors/cache/ClusterCachesInfo.java     |  16 +-
 .../cache/DynamicCacheChangeRequest.java        |   1 +
 .../processors/cache/ExchangeActions.java       | 109 ++++-
 .../processors/cache/GridCacheAdapter.java      |   4 +
 .../processors/cache/GridCacheIoManager.java    |  85 ++--
 .../GridCachePartitionExchangeManager.java      |  49 ++-
 .../processors/cache/GridCacheProcessor.java    |  83 ++--
 .../cache/binary/BinaryMetadataTransport.java   |   4 +-
 .../dht/GridClientPartitionTopology.java        |   5 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |  13 +-
 .../dht/preloader/GridDhtPartitionMap.java      |  13 +-
 .../GridDhtPartitionsExchangeFuture.java        |  13 +-
 .../distributed/near/GridNearCacheAdapter.java  |   4 +-
 .../GridCacheDatabaseSharedManager.java         |   6 +-
 .../persistence/IgniteCacheSnapshotManager.java |   8 +
 .../persistence/tree/io/TrackingPageIO.java     |  12 +-
 .../wal/FileWriteAheadLogManager.java           |   6 +-
 .../cache/transactions/IgniteTxManager.java     |   2 +-
 .../processors/cluster/ClusterProcessor.java    |   2 +-
 .../cluster/GridClusterStateProcessor.java      |   7 -
 .../continuous/GridContinuousProcessor.java     |   4 +-
 .../datastreamer/DataStreamProcessor.java       |   2 +-
 .../datastreamer/DataStreamerImpl.java          |   2 +-
 .../GridCacheAtomicSequenceImpl.java            |  52 ++-
 .../processors/igfs/IgfsDataManager.java        |   2 +-
 .../igfs/IgfsFragmentizerManager.java           |   4 +-
 .../processors/job/GridJobProcessor.java        |   8 +-
 .../GridMarshallerMappingProcessor.java         |   4 +-
 .../utils/PlatformConfigurationUtils.java       |   8 +-
 .../processors/query/GridQueryProcessor.java    |   2 +-
 .../handlers/task/GridTaskCommandHandler.java   |   4 +-
 .../processors/task/GridTaskProcessor.java      |   6 +-
 .../internal/util/GridPartitionStateMap.java    |  60 ++-
 .../visor/cache/VisorCacheConfiguration.java    |  11 +-
 .../visor/node/VisorBasicConfiguration.java     |   2 +-
 .../node/VisorMemoryPolicyConfiguration.java    |   2 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |  32 +-
 .../node/VisorNodeDataCollectorJobResult.java   |  73 +++-
 .../visor/node/VisorNodeDataCollectorTask.java  |  14 +-
 .../node/VisorNodeDataCollectorTaskResult.java  |  28 +-
 .../visor/node/VisorPersistenceMetrics.java     | 214 +++++++++
 .../visor/service/VisorServiceTask.java         |  10 +-
 .../jobstealing/JobStealingCollisionSpi.java    |   2 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   5 +
 .../messages/TcpDiscoveryAbstractMessage.java   |   8 +-
 ...idCommunicationManagerListenersSelfTest.java |   2 +-
 .../GridCommunicationSendMessageSelfTest.java   |   2 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |   2 +-
 ...lerCacheClientRequestsMappingOnMissTest.java |   6 +-
 ...naryObjectMetadataExchangeMultinodeTest.java |   6 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |  32 ++
 .../CacheLateAffinityAssignmentTest.java        |  81 +++-
 .../near/GridCacheNearEvictionSelfTest.java     |   5 +-
 .../near/GridCacheNearMetricsSelfTest.java      |  29 +-
 .../GridCachePartitionedNodeRestartTest.java    |   5 -
 ...DeadlockDetectionMessageMarshallingTest.java |   2 +-
 .../communication/GridIoManagerBenchmark.java   |   4 +-
 .../communication/GridIoManagerBenchmark0.java  |  12 +-
 .../communication/GridCacheMessageSelfTest.java |   2 +-
 .../testframework/GridSpiTestContext.java       |   5 +-
 .../testsuites/IgniteUtilSelfTestSuite.java     |   3 +
 .../ignite/util/GridPartitionMapSelfTest.java   | 162 +++++++
 .../hadoop/shuffle/HadoopShuffle.java           |   2 +-
 .../query/h2/opt/GridH2IndexBase.java           |   2 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |   2 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |   2 +-
 .../Cache/CacheConfigurationTest.cs             |  21 +
 .../Cache/Configuration/CacheConfiguration.cs   |  75 +++-
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |   7 +-
 .../Apache.Ignite.Core/Impl/IgniteUtils.cs      |  12 +-
 modules/web-console/frontend/.eslintrc          |   2 +-
 modules/web-console/frontend/app/app.js         |   4 +
 .../app/components/bs-select-menu/style.scss    |   1 +
 .../grid-column-selector/component.js           |  29 ++
 .../grid-column-selector/controller.js          | 111 +++++
 .../grid-column-selector/controller.spec.js     | 435 +++++++++++++++++++
 .../components/grid-column-selector/index.js    |  24 +
 .../components/grid-column-selector/style.scss  |  24 +
 .../grid-column-selector/template.pug           |  28 ++
 .../list-of-registered-users.categories.js      |  22 +-
 .../list-of-registered-users.column-defs.js     |   4 +-
 .../list-of-registered-users.controller.js      |  46 --
 .../list-of-registered-users.scss               |   3 +
 .../list-of-registered-users.tpl.pug            |  26 +-
 .../components/pcbProtectFromBsSelectRender.js  |  32 --
 .../components/page-configure-basic/index.js    |   2 -
 .../page-configure-basic/template.pug           |   4 +-
 .../protect-from-bs-select-render/directive.js  |  32 ++
 .../protect-from-bs-select-render/index.js      |  24 +
 .../frontend/app/filters/duration.filter.js     |   2 +-
 .../helpers/jade/form/form-field-checkbox.pug   |   2 +-
 .../frontend/app/helpers/jade/mixins.pug        |   1 -
 .../generator/ConfigurationGenerator.js         |   9 +-
 .../frontend/app/modules/sql/sql.controller.js  |  21 +-
 .../states/configuration/caches/affinity.pug    |  18 +-
 .../states/configuration/caches/general.pug     |  50 +--
 .../frontend/app/primitives/btn/index.scss      |   8 +-
 .../frontend/app/primitives/dropdown/index.pug  |   2 +-
 .../frontend/app/primitives/tooltip/index.pug   |   5 +-
 .../app/primitives/ui-grid-settings/index.pug   |  33 --
 .../frontend/public/stylesheets/style.scss      |  17 +
 .../web-console/frontend/views/sql/sql.tpl.pug  |   6 +-
 116 files changed, 2149 insertions(+), 555 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b223076c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index cbbfca0,0f859eb..f4524ef
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -2114,32 -2119,24 +2119,27 @@@ public class GridCacheProcessor extend
      ) {
          initCacheProxies(topVer, err);
  
-         if (exchActions != null && exchActions.systemCachesStarting() &&
exchActions.newClusterState() == null) {
+         if (exchActions == null)
+             return;
+ 
 -        if (exchActions.systemCachesStarting() && exchActions.newClusterState()
== null)
++        if (exchActions.systemCachesStarting() && exchActions.newClusterState()
== null) {
              ctx.dataStructures().restoreStructuresState(ctx);
  
 +            ctx.service().updateUtilityCache();
 +        }
 +
-         if (exchActions != null && err == null) {
-             Collection<IgniteBiTuple<CacheGroupContext, Boolean>> stoppedGrps
= null;
- 
-             boolean forceCheckpoint = false;
- 
-             for (ExchangeActions.ActionData action : exchActions.cacheStopRequests()) {
-                 GridCacheContext<?, ?> stopCtx;
-                 boolean destroy;
- 
-                 if (!forceCheckpoint){
-                     try {
-                         sharedCtx.database().waitForCheckpoint("caches stop");
-                     }
-                     catch (IgniteCheckedException e) {
-                         U.error(log, "Failed to wait for checkpoint finish during cache
stop.", e);
-                     }
- 
-                     forceCheckpoint = true;
+         if (err == null) {
+             // Force checkpoint if there is any cache stop request
+             if (exchActions.cacheStopRequests().size() > 0) {
+                 try {
+                     sharedCtx.database().waitForCheckpoint("caches stop");
+                 }
+                 catch (IgniteCheckedException e) {
+                     U.error(log, "Failed to wait for checkpoint finish during cache stop.",
e);
                  }
+             }
  
+             for (ExchangeActions.ActionData action : exchActions.cacheStopRequests()) {
                  stopGateway(action.request());
  
                  sharedCtx.database().checkpointReadLock();

http://git-wip-us.apache.org/repos/asf/ignite/blob/b223076c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/b223076c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------


Mime
View raw message