Merge pull request #159 from shabtaisharon/ESCP-3270

ESCP-3270: Add support for Restore fail-fast

Author: Sharon Shabtai

SpectraLogic.SpectraRioBrokerClient.Integration.Test/SpectraRioBrokerClientIntegrationTests.cs

@@ -1584,6 +1584,70 @@ public void UpdateRestoreJobPriority()
             }
         }
 
+        [Test]
+        public void RestoreWithFailFastFalse()
+        {
+            var fileName = "RestoreWithFailFastFalse" + Guid.NewGuid();
+            try
+            {
+                var archiveRequest = new ArchiveRequest(SpectraRioBrokerClientFixture.BrokerName, new List<ArchiveFile>
+                {
+                    new ArchiveFile(fileName, fileName.ToAtoZUri(), 14,
+                        new Dictionary<string, string> { { "test", "RestoreWithFailFastFalse" } }, false)
+                }, jobName: "RestoreWithFailFastFalse");
+
+                var archiveJob = SpectraRioBrokerClientFixture.SpectraRioBrokerClient.Archive(archiveRequest);
+
+                var pollingAttempts = 0;
+                do
+                {
+                    archiveJob = SpectraRioBrokerClientFixture.SpectraRioBrokerClient.GetJob(
+                        new GetJobRequest(archiveJob.JobId));
+                    _log.Debug(archiveJob.Status);
+                    Thread.Sleep(TimeSpan.FromSeconds(PollingInterval));
+                    pollingAttempts++;
+                } while (archiveJob.Status.Status == JobStatusEnum.ACTIVE && pollingAttempts < MaxPollingAttempts);
+
+                Assert.Less(pollingAttempts, MaxPollingAttempts);
+                Assert.AreEqual(JobStatusEnum.COMPLETED, archiveJob.Status.Status);
+
+                var restoreRequest = new RestoreRequest(SpectraRioBrokerClientFixture.BrokerName, new List<RestoreFile>
+                {
+                    new RestoreFile("not_found.txt", "1".ToDevNullUri()),
+                    new RestoreFile(fileName, "2".ToDevNullUri())
+                }, failFast: false);
+
+                var restoreJob = SpectraRioBrokerClientFixture.SpectraRioBrokerClient.Restore(restoreRequest);
+
+                pollingAttempts = 0;
+                do
+                {
+                    restoreJob = SpectraRioBrokerClientFixture.SpectraRioBrokerClient.GetJob(
+                        new GetJobRequest(restoreJob.JobId));
+                    _log.Debug(restoreJob.Status);
+                    Thread.Sleep(TimeSpan.FromSeconds(PollingInterval));
+                    pollingAttempts++;
+                } while (restoreJob.Status.Status == JobStatusEnum.ACTIVE && pollingAttempts < MaxPollingAttempts);
+
+                Assert.Less(pollingAttempts, MaxPollingAttempts);
+                Assert.AreEqual(JobStatusEnum.ERROR, restoreJob.Status.Status);
+
+                var job = SpectraRioBrokerClientFixture.SpectraRioBrokerClient.GetJob(
+                    new GetJobRequest(restoreJob.JobId));
+
+                Assert.AreEqual(JobStatusEnum.ERROR, job.Status.Status);
+                Assert.AreEqual("Restore job failed (1 of 2 did not complete).", job.Status.Message);
+                Assert.AreEqual(1, job.FilesTransferred);
+                Assert.AreEqual(1, job.Progress);
+            }
+            finally
+            {
+                var deleteF1Request = new DeleteFileRequest(SpectraRioBrokerClientFixture.BrokerName, fileName);
+                SpectraRioBrokerClientFixture.SpectraRioBrokerClient.DeleteFile(deleteF1Request);
+            }
+        }
+
+        
         #endregion Methods
     }
 }

SpectraLogic.SpectraRioBrokerClient/Calls/Broker/RestoreRequest.cs

@@ -74,9 +74,10 @@ public class RestoreRequest : RestRequest
         /// </param>
         /// <param name="jobName">Name of the job. Default = null.</param>
         /// <param name="jobPriority">Sets the job priority. Null if not specified.</param>
+        /// <param name="failFast">If enabled, when a validation error occurs the job fails immediately. If disabled, the job continues even though a validation error occurred. Default = true.</param>
         /// <exception cref="ArgumentNullException"></exception>
         public RestoreRequest(string brokerName, IEnumerable<RestoreFile> files, bool ignoreDuplicates = false,
-            string jobName = null, JobPriority? jobPriority = null)
+            string jobName = null, JobPriority? jobPriority = null, bool failFast = true)
         {
             Contract.Requires<ArgumentNullException>(brokerName != null, "brokerName");
             Contract.Requires<ArgumentNullException>(files != null, "files");
@@ -89,6 +90,7 @@ public RestoreRequest(string brokerName, IEnumerable<RestoreFile> files, bool ig
             {
                 AddQueryParam("priority", jobPriority.ToString().ToUpper());
             }
+            AddQueryParam("fail-fast", failFast.ToString());
         }
 
         #endregion Constructors