Переглянути джерело

AMBARI-5282. supervisor.enable should be removed from Ambari's Storm Config section (dlysnichenko)

Lisnichenko Dmitro 11 роки тому
батько
коміт
b1563db098

+ 0 - 7
ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/configuration/storm-site.xml

@@ -290,13 +290,6 @@
     <value>5</value>
     <description>How often the supervisor sends a heartbeat to the master.</description>
   </property>
-  <property>
-    <name>supervisor.enable</name>
-    <value>true</value>
-    <description>Whether or not the supervisor should launch workers assigned to it. Defaults
-       to true -- and you should probably never change this value. This configuration
-       is used in the Storm unit tests.</description>
-  </property>
   <property>
     <name>worker.childopts</name>
     <value>-Xmx768m -javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=,port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM</value>

+ 0 - 1
ambari-web/app/assets/data/configurations/cluster_level_configs.json

@@ -604,7 +604,6 @@
         "storm.zookeeper.servers" : "['localhost']",
         "storm.zookeeper.session.timeout" : "20000",
         "supervisor.childopts" : "-Xmx256m",
-        "supervisor.enable" : "true",
         "supervisor.heartbeat.frequency.secs" : "5",
         "supervisor.monitor.frequency.secs" : "3",
         "supervisor.slots.ports" : "[6700, 6701, 6702, 6703]",

+ 1 - 13
ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/STORM.json

@@ -529,18 +529,6 @@
         "type" : "storm-site.xml"
       }
     },
-    {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.0.8/stackServices/STORM/configurations/supervisor.enable",
-      "StackConfigurations" : {
-        "property_description" : "",
-        "property_name" : "supervisor.enable",
-        "property_value" : "true",
-        "service_name" : "STORM",
-        "stack_name" : "HDP",
-        "stack_version" : "2.0.8",
-        "type" : "storm-site.xml"
-      }
-    },
     {
       "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.0.8/stackServices/STORM/configurations/supervisor.heartbeat.frequency.secs",
       "StackConfigurations" : {
@@ -1094,4 +1082,4 @@
       }
     }
   ]
-}
+}

+ 0 - 8
ambari-web/app/data/HDP2/site_properties.js

@@ -912,14 +912,6 @@ module.exports =
       "displayType": "int",
       "unit": "seconds"
     },
-    {
-      "id": "site property",
-      "serviceName": "STORM",
-      "category": "Supervisor",
-      "displayName": "supervisor.enable",
-      "name": "supervisor.enable",
-      "displayType": "checkbox"
-    },
     {
       "id": "site property",
       "serviceName": "STORM",