ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [28/28] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-2.1.2' into ignite-2.1.2-exchange
Date Tue, 04 Jul 2017 08:19:51 GMT
Merge remote-tracking branch 'remotes/community/ignite-2.1.2' into ignite-2.1.2-exchange


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

Branch: refs/heads/ignite-2.1.2-exchange
Commit: 377cc9d7aeaf3472ec35611c27154783d4ce2a51
Parents: 058ed1c ae5ec94
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Jul 4 11:18:57 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Jul 4 11:18:57 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |  11 +-
 .../cache/CacheAffinitySharedManager.java       |  26 +-
 .../processors/cache/ClusterCachesInfo.java     |  13 +-
 .../cache/DynamicCacheChangeRequest.java        |   1 +
 .../processors/cache/ExchangeActions.java       | 109 ++++-
 .../processors/cache/GridCacheAdapter.java      |   4 +
 .../GridCachePartitionExchangeManager.java      |  25 +-
 .../processors/cache/GridCacheProcessor.java    |  67 +--
 .../dht/GridClientPartitionTopology.java        |   5 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |  13 +-
 .../dht/preloader/GridDhtPartitionMap.java      |  13 +-
 .../distributed/near/GridNearCacheAdapter.java  |   4 +-
 .../wal/FileWriteAheadLogManager.java           |   6 +-
 .../GridCacheAtomicSequenceImpl.java            |  52 ++-
 .../internal/util/GridPartitionStateMap.java    |  60 ++-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   5 +
 .../messages/TcpDiscoveryAbstractMessage.java   |   8 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |  32 ++
 .../CacheLateAffinityAssignmentTest.java        |  81 +++-
 .../near/GridCacheNearEvictionSelfTest.java     |   5 +-
 .../near/GridCacheNearMetricsSelfTest.java      |  29 +-
 .../GridCachePartitionedNodeRestartTest.java    |   5 -
 ...IgnitePersistentStoreDataStructuresTest.java |   2 +
 .../testframework/junits/GridAbstractTest.java  |  10 +-
 .../testsuites/IgniteUtilSelfTestSuite.java     |   3 +
 .../ignite/util/GridPartitionMapSelfTest.java   | 162 +++++++
 modules/web-console/frontend/.eslintrc          |   2 +-
 modules/web-console/frontend/app/app.config.js  |   3 +-
 modules/web-console/frontend/app/app.js         |   6 +
 .../app/components/bs-select-menu/controller.js |  28 ++
 .../app/components/bs-select-menu/directive.js  |  30 ++
 .../app/components/bs-select-menu/index.js      |  24 +
 .../app/components/bs-select-menu/style.scss    |  78 ++++
 .../app/components/bs-select-menu/template.pug  |  49 +++
 .../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 ++
 .../input-dialog/input-dialog.tpl.pug           |   2 +-
 .../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 --
 .../page-configure-basic/controller.js          |   2 +-
 .../page-configure-basic/controller.spec.js     |   1 -
 .../components/page-configure-basic/index.js    |   2 -
 .../page-configure-basic/template.pug           |   5 +-
 .../protect-from-bs-select-render/directive.js  |  32 ++
 .../protect-from-bs-select-render/index.js      |  24 +
 .../directives/ui-ace-pojos/ui-ace-pojos.pug    |   2 +-
 .../helpers/jade/form/form-field-checkbox.pug   |   2 +-
 .../helpers/jade/form/form-field-dropdown.pug   |   1 -
 .../frontend/app/helpers/jade/mixins.pug        |   3 +-
 .../frontend/app/modules/sql/sql.controller.js  |  21 +-
 .../states/configuration/caches/node-filter.pug |   2 +-
 .../states/configuration/caches/store.pug       |   2 +-
 .../configuration/clusters/deployment.pug       |   2 +-
 .../clusters/general/discovery/zookeeper.pug    |   2 +-
 .../states/configuration/clusters/hadoop.pug    |   2 +-
 .../configuration/clusters/load-balancing.pug   |   2 +-
 .../states/configuration/clusters/logger.pug    |   2 +-
 .../configuration/clusters/logger/log4j.pug     |   2 +-
 .../configuration/clusters/logger/log4j2.pug    |   2 +-
 .../states/configuration/clusters/swap.pug      |   2 +-
 .../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/controllers/domains-controller.js  |   3 -
 .../frontend/public/stylesheets/style.scss      |  17 +
 .../views/configuration/domains-import.tpl.pug  |  13 +-
 .../web-console/frontend/views/sql/sql.tpl.pug  |   6 +-
 .../frontend/views/templates/select.tpl.pug     |  26 --
 .../ignite/console/agent/rest/RestExecutor.java |  24 +-
 78 files changed, 1637 insertions(+), 372 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/377cc9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/377cc9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/377cc9d7/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 119326a,402d874..e238b11
--- 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
@@@ -2110,35 -2117,28 +2117,30 @@@ public class GridCacheProcessor extend
      public void onExchangeDone(
          AffinityTopologyVersion topVer,
          @Nullable ExchangeActions exchActions,
-         Throwable err
+         @Nullable Throwable err
      ) {
 +        long start = U.currentTimeMillis();
 +
          initCacheProxies(topVer, err);
  
-         if (exchActions != null && exchActions.systemCachesStarting() &&
exchActions.newClusterState() == null)
-             ctx.dataStructures().restoreStructuresState(ctx);
- 
-         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 (exchActions == null)
+             return;
  
-                 if (!forceCheckpoint){
-                     try {
-                         sharedCtx.database().waitForCheckpoint("caches stop");
-                     }
-                     catch (IgniteCheckedException e) {
-                         U.error(log, "Failed to wait for checkpoint finish during cache
stop.", e);
-                     }
+         if (exchActions.systemCachesStarting() && exchActions.newClusterState()
== null)
+             ctx.dataStructures().restoreStructuresState(ctx);
  
-                     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();
@@@ -2162,14 -2166,9 +2168,11 @@@
                  }
              }
  
-             for (CacheGroupDescriptor grpDesc : exchActions.cacheGroupsToStop())
-                 stopCacheGroup(grpDesc.groupId());
- 
-             if (stoppedGrps != null && !sharedCtx.kernalContext().clientNode())
-                 sharedCtx.database().onCacheGroupsStopped(stoppedGrps);
+             if (!sharedCtx.kernalContext().clientNode())
+                 sharedCtx.database().onCacheGroupsStopped(stoppedGroups);
          }
 +
 +        log.info("processor onExchangeDone [topVer=" + topVer + ", time=" + (U.currentTimeMillis()
- start) + ']');
      }
  
      /**


Mime
View raw message