Fixed the two tests that were failing in the continuous build. Disabled

four really long winded AVM performance and stress tests.  This should speed
up the continuous build on the wcm branch.  The tests should probably be set up
to run periodically with other long running exhaustive performance, and stress tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-11-06 06:11:26 +00:00
parent 7fdf8130c8
commit 2c20af6d2b
6 changed files with 288 additions and 284 deletions

View File

@@ -33,84 +33,84 @@ public class AVMStressTest extends AVMServiceTestBase
*/
public void testNThreads()
{
try
{
int nCopies = 1;
int nThreads = 1;
BulkLoader loader = new BulkLoader();
loader.setAvmService(fService);
long start = System.currentTimeMillis();
for (int i = 0; i < nCopies; i++)
{
fService.createDirectory("main:/", "" + i);
loader.recursiveLoad("source", "main:/" + i);
fService.createSnapshot("main", null, null);
}
System.out.println("Load time: " + (System.currentTimeMillis() - start));
List<AVMTester> testers = new ArrayList<AVMTester>();
List<Thread> threads = new ArrayList<Thread>();
for (int i = 0; i < nThreads; i++)
{
AVMTester tester
= new AVMTester(800, // create file.
20, // create dir,
0, // rename
2, // create layered dir
5, // create layered file
10, // remove node
20, // modify file.
3200, // read file
10, // snapshot
1000, // # ops
fService);
tester.refresh();
Thread thread = new Thread(tester);
testers.add(tester);
threads.add(thread);
}
for (Thread thread : threads)
{
thread.start();
}
int exited = 0;
// long sampStart = System.currentTimeMillis();
while (exited != nThreads)
{
try
{
Thread.sleep(2000);
for (int i = 0; i < nThreads; i++)
{
if (threads.get(i) == null)
{
continue;
}
threads.get(i).join(1000);
if (!threads.get(i).isAlive())
{
threads.set(i, null);
if (testers.get(i).getError())
{
for (AVMTester tester : testers)
{
tester.setExit();
}
fail();
}
exited++;
}
}
}
catch (InterruptedException e)
{
// Do nothing.
}
}
}
catch (Exception e)
{
e.printStackTrace(System.err);
fail();
}
// try
// {
// int nCopies = 1;
// int nThreads = 1;
// BulkLoader loader = new BulkLoader();
// loader.setAvmService(fService);
// long start = System.currentTimeMillis();
// for (int i = 0; i < nCopies; i++)
// {
// fService.createDirectory("main:/", "" + i);
// loader.recursiveLoad("source", "main:/" + i);
// fService.createSnapshot("main", null, null);
// }
// System.out.println("Load time: " + (System.currentTimeMillis() - start));
// List<AVMTester> testers = new ArrayList<AVMTester>();
// List<Thread> threads = new ArrayList<Thread>();
// for (int i = 0; i < nThreads; i++)
// {
// AVMTester tester
// = new AVMTester(800, // create file.
// 20, // create dir,
// 0, // rename
// 2, // create layered dir
// 5, // create layered file
// 10, // remove node
// 20, // modify file.
// 3200, // read file
// 10, // snapshot
// 1000, // # ops
// fService);
// tester.refresh();
// Thread thread = new Thread(tester);
// testers.add(tester);
// threads.add(thread);
// }
// for (Thread thread : threads)
// {
// thread.start();
// }
// int exited = 0;
// // long sampStart = System.currentTimeMillis();
// while (exited != nThreads)
// {
// try
// {
// Thread.sleep(2000);
// for (int i = 0; i < nThreads; i++)
// {
// if (threads.get(i) == null)
// {
// continue;
// }
// threads.get(i).join(1000);
// if (!threads.get(i).isAlive())
// {
// threads.set(i, null);
// if (testers.get(i).getError())
// {
// for (AVMTester tester : testers)
// {
// tester.setExit();
// }
// fail();
// }
// exited++;
// }
// }
// }
// catch (InterruptedException e)
// {
// // Do nothing.
// }
// }
// }
// catch (Exception e)
// {
// e.printStackTrace(System.err);
// fail();
// }
}
}