Merge branch 'develop' into v6.8-qdr

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java

@@ -146,6 +146,7 @@ public Dataset findDeep(Object pk) {
                     .setHint("eclipselink.left-join-fetch", "o.files.creator")
                     .setHint("eclipselink.left-join-fetch", "o.files.alternativePersistentIndentifiers")
                     .setHint("eclipselink.left-join-fetch", "o.files.roleAssignments")
+                    .setHint("eclipselink.left-join-fetch", "o.storageUse")
                     .getSingleResult();
         } catch (NoResultException | NonUniqueResultException ex) {
             return null;

src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java

@@ -15,6 +15,8 @@
 import jakarta.ejb.Asynchronous;
 import jakarta.ejb.EJB;
 import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import jakarta.inject.Named;
 import jakarta.json.Json;
 import jakarta.json.JsonArrayBuilder;
@@ -47,6 +49,7 @@ public class IndexBatchServiceBean {
     SystemConfig systemConfig;
 
     @Asynchronous
+    @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
     public Future<JsonObjectBuilder> indexStatus() {
         JsonObjectBuilder response = Json.createObjectBuilder();
         logger.info("Beginning indexStatus()");
@@ -76,6 +79,7 @@ public Future<JsonObjectBuilder> indexStatus() {
     }
 
     @Asynchronous
+    @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
     public Future<JsonObjectBuilder> clearOrphans() {
         JsonObjectBuilder response = Json.createObjectBuilder();
         List<String> solrIds = new ArrayList<>();
@@ -103,6 +107,7 @@ public Future<JsonObjectBuilder> clearOrphans() {
 
 
     @Asynchronous
+    @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
     public Future<JsonObjectBuilder> indexAllOrSubset(long numPartitions, long partitionId, boolean skipIndexed, boolean previewOnly) {
         JsonObjectBuilder response = Json.createObjectBuilder();
         indexAllOrSubset(numPartitions, partitionId, skipIndexed);
@@ -140,7 +145,8 @@ public JsonObjectBuilder indexAllOrSubsetPreview(long numPartitions, long partit
         return response;
     }
 
-    public Future<String> indexAllOrSubset(long numPartitions, long partitionId, boolean skipIndexed) {
+    @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+    private Future<String> indexAllOrSubset(long numPartitions, long partitionId, boolean skipIndexed) {
         long indexAllTimeBegin = System.currentTimeMillis();
         String status;
 

src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java

@@ -1547,13 +1547,18 @@ public boolean isValid(SolrSearchResult result) {
         });
     }
 
+    private Map<Long, Boolean> seesStatus = new HashMap<>();
+    
     public boolean canSeeCurationStatus(Long datasetId) {
-        boolean creatorsCanSeeStatus = JvmSettings.UI_SHOW_CURATION_STATUS_TO_ALL.lookupOptional(Boolean.class).orElse(false);
-        if (creatorsCanSeeStatus) {
-            return permissionsWrapper.canViewUnpublishedDataset(getDataverseRequest(),(Dataset) dvObjectService.findDvObject(datasetId));
-        } else {
-            return canPublishDataset(datasetId);
+        if (!seesStatus.containsKey(datasetId)) {
+            boolean creatorsCanSeeStatus = JvmSettings.UI_SHOW_CURATION_STATUS_TO_ALL.lookupOptional(Boolean.class).orElse(false);
+            if (creatorsCanSeeStatus) {
+                seesStatus.put(datasetId, permissionsWrapper.canViewUnpublishedDataset(getDataverseRequest(), (Dataset) dvObjectService.findDvObject(datasetId)));
+            } else {
+                seesStatus.put(datasetId, canPublishDataset(datasetId));
+            }
         }
+        return seesStatus.get(datasetId);
     }
 
     public enum SortOrder {

src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java

@@ -39,6 +39,7 @@
 import jakarta.persistence.PersistenceContext;
 
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.UpdateResponse;
 import org.apache.solr.common.SolrInputDocument;
 
 @Named
@@ -327,7 +328,47 @@ private void persistToSolr(Collection<SolrInputDocument> docs) throws SolrServer
         /**
          * @todo Do something with these responses from Solr.
          */
-        solrClientService.getSolrClient().add(docs);
+        int maxRetries = 3;
+        int retryCount = 0;
+        boolean success = false;
+
+        while (!success && retryCount < maxRetries) {
+            try {
+                if (retryCount > 0) {
+                    // Exponential backoff
+                    Thread.sleep((long) Math.pow(2, retryCount) * 1000);
+                    logger.info("Retry attempt " + retryCount + " for Solr batch");
+                }
+
+                logger.fine("persisting " + docs.size() + " docs to Solr...");
+                UpdateResponse response = solrClientService.getSolrClient().add(docs);
+
+                // Check response status
+                if (response.getStatus() == 0) {
+                    success = true;
+                    logger.fine("Successfully added " + docs.size() + " docs to Solr in " +
+                            response.getQTime() + "ms");
+                } else {
+                    logger.warning("Solr returned non-zero status: " + response.getStatus());
+                }
+            } catch (SolrServerException | IOException e) {
+                retryCount++;
+                if (e.getMessage() != null && e.getMessage().contains("Request processing has stalled")) {
+                    logger.warning("Solr request stalled. Retry " + retryCount + "/" + maxRetries);
+
+                    // If this is the last retry, rethrow
+                    if (retryCount >= maxRetries) {
+                        throw e;
+                    }
+                } else {
+                    // For other exceptions, don't retry
+                    throw e;
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new IOException("Interrupted during retry backoff", e);
+            }
+        }
     }
 
 

src/main/webapp/search-include-fragment.xhtml

@@ -582,7 +582,7 @@
                             <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{result.deaccessionedState}"/>
                             <h:outputText value="#{bundle['embargoed']}" styleClass="label label-primary" rendered="#{SearchIncludeFragment.isActivelyEmbargoed(result)}"/>
                             <h:outputText value="#{bundle['retentionExpired']}" styleClass="label label-warning" rendered="#{SearchIncludeFragment.isRetentionExpired(result)}"/>
-                            <h:outputText value="#{DatasetUtil:getLocaleCurationStatusLabelFromString(result.curationStatus)}" styleClass="label curation-status" rendered="#{SearchIncludeFragment.canSeeCurationStatus(result.entityId)}"/>
+                            <h:outputText value="#{DatasetUtil:getLocaleCurationStatusLabelFromString(result.curationStatus)}" styleClass="label curation-status" rendered="#{result.draftState and SearchIncludeFragment.canSeeCurationStatus(result.entityId)}"/>
                             <h:outputText value="#{result.userRole}" styleClass="label label-primary" rendered="#{!empty result.userRole}"/>
                             <h:outputText value="#{bundle['incomplete']}" styleClass="label label-danger" rendered="#{!result.harvested and !SearchIncludeFragment.isValid(result)}"/>
                         </div>