From 24f1d8326351d67556ebcf0ec29022a8add8bd48 Mon Sep 17 00:00:00 2001
From: Corey Kosak <kosak@users.noreply.github.com>
Date: Mon, 27 Jan 2025 22:50:13 -0500
Subject: [PATCH 1/2] feat(csharp/ExcelAddIn): Add a version number and display
 it in the GUI (#6602)

We are establishing a version numbering scheme for the Excel AddIn.

This PR sets the AddIn to be version 0.8.0, displays that version in the
dialog boxes, and we also note the versions of Community Core and
Enterprise Core+ that it was built from in the file VERSIONS.md.

We also make relevant changes to the ExcelAddInInstaller that also
surface the version number for the installer.
---
 csharp/ExcelAddIn/util/Utility.cs             |  2 +
 .../views/ConnectionManagerDialog.Designer.cs | 15 ++++--
 .../views/ConnectionManagerDialog.cs          |  4 +-
 .../views/ConnectionManagerDialog.resx        |  7 +--
 .../views/CredentialsDialog.Designer.cs       | 52 ++++++++++++-------
 csharp/ExcelAddIn/views/CredentialsDialog.cs  |  6 ++-
 .../ExcelAddIn/views/CredentialsDialog.resx   |  4 +-
 .../ExcelAddInInstaller.aip                   |  8 +--
 .../Prerequisites/.NET 8.0/.gitignore         |  1 +
 .../Prerequisites/.NET 8.0/README.md          |  9 ++++
 csharp/ExcelAddInInstaller/VERSIONS.md        |  5 ++
 .../ExcelAddInInstaller/dhinstall/.gitignore  |  5 +-
 12 files changed, 80 insertions(+), 38 deletions(-)
 create mode 100644 csharp/ExcelAddInInstaller/Prerequisites/.NET 8.0/.gitignore
 create mode 100644 csharp/ExcelAddInInstaller/Prerequisites/.NET 8.0/README.md
 create mode 100644 csharp/ExcelAddInInstaller/VERSIONS.md

diff --git a/csharp/ExcelAddIn/util/Utility.cs b/csharp/ExcelAddIn/util/Utility.cs
index 4b9de77ca3a..149a1c08392 100644
--- a/csharp/ExcelAddIn/util/Utility.cs
+++ b/csharp/ExcelAddIn/util/Utility.cs
@@ -4,6 +4,8 @@
 namespace Deephaven.ExcelAddIn.Util;
 
 internal static class Utility {
+  public const string VersionString = "Version 0.8.0";
+
   public static T Exchange<T>(ref T item, T newValue) {
     var result = item;
     item = newValue;
diff --git a/csharp/ExcelAddIn/views/ConnectionManagerDialog.Designer.cs b/csharp/ExcelAddIn/views/ConnectionManagerDialog.Designer.cs
index 604c97b2d12..08c6de2edd2 100644
--- a/csharp/ExcelAddIn/views/ConnectionManagerDialog.Designer.cs
+++ b/csharp/ExcelAddIn/views/ConnectionManagerDialog.Designer.cs
@@ -23,7 +23,6 @@ protected override void Dispose(bool disposing) {
     /// the contents of this method with the code editor.
     /// </summary>
     private void InitializeComponent() {
-      colorDialog1 = new ColorDialog();
       dataGridView1 = new DataGridView();
       newButton = new Button();
       connectionsLabel = new Label();
@@ -31,6 +30,7 @@ private void InitializeComponent() {
       deleteButton = new Button();
       reconnectButton = new Button();
       makeDefaultButton = new Button();
+      versionLabel = new Label();
       ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
       SuspendLayout();
       // 
@@ -114,11 +114,21 @@ private void InitializeComponent() {
       makeDefaultButton.UseVisualStyleBackColor = true;
       makeDefaultButton.Click += makeDefaultButton_Click;
       // 
+      // versionLabel
+      // 
+      versionLabel.AutoSize = true;
+      versionLabel.Location = new Point(12, 581);
+      versionLabel.Name = "versionLabel";
+      versionLabel.Size = new Size(59, 25);
+      versionLabel.TabIndex = 6;
+      versionLabel.Text = "label1";
+      // 
       // ConnectionManagerDialog
       // 
       AutoScaleDimensions = new SizeF(10F, 25F);
       AutoScaleMode = AutoScaleMode.Font;
       ClientSize = new Size(1115, 615);
+      Controls.Add(versionLabel);
       Controls.Add(makeDefaultButton);
       Controls.Add(reconnectButton);
       Controls.Add(deleteButton);
@@ -134,8 +144,6 @@ private void InitializeComponent() {
     }
 
     #endregion
-
-    private ColorDialog colorDialog1;
     private DataGridView dataGridView1;
     private Button newButton;
     private Label connectionsLabel;
@@ -143,5 +151,6 @@ private void InitializeComponent() {
     private Button deleteButton;
     private Button reconnectButton;
     private Button makeDefaultButton;
+    private Label versionLabel;
   }
 }
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/views/ConnectionManagerDialog.cs b/csharp/ExcelAddIn/views/ConnectionManagerDialog.cs
index d56b79f950a..27d561bddc9 100644
--- a/csharp/ExcelAddIn/views/ConnectionManagerDialog.cs
+++ b/csharp/ExcelAddIn/views/ConnectionManagerDialog.cs
@@ -1,4 +1,5 @@
-using Deephaven.ExcelAddIn.Viewmodels;
+using Deephaven.ExcelAddIn.Util;
+using Deephaven.ExcelAddIn.Viewmodels;
 
 namespace Deephaven.ExcelAddIn.Views;
 
@@ -18,6 +19,7 @@ public ConnectionManagerDialog() {
 
     _bindingSource.DataSource = typeof(ConnectionManagerDialogRow);
     dataGridView1.DataSource = _bindingSource;
+    versionLabel.Text = Utility.VersionString;
   }
 
   public void AddRow(ConnectionManagerDialogRow row) {
diff --git a/csharp/ExcelAddIn/views/ConnectionManagerDialog.resx b/csharp/ExcelAddIn/views/ConnectionManagerDialog.resx
index 7f2cf2b8014..b92c16350e8 100644
--- a/csharp/ExcelAddIn/views/ConnectionManagerDialog.resx
+++ b/csharp/ExcelAddIn/views/ConnectionManagerDialog.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema
+    Microsoft ResX Schema 
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/views/CredentialsDialog.Designer.cs b/csharp/ExcelAddIn/views/CredentialsDialog.Designer.cs
index aca6db6b75a..05c3fd45d94 100644
--- a/csharp/ExcelAddIn/views/CredentialsDialog.Designer.cs
+++ b/csharp/ExcelAddIn/views/CredentialsDialog.Designer.cs
@@ -24,7 +24,7 @@ protected override void Dispose(bool disposing) {
     /// </summary>
     private void InitializeComponent() {
       corePlusPanel = new Panel();
-      label1 = new Label();
+      operateAsLabel = new Label();
       validateCertCheckBox = new CheckBox();
       operateAsBox = new TextBox();
       passwordBox = new TextBox();
@@ -35,11 +35,12 @@ private void InitializeComponent() {
       jsonUrlLabel = new Label();
       corePanel = new Panel();
       connectionStringBox = new TextBox();
-      label2 = new Label();
+      connectionStringLabel = new Label();
       groupBox1 = new GroupBox();
       sessionTypeIsGroovyButton = new RadioButton();
       sessionTypeIsPythonButton = new RadioButton();
       finalPanel = new Panel();
+      versionLabel = new Label();
       makeDefaultCheckBox = new CheckBox();
       testResultsTextBox = new TextBox();
       testResultsLabel = new Label();
@@ -61,7 +62,7 @@ private void InitializeComponent() {
       // 
       // corePlusPanel
       // 
-      corePlusPanel.Controls.Add(label1);
+      corePlusPanel.Controls.Add(operateAsLabel);
       corePlusPanel.Controls.Add(validateCertCheckBox);
       corePlusPanel.Controls.Add(operateAsBox);
       corePlusPanel.Controls.Add(passwordBox);
@@ -76,14 +77,14 @@ private void InitializeComponent() {
       corePlusPanel.Size = new Size(1054, 299);
       corePlusPanel.TabIndex = 2;
       // 
-      // label1
+      // operateAsLabel
       // 
-      label1.AutoSize = true;
-      label1.Location = new Point(75, 183);
-      label1.Name = "label1";
-      label1.Size = new Size(96, 25);
-      label1.TabIndex = 217;
-      label1.Text = "OperateAs";
+      operateAsLabel.AutoSize = true;
+      operateAsLabel.Location = new Point(75, 183);
+      operateAsLabel.Name = "operateAsLabel";
+      operateAsLabel.Size = new Size(96, 25);
+      operateAsLabel.TabIndex = 217;
+      operateAsLabel.Text = "OperateAs";
       // 
       // validateCertCheckBox
       // 
@@ -160,7 +161,7 @@ private void InitializeComponent() {
       // corePanel
       // 
       corePanel.Controls.Add(connectionStringBox);
-      corePanel.Controls.Add(label2);
+      corePanel.Controls.Add(connectionStringLabel);
       corePanel.Controls.Add(groupBox1);
       corePanel.Dock = DockStyle.Top;
       corePanel.Location = new Point(0, 490);
@@ -176,14 +177,14 @@ private void InitializeComponent() {
       connectionStringBox.Size = new Size(795, 31);
       connectionStringBox.TabIndex = 1;
       // 
-      // label2
+      // connectionStringLabel
       // 
-      label2.AutoSize = true;
-      label2.Location = new Point(27, 23);
-      label2.Name = "label2";
-      label2.Size = new Size(153, 25);
-      label2.TabIndex = 0;
-      label2.Text = "Connection String";
+      connectionStringLabel.AutoSize = true;
+      connectionStringLabel.Location = new Point(27, 23);
+      connectionStringLabel.Name = "connectionStringLabel";
+      connectionStringLabel.Size = new Size(153, 25);
+      connectionStringLabel.TabIndex = 0;
+      connectionStringLabel.Text = "Connection String";
       // 
       // groupBox1
       // 
@@ -220,6 +221,7 @@ private void InitializeComponent() {
       // 
       // finalPanel
       // 
+      finalPanel.Controls.Add(versionLabel);
       finalPanel.Controls.Add(makeDefaultCheckBox);
       finalPanel.Controls.Add(testResultsTextBox);
       finalPanel.Controls.Add(testResultsLabel);
@@ -231,6 +233,15 @@ private void InitializeComponent() {
       finalPanel.Size = new Size(1054, 106);
       finalPanel.TabIndex = 4;
       // 
+      // versionLabel
+      // 
+      versionLabel.AutoSize = true;
+      versionLabel.Location = new Point(12, 72);
+      versionLabel.Name = "versionLabel";
+      versionLabel.Size = new Size(110, 25);
+      versionLabel.TabIndex = 8;
+      versionLabel.Text = "versionLabel";
+      // 
       // makeDefaultCheckBox
       // 
       makeDefaultCheckBox.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@@ -377,7 +388,7 @@ private void InitializeComponent() {
     private Panel corePlusPanel;
     private Panel corePanel;
     private Label jsonUrlLabel;
-    private Label label2;
+    private Label connectionStringLabel;
     private TextBox jsonUrlBox;
     private TextBox connectionStringBox;
     private Label passwordLabel;
@@ -395,6 +406,7 @@ private void InitializeComponent() {
     private RadioButton sessionTypeIsGroovyButton;
     private RadioButton sessionTypeIsPythonButton;
     private Panel connectionIdPanel;
-    private Label label1;
+    private Label operateAsLabel;
+    private Label versionLabel;
   }
 }
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/views/CredentialsDialog.cs b/csharp/ExcelAddIn/views/CredentialsDialog.cs
index f3b664cab31..0b538bd4936 100644
--- a/csharp/ExcelAddIn/views/CredentialsDialog.cs
+++ b/csharp/ExcelAddIn/views/CredentialsDialog.cs
@@ -1,4 +1,5 @@
-using Deephaven.ExcelAddIn.ViewModels;
+using Deephaven.ExcelAddIn.Util;
+using Deephaven.ExcelAddIn.ViewModels;
 
 namespace ExcelAddIn.views {
   public partial class CredentialsDialog : Form {
@@ -47,6 +48,9 @@ public CredentialsDialog(CredentialsDialogViewModel vm) {
       // Bind the IsDefault property
       makeDefaultCheckBox.DataBindings.Add(nameof(makeDefaultCheckBox.Checked),
         vm, nameof(vm.IsDefault));
+
+      // Set the version label
+      versionLabel.Text = Utility.VersionString;
     }
 
     public void SetTestResultsBox(string testResultsState) {
diff --git a/csharp/ExcelAddIn/views/CredentialsDialog.resx b/csharp/ExcelAddIn/views/CredentialsDialog.resx
index 4f24d55cd6b..b92c16350e8 100644
--- a/csharp/ExcelAddIn/views/CredentialsDialog.resx
+++ b/csharp/ExcelAddIn/views/CredentialsDialog.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema
+    Microsoft ResX Schema 
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/csharp/ExcelAddInInstaller/ExcelAddInInstaller.aip b/csharp/ExcelAddInInstaller/ExcelAddInInstaller.aip
index e67e5d01d15..5faf4913676 100644
--- a/csharp/ExcelAddInInstaller/ExcelAddInInstaller.aip
+++ b/csharp/ExcelAddInInstaller/ExcelAddInInstaller.aip
@@ -12,10 +12,10 @@
     <ROW Property="BannerBitmap" Value="banner.jpg" MultiBuildValue="DefaultBuild:Banner.jpg" Type="1" MsiKey="BannerBitmap"/>
     <ROW Property="DialogBitmap" Value="dialog.jpg" MultiBuildValue="DefaultBuild:Dialog.jpg" Type="1" MsiKey="DialogBitmap"/>
     <ROW Property="Manufacturer" Value="Deephaven Data Labs LLC"/>
-    <ROW Property="ProductCode" Value="1033:{5C1E1B63-CC23-4F4D-8564-A843AA5D7413} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{7CA02F46-8607-4C9B-8372-AAAACD94DAC4} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Deephaven Excel Add-In"/>
-    <ROW Property="ProductVersion" Value="1.0.0" Options="32"/>
+    <ROW Property="ProductVersion" Value="0.8.0" Options="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{98EB9359-8BA3-44BA-A411-AED290E6EBD9}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -67,7 +67,7 @@
     <ROW Component="zstd.dll" ComponentId="{4DE80229-9EDC-40D0-9B91-4E6BCECAC0C9}" Directory_="APPDIR" Attributes="256" KeyPath="zstd.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="A0BFC224E0E9125ADE0B2DBF343" Title=".NET Desktop Runtime 8.0.8 x64" Description=".NET Desktop Runtime 8.0.8 x64" Display="3" Level="1" Attributes="0"/>
+    <ROW Feature="A0BFC224E0E9125ADE0B2DBF343" Title=".NET Desktop Runtime 8.0.12 x64" Description=".NET Desktop Runtime 8.0.12 x64" Display="3" Level="1" Attributes="0"/>
     <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
@@ -351,7 +351,7 @@
     <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
-    <ROW PrereqKey="A0BFC224E0E9125ADE0B2DBF343" DisplayName=".NET Desktop Runtime 8.0.8 x64" VersionMin="8.0" SetupFileUrl="Prerequisites\.NET 8.0\windowsdesktop-runtime-8.0.8-win-x64.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows 7 RTM x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="fx" TargetName=".NET 8.0\windowsdesktop-runtime-8.0.8-win-x64.exe" Feature="A0BFC224E0E9125ADE0B2DBF343"/>
+    <ROW PrereqKey="A0BFC224E0E9125ADE0B2DBF343" DisplayName=".NET Desktop Runtime 8.0.12 x64" VersionMin="8.0" SetupFileUrl="Prerequisites\.NET 8.0\windowsdesktop-runtime-8.0.12-win-x64.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows 7 RTM x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="fx" TargetName=".NET 8.0\windowsdesktop-runtime-8.0.12-win-x64.exe" Feature="A0BFC224E0E9125ADE0B2DBF343"/>
     <ATTRIBUTE name="PrereqsOrder" value="A0BFC224E0E9125ADE0B2DBF343"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
diff --git a/csharp/ExcelAddInInstaller/Prerequisites/.NET 8.0/.gitignore b/csharp/ExcelAddInInstaller/Prerequisites/.NET 8.0/.gitignore
new file mode 100644
index 00000000000..b883f1fdc6d
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/Prerequisites/.NET 8.0/.gitignore	
@@ -0,0 +1 @@
+*.exe
diff --git a/csharp/ExcelAddInInstaller/Prerequisites/.NET 8.0/README.md b/csharp/ExcelAddInInstaller/Prerequisites/.NET 8.0/README.md
new file mode 100644
index 00000000000..c86b9e81347
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/Prerequisites/.NET 8.0/README.md	
@@ -0,0 +1,9 @@
+This file is a placeholder that creates this directory in source control.
+
+This directory is the location of the prerequisites for the Deephaven Excel
+AddIn. Currently it holds the .exe file for the .NET 8.0 Windows Desktop
+Runtime installer. You are meant to download this installer from Microsoft
+and place it in this directory.
+
+Instructions for doing so are in Confluence in the article entitled
+"Creating a Windows MSI Installer for the Deephaven Excel Add-In (2nd gen)"
diff --git a/csharp/ExcelAddInInstaller/VERSIONS.md b/csharp/ExcelAddInInstaller/VERSIONS.md
new file mode 100644
index 00000000000..478039dd776
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/VERSIONS.md
@@ -0,0 +1,5 @@
+# Deephaven Excel Addin Versions
+
+0.8.0:
+Built against Community Core at hash 5f62c5bc36d1cad63e3c9ddf33bedc83cb6bf377
+Built against Enterprise Core+ at release grizzly/1.20240517.349
diff --git a/csharp/ExcelAddInInstaller/dhinstall/.gitignore b/csharp/ExcelAddInInstaller/dhinstall/.gitignore
index 8620bdd7442..38e60d6d796 100644
--- a/csharp/ExcelAddInInstaller/dhinstall/.gitignore
+++ b/csharp/ExcelAddInInstaller/dhinstall/.gitignore
@@ -1,2 +1,3 @@
-*.dll
-*.exe
+bin/
+include/
+lib/

From f79fe67264296cdc7667251785642fa5d6d533a2 Mon Sep 17 00:00:00 2001
From: Ryan Caudy <ryan@deephaven.io>
Date: Tue, 28 Jan 2025 09:00:59 -0500
Subject: [PATCH 2/2] fix: DH-18482: EventDrivenUpdateGraph: Allow two
 concurrent threads to safely requestRefresh(), and ensure clean errors for
 nested refresh attempts (#6603)

---
 .../updategraph/impl/BaseUpdateGraph.java     |  8 ++-
 .../impl/EventDrivenUpdateGraph.java          | 22 +++++---
 .../impl/TestEventDrivenUpdateGraph.java      | 56 +++++++++++++++++++
 3 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/engine/table/src/main/java/io/deephaven/engine/updategraph/impl/BaseUpdateGraph.java b/engine/table/src/main/java/io/deephaven/engine/updategraph/impl/BaseUpdateGraph.java
index 5656caf60d2..a8709b39617 100644
--- a/engine/table/src/main/java/io/deephaven/engine/updategraph/impl/BaseUpdateGraph.java
+++ b/engine/table/src/main/java/io/deephaven/engine/updategraph/impl/BaseUpdateGraph.java
@@ -629,7 +629,7 @@ private void flushTerminalNotifications() {
             runNotification(notificationForThisThread);
         }
 
-        // We can not proceed until all of the terminal notifications have executed.
+        // We can not proceed until all the terminal notifications have executed.
         notificationProcessor.doAllWork();
     }
 
@@ -836,6 +836,10 @@ private void computeStatsAndLogCycle(final long cycleTimeNanos) {
         }
     }
 
+    void reportLockWaitNanos(final long lockWaitNanos) {
+        currentCycleLockWaitTotalNanos += lockWaitNanos;
+    }
+
     /**
      * Is the provided cycle time on budget?
      *
@@ -907,7 +911,7 @@ void refreshAllTables() {
     private void doRefresh(@NotNull final Runnable refreshFunction) {
         final long lockStartTimeNanos = System.nanoTime();
         exclusiveLock().doLocked(() -> {
-            currentCycleLockWaitTotalNanos += System.nanoTime() - lockStartTimeNanos;
+            reportLockWaitNanos(System.nanoTime() - lockStartTimeNanos);
             if (!running) {
                 return;
             }
diff --git a/engine/table/src/main/java/io/deephaven/engine/updategraph/impl/EventDrivenUpdateGraph.java b/engine/table/src/main/java/io/deephaven/engine/updategraph/impl/EventDrivenUpdateGraph.java
index b95acaa4bad..36e11c091c6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/updategraph/impl/EventDrivenUpdateGraph.java
+++ b/engine/table/src/main/java/io/deephaven/engine/updategraph/impl/EventDrivenUpdateGraph.java
@@ -53,14 +53,22 @@ public int parallelismFactor() {
      */
     @Override
     public void requestRefresh() {
-        maybeStart();
-        // do the work to refresh everything, on this thread
-        isUpdateThread.set(true);
-        try (final SafeCloseable ignored = ExecutionContext.newBuilder().setUpdateGraph(this).build().open()) {
-            refreshAllTables();
-        } finally {
-            isUpdateThread.remove();
+        if (isUpdateThread.get()) {
+            throw new IllegalStateException("Cannot request a refresh from an update thread");
         }
+        maybeStart();
+        // Do the work to refresh everything, driven by this thread. Note that we acquire the lock "early" in order to
+        // avoid any inconsistencies w.r.t. assumptions about clock, lock, and update-thread state.
+        final long lockStartTimeNanos = System.nanoTime();
+        exclusiveLock().doLocked(() -> {
+            reportLockWaitNanos(System.nanoTime() - lockStartTimeNanos);
+            isUpdateThread.set(true);
+            try (final SafeCloseable ignored = ExecutionContext.newBuilder().setUpdateGraph(this).build().open()) {
+                refreshAllTables();
+            } finally {
+                isUpdateThread.remove();
+            }
+        });
         final long nowNanos = System.nanoTime();
         synchronized (this) {
             maybeFlushUpdatePerformance(nowNanos, nowNanos);
diff --git a/engine/table/src/test/java/io/deephaven/engine/updategraph/impl/TestEventDrivenUpdateGraph.java b/engine/table/src/test/java/io/deephaven/engine/updategraph/impl/TestEventDrivenUpdateGraph.java
index b700c4ed006..10d7922b014 100644
--- a/engine/table/src/test/java/io/deephaven/engine/updategraph/impl/TestEventDrivenUpdateGraph.java
+++ b/engine/table/src/test/java/io/deephaven/engine/updategraph/impl/TestEventDrivenUpdateGraph.java
@@ -17,15 +17,20 @@
 import io.deephaven.engine.table.impl.perf.UpdatePerformanceTracker;
 import io.deephaven.engine.table.impl.sources.LongSingleValueSource;
 import io.deephaven.engine.testutil.TstUtils;
+import io.deephaven.engine.updategraph.TerminalNotification;
 import io.deephaven.engine.updategraph.UpdateGraph;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.annotations.ReflexiveUse;
 import junit.framework.TestCase;
+import org.apache.commons.lang3.mutable.MutableInt;
 import org.junit.*;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.*;
 
 import static io.deephaven.engine.context.TestExecutionContext.OPERATION_INITIALIZATION;
 import static io.deephaven.engine.util.TableTools.*;
@@ -165,6 +170,57 @@ public void testSimpleModify() {
         }
     }
 
+    @Test
+    public void testRefreshRace() throws ExecutionException, InterruptedException, TimeoutException {
+        final EventDrivenUpdateGraph eventDrivenUpdateGraph = EventDrivenUpdateGraph.newBuilder("TestEDUG").build();
+        final List<Runnable> retainedReferences = new ArrayList<>();
+
+        final MutableInt sourceRefreshCount = new MutableInt(0);
+        final Runnable sleepingSource = () -> {
+            try {
+                Thread.sleep(100);
+                sourceRefreshCount.increment();
+            } catch (InterruptedException e) {
+                Assert.fail("Interrupted while sleeping");
+            }
+        };
+        retainedReferences.add(sleepingSource);
+        eventDrivenUpdateGraph.addSource(sleepingSource);
+
+        final int numConcurrentRefreshes = 10;
+        final Future<?>[] refreshFutures = new Future[numConcurrentRefreshes];
+        final ExecutorService executor = Executors.newFixedThreadPool(numConcurrentRefreshes);
+        try {
+            for (int cri = 0; cri < numConcurrentRefreshes; ++cri) {
+                refreshFutures[cri] = executor.submit(eventDrivenUpdateGraph::requestRefresh);
+                Thread.sleep(10);
+            }
+            for (final Future<?> refreshFuture : refreshFutures) {
+                refreshFuture.get(10, TimeUnit.SECONDS);
+            }
+        } finally {
+            executor.shutdown();
+            Assert.assertTrue(executor.awaitTermination(1, TimeUnit.SECONDS));
+        }
+
+        Assert.assertEquals(numConcurrentRefreshes, sourceRefreshCount.intValue());
+        Assert.assertEquals(sleepingSource, retainedReferences.get(0));
+    }
+
+    @Test
+    public void testIllegalRefresh() {
+        final EventDrivenUpdateGraph eventDrivenUpdateGraph = EventDrivenUpdateGraph.newBuilder("TestEDUG").build();
+
+        eventDrivenUpdateGraph.addNotification(new TerminalNotification() {
+            @Override
+            public void run() {
+                Assert.assertThrows(IllegalStateException.class, eventDrivenUpdateGraph::requestRefresh);
+            }
+        });
+
+        eventDrivenUpdateGraph.requestRefresh();
+    }
+
     @Test
     public void testUpdatePerformanceTracker() {
         final Table upt = UpdatePerformanceTracker.getQueryTable();