You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/10/01 17:27:31 UTC
[33/50] [abbrv] git commit: AMBARI-7575. Repositories page does not
show services. (jaimin)
AMBARI-7575. Repositories page does not show services. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/122e5d18
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/122e5d18
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/122e5d18
Branch: refs/heads/branch-alerts-dev
Commit: 122e5d183de79a2e3d2af8e79b9da295d4667b71
Parents: 9db24da
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Sep 30 18:18:09 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Sep 30 18:18:15 2014 -0700
----------------------------------------------------------------------
.../services/STORM/configuration/storm-site.xml | 83 --------------------
.../app/controllers/main/admin/repositories.js | 5 +-
2 files changed, 1 insertion(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/122e5d18/ambari-server/src/main/resources/stacks/HDP/2.2.1/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.1/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.1/services/STORM/configuration/storm-site.xml
deleted file mode 100644
index eefcde0..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2.1/services/STORM/configuration/storm-site.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="true">
-
- <property>
- <name>storm.thrift.transport</name>
- <deleted>true</deleted>
- <description>This is calculated field that is based of security state and _storm.thrift.nonsecure.transport and _storm.thrift.secure.transport
- </description>
- </property>
- <property>
- <name>_storm.thrift.nonsecure.transport</name>
- <value>backtype.storm.security.auth.SimpleTransportPlugin</value>
- <description>The transport plug-in that used for non-secure mode for for Thrift client/server communication.</description>
- </property>
- <property>
- <name>_storm.thrift.secure.transport</name>
- <value>backtype.storm.security.auth.kerberos.KerberosSaslTransportPlugin</value>
- <description>The transport plug-in that used for secure mode for Thrift client/server communication.</description>
- </property>
-
- <property>
- <name>nimbus.childopts</name>
- <value>-Xmx1024m _JAAS_PLACEHOLDER -javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8649,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM</value>
- <description>
- This parameter is used by the storm-deploy project to configure the jvm options for the
- nimbus daemon. _JAAS_PLACEHOLDER will be replaced by -Djava.security.auth.login.config=path/to/jaas.conf
- when security is enabled and empty string otherwise
- </description>
- </property>
-
- <property>
- <name>worker.childopts</name>
- <value>-Xmx768m _JAAS_PLACEHOLDER -javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM</value>
- <description>The jvm opts provided to workers launched by this supervisor. All \"%ID%\" substrings are replaced with an identifier for this worker.</description>
- </property>
-
- <property>
- <name>ui.childopts</name>
- <value>-Xmx768m _JAAS_PLACEHOLDER</value>
- <description>Childopts for Storm UI Java process.</description>
- </property>
-
- <property>
- <name>supervisor.childopts</name>
- <value>-Xmx256m _JAAS_PLACEHOLDER -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=56431 -javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM</value>
- <description>This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.</description>
- </property>
-
- <property>
- <name>logviewer.childopts</name>
- <value>-Xmx128m _JAAS_PLACEHOLDER</value>
- <description>Childopts for log viewer java process.</description>
- </property>
-
- <property>
- <name>drpc.childopts</name>
- <value>-Xmx768m _JAAS_PLACEHOLDER</value>
- <description>Childopts for Storm DRPC Java process.</description>
- </property>
-
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/122e5d18/ambari-web/app/controllers/main/admin/repositories.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/repositories.js b/ambari-web/app/controllers/main/admin/repositories.js
index 7ed36bf..1b32c96 100644
--- a/ambari-web/app/controllers/main/admin/repositories.js
+++ b/ambari-web/app/controllers/main/admin/repositories.js
@@ -132,13 +132,10 @@ App.MainAdminRepositoriesController = Em.Controller.extend({
*/
parseServicesInfo: function (currentStack, upgradeStack) {
var result = [];
- var installedServices = App.Service.find().mapProperty('serviceName');
var displayOrder = App.StackService.displayOrder;
- if (currentStack.stackServices.length && upgradeStack.stackServices.length) {
+ if (currentStack.stackServices.length || upgradeStack.stackServices.length) {
// loop through all the service components
displayOrder.forEach(function (_stackServiceName) {
- var entry = currentStack.stackServices.
- findProperty("StackServices.service_name", _stackServiceName);
var stackService = App.StackService.find().findProperty('serviceName', _stackServiceName);
if (!!stackService) {
var myService = Em.Object.create({