GitHub user Jokser opened a pull request: https://github.com/apache/ignite/pull/5491
IGNITE-10397 Fix for 2.5 You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite ignite-10397-2.5 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/5491.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 #5491 ---- commit 702c31859251738b187e8db2a8155264f39b8b52 Author: Ivan Daschinskiy <ivandasch@...> Date: 2018-07-23T12:29:08Z IGNITE-8820 Fix rollback logic when tx is initiated from client. - Fixes #4399. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> (cherry picked from commit 5794eb0) commit 32777e77797f4cf3260d42d4ca408336247d4e55 Author: Dmitriy Govorukhin <dmitriy.govorukhin@...> Date: 2018-07-23T15:01:37Z IGNITE-9049 Fixed write of SWITCH_SEGMENT_RECORD at the end of a segment file - Fixes #4401. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> (cherry picked from commit 713a428) commit bbf8f83afe3b07e807912d9bab78873edf698d4d Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2018-07-24T14:38:34Z IGNITE-8892 Fixed CacheQueryFuture usage in DataStructures processor - Fixes #4415. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> (cherry picked from commit 281a400) commit e0404913088b5cd97cd79de1b62e6aaa4c00b5d2 Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2018-07-24T15:24:57Z Merge remote-tracking branch 'origin/ignite-2.5.1-master' into ignite-2.5.1-master commit 86c52700a007368a351ac3595a8e38bb02923080 Author: Sergey Chugunov <sergey.chugunov@...> Date: 2018-07-25T13:26:12Z IGNITE-9040 StopNodeFailureHandler is not able to stop node correctly on node segmentation Signed-off-by: Andrey Gura <ag...@apache.org> (cherry-picked from commit#469aaba59c0539507972f4725642b2f2f81c08a0) commit e1c3cc9d30baeaff4e653751775ab39a347b753b Author: Pavel Kovalenko <jokserfn@...> Date: 2018-07-24T14:48:57Z IGNITE-8791 Fixed missed update counter in WAL data record for backup transaction - Fixes #4264. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> (cherry picked from commit 13e2a31) commit 2ea5b376d895fe41cc882c4383b5d3d2793ba684 Author: devozerov <ppozerov@...> Date: 2018-07-31T09:53:51Z IGNITE-9114: SQL: fail query after some timeout if it cannot be mapped to topology. This closes #4453. commit 5b230b7015148e483136c229c9e6081bb9c68023 Author: Denis Mekhanikov <dmekhanikov@...> Date: 2018-04-20T15:41:06Z IGNITE-8134 Subscribe to system cache events on nodes outside BLT Signed-off-by: Andrey Gura <ag...@apache.org> (cherry picked from commit c82277e) commit 2528435ec946c479f6bf4eb7eaeabf092a0536a3 Author: devozerov <ppozerov@...> Date: 2018-07-31T14:15:49Z IGNITE-9114: SQL: use query time in retry timeout calculation. This closes #4460. commit 98d0ccc729e647a4ad8876e2d29423904e6fa6ca Author: devozerov <ppozerov@...> Date: 2018-07-31T14:18:49Z Merge remote-tracking branch 'upstream/ignite-2.5.1-master' into ignite-2.5.1-master commit c78a7f215699f65983edfcc0c9014d9e3108f381 Author: Anton Kalashnikov <kaa.dev@...> Date: 2018-08-01T09:23:03Z IGNITE-8757 idle_verify utility doesn't show both update counter and hash conflicts (cherry picked from commit 9131e4d) commit 66369583096b04d71c3f82e1ebfd1922ae6b0b6a Author: Anton Kalashnikov <kaa.dev@...> Date: 2018-07-31T13:13:27Z IGNITE-8973 Calculate partition hash and print into standard output Signed-off-by: Andrey Gura <ag...@apache.org> (cherry picked from commit 8309cef) commit e92788d392d4c60f76c4fd0f38c52669f4e3e772 Author: Evgeny Stanilovskiy <estanilovskiy@...> Date: 2018-08-01T11:05:58Z IGNITE-8939 Catch and proper propagate transaction string reprsentation - Fixes #4454. Signed-off-by: Dmitriy Pavlov <dpav...@apache.org> (cherry picked from commit 458480c5b0520aa8e28935361a37ab49e1e65ff6) commit 60155cb55ca35790da7f80ae167dd7fb3f3793fd Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2018-08-01T10:23:32Z IGNITE-9154: Fixed conflict version passed to events for ATOMIC cache. This closes #4463. (cherry picked from commit 3ea3a56) commit 15d72fc022f64939fee336438256460024ca59c0 Author: Andrey V. Mashenkov <andrey.mashenkov@...> Date: 2018-08-01T12:58:22Z Merge remote-tracking branch 'origin/ignite-2.5.1-master' into ignite-2.5.1-master commit 158f36de551e860176ac7f3bcf92e9751039a35c Author: ilantukh <ilantukh@...> Date: 2018-08-01T13:31:15Z IGNITE-8900 SqlFieldsQuery provides incorrect result when item size exceeds page size. (cherry picked from commit f1ecbbc) commit ef331f3ba58da49746f34546f1972cf65c083b3d Author: Maxim Muzafarov <maxmuzaf@...> Date: 2018-08-01T15:39:54Z IGNITE-7165 Re-balancing is cancelled if client node joins Signed-off-by: Anton Vinogradov <a...@apache.org> (cherry picked from commit 137dd06aaee9cc84104e6b4bf48306b050341e3a) commit cfe95a1b1762501dd9ac48a1a24228ac0bc3b5c3 Author: Pavel Kovalenko <jokserfn@...> Date: 2018-08-02T12:51:17Z IGNITE-9111 Do not wait for deactivation. Signed-off-by: agura <ag...@apache.org> (cherry picked from commit 8811a14) commit 2e43db33e09e1ed456ccaf3e9361e9b2f07f99a7 Author: Pavel Kovalenko <jokserfn@...> Date: 2018-08-02T13:18:44Z IGNITE-9129 P2P class deployment with ZK discovery fixed. Signed-off-by: agura <ag...@apache.org> (cherry picked from commit 0e9bb1c) commit d1ae06b8a2adbb1890b7e0605708dddb52cd0d29 Author: Ivan Daschinskiy <ivandasch@...> Date: 2018-08-02T15:57:22Z IGNITE-8869 PartitionsExchangeOnDiscoveryHistoryOverflowTest hangs on TeamCity. - Fixes #4277. Signed-off-by: Dmitriy Pavlov <dpav...@apache.org> (cherry picked from commit b718e4438e469ad0341f1bf9a605c2fe3ab5970c) commit c9ebbb2c2b8f1a1ebaac21586fa56ea6f57a7bb0 Author: Vitaliy Biryukov <biryukovvitaliy92@...> Date: 2018-07-30T17:33:04Z IGNITE-9127 ZooKeeper (Discovery) 1 suite hang, JMX logging disabled for ZK - Fixes #4450. Signed-off-by: Dmitriy Pavlov <dpav...@apache.org> (cherry picked from commit 774ed773a6786cbcd4e6ca7f12290211f4f52201) commit c191c75e67be4819b3c5b243dfdfb58f2e8240e2 Author: Sergey Chugunov <sergey.chugunov@...> Date: 2018-04-28T13:52:44Z IGNITE-8252 NPE is replaced with IgniteException with meaningful message - Fixes #3908. Signed-off-by: dspavlov <dpav...@gridgain.com> (cherry picked from commit 5135f82f3f53eddef9ab91da2e647e14488b2d5a) commit 63b4c4d2a479b957b6aa5cb00ac31c749e40cdfe Author: Anton Vinogradov <av@...> Date: 2018-07-23T10:18:16Z IGNITE-8783 Failover tests periodically cause hanging of the whole Data Structures suite on TC Signed-off-by: Anton Vinogradov <a...@apache.org> (cherry picked from commit 6582b084943ac63c36b062c8ae66b43883ef6c19) commit aa4a9b09dfd25a628cef62a92decd6c583141025 Author: Anton Kalashnikov <kaa.dev@...> Date: 2018-07-23T13:48:18Z IGNITE-8998 Send reconnect exception without partitions - Fixes #4358. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> (cherry picked from commit 78e0bb7efbc53e969c4c4918b6c6272c7b98dc36) commit 7e89cf89088f11d282f79c331897d17d7db00ed2 Author: EdShangGG <eshangareev@...> Date: 2018-07-17T14:19:36Z IGNITE-9012 Fixed exchange await logic in GridServiceProcessor - Fixes #4367. (cherry picked from commit 66e547a9eebf3e8354135b3300619754294a805d) commit 52cf2809a759071d440719f968ab0d0040fdf23e Author: EdShangGG <eshangareev@...> Date: 2018-07-17T15:04:38Z IGNITE-9013 Fail cache future when local node is stopping - Fixes #4369. (cherry picked from commit 85b2002796fb601d7e7ce7d7320943f9323c2bdd) commit 92dbb2197488b5c0c61182586d49254263b3a49b Author: Evgeny Stanilovskiy <estanilovskiy@...> Date: 2018-08-10T14:47:13Z IGNITE-9231 improvement throttle implementation, unpark threads on cpBuf condition. - Fixes #4506. Signed-off-by: Ivan Rakov <ira...@apache.org> commit 0e66d270a41caeedee20a93a3ad4aea95f074dce Author: Dmitriy Govorukhin <dmitriy.govorukhin@...> Date: 2018-08-13T08:59:27Z IGNITE-9244 Partition eviction should not take all threads in system pool (cherry picked from commit 2d63040) Signed-off-by: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> commit fcef6b826ef1eef13c14e752e52c1d05e49ac508 Author: Alexey Kukushkin <alexeykukushkin@...> Date: 2018-04-26T16:31:43Z IGNITE-8237 Ignite blocks on SecurityException in exchange-worker due to unauthorised on-heap cache configuration. - Fixes #3818. Signed-off-by: dpavlov <dpav...@apache.org> (cherry picked from commit 54cb262438bc83af3c4e864a7e5897b36fcd8c73) commit 0a12c50b4755380ab1b25dceee7420d465a6bfec Author: dpavlov <dpavlov@...> Date: 2018-04-26T16:38:05Z IGNITE-8237 Javadoc for method parameters added. (cherry picked from commit ebe55e3ff84232f67a2885354e3e26426a6b16cb) ---- ---