Miscellanous fix (#1371)

* Debug * Update DefaultAsyncQueryDAO.java * Update DefaultAsyncQueryDAO.java * Throw exception instead * Update AsyncQueryInterruptThread.java * Update pom.xml * Unit test case update * Update DefaultAsyncQueryDAO.java
yahoo · Aug 7, 2020 · fa22727 · fa22727
1 parent a1348e6
commit fa22727
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/AsyncQueryInterruptThread.java b/elide-async/src/main/java/com/yahoo/elide/async/service/AsyncQueryInterruptThread.java
@@ -47,9 +47,8 @@ public void run() {
     protected void interruptQuery() {
         try {
             long interruptTimeMillies = calculateTimeOut(maxRunTimeMinutes, submittedOn);
-
+            log.debug("Waiting on the future with the given timeout for {}", interruptTimeMillies);
             if (interruptTimeMillies > 0) {
-               log.debug("Waiting on the future with the given timeout for {}", interruptTimeMillies);
                task.get(interruptTimeMillies, TimeUnit.MILLISECONDS);
             }
         } catch (InterruptedException e) {

diff --git a/elide-async/src/main/java/com/yahoo/elide/async/service/DefaultAsyncQueryDAO.java b/elide-async/src/main/java/com/yahoo/elide/async/service/DefaultAsyncQueryDAO.java
@@ -201,8 +201,7 @@ protected Object executeInTransaction(DataStore dataStore, Transactional action)
             tx.commit(scope);
         } catch (IOException e) {
             log.error("IOException: {}", e);
-        } catch (Exception e) {
-            log.error("Exception: {}", e);
+            throw new IllegalStateException(e);
         }
         return result;
     }

diff --git a/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncQueryThreadTest.java b/elide-async/src/test/java/com/yahoo/elide/async/service/AsyncQueryThreadTest.java
@@ -102,4 +102,18 @@ public void testProcessQueryException() {
         verify(asyncQueryDao, times(1)).updateStatus(queryObj, QueryStatus.PROCESSING);
         verify(asyncQueryDao, times(1)).updateStatus(queryObj, QueryStatus.FAILURE);
     }
+
+    @Test
+    public void testAsyncQueryResultNullException() {
+        String query = "/group?sort=commonName&fields%5Bgroup%5D=commonName,description";
+
+        when(queryObj.getQuery()).thenReturn(query);
+        when(queryObj.getQueryType()).thenReturn(QueryType.JSONAPI_V1_0);
+        when(asyncQueryDao.createAsyncQueryResult(any(), any(), any(), any())).thenThrow(RuntimeException.class);
+
+        queryThread.processQuery();
+
+        verify(asyncQueryDao, times(1)).updateStatus(queryObj, QueryStatus.PROCESSING);
+        verify(asyncQueryDao, times(1)).updateStatus(queryObj, QueryStatus.FAILURE);
+    }
 }
diff --git a/...-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideDynamicConfiguration.java b/...-autoconfigure/src/main/java/com/yahoo/elide/spring/config/ElideDynamicConfiguration.java
@@ -12,6 +12,7 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties.Naming;
 import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
@@ -60,6 +61,7 @@ public class ElideDynamicConfiguration {
      * @return LocalContainerEntityManagerFactoryBean bean
      */
     @Bean
+    @ConditionalOnMissingBean
     public LocalContainerEntityManagerFactoryBean entityManagerFactory (
             DataSource source,
             JpaProperties jpaProperties,