Merge pull request #70 from sandeepsnairms/main

Job active flag not getting reset ifcheck CS enabled fails

Author: sandeepsnairms

MongoMigrationWebApp/Shared/MainLayout.razor

@@ -6,7 +6,7 @@
     <main>
         <div class="top-row px-4 d-flex justify-content-between align-items-center">
             <h2 class="text-left">Migrate to Azure Cosmos DB for MongoDB (vCore based)</h2>
-            <div class="ms-2 small">v0.7.7</div>
+            <div class="ms-2 small">v0.7.9</div>
         </div>
 
         <article class="content px-4">

OnlineMongoMigrationProcessor/Helpers/MongoHelper.cs

@@ -138,7 +138,8 @@ public static long GetDocumentCount(IMongoCollection<BsonDocument> collection, F
             {
                 Log.WriteLine($"Error checking for change streams: {ex.ToString()}", LogType.Error);
                 Log.Save();
-                return (IsCSEnabled: false, Version: version);
+                //return (IsCSEnabled: false, Version: version);
+                throw ex;
             }
         }
 

OnlineMongoMigrationProcessor/MigrationWorker.cs

@@ -266,17 +266,6 @@ public async Task StartMigrationAsync(MigrationJob job, string sourceConnectionS
                 {
                     Log.WriteLine($"Attempt {attempts} failed due to timeout: {ex.ToString()}. Details:{ex.ToString()}", LogType.Error);
 
-                    if (attempts >= maxRetries)
-                    {
-                        Log.WriteLine("Maximum retry attempts reached. Aborting operation.", LogType.Error);
-                        Log.Save();
-
-                        _job.CurrentlyActive = false;
-                        _jobs?.Save();
-
-                        _migrationProcessor?.StopProcessing();
-                    }
-
                     Log.WriteLine($"Retrying in {backoff.TotalSeconds} seconds...", LogType.Error);
                     Thread.Sleep(backoff);
                     Log.Save();
@@ -286,16 +275,29 @@ public async Task StartMigrationAsync(MigrationJob job, string sourceConnectionS
                 }
                 catch (Exception ex)
                 {
-                    Log.WriteLine(ex.ToString(), LogType.Error);
-                    Log.Save();
+                    Log.WriteLine($"Attempt {attempts} failed: {ex.ToString()}. Details:{ex.ToString()}", LogType.Error);
 
-                    _job.CurrentlyActive = false;
-                    _jobs?.Save();
-                    continueProcessing = false;
+                    Log.WriteLine($"Retrying in {backoff.TotalSeconds} seconds...", LogType.Error);
+                    Thread.Sleep(backoff);
+                    Log.Save();
 
-                    _migrationProcessor?.StopProcessing();
+                    continueProcessing = true;
+                    //backoff = TimeSpan.FromTicks(backoff.Ticks * 2);
+                   
                 }
             }
+            if (attempts == maxRetries)
+            {
+                Log.WriteLine("Maximum retry attempts reached. Aborting operation.", LogType.Error);
+                Log.Save();
+
+                _job.CurrentlyActive = false;
+                _jobs?.Save();
+                continueProcessing = false;
+
+                _migrationProcessor?.StopProcessing();
+
+            }
         }
 
         private async Task<List<MigrationChunk>> PartitionCollection(string databaseName, string collectionName, string idField = "_id")

OnlineMongoMigrationProcessor/Processors/CopyProcessor.cs

@@ -195,6 +195,7 @@ public void Migrate(MigrationUnit item, string sourceConnectionString, string ta
                         {
                             _job.CurrentlyActive = false;
                             _jobs?.Save();
+                            ProcessRunning = false;
                         }
                     }
                     else

OnlineMongoMigrationProcessor/Processors/MongoDocumentCopier.cs

@@ -166,7 +166,7 @@ public async Task<bool> CopyDocumentsAsync(
                 var gte = bounds.gte;
                 var lt = bounds.lt;
 
-                Log.WriteLine($"Document copy for chunk[{ migrationChunkIndex}], couting documents on target");
+                Log.WriteLine($"Document copy for chunk[{ migrationChunkIndex}], counting documents on target");
                 Log.Save();
 
                 try