db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r1647844 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
Date Wed, 24 Dec 2014 21:18:40 GMT
Author: mikem
Date: Wed Dec 24 21:18:39 2014
New Revision: 1647844

URL: http://svn.apache.org/r1647844
Log:
DERBY-6775 add to testBlobLinkedListReclamationOnRollback() test to check that free space
is used on subsequent inserts

increasing wait time, hoping to make test stable on slow machine in
oracle nightly testing.  Making it retry at least twice and increasing
second retry time.


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java?rev=1647844&r1=1647843&r2=1647844&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
Wed Dec 24 21:18:39 2014
@@ -154,10 +154,17 @@ public class ClobReclamationTest extends
                     // background thread made progress in last sleep,
                     // try sleeping again, wait longer as this machine
                     // seems to take longer to process the post
-                    // commit work.
+                    // commit work.  Most environments just need one
+                    // short retry, while enviroments where this does 
+                    // not work need much more time.  Make second retry
+                    // much longer.
                     try 
                     {
-                        Thread.sleep(10000 * num_retries);
+                        if (num_retries <= 1)
+                            Thread.sleep(10000);
+                        else
+                            Thread.sleep(60000 * num_retries);
+
                     }
                     catch (Exception ex)
                     {
@@ -176,7 +183,9 @@ public class ClobReclamationTest extends
                         num_allocated_pages == expectedAlloc); 
                 }
 
-                previous_alloc_count = num_allocated_pages;
+                // force at least 2 retries
+                if (num_retries > 1)
+                    previous_alloc_count = num_allocated_pages;
             }
             else
             {



Mime
View raw message