Merge pull request #53 from yma96/1.1.x

Add generation-timeout-minutes config
Commonjava · Dec 16, 2024 · 86cac22 · 86cac22
2 parents 817e37b + d081ec6
commit 86cac22
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/org/commonjava/indy/service/archive/config/PreSeedConfig.java b/src/main/java/org/commonjava/indy/service/archive/config/PreSeedConfig.java
@@ -34,4 +34,7 @@ public interface PreSeedConfig
 
     @WithName( "thread-multiplier" )
     Optional<Integer> threadMultiplier();
+
+    @WithName( "generation-timeout-minutes" )
+    Optional<Integer> generationTimeoutMinutes();
 }
diff --git a/src/main/java/org/commonjava/indy/service/archive/controller/ArchiveController.java b/src/main/java/org/commonjava/indy/service/archive/controller/ArchiveController.java
@@ -164,7 +164,7 @@ public void generate( HistoricalContentDTO content )
         {
             if ( isInProgress( buildConfigId ) )
             {
-                logger.info( "There is already generation process in progress for buildConfigId {}, try lock wait.",
+                logger.info( "There is already generation process in progress for buildConfigId {}, this request will skip.",
                              buildConfigId );
                 // Conflicted generation, just return immediately
                 return;
@@ -192,7 +192,7 @@ public void generate( HistoricalContentDTO content )
             } );
             try
             {
-                future.get( 60, TimeUnit.MINUTES );
+                future.get( preSeedConfig.generationTimeoutMinutes().orElse( 60 ), TimeUnit.MINUTES );
             }
             catch ( TimeoutException e )
             {

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -47,4 +47,5 @@ pre-seed:
   main-indy: https://indy-gateway-master-devel.psi.redhat.com
   storage-dir: data
   not-used-days-cleanup: 10
-  thread-multiplier: 4
+  thread-multiplier: 4
+  generation-timeout-minutes: 60
diff --git a/src/test/java/org/commonjava/indy/service/archive/util/TestPreSeedConfig.java b/src/test/java/org/commonjava/indy/service/archive/util/TestPreSeedConfig.java
@@ -52,4 +52,9 @@ public Optional<Integer> threadMultiplier()
         return Optional.of( 4 );
     }
 
+    public Optional<Integer> generationTimeoutMinutes()
+    {
+        return Optional.of( 60 );
+    }
+
 }