Skip to content

Storage gc to better handle batch and physical store error #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruhan1 merged 1 commit into from
Apr 12, 2024
Merged

Storage gc to better handle batch and physical store error #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rc/main/java/org/commonjava/storage/pathmapped/config/DefaultPathMappedStorageConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
public class DefaultPathMappedStorageConfig
implements PathMappedStorageConfig
{
private static final int DEFAULT_GC_BATCH_SIZE = 0; // no limit
private static final int DEFAULT_GC_BATCH_SIZE = 100;

private static final int MAX_GC_RESULT_SIZE = 100000;

Expand Down
22 changes: 13 additions & 9 deletions storage/src/main/java/org/commonjava/storage/pathmapped/core/PathMappedFileManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
Expand Down Expand Up @@ -398,25 +399,21 @@ public Map<FileInfo, Boolean> gc()

private Map<FileInfo, Boolean> executeGC() throws Exception
{
logger.info("Run storage gc.");
logger.info("Run storage gc...");
Map<FileInfo, Boolean> gcResults = new HashMap<>();
while ( true )
{
int batchSize = config.getGCBatchSize();
List<Reclaim> reclaims = pathDB.listOrphanedFiles( batchSize );

int size = reclaims.size();
logger.info( "Get reclaims for GC, size: {}", size );
logger.info( "Get reclaims for gc, size: {}", size );
if ( size <= 0 )
{
logger.info("gc complete.");
break;
}
else if ( batchSize > 0 && size < batchSize )
{
logger.info( "Reclaims size less than batch size {}. Break current gc.", batchSize );
logger.info("Gc complete.");
break;
}
final AtomicBoolean physicalStoreError = new AtomicBoolean( false );
reclaims.forEach( reclaim -> {
FileInfo fileInfo = new FileInfo();
fileInfo.setFileId( reclaim.getFileId() );
Expand All @@ -430,13 +427,20 @@ else if ( batchSize > 0 && size < batchSize )
else
{
logger.warn( "Delete from physical store failed, fileInfo: {}, reclaim: {}", fileInfo, reclaim );
physicalStoreError.set( true );
}
gcResults.put(fileInfo, result);
});
if ( physicalStoreError.get() )
{
// Break to avoid infinite loop. The listOrphanedFiles may fetch duplicated entries in this case.
logger.info("Gc hit physical store error. Break current gc. gcResults: {}", gcResults);
break;
}
int curSize = gcResults.size();
if ( curSize >= config.getGcMaxResultSize() )
{
logger.info("gc reach the max result size and complete, curSize: {}", curSize);
logger.info("Gc reach the max result size and complete, curSize: {}", curSize);
break;
}
}
Expand Down