Merge pull request #7165 from VoltDB/ENG-19626-SyncUDFUpdates-84

ENG-19626:
mode · May 20, 2020 · f2556b0 · f2556b0
2 parents 34ba71c + dbb8a3c
commit f2556b0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/frontend/org/voltdb/UserDefinedFunctionManager.java b/src/frontend/org/voltdb/UserDefinedFunctionManager.java
@@ -60,7 +60,9 @@ public UserDefinedFunctionRunner getFunctionRunnerById(int functionId) {
     }
 
     // Load all the UDFs recorded in the catalog. Instantiate and register them in the system.
-    public void loadFunctions(CatalogContext catalogContext) {
+    // WARNING: This is called from all sites in parallel but updates a shared static
+    //          data structure in FunctionForVoltDB
+    public synchronized void loadFunctions(CatalogContext catalogContext) {
         final CatalogMap<Function> catalogFunctions = catalogContext.database.getFunctions();
         // Remove obsolete tokens
         for (UserDefinedFunctionRunner runner : m_udfs.values()) {