default flag true & avoid already commited log

Author: ayu-devtron

env_gen.json

@@ -76,7 +76,7 @@
  | DEFAULT_TARGET_PLATFORM | string | |  |  | false |
  | DOCKER_BUILD_CACHE_PATH | string |/var/lib/docker |  |  | false |
  | ENABLE_BUILD_CONTEXT | bool |false |  |  | false |
- | ENABLE_WORKFLOW_EXECUTION_STAGE | bool |false | if enabled then we will display build stages separately for CI/Job/Pre-Post CD | false | false |
+ | ENABLE_WORKFLOW_EXECUTION_STAGE | bool |true | if enabled then we will display build stages separately for CI/Job/Pre-Post CD | true | false |
  | EXTERNAL_BLOB_STORAGE_CM_NAME | string |blob-storage-cm |  |  | false |
  | EXTERNAL_BLOB_STORAGE_SECRET_NAME | string |blob-storage-secret |  |  | false |
  | EXTERNAL_CD_NODE_LABEL_SELECTOR |  | |  |  | false |

env_gen.md

@@ -40,6 +40,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus"
 	bean2 "github.com/devtron-labs/devtron/pkg/plugin/bean"
 	"github.com/devtron-labs/devtron/pkg/sql"
+	util3 "github.com/devtron-labs/devtron/util"
 	"github.com/devtron-labs/devtron/util/sliceUtil"
 	"path"
 	"path/filepath"
@@ -1183,7 +1184,7 @@ func (impl *CiServiceImpl) UpdateCiWorkflowWithStage(wf *pipelineConfig.CiWorkfl
 
 	defer func() {
 		dbErr := impl.transactionManager.RollbackTx(tx)
-		if dbErr != nil {
+		if dbErr != nil && dbErr.Error() != util3.SqlAlreadyCommitedErrMsg {
 			impl.Logger.Errorw("error in rolling back transaction", "workflowName", wf.Name, "error", dbErr)
 		}
 	}()

pkg/pipeline/CiService.go

@@ -160,7 +160,7 @@ type CiCdConfig struct {
 	UseArtifactListingQueryV2                  bool                         `env:"USE_ARTIFACT_LISTING_QUERY_V2" envDefault:"true"`
 	UseImageTagFromGitProviderForTagBasedBuild bool                         `env:"USE_IMAGE_TAG_FROM_GIT_PROVIDER_FOR_TAG_BASED_BUILD" envDefault:"false"` // this is being done for https://github.com/devtron-labs/devtron/issues/4263
 	UseDockerApiToGetDigest                    bool                         `env:"USE_DOCKER_API_TO_GET_DIGEST" envDefault:"false"`
-	EnableWorkflowExecutionStage               bool                         `env:"ENABLE_WORKFLOW_EXECUTION_STAGE" envDefault:"false" description:"if enabled then we will display build stages separately for CI/Job/Pre-Post CD" example:"false"`
+	EnableWorkflowExecutionStage               bool                         `env:"ENABLE_WORKFLOW_EXECUTION_STAGE" envDefault:"true" description:"if enabled then we will display build stages separately for CI/Job/Pre-Post CD" example:"true"`
 }
 
 type CiConfig struct {

pkg/pipeline/types/CiCdConfig.go

@@ -28,6 +28,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/sql"
 	"github.com/devtron-labs/devtron/pkg/workflow/cd/adapter"
 	"github.com/devtron-labs/devtron/pkg/workflow/cd/bean"
+	"github.com/devtron-labs/devtron/util"
 	"go.uber.org/zap"
 )
 
@@ -95,7 +96,7 @@ func (impl *CdWorkflowRunnerServiceImpl) SaveCDWorkflowRunnerWithStage(wfr *pipe
 
 	defer func() {
 		dbErr := impl.transactionManager.RollbackTx(tx)
-		if dbErr != nil {
+		if dbErr != nil && dbErr.Error() != util.SqlAlreadyCommitedErrMsg {
 			impl.logger.Errorw("error in rolling back transaction", "workflowName", wfr.Name, "error", dbErr)
 		}
 	}()

pkg/workflow/cd/CdWorkflowRunnerService.go

@@ -30,4 +30,5 @@ const (
 	ConfigMapSecretUsageTypeVolume      string = "volume"
 	YamlSeparator                       string = "---\n"
 	NotSupportedErr                            = "This feature is not supported"
+	SqlAlreadyCommitedErrMsg                   = "sql: transaction has already been committed or rolled back"
 )