Handle shutdown

Author: labkey-nicka

experiment/src/org/labkey/experiment/api/ExpMaterialImpl.java

@@ -37,6 +37,7 @@
 import org.labkey.api.data.Table;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
+import org.labkey.api.data.dialect.SqlDialect;
 import org.labkey.api.exp.ObjectProperty;
 import org.labkey.api.exp.OntologyManager;
 import org.labkey.api.exp.PropertyDescriptor;
@@ -497,7 +498,18 @@ private void getCustomIndexValues(
         for (ExpMaterialTable.Column column : ExpMaterialTable.Column.values())
             skipColumns.add(column.name());
 
-        processIndexValues(props, table, skipColumns, identifiersHi, new HashSet<>(), new HashSet<>(), keywordsHi, new HashSet<>(), new HashSet<>(), jsonData);
+        try
+        {
+            processIndexValues(props, table, skipColumns, identifiersHi, new HashSet<>(), new HashSet<>(), keywordsHi, new HashSet<>(), new HashSet<>(), jsonData);
+        }
+        catch (RuntimeException x)
+        {
+            // Cached temp table torn down concurrently (schema-change re-index); retry once via the live join.
+            if (!SqlDialect.isObjectNotFoundException(x))
+                throw x;
+            table.uncacheMaterializedView();
+            processIndexValues(props, table, skipColumns, identifiersHi, new HashSet<>(), new HashSet<>(), keywordsHi, new HashSet<>(), new HashSet<>(), jsonData);
+        }
     }
 
     static final List<Pair<Long,Long>> updateLastIndexedList = new ArrayList<>();

experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java

@@ -119,6 +119,7 @@
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.test.TestWhen;
+import org.labkey.api.util.ContextListener;
 import org.labkey.api.util.GUID;
 import org.labkey.api.util.HeartBeat;
 import org.labkey.api.util.JunitUtil;
@@ -1377,12 +1378,23 @@ private _MaterializedQueryHelper getOrCreateMQH()
         });
     }
 
+    /** Drop the cached materialized helper for this table's sample type so the next read rebuilds (or uses the live join). */
+    void uncacheMaterializedView()
+    {
+        if (null != _ss)
+            _materializedQueries.remove(_ss.getLSID());
+    }
+
     /* SELECT and JOIN, does not include WHERE, same as getJoinSQL() */
     private @Nullable SQLFragment getMaterializedSQL()
     {
         if (null == _ss)
             return getJoinSQL(null);
 
+        // Skip the materialized path during shutdown; temp-table cleanup can drop it mid-read (42P01), so use the live join.
+        if (ContextListener.isShuttingDown())
+            return null;
+
         var mqh = getOrCreateMQH();
 
         SQLFragment tempRef = mqh.tryGetFromSqlIfLoaded("_cached_view_");

search/src/org/labkey/search/model/AbstractSearchService.java

@@ -57,6 +57,7 @@
 import org.labkey.api.util.Path;
 import org.labkey.api.util.QuietCloser;
 import org.labkey.api.util.ShutdownListener;
+import org.labkey.api.util.ShuttingDownException;
 import org.labkey.api.util.StringUtilsLabKey;
 import org.labkey.api.util.SystemMaintenance;
 import org.labkey.api.util.SystemMaintenance.MaintenanceTask;
@@ -1155,15 +1156,18 @@ public Container getContainer()
             catch (Throwable x)
             {
                 success = false;
-                try
-                {
-                    ExceptionUtil.logExceptionToMothership(null, x);
-                }
-                catch (Throwable t)
+                if (!(_shuttingDown || x instanceof ShuttingDownException))
                 {
-                    /* */
+                    try
+                    {
+                        ExceptionUtil.logExceptionToMothership(null, x);
+                    }
+                    catch (Throwable t)
+                    {
+                        /* */
+                    }
+                    _log.error("Error running {}", null != i ? i._id : "", x);
                 }
-                _log.error("Error running {}", null != i ? i._id : "", x);
             }
             finally
             {