[hibernate-commits] [hibernate/hibernate-orm] 40e62a: HHH-11320 Disable testContestedPutFromLoad because...

Branch: refs/heads/5.1 Home: https://github.com/hibernate/hibernate-orm Commit: 40e62aac7bc297f70246592911262d9818698b4c https://github.com/hibernate/hibernate-orm/commit/40e62aac7bc297f70246592... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionAccessStrategyTest.java Log Message: ----------- HHH-11320 Disable testContestedPutFromLoad because of short timeout (cherry picked from commit f4f50aa5c80f3d5669e02c77f84c1e005c79f3c3) Commit: 7b355c8037308aa947cf7c8997ab5ffc6d6d18ce https://github.com/hibernate/hibernate-orm/commit/7b355c8037308aa947cf7c8... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/CorrectnessTestCase.java Log Message: ----------- HHH-11323 Update CorrectnessTestCase (cherry picked from commit ba3677b6900750abc427f7042e4e735b853794e0) Commit: 7cf3d2e527de5390e6f534de5c43c94a481c2548 https://github.com/hibernate/hibernate-orm/commit/7cf3d2e527de5390e6f534d... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/FutureUpdateSynchronization.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/LockingInterceptor.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonStrictAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/RemovalSynchronization.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TombstoneAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TombstoneCallInterceptor.java R hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TombstoneSynchronization.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/VersionedCallInterceptor.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FutureUpdate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/InvocationAfterCompletion.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/LifecycleCallbacks.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/Tombstone.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/TombstoneUpdate.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionAccessStrategyTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionAccessStrategyTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionAccessStrategyTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractNonInvalidationTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/TombstoneTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/VersionedTest.java A hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/ExpectingInterceptor.java Log Message: ----------- HHH-11323 + HHH-11339 Evict during concurrent update and putFromLoad can result in stale entry in 2LC PutFromLoads in replicated/distributed caches should propagate asynchronously It would require additional effort to isolate only changes that fix HHH-11323 and which just allow async propagation. (cherry picked from commit 160f5ba86345e677787f4d2d8e8c8b98ce88e1b5) Commit: f2f4c1a95467acd2958c54bd0b649ee2d33e53fb https://github.com/hibernate/hibernate-orm/commit/f2f4c1a95467acd2958c54b... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/FutureUpdateSynchronization.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/LockingInterceptor.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonStrictAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TombstoneAccessDelegate.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/UnorderedDistributionInterceptor.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionAccessStrategyTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/TombstoneTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/ExpectingInterceptor.java Log Message: ----------- HHH-11339 Use UnorderedDistributionInterceptor for async replication (cherry picked from commit f59807554a84b5e32103bd04542fd9a0b3a68445) Commit: 8ca291fe20ce9ca26640788766b3617b30ed25c9 https://github.com/hibernate/hibernate-orm/commit/8ca291fe20ce9ca26640788... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TxPutFromLoadInterceptor.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionAccessStrategyTest.java Log Message: ----------- HHH-11350 Intermittent failure in testEvictAll/testRemoveAll (cherry picked from commit 2a4efd46caf1a8dbcce5eb1156934b305af3e7a8) Commit: 1ecc926fa17119e2c428a45b305c24e1e6b805d2 https://github.com/hibernate/hibernate-orm/commit/1ecc926fa17119e2c428a45... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTest.java Log Message: ----------- HHH-11350 Intermittent failure in EntityCollectionInvalidationTest.testAll (cherry picked from commit 20daac6ea7a062d02854c536bc9db4e52057af11) Commit: 4cc22a679d4f6dc66fc0bf4066444d2583802e74 https://github.com/hibernate/hibernate-orm/commit/4cc22a679d4f6dc66fc0bf4... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java Log Message: ----------- HHH-11344 : Prevent NPE when running with log on trace level (cherry picked from commit 4ceb71f08a1a5fd71d6df6c47aeaa7547755bfdf) Commit: 4a6c46dd8e7b6323e88cfb2523b72721ca138b68 https://github.com/hibernate/hibernate-orm/commit/4a6c46dd8e7b6323e88cfb2... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractExtraAPITest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionAccessStrategyTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionAccessStrategyTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionImplTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionAccessStrategyTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractFunctionalTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractNonInvalidationTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ReadOnlyTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ReadWriteTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/NaturalIdInvalidationTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/CorrectnessTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestSupport.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/ExpectingInterceptor.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/TestInfinispanRegionFactory.java Log Message: ----------- HHH-11344 Testsuite speed-up * reduce number of setups (@Before -> @BeforeClassOnce) * remove sleeps related to JGroups flush (issue in a 6+ years old version) * do not create new cache manager in CollectionRegionAccessStrategyTest#doPutFromLoadRemoveDoesNotProduceStaleDataInvalidation * Share cache manager in some tests * Replace system time with mocked time service where possible * Replace sleeps with synchronization * Disabled ConcurrentWriteTest.testMany (this is a stress test) (cherry picked from commit a21706bf02c0e9f61cbe522f407fd0d35e621f57) Commit: b0040eb3bb887c26160826cf99278a3ee425845c https://github.com/hibernate/hibernate-orm/commit/b0040eb3bb887c26160826c... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java Log Message: ----------- HHH-11372 Do not send RemoveExpiredCommands in repl/dist caches (cherry picked from commit 1ba6e00e002c16887893c2b9219c0ff4470b4b35) Commit: 46898c928a6cb0a6571d50220b74911ed2652dfc https://github.com/hibernate/hibernate-orm/commit/46898c928a6cb0a6571d502... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/LockingInterceptor.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/ExpectingInterceptor.java Log Message: ----------- HHH-11373 Silence lock acquisition failures on remote nodes (cherry picked from commit 69ba7a50ce6c1cca893529226e1813121cfa64b1) Commit: f87a66e32d69279d4cd375b73d759d7921876ac4 https://github.com/hibernate/hibernate-orm/commit/f87a66e32d69279d4cd375b... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/CorrectnessTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/entities/Address.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/entities/Person.java Log Message: ----------- HHH-11381 : Run CorrectnessTestCase in nonstrict mode * the test was not running in nonstrict-read-write mode but in read-write mode instead * for collections, we have to fallback to read-write mode * there are expected failures in nonstrict mode, as the test does not allow stale reads (adding a switch to handle these is TODO) (cherry picked from commit f574325c0464c2ecbc38c584b5226f5ae0121093) Commit: 4f4f1073e581257f50e90c43f9c7adf880827f22 https://github.com/hibernate/hibernate-orm/commit/4f4f1073e581257f50e90c4... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonStrictAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TombstoneCallInterceptor.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/VersionedCallInterceptor.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/VersionedTest.java Log Message: ----------- HHH-11381 In nonstrict mode, putFromLoad after evict can behave incorrectly * piggybacking minor improvements for size command, too (cherry picked from commit 3d712b0a6e7c3834bb5b50abcaf4fbffd802b009) Commit: 91c12a668c3cb2349f08ece94b6b491de98f8df8 https://github.com/hibernate/hibernate-orm/commit/91c12a668c3cb2349f08ece... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractNonInvalidationTest.java Log Message: ----------- HHH-11323 + HHH-11339 : Fix TombstoneTest failure Commit: e336dc9c9d571767b72a9f5870f68892735ac60a https://github.com/hibernate/hibernate-orm/commit/e336dc9c9d571767b72a9f5... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionAccessStrategyTest.java Log Message: ----------- HHH-11350 Intermittent failure in testEvictAll/testRemoveAll Compare: https://github.com/hibernate/hibernate-orm/compare/893a316ccfcf...e336dc9...