svn commit: r1536459 - in /oozie/trunk: core/src/test/java/org/apache/oozie/service/TestZKLocksService.java release-log.txt

Mon, 28 Oct 2013 11:11:36 -0700 

Author: rkanter
Date: Mon Oct 28 18:07:27 2013
New Revision: 1536459

URL: http://svn.apache.org/r1536459
Log:
OOZIE-1589 TestZKLocksService is flakey (rkanter)

Modified:
    
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java
    oozie/trunk/release-log.txt

Modified: 
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java?rev=1536459&r1=1536458&r2=1536459&view=diff
==============================================================================
--- 
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java 
(original)
+++ 
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java 
Mon Oct 28 18:07:27 2013
@@ -154,13 +154,13 @@ public class TestZKLocksService extends 
         Locker l2 = new WriteLocker("a", 2, -1, sb, zkls2);
 
         new Thread(l1).start();
-        Thread.sleep(500);
+        sleep(1000);
         new Thread(l2).start();
-        Thread.sleep(500);
+        sleep(1000);
         l1.finish();
-        Thread.sleep(500);
+        sleep(1000);
         l2.finish();
-        Thread.sleep(500);
+        sleep(1000);
         assertEquals("a:1-L a:1-U a:2-L a:2-U", sb.toString().trim());
     }
 
@@ -196,13 +196,13 @@ public class TestZKLocksService extends 
         Locker l2 = new WriteLocker("a", 2, 0, sb, zkls2);
 
         new Thread(l1).start();
-        Thread.sleep(500);
+        sleep(1000);
         new Thread(l2).start();
-        Thread.sleep(500);
+        sleep(1000);
         l1.finish();
-        Thread.sleep(500);
+        sleep(1000);
         l2.finish();
-        Thread.sleep(500);
+        sleep(1000);
         assertEquals("a:1-L a:2-N a:1-U", sb.toString().trim());
     }
 
@@ -235,16 +235,16 @@ public class TestZKLocksService extends 
     public void _testTimeoutWaitingWriteLock(ZKLocksService zkls1, 
ZKLocksService zkls2) throws Exception {
         StringBuffer sb = new StringBuffer("");
         Locker l1 = new WriteLocker("a", 1, 0, sb, zkls1);
-        Locker l2 = new WriteLocker("a", 2, 1000, sb, zkls2);
+        Locker l2 = new WriteLocker("a", 2, (long) (WAITFOR_RATIO * 2000), sb, 
zkls2);
 
         new Thread(l1).start();
-        Thread.sleep(500);
+        sleep(1000);
         new Thread(l2).start();
-        Thread.sleep(500);
+        sleep(1000);
         l1.finish();
-        Thread.sleep(500);
+        sleep(1000);
         l2.finish();
-        Thread.sleep(500);
+        sleep(1000);
         assertEquals("a:1-L a:1-U a:2-L a:2-U", sb.toString().trim());
     }
 
@@ -280,13 +280,13 @@ public class TestZKLocksService extends 
         Locker l2 = new WriteLocker("a", 2, 50, sb, zkls2);
 
         new Thread(l1).start();
-        Thread.sleep(500);
+        sleep(1000);
         new Thread(l2).start();
-        Thread.sleep(500);
+        sleep(1000);
         l1.finish();
-        Thread.sleep(500);
+        sleep(1000);
         l2.finish();
-        Thread.sleep(500);
+        sleep(1000);
         assertEquals("a:1-L a:2-N a:1-U", sb.toString().trim());
     }
 
@@ -322,13 +322,13 @@ public class TestZKLocksService extends 
         Locker l2 = new ReadLocker("a", 2, -1, sb, zkls2);
 
         new Thread(l1).start();
-        Thread.sleep(500);
+        sleep(1000);
         new Thread(l2).start();
-        Thread.sleep(500);
+        sleep(1000);
         l1.finish();
-        Thread.sleep(500);
+        sleep(1000);
         l2.finish();
-        Thread.sleep(500);
+        sleep(1000);
         assertEquals("a:1-L a:2-L a:1-U a:2-U", sb.toString().trim());
     }
 
@@ -364,13 +364,13 @@ public class TestZKLocksService extends 
         Locker l2 = new WriteLocker("a", 2, -1, sb, zkls2);
 
         new Thread(l1).start();
-        Thread.sleep(500);
+        sleep(1000);
         new Thread(l2).start();
-        Thread.sleep(500);
+        sleep(1000);
         l1.finish();
-        Thread.sleep(500);
+        sleep(1000);
         l2.finish();
-        Thread.sleep(500);
+        sleep(1000);
         assertEquals("a:1-L a:1-U a:2-L a:2-U", sb.toString().trim());
     }
 
@@ -406,13 +406,13 @@ public class TestZKLocksService extends 
         Locker l2 = new ReadLocker("a", 2, -1, sb, zkls2);
 
         new Thread(l1).start();
-        Thread.sleep(500);
+        sleep(1000);
         new Thread(l2).start();
-        Thread.sleep(500);
+        sleep(1000);
         l1.finish();
-        Thread.sleep(500);
+        sleep(1000);
         l2.finish();
-        Thread.sleep(500);
+        sleep(1000);
         assertEquals("a:1-L a:1-U a:2-L a:2-U", sb.toString().trim());
     }
 }

Modified: oozie/trunk/release-log.txt
URL: 
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1536459&r1=1536458&r2=1536459&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Oct 28 18:07:27 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1589 TestZKLocksService is flakey (rkanter)
 OOZIE-1541 Typo in Oozie HA admin -servers command in documentation (rkanter)
 OOZIE-1596 TestOozieMySqlDBCLI.testCreateMysql fails when tests are executed 
in a different order (rkanter)
 OOZIE-1592 El Expression Reference should point to the exact chapter in java 6 
(bowenzhangusa via rkanter)

Reply via email to