GitHub user tledkov-gridgain opened a pull request: https://github.com/apache/ignite/pull/2211
IGNITE-5604 Activate fails node was stopped with cancel=true and big objects in cache You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite ignite-5604 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/2211.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #2211 ---- commit b52a84e885b0f88971290200942e0bbe01252ff6 Author: sboikov <sboi...@gridgain.com> Date: 2017-06-13T15:09:41Z Merge remote-tracking branch 'remotes/origin/master' into ignite-2.1.1 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticAware.java # modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java # modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java # modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java # modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java # modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java # modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java commit fb2e6d4ab00e3e443bdd896918e812d6fa6119ba Author: sboikov <sboi...@gridgain.com> Date: 2017-06-13T15:10:18Z Merge remote-tracking branch 'remotes/origin/master' into ignite-2.1.1 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticAware.java # modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java # modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java # modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java # modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java # modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java # modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java commit 2300ec47da979847c36a41e95bebbbd3af1758f1 Author: sboikov <sboi...@gridgain.com> Date: 2017-06-13T15:10:52Z Merge remote-tracking branch 'community/ignite-2.1.1' into ignite-2.1.1 commit ff9e4559711c69c73210f5d91036fc829b7eef17 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-06-13T15:24:09Z ignite-5267 : Minors. commit 34f8c244313ebf94b65c40d5f17dc507f2b54251 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-06-13T15:32:33Z ignite-5267 : Minors. commit 2101132fb553c83a2936bbd8501dbdb696ddd054 Author: mcherkasov <mcherka...@gridgain.com> Date: 2017-06-13T15:36:54Z IGNITE-5364 Remove contention on DataStructure creation or removing commit c49daaecc8db6c0d71927cc149274e9b51e37911 Author: Ivan Rakov <ivan.glu...@gmail.com> Date: 2017-06-13T15:44:54Z ignite-2.1.1 Activate nodes after start commit 6aecaa358c1f9365eb8b1d073634ac74cc65f4d6 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-06-13T16:08:24Z ignite-5267 : Minors. commit 2b030c0dd40db0e0d400fd3652ffb609bcd9ac06 Author: Pavel Kovalenko <jokse...@gmail.com> Date: 2017-06-13T16:41:55Z ignite-2.1.1 Extract Ignite updates checker to separate class. Fixed GridUpdateNotifier test. commit db07d5853e80e6e55bb54cae138d2908fd976f2b Author: Pavel Kovalenko <jokse...@gmail.com> Date: 2017-06-13T16:42:14Z Merge branch 'ignite-2.1.1' of https://github.com/gridgain/apache-ignite into ignite-2.1.1 commit b3adc5127dd897dd035224e419b020e6f7a1357d Author: oleg-ostanin <oosta...@gridgain.com> Date: 2017-06-13T19:28:24Z IGNITE-GG-12267 skiped upload ignite-benchmarks and apache-ignite pom.xml to maven repo commit 4d201dba5a66a3771d4a2d7076d6bc95a0def9fc Author: Alexey Kuznetsov <akuznet...@apache.org> Date: 2017-06-14T04:41:01Z IGNITE-4758 - Added missing fields and fixed typos. commit 9ebdc1106555d9233d5d328fd6cc71f7a1402490 Author: Alexey Kuznetsov <akuznet...@apache.org> Date: 2017-06-14T07:58:20Z IGNITE-5239 Web Console show full stack trace on Queries screen. commit 87c6bf2b761f585dee095f9a56641b4741d0db3b Author: Andrey Novikov <anovi...@gridgain.com> Date: 2017-06-14T08:04:11Z IGNITE-5366 Web Console: Added user notifications. commit b7a19ae7b54f05a0f2fe8223397e59f34b4f63cf Author: Vasiliy Sisko <vsi...@gridgain.com> Date: 2017-06-14T08:32:00Z IGNITE-5240 Fixed repository name. commit 42c04ddb17f560f4120636431da20e6e0b1422a9 Author: Alexey Kuznetsov <akuznet...@apache.org> Date: 2017-06-14T08:46:40Z IGNITE-5481 Reworked rebalance detection. commit 29df01dd2196fda7ed927e67e5e8bad194ce6f34 Author: Andrey Novikov <anovi...@gridgain.com> Date: 2017-06-14T08:55:03Z IGNITE-5402 Web Console: Fixed near cache generation for client mode. commit 0cb8a0ea43fc9dc1902655c32ba03968a3c3b517 Author: Igor Sapego <isap...@gridgain.com> Date: 2017-06-13T16:14:38Z GNITE-5478: ODBC: SQLNumParams now returns number of required parameters. commit 3f8ef4f821908b1a910a36c07457553b17f763e4 Author: Alexey Kuznetsov <akuznet...@gridgain.com> Date: 2017-06-13T16:30:43Z master - Fixed typo. commit 3bf8b0319fc50cb4a9294f90f4cf7b689bc48a77 Author: dpavlov <dpav...@gridgain.com> Date: 2017-06-14T10:57:40Z Fixing snapshot tests for 8.2.1 release: Activating grid in tests, NPE fix, class cast fix commit 5f5c5f1ba07cccd1ee072f4b1f95d32459d9507b Author: dpavlov <dpav...@gridgain.com> Date: 2017-06-14T10:58:21Z Merge remote-tracking branch 'apache-gridgain-fork/ignite-2.1.1' into ignite-2.1.1 commit 40db31ef76303215db1703166c94b795cd2eb2b2 Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Date: 2017-06-14T11:16:08Z ignite-2.1.1 do not create database shared manger on client + cosmetic changes commit 4e973551a4264395aa7fe167aba61736a0d259e6 Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Date: 2017-06-14T11:49:13Z ignite-2.1.1 invoke activate/deactivate for snapshot manager. commit 69aa299c9f9f864086266d618d28b78ca407b8ac Author: devozerov <voze...@gridgain.com> Date: 2017-06-14T11:55:48Z Fixed missing Apache header in HttpIgniteUpdatesChecker. commit 4eb8c5e4c687edb1c695d2d38ad93cca09cd024a Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Date: 2017-06-14T12:08:01Z ignite-2.1.1 validate operation change global state if snapshot operation in progress commit 752dd65f82221fdc7570c50ae4c0d41652541422 Author: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Date: 2017-06-14T12:08:29Z Merge remote-tracking branch 'professional/ignite-2.1.1' into ignite-2.1.1 commit 3d269d7d5094acb9b8ac86de16fc16c8c80ec5e6 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-06-14T12:20:20Z Minors. commit 73df0354241bff62c854847c4c98abac8a5b4c24 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-06-14T12:39:17Z Minors. commit 8b85477eabd6e9059d3849a277b9494845b67293 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-06-14T12:47:29Z Cache type validation. commit 51e6aed7c82e4c7885b85c57a7235f0d5872b7e7 Author: dpavlov <dpav...@gridgain.com> Date: 2017-06-14T13:00:46Z GG-12283: disabled handing tests to run others ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---