AMBARI-16959. Redundant info under config tab for falcon (aonishuk)

ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java

@@ -353,6 +353,7 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
     updateKerberosConfigs();
     updateYarnEnv();
     updatePhoenixConfigs();
+    updateFalconConfigs();
     updateKerberosDescriptorArtifacts();
     removeHiveOozieDBConnectionConfigs();
     updateClustersAndHostsVersionStateTableDML();
@@ -1892,6 +1893,29 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
     }
   }
 
+  /**
+   * Updates the Falcon-related configurations for the clusters managed by this Ambari
+   * Removes falcon_store_uri from falcon-env.
+   *
+   * @throws AmbariException if an error occurs while updating the configurations
+   */
+  protected void updateFalconConfigs() throws AmbariException {
+    AmbariManagementController ambariManagementController = injector.getInstance(AmbariManagementController.class);
+    Clusters clusters = ambariManagementController.getClusters();
+    Map<String, Cluster> clusterMap = getCheckedClusterMap(clusters);
+
+    for (final Cluster cluster : clusterMap.values()) {
+      Config falconEnvConfig = cluster.getDesiredConfigByType("falcon-env");
+      if (falconEnvConfig != null) {
+        Map<String, String> falconEnvEnvProperties = falconEnvConfig.getProperties();
+        if (falconEnvEnvProperties.containsKey("falcon_store_uri")) {
+          LOG.info("Removing property falcon_store_uri from falcon-env");
+          removeConfigurationPropertiesFromCluster(cluster, "falcon-env", Collections.singleton("falcon_store_uri"));
+        }
+      }
+    }
+  }
+
   /**
    * Removes the HDFS/AMS alert definitions for the standard deviation alerts,
    * including all history, notifications and groupings.

ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml

@@ -69,12 +69,6 @@
       <type>directory</type>
     </value-attributes>
   </property>
-  <property>
-    <name>falcon_store_uri</name>
-    <value>file:///hadoop/falcon/store</value>
-    <display-name>Falcon store URI</display-name>
-    <description>Directory where entity definitions are stored.</description>
-  </property>
   <!--embeddedmq properties-->
   <property>
     <name>falcon.embeddedmq.data</name>

ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py

@@ -130,17 +130,6 @@ def falcon(type, action = None, upgrade_type=None):
         owner = params.falcon_user,
         mode = 0777)
 
-      if params.falcon_store_uri[0:4] == "hdfs":
-        params.HdfsResource(params.falcon_store_uri,
-          type = "directory",
-          action = "create_on_execute",
-          owner = params.falcon_user,
-          mode = 0755)
-      elif params.falcon_store_uri[0:4] == "file":
-        Directory(params.falcon_store_uri[7:],
-          owner = params.falcon_user,
-          create_parents = True)
-
       if params.supports_hive_dr:
         params.HdfsResource(params.dfs_data_mirroring_dir,
           type = "directory",

ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py

@@ -80,7 +80,6 @@ proxyuser_group =  config['configurations']['hadoop-env']['proxyuser_group']
 
 java_home = config['hostLevelParams']['java_home']
 falcon_local_dir = config['configurations']['falcon-env']['falcon_local_dir']
-falcon_store_uri = config['configurations']['falcon-env']['falcon_store_uri']
 falcon_log_dir = config['configurations']['falcon-env']['falcon_log_dir']
 
 # falcon-startup.properties

ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java

@@ -491,6 +491,7 @@ public class UpgradeCatalog240Test {
     Method upgradeCapSchedulerView = UpgradeCatalog240.class.getDeclaredMethod("upgradeCapSchedulerView");
     Method updatePhoenixConfigs = UpgradeCatalog240.class.getDeclaredMethod("updatePhoenixConfigs");
     Method updateKerberosDescriptorArtifacts = AbstractUpgradeCatalog.class.getDeclaredMethod("updateKerberosDescriptorArtifacts");
+    Method updateFalconConfigs = UpgradeCatalog240.class.getDeclaredMethod("updateFalconConfigs");
 
     Capture<String> capturedStatements = newCapture(CaptureType.ALL);
 
@@ -524,6 +525,7 @@ public class UpgradeCatalog240Test {
             .addMockedMethod(upgradeCapSchedulerView)
             .addMockedMethod(updatePhoenixConfigs)
             .addMockedMethod(updateKerberosDescriptorArtifacts)
+            .addMockedMethod(updateFalconConfigs)
             .createMock();
 
     Field field = AbstractUpgradeCatalog.class.getDeclaredField("dbAccessor");
@@ -552,6 +554,7 @@ public class UpgradeCatalog240Test {
     upgradeCatalog240.upgradeCapSchedulerView();
     upgradeCatalog240.updatePhoenixConfigs();
     upgradeCatalog240.updateKerberosDescriptorArtifacts();
+    upgradeCatalog240.updateFalconConfigs();
 
     replay(upgradeCatalog240, dbAccessor);
 
@@ -635,6 +638,54 @@ public class UpgradeCatalog240Test {
     assertNull(hiveCapture.getValue().get("hive_hostname"));
   }
 
+  @Test
+  public void testUpdateFalconConfigs() throws Exception{
+    EasyMockSupport easyMockSupport = new EasyMockSupport();
+    final AmbariManagementController mockAmbariManagementController = easyMockSupport.createNiceMock(
+            AmbariManagementController.class);
+    final ConfigHelper mockConfigHelper = easyMockSupport.createMock(ConfigHelper.class);
+
+    final Clusters mockClusters = easyMockSupport.createStrictMock(Clusters.class);
+    final Cluster mockClusterExpected = easyMockSupport.createNiceMock(Cluster.class);
+
+    final Config mockFalconEnv = easyMockSupport.createNiceMock(Config.class);
+
+    final Map<String, String> propertiesExpectedFalconEnv = new HashMap<String, String>();
+    propertiesExpectedFalconEnv.put("falcon_store_uri", "file:///hadoop/falcon/store");
+    propertiesExpectedFalconEnv.put("property", "value");
+
+    final Injector mockInjector = Guice.createInjector(new Module() {
+      @Override
+      public void configure(Binder binder) {
+        binder.bind(AmbariManagementController.class).toInstance(mockAmbariManagementController);
+        binder.bind(ConfigHelper.class).toInstance(mockConfigHelper);
+        binder.bind(Clusters.class).toInstance(mockClusters);
+        binder.bind(EntityManager.class).toInstance(entityManager);
+        binder.bind(DBAccessor.class).toInstance(createNiceMock(DBAccessor.class));
+        binder.bind(OsFamily.class).toInstance(createNiceMock(OsFamily.class));
+      }
+    });
+
+    expect(mockAmbariManagementController.getClusters()).andReturn(mockClusters).once();
+    expect(mockClusters.getClusters()).andReturn(new HashMap<String, Cluster>() {{
+      put("normal", mockClusterExpected);
+    }}).once();
+
+    expect(mockClusterExpected.getDesiredConfigByType("falcon-env")).andReturn(mockFalconEnv).atLeastOnce();
+    expect(mockFalconEnv.getProperties()).andReturn(propertiesExpectedFalconEnv).anyTimes();
+
+    Capture<Map<String, String>> falconCapture =  newCapture();
+    expect(mockAmbariManagementController.createConfig(eq(mockClusterExpected), eq("falcon-env"),
+            capture(falconCapture), anyString(), (Map<String, Map<String, String>>)anyObject())).andReturn(null).once();
+
+    easyMockSupport.replayAll();
+    mockInjector.getInstance(UpgradeCatalog240.class).updateFalconConfigs();
+    easyMockSupport.verifyAll();
+
+    assertEquals("value", falconCapture.getValue().get("property"));
+    assertNull(falconCapture.getValue().get("falcon_store_uri"));
+  }
+
   @Test
   public void test_addParam_ParamsNotAvailable() {
 

ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py

@@ -146,10 +146,6 @@ class TestFalconServer(RMFTestCase):
         action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
         mode = 0777,
     )
-    self.assertResourceCalled('Directory', '/hadoop/falcon/store',
-        owner = 'falcon',
-        create_parents = True,
-    )
     self.assertResourceCalled('HdfsResource', '/apps/data-mirroring',
         immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
         security_enabled = False,
@@ -322,10 +318,6 @@ class TestFalconServer(RMFTestCase):
         action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
         mode = 0777,
     )
-    self.assertResourceCalled('Directory', '/hadoop/falcon/store',
-        owner = 'falcon',
-        create_parents = True,
-    )
     self.assertResourceCalled('HdfsResource', '/apps/data-mirroring',
         immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
         security_enabled = False,

ambari-web/app/data/HDP2/site_properties.js

@@ -1614,12 +1614,6 @@ var hdp2properties = [
     "filename": "falcon-env.xml",
     "category": "FALCON_SERVER"
   },
-  {
-    "name": "falcon_store_uri",
-    "serviceName": "FALCON",
-    "filename": "falcon-env.xml",
-    "category": "FALCON_SERVER"
-  },
 /************************************************AMBARI_METRICS******************************************/
   {
     "name": "timeline.metrics.service.operation.mode",