Revert "Remove in progress phase"

This reverts commit 3c919d6.

Author: igor.grzankowski

api/v4/common_types.go

@@ -572,6 +572,8 @@ type PhaseInfo struct {
 const (
 	// AppPkgDownloadPending indicates pending
 	AppPkgDownloadPending AppPhaseStatusType = 101
+	// AppPkgDownloadInProgress indicates in progress
+	AppPkgDownloadInProgress = 102
 	// AppPkgDownloadComplete indicates complete
 	AppPkgDownloadComplete = 103
 	// AppPkgDownloadError indicates error after retries
@@ -581,6 +583,8 @@ const (
 const (
 	// AppPkgPodCopyPending indicates pending
 	AppPkgPodCopyPending AppPhaseStatusType = 201
+	// AppPkgPodCopyInProgress indicates in progress
+	AppPkgPodCopyInProgress = 202
 	// AppPkgPodCopyComplete indicates complete
 	AppPkgPodCopyComplete = 203
 	// AppPkgMissingFromOperator indicates the downloaded app package is missing
@@ -592,6 +596,8 @@ const (
 const (
 	// AppPkgInstallPending indicates pending
 	AppPkgInstallPending AppPhaseStatusType = 301
+	// AppPkgInstallInProgress  indicates in progress
+	AppPkgInstallInProgress = 302
 	// AppPkgInstallComplete indicates complete
 	AppPkgInstallComplete = 303
 	// AppPkgMissingOnPodError indicates app pkg is not available on Pod for install

pkg/splunk/enterprise/afwscheduler.go

@@ -37,9 +37,11 @@ import (
 
 var appPhaseInfoStatuses = map[enterpriseApi.AppPhaseStatusType]bool{
 	enterpriseApi.AppPkgDownloadPending:     true,
+	enterpriseApi.AppPkgDownloadInProgress:  true,
 	enterpriseApi.AppPkgDownloadComplete:    true,
 	enterpriseApi.AppPkgDownloadError:       true,
 	enterpriseApi.AppPkgPodCopyPending:      true,
+	enterpriseApi.AppPkgPodCopyInProgress:   true,
 	enterpriseApi.AppPkgPodCopyComplete:     true,
 	enterpriseApi.AppPkgMissingFromOperator: true,
 	enterpriseApi.AppPkgPodCopyError:        true,
@@ -555,6 +557,34 @@ downloadWork:
 					continue
 				}
 
+				// update the download state of app to be DownloadInProgress
+				updatePplnWorkerPhaseInfo(ctx, downloadWorker.appDeployInfo, downloadWorker.appDeployInfo.PhaseInfo.FailCount, enterpriseApi.AppPkgDownloadInProgress)
+
+				appDeployInfo := downloadWorker.appDeployInfo
+
+				// create the sub-directories on the volume for downloading scoped apps
+				localPath, err := downloadWorker.createDownloadDirOnOperator(ctx)
+				if err != nil {
+					scopedLog.Error(err, "unable to create download directory on operator", "appSrcName", downloadWorker.appSrcName, "appName", appDeployInfo.AppName)
+
+					// increment the retry count and mark this app as download pending
+					updatePplnWorkerPhaseInfo(ctx, appDeployInfo, appDeployInfo.PhaseInfo.FailCount+1, enterpriseApi.AppPkgDownloadPending)
+
+					<-downloadWorkersRunPool
+					continue
+				}
+
+				// get the remoteDataClientMgr instance
+				remoteDataClientMgr, err := getRemoteDataClientMgr(ctx, downloadWorker.client, downloadWorker.cr, downloadWorker.afwConfig, downloadWorker.appSrcName)
+				if err != nil {
+					scopedLog.Error(err, "unable to get remote data client manager")
+					// increment the retry count and mark this app as download error
+					updatePplnWorkerPhaseInfo(ctx, appDeployInfo, appDeployInfo.PhaseInfo.FailCount+1, enterpriseApi.AppPkgDownloadError)
+
+					<-downloadWorkersRunPool
+					continue
+				}
+
 				// increment the count in worker waitgroup
 				downloadWorker.waiter.Add(1)
 

pkg/splunk/enterprise/util.go

@@ -426,18 +426,24 @@ func appPhaseStatusAsStr(status enterpriseApi.AppPhaseStatusType) string {
 	switch status {
 	case enterpriseApi.AppPkgDownloadPending:
 		return "Download Pending"
+	case enterpriseApi.AppPkgDownloadInProgress:
+		return "Download In Progress"
 	case enterpriseApi.AppPkgDownloadComplete:
 		return "Download Complete"
 	case enterpriseApi.AppPkgDownloadError:
 		return "Download Error"
 	case enterpriseApi.AppPkgPodCopyPending:
 		return "Pod Copy Pending"
+	case enterpriseApi.AppPkgPodCopyInProgress:
+		return "Pod Copy In Progress"
 	case enterpriseApi.AppPkgPodCopyComplete:
 		return "Pod Copy Complete"
 	case enterpriseApi.AppPkgPodCopyError:
 		return "Pod Copy Error"
 	case enterpriseApi.AppPkgInstallPending:
 		return "Install Pending"
+	case enterpriseApi.AppPkgInstallInProgress:
+		return "Install In Progress"
 	case enterpriseApi.AppPkgInstallComplete:
 		return "Install Complete"
 	case enterpriseApi.AppPkgInstallError:
@@ -452,6 +458,8 @@ func bundlePushStateAsStr(ctx context.Context, state enterpriseApi.BundlePushSta
 	switch state {
 	case enterpriseApi.BundlePushPending:
 		return "Bundle Push Pending"
+	case enterpriseApi.BundlePushInProgress:
+		return "Bundle Push In Progress"
 	case enterpriseApi.BundlePushComplete:
 		return "Bundle Push Complete"
 	default:

pkg/splunk/enterprise/util_test.go

@@ -1098,6 +1098,11 @@ func TestAppPhaseStatusAsStr(t *testing.T) {
 		t.Errorf("Got wrong status. Expected status=Download Pending, Got = %s", status)
 	}
 
+	status = appPhaseStatusAsStr(enterpriseApi.AppPkgDownloadInProgress)
+	if status != "Download In Progress" {
+		t.Errorf("Got wrong status. Expected status=\"Download In Progress\", Got = %s", status)
+	}
+
 	status = appPhaseStatusAsStr(enterpriseApi.AppPkgDownloadComplete)
 	if status != "Download Complete" {
 		t.Errorf("Got wrong status. Expected status=\"Download Complete\", Got = %s", status)
@@ -1108,11 +1113,36 @@ func TestAppPhaseStatusAsStr(t *testing.T) {
 		t.Errorf("Got wrong status. Expected status=\"Download Error\", Got = %s", status)
 	}
 
+	status = appPhaseStatusAsStr(enterpriseApi.AppPkgPodCopyPending)
+	if status != "Pod Copy Pending" {
+		t.Errorf("Got wrong status. Expected status=Pod Copy Pending, Got = %s", status)
+	}
+
+	status = appPhaseStatusAsStr(enterpriseApi.AppPkgPodCopyInProgress)
+	if status != "Pod Copy In Progress" {
+		t.Errorf("Got wrong status. Expected status=\"Pod Copy In Progress\", Got = %s", status)
+	}
+
+	status = appPhaseStatusAsStr(enterpriseApi.AppPkgPodCopyComplete)
+	if status != "Pod Copy Complete" {
+		t.Errorf("Got wrong status. Expected status=\"Pod Copy Complete\", Got = %s", status)
+	}
+
+	status = appPhaseStatusAsStr(enterpriseApi.AppPkgPodCopyError)
+	if status != "Pod Copy Error" {
+		t.Errorf("Got wrong status. Expected status=\"Pod Copy Error\", Got = %s", status)
+	}
+
 	status = appPhaseStatusAsStr(enterpriseApi.AppPkgInstallPending)
 	if status != "Install Pending" {
 		t.Errorf("Got wrong status. Expected status=Install Pending, Got = %s", status)
 	}
 
+	status = appPhaseStatusAsStr(enterpriseApi.AppPkgInstallInProgress)
+	if status != "Install In Progress" {
+		t.Errorf("Got wrong status. Expected status=\"Install In Progress\", Got = %s", status)
+	}
+
 	status = appPhaseStatusAsStr(enterpriseApi.AppPkgInstallComplete)
 	if status != "Install Complete" {
 		t.Errorf("Got wrong status. Expected status=\"Install Complete\", Got = %s", status)
@@ -1132,6 +1162,7 @@ func TestAppPhaseStatusAsStr(t *testing.T) {
 func TestBundlePushStateAsStr(t *testing.T) {
 	bpsMap := map[enterpriseApi.BundlePushStageType]string{
 		enterpriseApi.BundlePushPending:    "Bundle Push Pending",
+		enterpriseApi.BundlePushInProgress: "Bundle Push In Progress",
 		enterpriseApi.BundlePushComplete:   "Bundle Push Complete",
 		4:                                  "Invalid bundle push state",
 	}