add timeout for tag rebuild

Author: Vladimir Kotal

opengrok-indexer/src/main/java/org/opengrok/indexer/history/GitRepository.java

@@ -39,6 +39,12 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeSet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -589,6 +595,44 @@ boolean hasFileBasedTags() {
         return true;
     }
 
+    private void rebuildTagList(File directory) {
+        this.tagList = new TreeSet<>();
+        try (org.eclipse.jgit.lib.Repository repository = FileRepositoryBuilder.
+                create(Paths.get(directory.getAbsolutePath(), ".git").toFile())) {
+            try (Git git = new Git(repository)) {
+                List<Ref> refList = git.tagList().call(); // refs sorted according to tag names
+                Map<RevCommit, String> commit2Tags = new HashMap<>();
+                for (Ref ref : refList) {
+                    String tagName = ref.getName().replace("refs/tags/", "");
+                    String existingTags;
+                    RevCommit commit = getCommit(repository, ref);
+                    if ((existingTags = commit2Tags.get(commit)) != null) {
+                        existingTags = existingTags + TAGS_SEPARATOR + tagName;
+                        commit2Tags.put(commit, existingTags);
+                    } else {
+                        commit2Tags.put(commit, tagName);
+                    }
+                }
+
+                for (Map.Entry<RevCommit, String> entry : commit2Tags.entrySet()) {
+                    int commitTime = entry.getKey().getCommitTime();
+                    Date date = new Date((long) (commitTime) * 1000);
+                    GitTagEntry tagEntry = new GitTagEntry(entry.getKey().getName(),
+                            date, entry.getValue());
+                    this.tagList.add(tagEntry);
+                }
+            }
+        } catch (IOException | GitAPIException e) {
+            LOGGER.log(Level.WARNING, "cannot get tags for \"" + directory.getAbsolutePath() + "\"", e);
+            // In case of partial success, do not null-out tagList here.
+        }
+
+        if (LOGGER.isLoggable(Level.FINEST)) {
+            LOGGER.log(Level.FINEST, "Read tags count={0} for {1}",
+                    new Object[] {tagList.size(), directory});
+        }
+    }
+
     /**
      * Builds a Git tag list by querying Git commit hash, commit time, and tag
      * names.
@@ -622,42 +666,22 @@ boolean hasFileBasedTags() {
      */
     @Override
     protected void buildTagList(File directory, CommandTimeoutType cmdType) {
-        this.tagList = new TreeSet<>();
-
-        // TODO: add timeout
-        try (org.eclipse.jgit.lib.Repository repository = FileRepositoryBuilder.
-                create(Paths.get(directory.getAbsolutePath(), ".git").toFile())) {
-            try (Git git = new Git(repository)) {
-                List<Ref> refList = git.tagList().call(); // refs sorted according to tag names
-                Map<RevCommit, String> commit2Tags = new HashMap<>();
-                for (Ref ref : refList) {
-                    String tagName = ref.getName().replace("refs/tags/", "");
-                    String existingTags;
-                    RevCommit commit = getCommit(repository, ref);
-                    if ((existingTags = commit2Tags.get(commit)) != null) {
-                        existingTags = existingTags + TAGS_SEPARATOR + tagName;
-                        commit2Tags.put(commit, existingTags);
-                    } else {
-                        commit2Tags.put(commit, tagName);
-                    }
-                }
+        final ExecutorService executor = Executors.newSingleThreadExecutor();
+        final Future<?> future = executor.submit(() -> rebuildTagList(directory));
+        executor.shutdown();
 
-                for (Map.Entry<RevCommit, String> entry : commit2Tags.entrySet()) {
-                    int commitTime = entry.getKey().getCommitTime();
-                    Date date = new Date((long) (commitTime) * 1000);
-                    GitTagEntry tagEntry = new GitTagEntry(entry.getKey().getName(),
-                            date, entry.getValue());
-                    this.tagList.add(tagEntry);
-                }
-            }
-        } catch (IOException | GitAPIException e) {
-            LOGGER.log(Level.WARNING, "cannot get tags for \"" + directory.getAbsolutePath() + "\"", e);
-            // In case of partial success, do not null-out tagList here.
+        try {
+            future.get(RuntimeEnvironment.getInstance().getCommandTimeout(cmdType), TimeUnit.SECONDS);
+        }
+        catch (InterruptedException | ExecutionException e) {
+            LOGGER.log(Level.WARNING, "failed tag rebuild for directory " + directory, e);
+        }
+        catch (TimeoutException e) {
+            LOGGER.log(Level.WARNING, "timed out tag rebuild for directory " + directory, e);
         }
 
-        if (LOGGER.isLoggable(Level.FINEST)) {
-            LOGGER.log(Level.FINEST, "Read tags count={0} for {1}",
-                    new Object[] {tagList.size(), directory});
+        if (!executor.isTerminated()) {
+            executor.shutdownNow();
         }
     }