inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix intermittent HEAD test failure (AVMCrawler -> NPE)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-10-27 11:13:25 +00:00
parent f360f5fe3c
commit 1362d02f8e
3 changed files with 250 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

416
source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
View File

@@ -1,203 +1,213 @@
/* /*
* Copyright (C) 2005-2008 Alfresco Software Limited. * Copyright (C) 2005-2009 Alfresco Software Limited.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of * As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre * the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's * and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing * FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here: * the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing" */ * http://www.alfresco.com/legal/licensing" */
package org.alfresco.repo.avm; package org.alfresco.repo.avm;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.sf.acegisecurity.Authentication; import net.sf.acegisecurity.Authentication;
import org.alfresco.repo.avm.util.BulkLoader; import org.alfresco.repo.avm.util.BulkLoader;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
/** /**
* Another performance test that runs simultaneous crawlers that * Another performance test that runs simultaneous crawlers that
* do operations with locality of reference. * do operations with locality of reference.
* @author britt * @author britt
*/ */
public class AVMCrawlTestP extends AVMServiceTestBase public class AVMCrawlTestP extends AVMServiceTestBase
{ {
public void testCrawlA() public void testCrawlA()
{ {
testCrawl(1, testCrawl(1,
"source/java/org/alfresco/repo/avm/actions", // relative from .../repository "source/java/org/alfresco/repo/avm/actions", // relative from .../repository
1, 1,
30000); // 30 secs 30000); // 30 secs
} }
public void testCrawlB() public void testCrawlB()
{ {
testCrawl(2, testCrawl(2,
"source/java/org/alfresco/repo/avm", // relative from .../repository "source/java/org/alfresco/repo/avm", // relative from .../repository
2, 2,
30000); // 30 secs 30000); // 30 secs
} }
/* /*
public void xtestCrawlZ() public void xtestCrawlC()
{ {
testCrawl(8, testCrawl(10,
"source", // relative from .../repository "source/java/org/alfresco/repo/avm", // relative from .../repository
2, 2,
28800000); // 8 hours 60000); // 1 min
} }
*/ */
/** /*
* Do the crawl test public void xtestCrawlZ()
* {
* @param n Number of threads testCrawl(8,
* @param fsPath The path in the filesystem to load (tree of stuff) from "source", // relative from .../repository
* @param m How many multiples of content to start with 2,
* @param runTime Min run time (in msecs) 28800000); // 8 hours
*/ }
private void testCrawl(int n, String fsPath, int m, long runTime) */
{
try /**
{ * Do the crawl test
Authentication authentication = AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.SYSTEM_USER_NAME); *
try * @param n Number of threads
{ * @param fsPath The path in the filesystem to load (tree of stuff) from
if (m < 1) * @param m How many multiples of content to start with
{ * @param runTime Min run time (in msecs)
fail("Must have at least one 1 copy of content"); */
} private void testCrawl(int n, String fsPath, int m, long runTime)
{
BulkLoader loader = new BulkLoader(); try
loader.setAvmService(fService); {
for (int i = 0; i < m; i++) Authentication authentication = AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.SYSTEM_USER_NAME);
{ try
fService.createStore("d" + i); {
loader.recursiveLoad(fsPath, "d" + i + ":/"); if (m < 1)
fService.createSnapshot("d" + i, null, null); {
} fail("Must have at least one 1 copy of content");
long startTime = System.currentTimeMillis(); }
List<AVMCrawler> crawlers = new ArrayList<AVMCrawler>();
List<Thread> threads = new ArrayList<Thread>(); BulkLoader loader = new BulkLoader();
for (int i = 0; i < n; i++) loader.setAvmService(fService);
{ for (int i = 0; i < m; i++)
crawlers.add(new AVMCrawler(fService, authentication)); {
threads.add(new Thread(crawlers.get(i))); fService.createStore("d" + i);
threads.get(i).start(); loader.recursiveLoad(fsPath, "d" + i + ":/");
} fService.createSnapshot("d" + i, null, null);
while (true) }
{ long startTime = System.currentTimeMillis();
try List<AVMCrawler> crawlers = new ArrayList<AVMCrawler>();
{ List<Thread> threads = new ArrayList<Thread>();
Thread.sleep(5000); for (int i = 0; i < n; i++)
// Check that none of the crawlers has errored out. {
for (AVMCrawler crawler : crawlers) crawlers.add(new AVMCrawler(fService, authentication));
{ threads.add(new Thread(crawlers.get(i)));
if (crawler.getError()) threads.get(i).start();
{ }
for (AVMCrawler craw : crawlers) while (true)
{ {
craw.setDone(); try
} {
for (Thread thread : threads) Thread.sleep(5000);
{ // Check that none of the crawlers has errored out.
try for (AVMCrawler crawler : crawlers)
{ {
thread.join(); if (crawler.getError())
} {
catch (InterruptedException ie) for (AVMCrawler craw : crawlers)
{ {
// Do nothing. craw.setDone();
} }
} for (Thread thread : threads)
//fail(); {
System.err.println("Crawler error"); try
} {
} thread.join();
} }
catch (InterruptedException ie) catch (InterruptedException ie)
{ {
// Do nothing. // Do nothing.
} }
long now = System.currentTimeMillis(); }
if (now - startTime > runTime) //fail();
{ System.err.println("Crawler error");
break; }
} }
} }
for (AVMCrawler crawler : crawlers) catch (InterruptedException ie)
{ {
crawler.setDone(); // Do nothing.
} }
for (Thread thread : threads) long now = System.currentTimeMillis();
{ if (now - startTime > runTime)
try {
{ break;
thread.join(); }
} }
catch (InterruptedException ie) for (AVMCrawler crawler : crawlers)
{ {
// Do nothing. crawler.setDone();
} }
} for (Thread thread : threads)
long ops = 0L; {
int errorCnt = 0; try
for (AVMCrawler crawler : crawlers) {
{ thread.join();
ops += crawler.getOpCount(); }
errorCnt += (crawler.getError() ? 1 : 0); catch (InterruptedException ie)
} {
// Do nothing.
long time = System.currentTimeMillis() - startTime; }
System.out.println("Ops/Sec: " + (ops * 1000L / time)); }
long ops = 0L;
if (errorCnt > 0) int errorCnt = 0;
{ for (AVMCrawler crawler : crawlers)
StringBuffer errorStack = new StringBuffer(); {
errorStack.append("Crawler errors: ").append(errorCnt).append(" out of ").append(crawlers.size()).append(" are in error state"); ops += crawler.getOpCount();
errorCnt += (crawler.getError() ? 1 : 0);
for (AVMCrawler crawler : crawlers) }
{
if (crawler.getError()) long time = System.currentTimeMillis() - startTime;
{ System.out.println("Ops/Sec: " + (ops * 1000L / time));
errorStack.append("\n\n").append(crawler.getErrorStackTrace());
} if (errorCnt > 0)
} {
StringBuffer errorStack = new StringBuffer();
fail(errorStack.toString()); errorStack.append("Crawler errors: ").append(errorCnt).append(" out of ").append(crawlers.size()).append(" are in error state");
}
} for (AVMCrawler crawler : crawlers)
finally {
{ if (crawler.getError())
for (int i = 0; i < m; i++) {
{ errorStack.append("\n\n").append(crawler.getErrorStackTrace());
if (fService.getStore("d" + i) != null) }
{ }
fService.purgeStore("d" + i);
} fail(errorStack.toString());
} }
} }
} finally
finally {
{ for (int i = 0; i < m; i++)
AuthenticationUtil.clearCurrentSecurityContext(); {
} if (fService.getStore("d" + i) != null)
} {
} fService.purgeStore("d" + i);
}
}
}
}
finally
{
AuthenticationUtil.clearCurrentSecurityContext();
}
}
}

