Merge pull request #15166 from cdapio/improvement/CDAP-20641

[CDAP-20641] Use LCM feature flag for runtimeargs overwrite
cdapio · Jul 20, 2023 · f2119f0 · f2119f0
2 parents c30d11e + 129af29
commit f2119f0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/...ap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/SmartWorkflow.java b/...ap-etl/cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/SmartWorkflow.java
@@ -776,14 +776,12 @@ private void setWorkflowProperties() {
 
   private ETLBatchConfig getConfigFromRuntimeArgs(ApplicationConfigurer applicationConfigurer,
                                                   ETLBatchConfig originalConfig) {
-    if (applicationConfigurer == null || applicationConfigurer.getRuntimeConfigurer() == null) {
+    if (applicationConfigurer == null || applicationConfigurer.getRuntimeConfigurer() == null
+      || !Feature.LIFECYCLE_MANAGEMENT_EDIT.isEnabled(applicationConfigurer)) {
       return originalConfig;
     }
     RuntimeConfigurer runtimeConfigurer = applicationConfigurer.getRuntimeConfigurer();
     Map<String, String> runtimeArguments = runtimeConfigurer.getRuntimeArguments();
-    if (!runtimeArguments.containsKey(PipelineArguments.PIPELINE_CONFIG_OVERWRITE)) {
-      return originalConfig;
-    }
     boolean processTimingEnabled = PipelineArguments.isProcessTimingEnabled(runtimeArguments,
                                                   originalConfig.isProcessTimingEnabled());
     Map<String, String> properties = PipelineArguments.getEngineProperties(runtimeArguments,