Merge pull request #4784 from KoenZomers/Issue4758

Fixes `-RetryCount` parameter being ignored with `Submit-PnPSearchQuery`

Author: KoenZomers

CHANGELOG.md

@@ -113,6 +113,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Fixed passing a `Get-PnPRecycleBinItem` result or a GUID to `Restore-PnPRecycleBinItem` not working correctly. [#4667](https://github.com/pnp/powershell/pull/4667)
 - Fixed `Get-PnPChangeLog` not returning the changelog [#4707](https://github.com/pnp/powershell/pull/4707)
 - Fixed `-Description` and `-Sequence` not being applied when providing these through `Add-PnPApplicationCustomizer` [#4767](https://github.com/pnp/powershell/pull/4767)
+- Fixed `-RetryCount` parameter being ignored with `Submit-PnPSearchQuery` [#4784](https://github.com/pnp/powershell/pull/4784)
 
 ### Removed
 

src/Commands/Search/SubmitSearchQuery.cs

@@ -117,26 +117,26 @@ internal IEnumerable<object> Run()
             PnPResultTableCollection finalResults = null;
             do
             {
-                KeywordQuery keywordQuery = CreateKeywordQuery(clientFunction);
-                keywordQuery.StartRow = startRow;
-                keywordQuery.RowLimit = rowLimit;
-
-                if (All.IsPresent)
-                {
-                    if (currentCount != 0)
-                    {
-                        keywordQuery.Refiners = null; // Only need to set on first page for auto paging
-                    }
-                    keywordQuery.StartRow = 0;
-                    keywordQuery.QueryText += " IndexDocId>" + lastDocId;
-                }
+                var searchExec = new SearchExecutor(ClientContext);
 
                 // We'll always try at least once, even if RetryCount is 0 (default)
                 for (var iterator = 0; iterator <= RetryCount; iterator++)
                 {
                     try
                     {
-                        var searchExec = new SearchExecutor(ClientContext);
+                        KeywordQuery keywordQuery = CreateKeywordQuery(clientFunction);
+                        keywordQuery.StartRow = startRow;
+                        keywordQuery.RowLimit = rowLimit;
+
+                        if (All.IsPresent)
+                        {
+                            if (currentCount != 0)
+                            {
+                                keywordQuery.Refiners = null; // Only need to set on first page for auto paging
+                            }
+                            keywordQuery.StartRow = 0;
+                            keywordQuery.QueryText += " IndexDocId>" + lastDocId;
+                        }
                         var results = searchExec.ExecuteQuery(keywordQuery);
                         ClientContext.ExecuteQueryRetry();
 
@@ -190,15 +190,20 @@ internal IEnumerable<object> Run()
                     // If we're not retrying, or if we're on the last retry, don't catch the exception
                     catch (Exception ex)
                     {
-                        if (RetryCount > 0 && iterator < RetryCount)
+                        if (RetryCount > 0 && iterator < (RetryCount - 1))
                         {
                             var waitTime = 5 * (iterator + 1);
 
-                            WriteVerbose($"Search operation failed with exception {ex.Message}. Attempt {iterator + 1} out of {RetryCount}. Retrying in {waitTime} seconds.");
+                            WriteVerbose($"Search operation failed with exception {ex.Message.TrimEnd('.')}. Attempt {iterator + 1} out of {RetryCount}. Retrying in {waitTime} seconds.");
 
                             Thread.Sleep(TimeSpan.FromSeconds(waitTime));
                             continue;
                         }
+                        else if (iterator == RetryCount - 1)
+                        {
+                            WriteVerbose($"Search operation failed with exception {ex.Message.TrimEnd('.')}. Attempt {iterator + 1} out of {RetryCount}. Done retrying.");
+                            continue;
+                        }
                         else
                         {
                             throw;