db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1301294 - in /db/derby/code/branches/10.8: ./ java/client/org/apache/derby/client/net/NetCursor.java java/testing/org/apache/derbyTesting/system/nstest/NsTest.java java/testing/org/apache/derbyTesting/system/nstest/utils/MemCheck.java
Date Fri, 16 Mar 2012 00:21:01 GMT
Author: myrnavl
Date: Fri Mar 16 00:21:01 2012
New Revision: 1301294

URL: http://svn.apache.org/viewvc?rev=1301294&view=rev
Log:
DERBY-5649; make improvements to nstest so it's easier to run/analyze/debug
  adjust so the test runs better with -Dderby.nstest.backupRestore=false
  merge -c of 1301290 from trunk.

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java   (props
changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/NsTest.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/utils/MemCheck.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 00:21:01 2012
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,1181756,
 1183463,1183503,1183671,1186020,1186691,1189201,1189222,1203050,1203252,1204128,1207729,1208775,1210846,1212541,1213251,1230480,1236887,1239898,1241841,1242098,1242409,1242413,1242460,1242610,1243878,1292084,1292109,1293494,1294512,1294522,1295085
+/db/derby/code/trunk:1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,1181756,
 1183463,1183503,1183671,1186020,1186691,1189201,1189222,1203050,1203252,1204128,1207729,1208775,1210846,1212541,1213251,1230480,1236887,1239898,1241841,1242098,1242409,1242413,1242460,1242610,1243878,1292084,1292109,1293494,1294512,1294522,1295085,1301290

Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 00:21:01 2012
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7/java/client/org/apache/derby/client/net/NetCursor.java:1061570,1061578,1082235
-/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1145961,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636,1177589,1179374,1179546,1
 180790,1180858,1181756,1183463,1183671,1186020,1186691,1203252,1210846,1213251,1230480,1239898,1241841,1242098,1242409,1242413,1242460,1243878,1292109,1294512,1294522,1295085,1300658
+/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1145961,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636,1177589,1179374,1179546,1
 180790,1180858,1181756,1183463,1183671,1186020,1186691,1203252,1210846,1213251,1230480,1239898,1241841,1242098,1242409,1242413,1242460,1243878,1292109,1294512,1294522,1295085,1300658,1301290

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/NsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/NsTest.java?rev=1301294&r1=1301293&r2=1301294&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/NsTest.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/NsTest.java
Fri Mar 16 00:21:01 2012
@@ -117,34 +117,26 @@ public class NsTest extends Thread {
 	// see setSmallConfig()
 	public static int INIT_THREADS = 6; // keep this low to avoid deadlocks
 
-	// public static int MAX_INITIAL_ROWS = 60000; //for network server mode
-	public static int MAX_INITIAL_ROWS = 6000; // for network server mode
+	public static int MAX_INITIAL_ROWS = 6000;
 
 	public static int MAX_ITERATIONS = 2000; // Each client does these many
 	// transactions in the test.
 
-	// for network server mode
-	public static int MAX_LOW_STRESS_ROWS = 30; // num of rows worked over in a
-	// transaction
+	// num of rows worked over in a transaction
+	public static int MAX_LOW_STRESS_ROWS = 30; 
 
-	// for network server mode
-	public static int MAX_OPERATIONS_PER_CONN = 25; // num of transaction
-	// batches made by a client
+	// num of transaction batches
+	public static int MAX_OPERATIONS_PER_CONN = 25; 
 
-	// before closing the connection
-	// for network server mode
-	public static int NUMTESTER1 = 15; // for network server mode
+	public static int NUMTESTER1 = 15;
 
-	// ***public static int NUMTESTER1 = 45; //for embedded mode
-	public static int NUMTESTER2 = 45; // for network server mode
+	public static int NUMTESTER2 = 45;
 
-	// ***public static int NUMTESTER2 = 135; //for embedded server mode
-	public static int NUMTESTER3 = 10; // for network server mode
+	public static int NUMTESTER3 = 10;
 
-	// ***public static int NUMTESTER3 = 30; //for network server mode
-	public static int NUM_HIGH_STRESS_ROWS = 25000; // for network server mode
+	public static int NUM_HIGH_STRESS_ROWS = 25000;
 
-	public static int NUM_UNTOUCHED_ROWS = 6000; // for network server mode
+	public static int NUM_UNTOUCHED_ROWS = 6000;
 
 	// ***End of full test block
 
@@ -248,14 +240,14 @@ public class NsTest extends Thread {
 	private static void setSmallConfig() {
         
 		INIT_THREADS = 3; //keep this low to avoid deadlocks
-		MAX_INITIAL_ROWS = 150; //for a small test public
-		MAX_ITERATIONS = 50; //for a small test public static int
-		MAX_LOW_STRESS_ROWS = 10; //for a small test public static int
-		MAX_OPERATIONS_PER_CONN = 10; //for a small test public static int
+		MAX_INITIAL_ROWS = 150; //for a small test
+		MAX_ITERATIONS = 50; //for a small test
+		MAX_LOW_STRESS_ROWS = 10; //for a small test
+		MAX_OPERATIONS_PER_CONN = 10; //for a small test
 		NUMTESTER1 = 3; //for a small test 
 		NUMTESTER2 = 4;//for a small test
 		NUMTESTER3 = 3; //for a small test
-		NUM_HIGH_STRESS_ROWS = 20; //for a small test public
+		NUM_HIGH_STRESS_ROWS = 20; //for a small test
 		NUM_UNTOUCHED_ROWS = 50; //for a small test
 	}
     
@@ -284,13 +276,13 @@ public class NsTest extends Thread {
 			driver_type = "DerbyClient";
 		}
 		if (args.length >= 2) {
-		String testConfiguration = args [1];
-		if (testConfiguration.equalsIgnoreCase("small"))
-		{
-			System.out.println("using small config");
-			setSmallConfig();
-		}    
-	}
+			String testConfiguration = args [1];
+			if (testConfiguration.equalsIgnoreCase("small"))
+			{
+				System.out.println("using small config");
+				setSmallConfig();
+			}    
+		}
         
 		// Load the driver and get a connection to the database
 		String jdbcUrl = "";
@@ -425,7 +417,12 @@ public class NsTest extends Thread {
 		.println("Kicking off test threads that will work over the test table");
 
 		int numTestThread = 0;
-		int maxTestThreads = 1 + NUMTESTER1 + NUMTESTER2 + NUMTESTER3;
+		int maxTestThreads = 0;
+		String runBackup = System.getProperty("derby.nstest.backupRestore");
+		if ((runBackup != null) && (runBackup.equalsIgnoreCase("false")))
+				maxTestThreads = NUMTESTER1 + NUMTESTER2 + NUMTESTER3;
+		else
+				maxTestThreads = 1 + NUMTESTER1 + NUMTESTER2 + NUMTESTER3;
 		testThreads = new NsTest[maxTestThreads];
 
 		// This loop is made of 3 subloops that will initialize the required
@@ -433,7 +430,6 @@ public class NsTest extends Thread {
 		// It uses the numTestThread variable as the array index which gets
 		// incremented in each subloop
 		while (numTestThread < maxTestThreads) {
-			String runBackup = System.getProperty("derby.nstest.backupRestore");
 			// Check for property setting to decide the need for starting
 			// BackupRestore thread
 			if ((runBackup != null) && (runBackup.equalsIgnoreCase("false"))) {

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/utils/MemCheck.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/utils/MemCheck.java?rev=1301294&r1=1301293&r2=1301294&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/utils/MemCheck.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/system/nstest/utils/MemCheck.java
Fri Mar 16 00:21:01 2012
@@ -23,6 +23,8 @@ package org.apache.derbyTesting.system.n
 
 import java.util.Date;
 
+import org.apache.derbyTesting.system.nstest.NsTest;
+
 /**
  * MemCheck - a background thread that prints current memory usage
  */
@@ -48,6 +50,20 @@ public class MemCheck extends Thread {
 			try {
 				showmem();
 				sleep(delay);
+                
+				// first check if there are still active tester threads, so 
+				// we do not make backups on an unchanged db every 10 mins for
+				// the remainder of MAX_ITERATIONS.
+				if (NsTest.numActiveTestThreads() != 0 && NsTest.numActiveTestThreads() >
1)
+				{
+					continue;
+				}
+				else
+				{
+					System.out.println("no more test threads, finishing memcheck thread also");
+					showmem();
+					stopNow=true;
+				}
 			} catch (java.lang.InterruptedException ie) {
 				System.out.println("memcheck: unexpected error in sleep");
 			}



Mime
View raw message