Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better handling of FNFE 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1551370 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-12-16 22:01:19 +00:00
parent ef5c16fe21
commit 52caa0198b
1 changed files with 122 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

254
archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
View File

@ -63,76 +63,65 @@ public class DefaultFileLockManager
StopWatch stopWatch = new StopWatch(); StopWatch stopWatch = new StopWatch();
boolean acquired = false; boolean acquired = false;
mkdirs( file.getParentFile() ); mkdirs( file.getParentFile() );
try
Lock lock = null;
stopWatch.start();
while ( !acquired )
{ {
Lock lock = null; if ( timeout > 0 )
stopWatch.start();
while ( !acquired )
{ {
long delta = stopWatch.getTime();
if ( timeout > 0 ) log.debug( "delta {}, timeout {}", delta, timeout );
if ( delta > timeout )
{ {
long delta = stopWatch.getTime(); log.warn( "Cannot acquire read lock within {} millis. Will skip the file: {}", timeout, file );
log.debug( "delta {}, timeout {}", delta, timeout ); // we could not get the lock within the timeout period, so throw FileLockTimeoutException
if ( delta > timeout ) throw new FileLockTimeoutException();
{
log.warn( "Cannot acquire read lock within {} millis. Will skip the file: {}", timeout, file );
// we could not get the lock within the timeout period, so throw FileLockTimeoutException
throw new FileLockTimeoutException();
}
}
lock = new Lock( file, false );
Lock current = lockFiles.get( file );
if ( current != null )
{
log.debug( "read lock file exist continue wait" );
// close RandomAccessFile!!!
RandomAccessFile raf = lock.getRandomAccessFile();
if (raf != null)
{
raf.close();
}
continue;
}
try
{
createNewFileQuietly( file );
lock.openLock( false, timeout > 0 );
acquired = true;
}
catch ( FileNotFoundException e )
{
// can happen if an other thread has deleted the file
log.debug( "read Lock skip: {} try to create file", e.getMessage() );
createNewFileQuietly( file );
}
catch ( IOException e )
{
throw new FileLockException( e.getMessage(), e );
}
catch ( IllegalStateException e )
{
log.debug( "openLock {}:{}", e.getClass(), e.getMessage() );
} }
} }
Lock current = lockFiles.putIfAbsent( file, lock );
Lock current = lockFiles.get( file );
if ( current != null ) if ( current != null )
{ {
lock = current; log.debug( "read lock file exist continue wait" );
continue;
}
try
{
lock = new Lock( file, false );
createNewFileQuietly( file );
lock.openLock( false, timeout > 0 );
acquired = true;
}
catch ( FileNotFoundException e )
{
// can happen if an other thread has deleted the file
// close RandomAccessFile!!!
closeQuietly( lock.getRandomAccessFile() );
log.debug( "read Lock skip: {} try to create file", e.getMessage() );
createNewFileQuietly( file );
}
catch ( IOException e )
{
throw new FileLockException( e.getMessage(), e );
}
catch ( IllegalStateException e )
{
log.debug( "openLock {}:{}", e.getClass(), e.getMessage() );
} }
return lock;
} }
catch ( IOException e ) Lock current = lockFiles.putIfAbsent( file, lock );
if ( current != null )
{ {
throw new FileLockException( e.getMessage(), e ); lock = current;
} }
return lock;
} }
@ -150,85 +139,86 @@ public class DefaultFileLockManager
StopWatch stopWatch = new StopWatch(); StopWatch stopWatch = new StopWatch();
boolean acquired = false; boolean acquired = false;
Lock lock = null;
stopWatch.start();
while ( !acquired )
{
if ( timeout > 0 )
{
long delta = stopWatch.getTime();
log.debug( "delta {}, timeout {}", delta, timeout );
if ( delta > timeout )
{
log.warn( "Cannot acquire read lock within {} millis. Will skip the file: {}", timeout, file );
// we could not get the lock within the timeout period, so throw FileLockTimeoutException
throw new FileLockTimeoutException();
}
}
Lock current = lockFiles.get( file );
try
{
if ( current != null )
{
log.debug( "write lock file exist continue wait" );
continue;
}
lock = new Lock( file, true );
createNewFileQuietly( file );
lock.openLock( true, timeout > 0 );
acquired = true;
}
catch ( FileNotFoundException e )
{
// can happen if an other thread has deleted the file
// close RandomAccessFile!!!
closeQuietly( lock.getRandomAccessFile() );
log.debug( "write Lock skip: {} try to create file", e.getMessage() );
createNewFileQuietly( file );
}
catch ( IOException e )
{
throw new FileLockException( e.getMessage(), e );
}
catch ( IllegalStateException e )
{
log.debug( "openLock {}:{}", e.getClass(), e.getMessage() );
}
}
Lock current = lockFiles.putIfAbsent( file, lock );
if ( current != null )
{
lock = current;
}
return lock;
}
private void closeQuietly( RandomAccessFile randomAccessFile )
{
if ( randomAccessFile == null )
{
return;
}
try try
{ {
Lock lock = null; randomAccessFile.close();
stopWatch.start();
while ( !acquired )
{
if ( timeout > 0 )
{
long delta = stopWatch.getTime();
log.debug( "delta {}, timeout {}", delta, timeout );
if ( delta > timeout )
{
log.warn( "Cannot acquire read lock within {} millis. Will skip the file: {}", timeout, file );
// we could not get the lock within the timeout period, so throw FileLockTimeoutException
throw new FileLockTimeoutException();
}
}
lock = new Lock( file, true );
Lock current = lockFiles.get( file );
try
{
if ( current != null )
{
log.debug( "write lock file exist continue wait" );
// close RandomAccessFile!!!
RandomAccessFile raf = lock.getRandomAccessFile();
if (raf != null)
{
raf.close();
}
continue;
}
createNewFileQuietly( file );
lock.openLock( true, timeout > 0 );
acquired = true;
}
catch ( FileNotFoundException e )
{
// can happen if an other thread has deleted the file
log.debug( "write Lock skip: {} try to create file", e.getMessage() );
createNewFileQuietly( file );
}
catch ( IOException e )
{
throw new FileLockException( e.getMessage(), e );
}
catch ( IllegalStateException e )
{
log.debug( "openLock {}:{}", e.getClass(), e.getMessage() );
}
}
Lock current = lockFiles.putIfAbsent( file, lock );
if ( current != null )
{
lock = current;
}
return lock;
} }
catch ( IOException e )
catch (
FileNotFoundException e
)
{ {
throw new FileLockException( e.getMessage(), e ); // ignore
} }
} }
private void createNewFileQuietly( File file ) private void createNewFileQuietly( File file )