Skip to content

Add bulk repair endpoint for Koji repository volume URLs #2513

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
Jan 29, 2026
Merged

Add bulk repair endpoint for Koji repository volume URLs #2513

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
122 changes: 122 additions & 0 deletions addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,128 @@ public KojiRepairResult repairMetadataTimeout( KojiRepairRequest request, String
return repairMetadataTimeout( request, user, false );
}

public KojiMultiRepairResult repairAllVol( final String user, boolean isDryRun )
throws KojiRepairException, IndyWorkflowException
{
KojiMultiRepairResult result = new KojiMultiRepairResult();

if ( opLock.tryLock() )
{
try
{
List<RemoteRepository> kojiRemotes = getAllKojiRemotes();

final String newStorageRoot = config.getStorageRootUrl();
if ( newStorageRoot == null || newStorageRoot.trim().isEmpty() )
{
throw new KojiRepairException( "Storage root URL is not configured." );
}

DrainingExecutorCompletionService<KojiRepairResult> repairService =
new DrainingExecutorCompletionService<>( repairExecutor );

detectOverloadVoid( () -> kojiRemotes.forEach( r -> repairService.submit( () -> {
logger.info( "Attempting to repair volume URL in Koji remote: {}", r.getKey() );

try
{
return repairRepositoryVol( r, user, isDryRun, newStorageRoot );
}
catch ( KojiRepairException e )
{
logger.error( "Failed to execute repair for: " + r.getKey(), e );
}

return null;
} ) ) );

List<KojiRepairResult> results = new ArrayList<>();
try
{
repairService.drain( r -> {
if ( r != null )
{
results.add( r );
}
} );
}
catch ( InterruptedException | ExecutionException e )
{
logger.error( "Failed to repair volume URLs.", e );
}

result.setResults( results );
}
catch ( IndyDataException e )
{
throw new KojiRepairException( "Failed to list Koji remote repositories for repair. Reason: %s", e, e.getMessage() );
}
finally
{
opLock.unlock();
}
}
else
{
throw new KojiRepairException( "Koji repair manager is busy." );
}

return result;
}

private KojiRepairResult repairRepositoryVol( RemoteRepository repository, String user, boolean isDryRun, String newStorageRoot )
throws KojiRepairException
{
StoreKey storeKey = repository.getKey();
KojiRepairRequest request = new KojiRepairRequest( storeKey, isDryRun );
KojiRepairResult ret = new KojiRepairResult( request );

String oldUrl = repository.getUrl();

// Find /brewroot/ and replace everything before it with the new storage root
int brewrootIndex = oldUrl.indexOf( "/brewroot/" );
if ( brewrootIndex == -1 )
{
String error = String.format( "Repository URL does not contain '/brewroot/': %s", oldUrl );
logger.warn( error );
return ret.withError( error );
}

// Get the part after /brewroot (e.g., /vol/... or /packages/...)
String suffix = oldUrl.substring( brewrootIndex + "/brewroot".length() );
String newUrl = newStorageRoot + suffix;

boolean changed = !oldUrl.equals( newUrl );
if ( changed )
{
KojiRepairResult.RepairResult repairResult = new KojiRepairResult.RepairResult( storeKey );
repairResult.withPropertyChange( "url", oldUrl, newUrl );
ret.withResult( repairResult );

if ( !isDryRun )
{
try
{
repository.setUrl( newUrl );
ChangeSummary changeSummary = new ChangeSummary( user, "Repair " + storeKey + " volume URL to use new storage root" );
boolean fireEvents = false;
boolean skipIfExists = false;
storeManager.storeArtifactStore( repository, changeSummary, skipIfExists, fireEvents, new EventMetadata() );
}
catch ( IndyDataException e )
{
throw new KojiRepairException( "Failed to repair store: %s. Reason: %s", e, storeKey, e.getMessage() );
}
}
}
else
{
ret.withNoChange( storeKey );
}

return ret;
}


private List<RemoteRepository> getAllKojiRemotes()
throws IndyDataException
Expand Down
29 changes: 29 additions & 0 deletions addons/koji/jaxrs/src/main/java/org/commonjava/indy/koji/bind/jaxrs/KojiRepairResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,33 @@ public KojiMultiRepairResult repairAllMetadataTimeout( final @Context HttpServle
return null;
}

@ApiOperation(
"Repair koji repository remote url /vol for all koji remote repositories by replacing the storage root URL." )
@ApiImplicitParam( name = "isDryRun", paramType = "query",
value = "boolean value to specify if this request is a dry run request", defaultValue = "false",
dataType = "java.lang.Boolean" )
@ApiResponse( code = 200, message = "Operation finished (consult response content for success/failure).",
response = KojiMultiRepairResult.class )
@POST
@Path( "/vol/all" )
@Consumes( ApplicationContent.application_json )
public KojiMultiRepairResult repairAllVolumes( final @Context HttpServletRequest servletRequest,
final @QueryParam( "isDryRun" ) Boolean isDryRun,
final @Context SecurityContext securityContext )
{
String user = securityManager.getUser( securityContext, servletRequest );
final boolean dryRun = isDryRun == null ? false : isDryRun;
try
{
return repairManager.repairAllVol( user, dryRun );
}
catch ( KojiRepairException | IndyWorkflowException e )
{
logger.error( e.getMessage(), e );
responseHelper.throwError( e );
}

return null;
}

}