Merge pull request #367 from dimmik/beta/soft-lock-for-queue

soft lock on queue
dimmik · Nov 7, 2024 · 51513b2 · 51513b2
2 parents 8321986 + baebb03
commit 51513b2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/TCBlazor/Client/Pages/TourListPage.razor b/TCBlazor/Client/Pages/TourListPage.razor
@@ -216,8 +216,7 @@ else
     {
         InProgress = true;
         Tour t = new Tour() { Id = tour.Id, Name = tour.Name, Duration = tour.Duration };
-        _ = engine.RequestEditTourProps(t, ("changename", t));
-        _ = engine.RequestEditTourProps(t, ("duration", t));
+        _ = engine.RequestEditTourProps(t, ("changename", t), ("duration", t));
         return Task.CompletedTask;
     }
 

diff --git a/TCalcCore/Network/ITCDataService.cs b/TCalcCore/Network/ITCDataService.cs
@@ -26,7 +26,7 @@ public interface ITCDataService
         Task GetAndStoreToken(string scope, string code);
         Task GetAndStoreTokenForCodeMd5(string code);
         Task<AuthData> GetAuthData(bool forceGetFromServer = false);
-        Task<Queue<SerializableTourOperation>> GetServerQueue(string tourId);
+        Task<Queue<SerializableTourOperation>> GetServerQueue(string tourId, bool checkOut = false);
         Task<TourList> GetTourList(Func<TourList, bool, DateTimeOffset, Task> onTourListAvailable, bool forceFromServer);
         Task<TourList> GetTourListFromServer();
         Task<TourList> GetTourVersions(Tour tour);

diff --git a/TCalcCore/Network/TCDataService.cs b/TCalcCore/Network/TCDataService.cs
@@ -320,8 +320,28 @@ private Queue<SerializableTourOperation> GetLocalQueue(string tourId)
         #endregion
 
         #region Server Queue
-        public async Task<Queue<SerializableTourOperation>> GetServerQueue(string tourId)
+        public async Task<Queue<SerializableTourOperation>> GetServerQueue(string tourId, bool checkOut = false)
         {
+            var waitInMs = 10;
+            var waitCnt = 300;
+            var counter = 0;
+            while (counter < waitCnt)
+            {
+                if (!CheckedOut)
+                {
+                    return await GetServerQueueInternal(tourId, checkOut);
+                }
+                counter++;
+                await Task.Delay(waitInMs);
+            }
+            // for some reason cannot get the checked-in queue after 3s. So be it, return what we have.
+            logger?.Log("Failed to acquire server queue");
+            return await GetServerQueueInternal(tourId, false);
+        }
+        private bool CheckedOut = false;
+        private async Task<Queue<SerializableTourOperation>> GetServerQueueInternal(string tourId, bool checkOut)
+        {
+            CheckedOut = checkOut;
             var (qc, _) = await ts.GetObject<SerializableTourOperationContainer>(
                 GetUpdateQueueStorageKey(tourId),
                 () => default,
@@ -342,7 +362,14 @@ private async Task StoreServerQueue(string tourId, Queue<SerializableTourOperati
             {
                 operations = q.ToList()
             };
-            await ts.SetObject(GetUpdateQueueStorageKey(tourId), qc);
+            try
+            {
+                await ts.SetObject(GetUpdateQueueStorageKey(tourId), qc);
+            }
+            finally
+            {
+                CheckedOut = false;
+            }
             OnServerQueueStored?.Invoke();
         }
         #endregion
@@ -365,7 +392,7 @@ private async Task UpdateTour(string tourId, Tour tour)
 
         private async Task EditTourData(string tourId, params SerializableTourOperation[] ops)
         {
-            Queue<SerializableTourOperation> serverQueue = await GetServerQueue(tourId);
+            Queue<SerializableTourOperation> serverQueue = await GetServerQueue(tourId, checkOut: true);
             Queue<SerializableTourOperation> localQueue = GetLocalQueue(tourId);
             foreach (var op in ops)
             {