remove check for ConfDeploymentException

Author: rlieberman-splunk

pkg/splunk/enterprise/afwscheduler.go

@@ -1727,17 +1727,6 @@ func (shcPlaybookContext *SHCPlaybookContext) isBundlePushComplete(ctx context.C
 			return false, nil
 		}
 
-		// If Splunk reports that a deployment job is already running, treat it as still
-		// in progress rather than resetting state to Pending and re-triggering. Resetting
-		// would schedule a second push while the first is still holding Splunk's deployment
-		// lock, producing another ConfDeploymentException and creating a retry storm.
-		// This can happen in FIPS mode (premature state reset caused by the FIPS banner) or
-		// after an operator restart mid-push.
-		if strings.Contains(stdOut, "ConfDeploymentException: Can't start deployment job as one is already running!") {
-			scopedLog.Info("SHC Bundle Push is already running; will recheck status on next reconcile", "statusFileOutput", stdOut)
-			return false, nil
-		}
-
 		// this means there was an error in bundle push command
 		err = fmt.Errorf("there was an error in applying SHC Bundle, err=\"%v\"", stdOut)
 		scopedLog.Error(err, "SHC Bundle push status file reported an error while applying bundle")

pkg/splunk/enterprise/afwscheduler_test.go

@@ -4898,26 +4898,6 @@ func TestSHCIsBundlePushComplete(t *testing.T) {
 			expectedError:  false,
 			description:    "FIPS banner before success string should still be recognized as complete",
 		},
-		{
-			name:           "ConfDeploymentException alone - treated as still in progress",
-			catStdOut:      "ConfDeploymentException: Can't start deployment job as one is already running!",
-			catStdErr:      "",
-			catErr:         nil,
-			expectsRemoval: false,
-			expectedResult: false,
-			expectedError:  false,
-			description:    "ConfDeploymentException must not reset state to Pending; treat as still in progress to avoid retry storm",
-		},
-		{
-			name:           "FIPS banner followed by ConfDeploymentException - treated as still in progress",
-			catStdOut:      splunkFIPSProviderBannerStr + "\n" + splunkSSLCertWarnStr + " Hostname Validation is disabled.\nConfDeploymentException: Can't start deployment job as one is already running!",
-			catStdErr:      "",
-			catErr:         nil,
-			expectsRemoval: false,
-			expectedResult: false,
-			expectedError:  false,
-			description:    "FIPS banner plus ConfDeploymentException is the primary FIPS retry-storm scenario; must not reset to Pending",
-		},
 	}
 
 	for _, tt := range tests {