37
source/java/org/alfresco/repo/avm/AVMCrawler.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2008 Alfresco Software Limited. * Copyright (C) 2005-2009 Alfresco Software Limited.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@@ -39,9 +39,12 @@ import net.sf.acegisecurity.Authentication;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.avm.AVMException; import org.alfresco.service.cmr.avm.AVMException;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMNotFoundException;
import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor; import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentIOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** /**
@@ -50,6 +53,8 @@ import org.alfresco.service.cmr.repository.ContentIOException;
*/ */
class AVMCrawler implements Runnable class AVMCrawler implements Runnable
{ {
private static Log logger = LogFactory.getLog(AVMCrawler.class);
/** /**
* The AVMService to use. * The AVMService to use.
*/ */
@@ -158,7 +163,7 @@ class AVMCrawler implements Runnable
if (reps.size() == 0) if (reps.size() == 0)
{ {
System.out.println("No AVM stores"); logger.warn("No AVM stores");
return; return;
} }
@@ -177,7 +182,7 @@ class AVMCrawler implements Runnable
if (dirs.size() == 0) if (dirs.size() == 0)
{ {
System.out.println("No dirs in root: "+repDesc.getName() + ":/"); logger.warn("No dirs in root: "+repDesc.getName() + ":/");
} }
else else
{ {
@@ -205,20 +210,25 @@ class AVMCrawler implements Runnable
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
String path = files.get(fRandom.nextInt(files.size())).getPath();
logger.info("Reading: " + path);
BufferedReader BufferedReader
reader = new BufferedReader reader = new BufferedReader
(new InputStreamReader (new InputStreamReader
(fService.getFileInputStream(-1, files.get(fRandom.nextInt(files.size())).getPath()))); (fService.getFileInputStream(-1, path)));
fOpCount++; fOpCount++;
String line = reader.readLine(); String line = reader.readLine();
System.out.println(line); if (logger.isDebugEnabled())
{
logger.debug(line);
}
reader.close(); reader.close();
} }
// Modify some files. // Modify some files.
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
String path = files.get(fRandom.nextInt(files.size())).getPath(); String path = files.get(fRandom.nextInt(files.size())).getPath();
System.out.println("Modifying: " + path); logger.info("Modifying: " + path);
PrintStream out = new PrintStream(fService.getFileOutputStream(path)); PrintStream out = new PrintStream(fService.getFileOutputStream(path));
out.println("I am " + path); out.println("I am " + path);
out.close(); out.close();
@@ -235,7 +245,7 @@ class AVMCrawler implements Runnable
{ {
break; break;
} }
System.out.println("Creating File: " + name); logger.info("Creating File: " + name);
fService.createFile(dir.getPath(), name, fService.createFile(dir.getPath(), name,
new ByteArrayInputStream(("I am " + name).getBytes())); new ByteArrayInputStream(("I am " + name).getBytes()));
fOpCount++; fOpCount++;
@@ -249,7 +259,7 @@ class AVMCrawler implements Runnable
{ {
break; break;
} }
System.out.println("Creating Directory: " + name); logger.info("Creating Directory: " + name);
fService.createDirectory(dir.getPath(), name); fService.createDirectory(dir.getPath(), name);
fOpCount++; fOpCount++;
} }
@@ -260,7 +270,7 @@ class AVMCrawler implements Runnable
{ {
List<String> names = new ArrayList<String>(listing.keySet()); List<String> names = new ArrayList<String>(listing.keySet());
String name = names.get(fRandom.nextInt(names.size())); String name = names.get(fRandom.nextInt(names.size()));
System.out.println("Removing: " + name); logger.info("Removing: " + name);
fService.removeNode(dir.getPath(), fService.removeNode(dir.getPath(),
name); name);
fOpCount++; fOpCount++;
@@ -280,13 +290,18 @@ class AVMCrawler implements Runnable
if (fRandom.nextInt(16) == 0) if (fRandom.nextInt(16) == 0)
{ {
System.out.println("Snapshotting: " + repDesc.getName()); logger.info("Snapshotting: " + repDesc.getName());
fService.createSnapshot(repDesc.getName(), null, null); fService.createSnapshot(repDesc.getName(), null, null);
fOpCount++; fOpCount++;
} }
} }
catch (Exception e) catch (Exception e)
{ {
if (e instanceof AVMNotFoundException)
{
logger.info(e.getMessage());
return;
}
e.printStackTrace(System.err); e.printStackTrace(System.err);
if (e instanceof AVMException) if (e instanceof AVMException)
{ {
@@ -320,5 +335,3 @@ class AVMCrawler implements Runnable
return fOpCount; return fOpCount;
} }
} }

