[jboss-svn-commits] JBL Code SVN: r38185 - in labs/jbosstm/branches/JBOSSTS_4_16: qa and 3 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: mmusgrov
Date: 2012-09-19 07:57:41 -0400 (Wed, 19 Sep 2012)
New Revision: 38185

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/CoreEnvironmentBean.java
   labs/jbosstm/branches/JBOSSTS_4_16/qa/TaskImpl.properties
   labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java
   labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java
   labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh
Log:
JBTM-1237 backport fix to multiply up QA crashrec wait timeouts

Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/CoreEnvironmentBean.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/CoreEnvironmentBean.java	2012-09-19 10:26:36 UTC (rev 38184)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/CoreEnvironmentBean.java	2012-09-19 11:57:41 UTC (rev 38185)
@@ -58,6 +58,8 @@
     private volatile boolean allowMultipleLastResources = false;
     private volatile boolean disableMultipleLastResourcesWarning = false;
 
+    @FullPropertyName(name = "timeout.factor")
+    private volatile int timeoutFactor = 1;
 
     /**
      * Returns the 'var' directory path.
@@ -306,6 +308,24 @@
     }
 
     /**
+     * Get a factor by which all crashrec delays in the QA test suited will be multiplied
+     * @return the multiplier
+     */
+    public int getTimeoutFactor()
+    {
+        return timeoutFactor;
+    }
+
+    /**
+     * Set a factor by which all crashrec delays in the QA test suited will be multiplied
+     * @param timeoutFactor the factor
+     */
+    public void setTimeoutFactor(int timeoutFactor)
+    {
+        this.timeoutFactor = timeoutFactor;
+    }
+
+    /**
      * @return the version control tag of the source used, or "unknown"
      */
     public String getBuildVersion()

Modified: labs/jbosstm/branches/JBOSSTS_4_16/qa/TaskImpl.properties
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/qa/TaskImpl.properties	2012-09-19 10:26:36 UTC (rev 38184)
+++ labs/jbosstm/branches/JBOSSTS_4_16/qa/TaskImpl.properties	2012-09-19 11:57:41 UTC (rev 38185)
@@ -63,13 +63,15 @@
 # so setting a short periodicRecoveryPeriod is no longer useful.
 #COMMAND_LINE_11=-DRecoveryEnvironmentBean.periodicRecoveryPeriod=10
 COMMAND_LINE_11=-DRecoveryEnvironmentBean.recoveryBackoffPeriod=5
+#timeoutFactor is a multiplier by which delays are multiplied - set to a larger value on slow servers
+COMMAND_LINE_12=-DCoreEnvironmentBean.timeoutFactor=1
 #
 # enable these to debug spawned processes. You may need to pause the test
 # framework in a debugger too, or it may spawn multiple procs on the same
 # debug port.
 #
-#COMMAND_LINE_12=-Xdebug
-#COMMAND_LINE_13=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006
+#COMMAND_LINE_13=-Xdebug
+#COMMAND_LINE_14=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006
 
 
 #

Modified: labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java	2012-09-19 10:26:36 UTC (rev 38184)
+++ labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java	2012-09-19 11:57:41 UTC (rev 38185)
@@ -32,6 +32,7 @@
 package org.jboss.jbossts.qa.CrashRecovery11Utils;
 
 import com.arjuna.ats.arjuna.common.recoveryPropertyManager;
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
 
 public class Delays
 {
@@ -41,6 +42,11 @@
 
 			int _backoffPeriod = recoveryPropertyManager.getRecoveryEnvironmentBean().getRecoveryBackoffPeriod();
 
+			int _delayFactor = arjPropertyManager.getCoreEnvironmentBean().getTimeoutFactor();
+
+			_backoffPeriod *= _delayFactor;
+			_recoveryPeriod *= _delayFactor;
+
 			return (_backoffPeriod + _recoveryPeriod + (5 * 1000) /*5 secs for processing*/);
 	}
 }

Modified: labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java	2012-09-19 10:26:36 UTC (rev 38184)
+++ labs/jbosstm/branches/JBOSSTS_4_16/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java	2012-09-19 11:57:41 UTC (rev 38185)
@@ -21,6 +21,7 @@
 package org.jboss.jbossts.qa.Utils;
 
 import com.arjuna.ats.arjuna.common.recoveryPropertyManager;
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
 
 import java.io.BufferedReader;
 import java.io.PrintStream;
@@ -150,8 +151,28 @@
         awaitReplayCompletion(5); // was 60
     }
 
+    public static void awaitReplayCompletionCR06() throws InterruptedException {
+        awaitReplayCompletion(10); // was 5
+    }
+
     private static void awaitReplayCompletion(int seconds) throws InterruptedException
     {
-        Thread.sleep(seconds * 1000);
+        Thread.sleep(getDelayFactor() * seconds * 1000);
     }
+
+    private static int getDelayFactor() {
+        if (delayFactor < 0) {
+            delayFactor = arjPropertyManager.getCoreEnvironmentBean().getTimeoutFactor();
+//            delayFactor = Integer.getInteger("timeout.factor", 1);
+
+            if (delayFactor <= 0)
+                delayFactor = 1;
+
+            System.out.printf("Using timeout delay factor of %d%n", delayFactor);
+        }
+
+        return delayFactor;
+    }
+
+    private static int delayFactor = -1;
 }

Modified: labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh	2012-09-19 10:26:36 UTC (rev 38184)
+++ labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh	2012-09-19 11:57:41 UTC (rev 38185)
@@ -188,6 +188,8 @@
 	exit -1
 fi
 
+[ -z "${MFACTOR+x}" ] || sed -i TaskImpl.properties -e "s/COMMAND_LINE_12=-DCoreEnvironmentBean.timeoutFactor=[0-9]*/COMMAND_LINE_12=-DCoreEnvironmentBean.timeoutFactor=${MFACTOR}/"
+
 sed -i TaskImpl.properties -e "s#^COMMAND_LINE_0=.*#COMMAND_LINE_0=${JAVA_HOME}/bin/java#"
 if [ "$?" != "0" ]; then
 	exit -1