improved debug

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2007-01-18 09:05:19 +00:00
parent 05e098c7a6
commit 954400026d
2 changed files with 47 additions and 32 deletions

View File

@@ -105,11 +105,17 @@ public class ConcurrentNodeServiceTest extends TestCase
this.authenticationComponent.setSystemUserAsCurrentUser();
// create a first store directly
UserTransaction tx = transactionService.getUserTransaction();
tx.begin();
StoreRef storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis());
TransactionUtil.executeInUserTransaction(transactionService, new TransactionUtil.TransactionWork<Object>()
{
public Object doWork() throws Exception
{
StoreRef storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_"
+ System.currentTimeMillis());
rootNodeRef = nodeService.getRootNode(storeRef);
tx.commit();
return null;
}
});
}
@Override
@@ -126,12 +132,17 @@ public class ConcurrentNodeServiceTest extends TestCase
protected Map<QName, ChildAssociationRef> commitNodeGraph() throws Exception
{
UserTransaction tx = transactionService.getUserTransaction();
tx.begin();
Map<QName, ChildAssociationRef> answer = buildNodeGraph();
tx.commit();
return TransactionUtil.executeInUserTransaction(transactionService,
new TransactionUtil.TransactionWork<Map<QName, ChildAssociationRef>>()
{
return null;// answer;
public Map<QName, ChildAssociationRef> doWork() throws Exception
{
Map<QName, ChildAssociationRef> answer = buildNodeGraph();
return answer;
}
});
}
public void test1() throws Exception
@@ -143,34 +154,42 @@ public class ConcurrentNodeServiceTest extends TestCase
{
testConcurrent();
}
public void test3() throws Exception
{
testConcurrent();
}
public void test4() throws Exception
{
testConcurrent();
}
public void test5() throws Exception
{
testConcurrent();
}
public void test6() throws Exception
{
testConcurrent();
}
public void test7() throws Exception
{
testConcurrent();
}
public void test8() throws Exception
{
testConcurrent();
}
public void test9() throws Exception
{
testConcurrent();
}
public void test10() throws Exception
{
testConcurrent();

View File

@@ -321,6 +321,7 @@ public class IndexInfo
indexInfo = new IndexInfo(canonicalFile);
indexInfos.put(canonicalFile, indexInfo);
}
s_logger.error("Got "+indexInfo +" for "+file.getAbsolutePath());
return indexInfo;
}
catch (IOException e)
@@ -493,8 +494,8 @@ public class IndexInfo
for (String id : deletable)
{
indexEntries.remove(id);
deleteQueue.add(id);
}
clearOldReaders();
synchronized (cleaner)
{
cleaner.notify();
@@ -1445,12 +1446,12 @@ public class IndexInfo
if (TransactionStatus.DELETABLE.follows(entry.getStatus()))
{
indexEntries.remove(id);
deleteQueue.add(id);
synchronized (cleaner)
{
cleaner.notify();
}
writeStatus();
clearOldReaders();
}
else
{
@@ -2293,7 +2294,7 @@ public class IndexInfo
catch (IOException e)
{
s_logger.error(e);
s_logger.error("Error reading index file", e);
}
finally
{
@@ -2502,7 +2503,7 @@ public class IndexInfo
}
catch (IOException e)
{
s_logger.error(e);
s_logger.error("Failed to merge deletions", e);
fail = true;
}
@@ -2770,7 +2771,7 @@ public class IndexInfo
}
catch (Throwable e)
{
s_logger.error(e);
s_logger.error("Failed to merge indexes", e);
fail = true;
}
@@ -2827,15 +2828,6 @@ public class IndexInfo
for (String id : toDelete)
{
indexEntries.remove(id);
// Only delete if there is no existing ref counting reader
if (!referenceCountingReadOnlyIndexReaders.containsKey(id))
{
if (s_logger.isDebugEnabled())
{
s_logger.debug("... queued delete for " + id);
}
deleteQueue.add(id);
}
}
dumpInfo();
@@ -2972,7 +2964,11 @@ public class IndexInfo
public String toString()
{
return indexDirectory.toString();
StringBuilder builder = new StringBuilder();
builder.append(indexDirectory.toString());
builder.append(" ");
builder.append(super.toString());
return builder.toString();
}
public boolean isEnableCleanerThread()