17
source/java/org/alfresco/repo/avm/ibatis/ChildEntryDAOIbatis.java
View File

@@ -34,6 +34,7 @@ import org.alfresco.repo.avm.ChildEntryImpl;
import org.alfresco.repo.avm.ChildKey; import org.alfresco.repo.avm.ChildKey;
import org.alfresco.repo.avm.DirectoryNode; import org.alfresco.repo.avm.DirectoryNode;
import org.alfresco.repo.domain.avm.AVMChildEntryEntity; import org.alfresco.repo.domain.avm.AVMChildEntryEntity;
import org.springframework.dao.ConcurrencyFailureException;
/** /**
* iBATIS DAO wrapper for ChildEntry * iBATIS DAO wrapper for ChildEntry
@@ -147,9 +148,12 @@ class ChildEntryDAOIbatis implements ChildEntryDAO
AVMNode childNode = AVMDAOs.Instance().fAVMNodeDAO.getByID(childEntryEntity.getChildId()); AVMNode childNode = AVMDAOs.Instance().fAVMNodeDAO.getByID(childEntryEntity.getChildId());
if (childNode == null)
{
throw new ConcurrencyFailureException("Child node (" + childEntryEntity.getParentNodeId() + ", " + childEntryEntity.getChildId() + ") no longer exists");
}
ChildEntry ce = new ChildEntryImpl(new ChildKey(parentNode, childEntryEntity.getName()), childNode); ChildEntry ce = new ChildEntryImpl(new ChildKey(parentNode, childEntryEntity.getName()), childNode);
ce.setKey(new ChildKey(parentNode, childEntryEntity.getName()));
ce.setChild(childNode);
return ce; return ce;
} }
@@ -160,11 +164,14 @@ class ChildEntryDAOIbatis implements ChildEntryDAO
return null; return null;
} }
DirectoryNode parentNode = (DirectoryNode)AVMDAOs.Instance().fAVMNodeDAO.getByID(childEntryEntity.getParentNodeId()); DirectoryNode parentNode = (DirectoryNode)AVMDAOs.Instance().fAVMNodeDAO.getByID(childEntryEntity.getParentNodeId());
if (parentNode == null)
{
throw new ConcurrencyFailureException("Parent node (" + childEntryEntity.getParentNodeId() + ", " + childEntryEntity.getChildId() + ") no longer exists");
}
ChildEntry ce = new ChildEntryImpl(new ChildKey(parentNode, childEntryEntity.getName()), childNode); ChildEntry ce = new ChildEntryImpl(new ChildKey(parentNode, childEntryEntity.getName()), childNode);
ce.setKey(new ChildKey(parentNode, childEntryEntity.getName()));
ce.setChild(childNode);
return ce; return ce;
} }
} }