ambari git commit: AMBARI-11076. Atlas Install fails with war error (Jon Maron via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk fa1303aaa - 2dcf4f310
AMBARI-11076. Atlas Install fails with war error (Jon Maron via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2dcf4f31
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2dcf4f31
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2dcf4f31
Branch: refs/heads/trunk
Commit: 2dcf4f3107da6c58bba68308163ea79cead04b09
Parents: fa1303a
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Tue May 12 11:13:01 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Tue May 12 11:13:01 2015 -0700
--
.../ATLAS/0.1.0.2.3/package/scripts/metadata.py| 9 -
.../ATLAS/0.1.0.2.3/package/scripts/metadata_server.py | 13 -
.../python/stacks/2.3/ATLAS/test_metadata_server.py| 11 ++-
3 files changed, 18 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2dcf4f31/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
index a4274ca..61cdec4 100644
---
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
+++
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
@@ -17,8 +17,6 @@ See the License for the specific language governing
permissions and
limitations under the License.
-import os
-import shutil
from resource_management import Directory, Fail, Logger, File, \
InlineTemplate, StaticFile
from resource_management.libraries.functions import format
@@ -67,13 +65,6 @@ def metadata():
recursive=True
)
-metadata_war_file =
format('{params.metadata_home}/server/webapp/metadata.war')
-if not os.path.isfile(metadata_war_file):
-raise Fail(Unable to copy {0} because it does not
exist.format(metadata_war_file))
-
-Logger.info(Copying {0} to {1}.format(metadata_war_file,
params.expanded_war_dir))
-shutil.copy2(metadata_war_file, params.expanded_war_dir)
-
File(format('{conf_dir}/application.properties'),
content=InlineTemplate(params.application_properties_content),
mode=0644,
http://git-wip-us.apache.org/repos/asf/ambari/blob/2dcf4f31/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
index 94a8f9e..2484315 100644
---
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
+++
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
@@ -16,9 +16,12 @@ See the License for the specific language governing
permissions and
limitations under the License.
+import os
+import shutil
from metadata import metadata
-from resource_management import Execute, check_process_status, Script
+from resource_management import Execute, check_process_status, Script, Fail, \
+ Logger
from resource_management.libraries.functions import format
class MetadataServer(Script):
@@ -43,6 +46,14 @@ class MetadataServer(Script):
def start(self, env, rolling_restart=False):
import params
env.set_params(params)
+
+metadata_war_file =
format('{params.metadata_home}/server/webapp/metadata.war')
+if not os.path.isfile(metadata_war_file):
+ raise Fail(Unable to copy {0} because it does not
exist.format(metadata_war_file))
+
+Logger.info(Copying {0} to {1}.format(metadata_war_file,
params.expanded_war_dir))
+shutil.copy2(metadata_war_file, params.expanded_war_dir)
+
daemon_cmd = format('source {params.conf_dir}/metadata-env.sh ;
{params.metadata_start_script} --port {params.metadata_port}')
no_op_test = format('ls {params.pid_file} /dev/null 21 ps -p `cat
{params.pid_file}` /dev/null 21')
Execute(daemon_cmd,
http://git-wip-us.apache.org/repos/asf/ambari/blob/2dcf4f31/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
index 90df616..6f1377b 100644
---
ambari git commit: AMBARI-11073. RU: Should not complain about decommissioned components (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 5378bd912 - fa1303aaa
AMBARI-11073. RU: Should not complain about decommissioned components
(dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa1303aa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa1303aa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa1303aa
Branch: refs/heads/trunk
Commit: fa1303aaa6c4ac61a8f3f213dc33adf5b062b458
Parents: 5378bd9
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Tue May 12 21:00:18 2015 +0300
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Tue May 12 21:00:18 2015 +0300
--
.../ambari/server/checks/CheckDescription.java | 7 --
.../checks/ServicesDecommissionCheck.java | 68
.../checks/ServicesDecommissionCheckTest.java | 105 ---
3 files changed, 180 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1303aa/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 083d3f9..8e92cfe 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
@@ -72,13 +72,6 @@ public enum CheckDescription {
put(AbstractCheckDescriptor.DEFAULT, The SNameNode component must be
deleted from host: {{fails}}.);
}}),
- SERVICES_DECOMMISSION(PrereqCheckType.SERVICE,
- Services should not have components in decommission state,
- new HashMapString, String() {{
-put(AbstractCheckDescriptor.DEFAULT,
- The following Services must not have components in decommissioned
or decommissioning state: {{fails}}.);
- }}),
-
SERVICES_MAINTENANCE_MODE(PrereqCheckType.SERVICE,
No services can be in Maintenance Mode,
new HashMapString, String() {{
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1303aa/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesDecommissionCheck.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesDecommissionCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesDecommissionCheck.java
deleted file mode 100644
index 6ebfd1f..000
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesDecommissionCheck.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.
- */
-package org.apache.ambari.server.checks;
-
-import java.util.Map;
-
-import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.controller.PrereqCheckRequest;
-import org.apache.ambari.server.state.Cluster;
-import org.apache.ambari.server.state.HostComponentAdminState;
-import org.apache.ambari.server.state.Service;
-import org.apache.ambari.server.state.ServiceComponent;
-import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.ambari.server.state.stack.PrereqCheckStatus;
-import org.apache.ambari.server.state.stack.PrerequisiteCheck;
-
-import com.google.inject.Singleton;
-
-/**
- * Checks that there are no services in decommission state.
- */
-@Singleton
-public class ServicesDecommissionCheck extends AbstractCheckDescriptor {
-
- /**
- * Constructor.
- */
- public ServicesDecommissionCheck() {
-super(CheckDescription.SERVICES_DECOMMISSION);
- }
-
- @Override
- public void perform(PrerequisiteCheck prerequisiteCheck, PrereqCheckRequest
request) throws AmbariException {
-final String clusterName = request.getClusterName();
-final Cluster cluster = clustersProvider.get().getCluster(clusterName);
-for (Map.EntryString, Service
ambari git commit: AMBARI-11016. RU: Re-arrange manual steps in upgrade packs (dlysnichenko)
Repository: ambari Updated Branches: refs/heads/trunk df513801b - 5378bd912 AMBARI-11016. RU: Re-arrange manual steps in upgrade packs (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5378bd91 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5378bd91 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5378bd91 Branch: refs/heads/trunk Commit: 5378bd91289e1943ff28f39a01c1c4e7981e9aba Parents: df51380 Author: Lisnichenko Dmitro dlysniche...@hortonworks.com Authored: Tue May 12 20:53:59 2015 +0300 Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com Committed: Tue May 12 20:53:59 2015 +0300 -- .../resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml| 11 ++- .../resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml| 11 ++- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml| 11 ++- 3 files changed, 18 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/5378bd91/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml index 0cf8ff2..8c0a6d6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml @@ -50,6 +50,12 @@ /task /execute-stage + execute-stage service=RANGER component=RANGER_ADMIN title=Pre Upgrade Ranger +task xsi:type=manual + messageBefore continuing, please backup the Ranger Admin database and Ranger Audit database/message +/task + /execute-stage + /group group name=ZOOKEEPER title=ZooKeeper @@ -306,11 +312,6 @@ service name=RANGER component name=RANGER_ADMIN -pre-upgrade - task xsi:type=manual -messageBefore continuing, please backup the Ranger Admin database and Ranger Audit database/message - /task -/pre-upgrade upgrade task xsi:type=restart / /upgrade http://git-wip-us.apache.org/repos/asf/ambari/blob/5378bd91/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml index e233afa..64a621e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml @@ -50,6 +50,12 @@ /task /execute-stage + execute-stage service=RANGER component=RANGER_ADMIN title=Pre Upgrade Ranger +task xsi:type=manual + messageBefore continuing, please backup the Ranger Admin database and Ranger Audit database/message +/task + /execute-stage + /group group name=ZOOKEEPER title=ZooKeeper @@ -306,11 +312,6 @@ service name=RANGER component name=RANGER_ADMIN -pre-upgrade - task xsi:type=manual -messageBefore continuing, please backup the Ranger Admin database and Ranger Audit database/message - /task -/pre-upgrade upgrade task xsi:type=restart / /upgrade http://git-wip-us.apache.org/repos/asf/ambari/blob/5378bd91/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml index 1937890..be9cc14 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml @@ -50,6 +50,12 @@ /task /execute-stage + execute-stage service=RANGER component=RANGER_ADMIN title=Pre Upgrade Ranger +task xsi:type=manual + messageBefore continuing, please backup the Ranger Admin database and Ranger Audit database/message +/task + /execute-stage + /group group name=ZOOKEEPER title=ZooKeeper @@ -306,11 +312,6 @@ service name=RANGER component name=RANGER_ADMIN -pre-upgrade - task xsi:type=manual -messageBefore continuing, please backup the Ranger Admin database and Ranger Audit database/message - /task -/pre-upgrade upgrade task xsi:type=restart /
Git Push Summary
Repository: ambari Updated Branches: refs/heads/origin/branch-2.0.maint [deleted] 11695e4fe
ambari git commit: AMBARI-11083. Upgrade 1.6.1 - 2.0.1 - nagios not removed.
Repository: ambari
Updated Branches:
refs/heads/trunk bd1971616 - 017ae9f0e
AMBARI-11083. Upgrade 1.6.1 - 2.0.1 - nagios not removed.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/017ae9f0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/017ae9f0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/017ae9f0
Branch: refs/heads/trunk
Commit: 017ae9f0e4a1e4fbe933168ca9a30499b83c5d3a
Parents: bd19716
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Tue May 12 12:41:25 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Tue May 12 12:41:31 2015 -0700
--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java| 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/017ae9f0/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
index 9804bca..d2b9610 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
@@ -467,6 +467,7 @@ public class UpgradeCatalog200 extends
AbstractUpgradeCatalog {
desiredStateDao.remove(serviceDesiredState);
// remove service
+cluster.getClusterServiceEntities().remove(nagios);
ClusterServiceEntityPK primaryKey = new ClusterServiceEntityPK();
primaryKey.setClusterId(nagios.getClusterId());
primaryKey.setServiceName(nagios.getServiceName());
ambari git commit: AMBARI-11082. Namenode heapsize should depend on 'dfs.datanode.data.dir' value (srimanth)
Repository: ambari Updated Branches: refs/heads/trunk 2dcf4f310 - bd1971616 AMBARI-11082. Namenode heapsize should depend on 'dfs.datanode.data.dir' value (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd197161 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd197161 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd197161 Branch: refs/heads/trunk Commit: bd197161612b70739a2e6145916ce2074e63e8ab Parents: 2dcf4f3 Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Tue May 12 11:39:28 2015 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Tue May 12 11:39:34 2015 -0700 -- .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml| 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/bd197161/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml index 5d363b5..3cff24c 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml @@ -53,6 +53,12 @@ unitMB/unit increment-step256/increment-step /value-attributes +depends-on + property +typehdfs-site/type +namedfs.datanode.data.dir/name + /property +/depends-on /property property namenamenode_opt_newsize/name
ambari git commit: AMBARI-11083. Upgrade 1.6.1 - 2.0.1 - nagios not removed.
Repository: ambari
Updated Branches:
refs/heads/origin/branch-2.0.maint [created] 11695e4fe
AMBARI-11083. Upgrade 1.6.1 - 2.0.1 - nagios not removed.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/11695e4f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/11695e4f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/11695e4f
Branch: refs/heads/origin/branch-2.0.maint
Commit: 11695e4fe531680bf8fcc00c1598664e549c5728
Parents: a21a69e
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Tue May 12 12:44:57 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Tue May 12 12:44:57 2015 -0700
--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java| 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/11695e4f/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
index 4e444b9..1b22c89 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
@@ -489,6 +489,7 @@ public class UpgradeCatalog200 extends
AbstractUpgradeCatalog {
desiredStateDao.remove(serviceDesiredState);
// remove service
+cluster.getClusterServiceEntities().remove(nagios);
ClusterServiceEntityPK primaryKey = new ClusterServiceEntityPK();
primaryKey.setClusterId(nagios.getClusterId());
primaryKey.setServiceName(nagios.getServiceName());
[1/7] ambari git commit: AMBARI-11081. Kerberos: cannot get passed Install and Test Kerberos Client step (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c94780aa3 - e6b3972f4
AMBARI-11081. Kerberos: cannot get passed Install and Test Kerberos Client
step (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6b3972f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6b3972f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6b3972f
Branch: refs/heads/trunk
Commit: e6b3972f4dc28cae594c8c5719c84986e8044e30
Parents: bcfffdb
Author: Alex Antonenko hiv...@gmail.com
Authored: Tue May 12 21:29:14 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Tue May 12 23:48:37 2015 +0300
--
.../main/admin/kerberos/step3_controller.js | 19 +-
ambari-web/app/messages.js | 1 +
.../app/templates/main/admin/kerberos/step3.hbs | 71 +++-
3 files changed, 89 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6b3972f/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js
index ef1ef8e..8946481 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step3_controller.js
@@ -21,6 +21,7 @@ App.KerberosWizardStep3Controller =
App.KerberosProgressPageController.extend({
clusterDeployState: 'KERBEROS_DEPLOY',
serviceName: 'KERBEROS',
componentName: 'KERBEROS_CLIENT',
+ ignore: undefined,
commands: ['installKerberos', 'testKerberos'],
@@ -102,6 +103,22 @@ App.KerberosWizardStep3Controller =
App.KerberosProgressPageController.extend({
} else {
wizardController.setLowerStepsDisable(3);
}
- }.observes('tasks.@each.status')
+ }.observes('tasks.@each.status'),
+
+ /**
+ * Show or hide warning to ignore errors and continue with the install
+ */
+ showIgnore: function() {
+return this.get('tasks').someProperty('showRetry', true);
+ }.property('tasks.@each.showRetry'),
+
+ /**
+ * Enable or disable next button if ignore checkbox ticked
+ */
+ ignoreAndProceed: function() {
+if (this.get('showIgnore')) {
+ this.set('isSubmitDisabled', !this.get('ignore'));
+}
+ }.observes('ignore','showIgnore')
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6b3972f/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 0f33660..3bc1cab 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -987,6 +987,7 @@ Em.I18n.translations = {
'admin.kerberos.wizard.step1.header': 'Get Started',
'admin.kerberos.wizard.step2.header': 'Configure Kerberos',
'admin.kerberos.wizard.step3.header': 'Install and Test Kerberos Client',
+ 'admin.kerberos.wizard.step3.checkbox.ignoreAndProceed.label': 'Ignore
errors and continue to next step',
'admin.kerberos.wizard.step4.header': 'Configure Identities',
'admin.kerberos.wizard.step5.header': 'Confirm Configuration',
'admin.kerberos.wizard.step6.header': 'Stop Services',
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6b3972f/ambari-web/app/templates/main/admin/kerberos/step3.hbs
--
diff --git a/ambari-web/app/templates/main/admin/kerberos/step3.hbs
b/ambari-web/app/templates/main/admin/kerberos/step3.hbs
index c74b677..a3a45a6 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step3.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step3.hbs
@@ -16,5 +16,74 @@
* limitations under the License.
}}
div id=kerberos-wizard-step3
- {{template templates/common/progress}}
+div id=common-progress-page
+h2{{view.headerTitle}}/h2
+
+div {{bindAttr class=view.noticeClass}}{{{view.notice}}}
+ {{#if controller.showRetry}}
+ a href=# {{action retry target=controller}}
+{{t common.retry}}
+ /a
+ {{/if}}
+/div
+ {{#if controller.isLoaded}}
+ div class=clearfix
+{{#each task in controller.tasks}}
+ {{#view view.taskView contentBinding=task}}
+ div class=item
+ div {{bindAttr class=:pull-left view.linkClass
view.parentView.labelWidth}}
+ i {{bindAttr class=view.icon view.iconColor}}/i
+ a {{action showHostProgressPopup task
target=controller}} {{task.title}}/a
+ /div
+ div {{bindAttr class=view.showProgressBar::hide :row
:span5
[4/7] ambari git commit: AMBARI-11072. Files View: Support Auto Create and Cluster Association (alexantonenko)
AMBARI-11072. Files View: Support Auto Create and Cluster Association
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7ccaca98
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7ccaca98
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7ccaca98
Branch: refs/heads/trunk
Commit: 7ccaca98597f1c448096d5a1b9ace0d17a3f34c0
Parents: c94780a
Author: Alex Antonenko hiv...@gmail.com
Authored: Tue May 12 20:10:56 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Tue May 12 23:48:37 2015 +0300
--
.../view/filebrowser/DownloadService.java | 1 -
.../view/filebrowser/FileOperationService.java | 7 +-
.../apache/ambari/view/filebrowser/HdfsApi.java | 5 ++
.../ambari/view/filebrowser/HdfsService.java| 17 -
.../view/filebrowser/PropertyValidator.java | 72
.../resources/ui/app/components/uploader.js | 2 +-
contrib/views/files/src/main/resources/view.xml | 17 -
.../view/filebrowser/FilebrowserTest.java | 7 +-
.../view/filebrowser/HdfsServiceTest.java | 49 +
9 files changed, 167 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ccaca98/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java
--
diff --git
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java
index 063d453..1685450 100644
---
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java
+++
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java
@@ -53,7 +53,6 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.ambari.view.ViewContext;
import org.apache.hadoop.security.AccessControlException;
import org.json.simple.JSONObject;
-//import org.glassfish.jersey.server.ChunkedOutput;
/**
* Service for download and aggregate files
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ccaca98/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/FileOperationService.java
--
diff --git
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/FileOperationService.java
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/FileOperationService.java
index 4628b1d..ded3684 100644
---
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/FileOperationService.java
+++
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/FileOperationService.java
@@ -33,6 +33,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ambari.view.ViewContext;
import org.apache.ambari.view.filebrowser.utils.NotFoundFormattedException;
import org.apache.ambari.view.filebrowser.utils.ServiceFormattedException;
+import org.json.simple.JSONObject;
/**
* File operations service
@@ -57,8 +58,10 @@ public class FileOperationService extends HdfsService {
@Produces(MediaType.APPLICATION_JSON)
public Response listdir(@QueryParam(path) String path) {
try {
- return Response.ok(
-
getApi(context).fileStatusToJSON(getApi(context).listdir(path))).build();
+ JSONObject response = new JSONObject();
+ response.put(files,
getApi(context).fileStatusToJSON(getApi(context).listdir(path)));
+ response.put(meta,
getApi(context).fileStatusToJSON(getApi(context).getFileStatus(path)));
+ return Response.ok(response).build();
} catch (WebApplicationException ex) {
throw ex;
} catch (FileNotFoundException ex) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ccaca98/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
--
diff --git
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
index ef87001..b521085 100644
---
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
+++
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
@@ -33,6 +33,8 @@ import java.util.Map;
import org.apache.hadoop.security.UserGroupInformation;
import org.json.simple.JSONArray;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.LinkedHashMap;
@@ -40,6 +42,8 @@ import java.util.LinkedHashMap;
* Hdfs Business Delegate
*/
public class HdfsApi {
+ protected static final Logger logger =
[6/7] ambari git commit: AMBARI-11080. Fields in UI are not ordered even when specifying (category) index in site_properties.js (alexantonenko)
AMBARI-11080. Fields in UI are not ordered even when specifying (category)
index in site_properties.js (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bcfffdb5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bcfffdb5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bcfffdb5
Branch: refs/heads/trunk
Commit: bcfffdb55ad182d8c816b45cd5df3fc7a13f2b74
Parents: f085f59
Author: Alex Antonenko hiv...@gmail.com
Authored: Tue May 12 21:24:12 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Tue May 12 23:48:37 2015 +0300
--
.../configs/service_configs_by_category_view.js | 8 ++-
.../service_configs_by_category_view_test.js| 62
2 files changed, 68 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bcfffdb5/ambari-web/app/views/common/configs/service_configs_by_category_view.js
--
diff --git
a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index ab2a498..2e9e6e5 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -44,9 +44,13 @@ App.ServiceConfigsByCategoryView =
Em.View.extend(App.UserPref, App.ConfigOverri
* @type {Array}
*/
categoryConfigs: function () {
-var categoryConfigs = this.get('categoryConfigsAll');
+// sort content type configs, sort the rest of configs based on index and
then add content array at the end (as intended)
+var categoryConfigs = this.get('categoryConfigsAll'),
+ contentOrderedArray =
this.orderContentAtLast(categoryConfigs.filterProperty('displayType','content')),
+ contentFreeConfigs = categoryConfigs.filter(function(config) {return
config.get('displayType')!=='content';}),
+ indexOrdered = this.sortByIndex(contentFreeConfigs);
-return
this.orderContentAtLast(this.sortByIndex(categoryConfigs)).filterProperty('isVisible',
true);
+return
indexOrdered.concat(contentOrderedArray).filterProperty('isVisible', true);
}.property('categoryConfigsAll.@each.isVisible').cacheable(),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/bcfffdb5/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
--
diff --git
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
index aeae18b..30f1749 100644
---
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
+++
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
@@ -521,4 +521,66 @@ describe('App.ServiceConfigsByCategoryView', function () {
});
+ describe('#categoryConfigs', function () {
+var view,
+ result = [1,2,3,4,5],
+ cases = [
+{
+ categoryNname: 'TestCategory',
+ serviceConfigs: [
+Em.Object.create({category: TestCategory, index: 1, name: a,
isVisible: true, resultId: 1}),
+Em.Object.create({category: TestCategory, index: 2, name: b,
isVisible: true, resultId: 2}),
+Em.Object.create({category: TestCategory, index: 5, name: c,
isVisible: true, resultId: 5}),
+Em.Object.create({category: TestCategory, index: 4, name: d,
isVisible: true, resultId: 4}),
+Em.Object.create({category: TestCategory, index: 3, name: e,
isVisible: true, resultId: 3})
+ ],
+ title: 'Order by index with no content type'
+},
+{
+ categoryNname: 'TestCategory',
+ serviceConfigs: [
+Em.Object.create({category: TestCategory, index: 1, name: a,
isVisible: true, resultId: 1, displayType: 'int'}),
+Em.Object.create({category: TestCategory, index: 2, name: b,
isVisible: true, resultId: 4, displayType: 'content'}),
+Em.Object.create({category: TestCategory, index: 3, name: c,
isVisible: true, resultId: 2}),
+Em.Object.create({category: TestCategory, index: 4, name: d,
isVisible: true, resultId: 5, displayType: 'content'}),
+Em.Object.create({category: TestCategory, index: 5, name: e,
isVisible: true, resultId: 3})
+ ],
+ title: 'Order configs by index and display type equal to content'
+},
+{
+ categoryNname: 'TestCategory',
+ serviceConfigs: [
+Em.Object.create({category: TestCategory, name: a, isVisible:
true, resultId: 1, displayType: 'content'}),
+
[7/7] ambari git commit: AMBARI-11077. Kerb: wizard should use non-button undo icon (alexantonenko)
AMBARI-11077. Kerb: wizard should use non-button undo icon (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd8a5f98
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd8a5f98
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd8a5f98
Branch: refs/heads/trunk
Commit: bd8a5f98df2ec403480122a10b1d60d38f7507cc
Parents: 81a3eeb
Author: Alex Antonenko hiv...@gmail.com
Authored: Tue May 12 20:46:01 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Tue May 12 23:48:37 2015 +0300
--
ambari-web/app/styles/application.less| 4
.../app/templates/common/configs/compare_property.hbs | 2 +-
.../templates/common/configs/notifications_configs.hbs| 4 ++--
.../app/templates/common/configs/overriddenProperty.hbs | 4 ++--
.../templates/common/configs/service_config_category.hbs | 10 +-
.../widgets/comparison/config_widget_comparison.hbs | 2 +-
.../templates/main/alerts/create_alert_notification.hbs | 2 +-
ambari-web/app/views/common/controls_view.js | 2 +-
8 files changed, 17 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 1e8e6d4..806d356 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -480,6 +480,10 @@ h1 {
}
}
+.btn-small {
+ text-decoration: none !important;
+}
+
.hide {
visibility: hidden;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/templates/common/configs/compare_property.hbs
--
diff --git a/ambari-web/app/templates/common/configs/compare_property.hbs
b/ambari-web/app/templates/common/configs/compare_property.hbs
index a5e17dd..f593825 100644
--- a/ambari-web/app/templates/common/configs/compare_property.hbs
+++ b/ambari-web/app/templates/common/configs/compare_property.hbs
@@ -25,7 +25,7 @@
{{/if}}
{{#unless compareConfig.isMock}}
{{#if compareConfig.supportsFinal}}
-a disabled=disabled {{bindAttr class=:btn :btn-small
:btn-final compareConfig.isFinal:active compareConfig.hideFinalIcon:hidden }}
+a disabled=disabled {{bindAttr class=:btn-small :btn-final
compareConfig.isFinal:active compareConfig.hideFinalIcon:hidden }}
i class=icon-lock/i
/a
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/templates/common/configs/notifications_configs.hbs
--
diff --git a/ambari-web/app/templates/common/configs/notifications_configs.hbs
b/ambari-web/app/templates/common/configs/notifications_configs.hbs
index 27d1820..d58d076 100644
--- a/ambari-web/app/templates/common/configs/notifications_configs.hbs
+++ b/ambari-web/app/templates/common/configs/notifications_configs.hbs
@@ -48,7 +48,7 @@
{{#if isRemovable}}
{{#isAccessible ADMIN}}
{{#unless this.isComparison}}
-a class=btn btn-small href=# data-toggle=tooltip
+a class=btn-small href=# data-toggle=tooltip
{{action removeProperty this target=view}}
{{translateAttr data-original-title=common.remove}}
i class=icon-minus-sign/i
@@ -71,7 +71,7 @@
div class=entry-row indent-1
{{view Ember.RadioButton name=tlsOrSsl
disabledBinding=view.configsAreDisabled selectionBinding=view.tlsOrSsl
value=ssl}} {{t installer.step7.misc.notification.use_ssl}}
/div
-
+
{{#isAccessible ADMIN}}
{{#if view.canEdit}}
{{#unless view.configsAreDisabled}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/templates/common/configs/overriddenProperty.hbs
--
diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs
b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
index d9d8dd2..9484f7e 100644
--- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs
+++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
@@ -21,7 +21,7 @@
{{view overriddenSCP.viewClass serviceConfigBinding=overriddenSCP
categoryConfigsBinding=view.categoryConfigs}}
{{#if overriddenSCP.supportsFinal}}
a href=# data-toggle=tooltip
-{{bindAttr class=:btn :btn-small :btn-final
overriddenSCP.isFinal:active
ambari git commit: AMBARI-10707. AMS does not work with NN HA in AMS distrbuted mode. (swagle)
Repository: ambari Updated Branches: refs/heads/trunk 017ae9f0e - 891f668cc AMBARI-10707. AMS does not work with NN HA in AMS distrbuted mode. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/891f668c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/891f668c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/891f668c Branch: refs/heads/trunk Commit: 891f668cc987165479875fe8db11d0364e873476 Parents: 017ae9f Author: Siddharth Wagle swa...@hortonworks.com Authored: Tue May 12 12:55:20 2015 -0700 Committer: Siddharth Wagle swa...@hortonworks.com Committed: Tue May 12 12:55:20 2015 -0700 -- .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 38 1 file changed, 38 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/891f668c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py index c7de4f3..507336b 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py @@ -89,6 +89,15 @@ def ams(name=None): mode=0644 ) + XmlConfig(hdfs-site.xml, +conf_dir=params.hbase_conf_dir, +configurations=params.config['configurations']['hdfs-site'], + configuration_attributes=params.config['configuration_attributes']['hdfs-site'], +owner=params.ams_user, +group=params.user_group, +mode=0644 + ) + XmlConfig(core-site.xml, conf_dir=params.ams_collector_conf_dir, configurations=params.config['configurations']['core-site'], @@ -97,6 +106,16 @@ def ams(name=None): group=params.user_group, mode=0644 ) + + XmlConfig(core-site.xml, +conf_dir=params.hbase_conf_dir, +configurations=params.config['configurations']['core-site'], + configuration_attributes=params.config['configuration_attributes']['core-site'], +owner=params.ams_user, +group=params.user_group, +mode=0644 + ) + else: ServiceConfig(params.ams_embedded_hbase_win_service_name, action=change_user, @@ -249,6 +268,15 @@ def ams(name=None): mode=0644 ) + XmlConfig(hdfs-site.xml, +conf_dir=params.hbase_conf_dir, +configurations=params.config['configurations']['hdfs-site'], + configuration_attributes=params.config['configuration_attributes']['hdfs-site'], +owner=params.ams_user, +group=params.user_group, +mode=0644 + ) + XmlConfig(core-site.xml, conf_dir=params.ams_collector_conf_dir, configurations=params.config['configurations']['core-site'], @@ -257,6 +285,16 @@ def ams(name=None): group=params.user_group, mode=0644 ) + + XmlConfig(core-site.xml, +conf_dir=params.hbase_conf_dir, +configurations=params.config['configurations']['core-site'], + configuration_attributes=params.config['configuration_attributes']['core-site'], +owner=params.ams_user, +group=params.user_group, +mode=0644 + ) + pass elif name == 'monitor':
ambari git commit: AMBARI-11070. Ambari UI should not allow incorrect NN UI https configuration (mpapirkovskyy via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 6701cfc17 - 628812a16
AMBARI-11070. Ambari UI should not allow incorrect NN UI https configuration
(mpapirkovskyy via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/628812a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/628812a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/628812a1
Branch: refs/heads/trunk
Commit: 628812a16025a23f21067d1d58b1666146141538
Parents: 6701cfc
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Tue May 12 14:38:57 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Tue May 12 14:38:57 2015 -0700
--
.../stacks/HDP/2.2/services/stack_advisor.py| 34
1 file changed, 34 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/628812a1/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index a7aa973..5a49fda 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -19,6 +19,7 @@ limitations under the License.
import math
from math import floor
+from urlparse import urlparse
class HDP22StackAdvisor(HDP21StackAdvisor):
@@ -637,6 +638,27 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
VALID_TRANSFER_PROTECTION_VALUES = ['authentication', 'integrity',
'privacy']
validationItems = []
+address_properties = [
+ # dfs.datanode.address,
+ # dfs.datanode.http.address,
+ # dfs.datanode.https.address,
+ # dfs.datanode.ipc.address,
+ # dfs.journalnode.http-address,
+ # dfs.journalnode.https-address,
+ # dfs.namenode.rpc-address,
+ # dfs.namenode.secondary.http-address,
+ dfs.namenode.http-address,
+ dfs.namenode.https-address,
+]
+#Validating *address properties for correct values
+
+for address_property in address_properties:
+ if address_property in hdfs_site:
+value = hdfs_site[address_property]
+if not is_valid_host_port_authority(value):
+ validationItems.append({config-name : address_property, item :
+self.getErrorItem(address_property + does not contain a valid
host:port authority: + value)})
+
#Adding Ranger Plugin logic here
ranger_plugin_properties = getSiteProperties(configurations,
ranger-hdfs-plugin-properties)
ranger_plugin_enabled =
ranger_plugin_properties['ranger-hdfs-plugin-enabled']
@@ -1000,3 +1022,15 @@ def is_number(s):
pass
return False
+
+def is_valid_host_port_authority(target):
+ has_scheme = :// in target
+ if not has_scheme:
+target = dummyscheme://+target
+ try:
+result = urlparse(target)
+if result.hostname is not None and result.port is not None:
+ return True
+ except ValueError:
+pass
+ return False
ambari git commit: AMBARI-11030 Queue-specific metrics cannot be queried as time series data via Ambari API (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 891f668cc - c94780aa3
AMBARI-11030 Queue-specific metrics cannot be queried as time series data via
Ambari API (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c94780aa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c94780aa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c94780aa
Branch: refs/heads/trunk
Commit: c94780aa3e3636818e3011bede6acdf2066e3fe4
Parents: 891f668
Author: Dmytro Sen d...@apache.org
Authored: Tue May 12 23:44:51 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Tue May 12 23:45:53 2015 +0300
--
.../controller/internal/BaseProvider.java | 3 ++-
.../controller/internal/BaseProviderTest.java | 22
.../timeline/AMSPropertyProviderTest.java | 6 +++---
3 files changed, 27 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c94780aa/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
index a95342a..ca5e70e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
@@ -79,7 +79,8 @@ public abstract class BaseProvider {
* p/
* {@code metrics/yarn/Queue/-/AppsCompleted/-/foo/-/bar/-}
*/
- private static final Pattern METRIC_ARGUMENT_METHOD_REPLACEMENT =
Pattern.compile(\\$\\d+(\\.\\w+(\\(\\\S+\\\)|\\(\\d+\\)))*);
+ private static final Pattern METRIC_ARGUMENT_METHOD_REPLACEMENT =
+ Pattern.compile(\\$\\d+(\\.\\S+\\(\\S+\\))*);
// - Constructors --
http://git-wip-us.apache.org/repos/asf/ambari/blob/c94780aa/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BaseProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BaseProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BaseProviderTest.java
index 380142e..4995fa6 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BaseProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BaseProviderTest.java
@@ -326,6 +326,7 @@ public class BaseProviderTest {
SetString propertyIds = new HashSetString();
propertyIds.add(metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\[^-]+\,\\)EventPutSuccessCount/rate/sum);
propertyIds.add(metrics/yarn/Queue/$1.replaceAll(\([.])\,\/\)/AppsCompleted);
+
propertyIds.add(metrics/yarn/Queue/$1.replaceAll(\,q(\\d+)=\,\/\).substring(1)/AppsFailed);
TestProvider provider = new TestProvider(propertyIds);
EntryString, Pattern entry =
provider.getRegexEntry(metrics/flume/flume);
@@ -347,6 +348,27 @@ public class BaseProviderTest {
assertEquals(
metrics/flume/(\\S*)/CHANNEL/(\\S*)EventPutSuccessCount/rate,
entry.getValue().pattern());
+
+entry = provider.getRegexEntry(metrics/yarn/Queue/root/AppsCompleted);
+
assertEquals(metrics/yarn/Queue/$1.replaceAll(\([.])\,\/\)/AppsCompleted,
+entry.getKey());
+assertEquals(
+metrics/yarn/Queue/(\\S*)/AppsCompleted,
+entry.getValue().pattern());
+
+entry =
provider.getRegexEntry(metrics/yarn/Queue/root/default/AppsCompleted);
+
assertEquals(metrics/yarn/Queue/$1.replaceAll(\([.])\,\/\)/AppsCompleted,
+entry.getKey());
+assertEquals(
+metrics/yarn/Queue/(\\S*)/AppsCompleted,
+entry.getValue().pattern());
+
+entry =
provider.getRegexEntry(metrics/yarn/Queue/root/default/AppsFailed);
+
assertEquals(metrics/yarn/Queue/$1.replaceAll(\,q(\\d+)=\,\/\).substring(1)/AppsFailed,
+entry.getKey());
+assertEquals(
+metrics/yarn/Queue/(\\S*)/AppsFailed,
+entry.getValue().pattern());
}
static class TestProvider extends BaseProvider {
http://git-wip-us.apache.org/repos/asf/ambari/blob/c94780aa/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
[5/7] ambari git commit: AMBARI-11075. Apply a property value in hdfs-site when ranger-hdfs-plugin is enabled (alexantonenko)
AMBARI-11075. Apply a property value in hdfs-site when ranger-hdfs-plugin is
enabled (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/81a3eebd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/81a3eebd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/81a3eebd
Branch: refs/heads/trunk
Commit: 81a3eebdd47c4c0179d3af2f5c45baf69a474db7
Parents: 17f4eca
Author: Alex Antonenko hiv...@gmail.com
Authored: Tue May 12 20:30:29 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Tue May 12 23:48:37 2015 +0300
--
.../utils/configs/modification_handlers/hdfs.js | 18 +++
.../configs/service_configs_by_category_view.js | 89 ++-
.../service_configs_by_category_view_test.js| 151 +++
ambari-web/test/views/main/host_test.js | 2 +-
4 files changed, 223 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/81a3eebd/ambari-web/app/utils/configs/modification_handlers/hdfs.js
--
diff --git a/ambari-web/app/utils/configs/modification_handlers/hdfs.js
b/ambari-web/app/utils/configs/modification_handlers/hdfs.js
index 128b62b..bff1ddd 100644
--- a/ambari-web/app/utils/configs/modification_handlers/hdfs.js
+++ b/ambari-web/app/utils/configs/modification_handlers/hdfs.js
@@ -34,9 +34,12 @@ module.exports =
App.ServiceConfigModificationHandler.create({
var affectedPropertyName = changedConfig.get(name);
if (affectedPropertyName == rangerPluginEnabledName) {
var configDfsPermissionsEnabled = this.getConfig(allConfigs,
'dfs.permissions.enabled', 'hdfs-site.xml', 'HDFS');
+ var configAttributesProviderClass = this.getConfig(allConfigs,
'dfs.namenode.inode.attributes.provider.class', 'hdfs-site.xml', 'HDFS');
+ var isAttributesProviderClassSet = typeof configAttributesProviderClass
!== 'undefined';
var rangerPluginEnabled = newValue == Yes;
var newDfsPermissionsEnabled = rangerPluginEnabled ? true : true;
+ var newAttributesProviderClass =
'org.apache.ranger.authorization.hadoop.RangerHdfsAuthorizer';
// Add Hive-Ranger configs
if (configDfsPermissionsEnabled != null newDfsPermissionsEnabled !==
configDfsPermissionsEnabled.get('value')) {
@@ -52,6 +55,21 @@ module.exports =
App.ServiceConfigModificationHandler.create({
filename : 'hdfs-site.xml'
});
}
+ if (rangerPluginEnabled (!isAttributesProviderClassSet ||
newAttributesProviderClass != configAttributesProviderClass.get('value'))) {
+affectedProperties.push({
+ serviceName : HDFS,
+ sourceServiceName : HDFS,
+ propertyName : 'dfs.namenode.inode.attributes.provider.class',
+ propertyDisplayName : 'dfs.namenode.inode.attributes.provider.class',
+ newValue : newAttributesProviderClass,
+ curValue : isAttributesProviderClassSet ?
configAttributesProviderClass.get('value') : '',
+ changedPropertyName : rangerPluginEnabledName,
+ removed : false,
+ isNewProperty : !isAttributesProviderClassSet,
+ filename : 'hdfs-site.xml',
+ categoryName: 'Custom hdfs-site'
+});
+ }
}
return affectedProperties;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/81a3eebd/ambari-web/app/views/common/configs/service_configs_by_category_view.js
--
diff --git
a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index 85402f0..ab2a498 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -162,9 +162,20 @@ App.ServiceConfigsByCategoryView =
Em.View.extend(App.UserPref, App.ConfigOverri
header: Warning: you must also change these Service properties,
onApply: function () {
self.get(newAffectedProperties).forEach(function(item) {
-self.get(controller.stepConfigs).findProperty(serviceName,
item.serviceName).get(configs).find(function(config) {
- return item.propertyName == config.get('name') (item.filename
== null || item.filename == config.get('filename'));
-}).set(value, item.newValue);
+if (item.isNewProperty) {
+ self.createProperty({
+name: item.propertyName,
+displayName: item.propertyDisplayName,
+value: item.newValue,
+categoryName: item.categoryName,
+serviceName: item.serviceName,
+filename: item.filename
+
[3/7] ambari git commit: AMBARI-11074. UI - Removing config group overrides and saving doesn't save changes as they are still pending in UI (alexantonenko)
AMBARI-11074. UI - Removing config group overrides and saving doesn't save
changes as they are still pending in UI (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/17f4eca6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/17f4eca6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/17f4eca6
Branch: refs/heads/trunk
Commit: 17f4eca6daccdc5b5963f15cb0811a6d11fceca6
Parents: 7ccaca9
Author: Alex Antonenko hiv...@gmail.com
Authored: Tue May 12 20:19:11 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Tue May 12 23:48:37 2015 +0300
--
ambari-web/app/mixins/common/configs/configs_saver.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/17f4eca6/ambari-web/app/mixins/common/configs/configs_saver.js
--
diff --git a/ambari-web/app/mixins/common/configs/configs_saver.js
b/ambari-web/app/mixins/common/configs/configs_saver.js
index 01d9997..816af7a 100644
--- a/ambari-web/app/mixins/common/configs/configs_saver.js
+++ b/ambari-web/app/mixins/common/configs/configs_saver.js
@@ -120,7 +120,7 @@ App.ConfigsSaverMixin = Em.Mixin.create({
var overridenConfigs = this.getConfigsForGroup(configs,
configGroup.get('name'));
- if (Em.isArray(overridenConfigs) overridenConfigs.length) {
+ if (Em.isArray(overridenConfigs)) {
this.saveGroup(overridenConfigs, configGroup,
this.get('content.serviceName') === serviceName);
}
}
@@ -1250,4 +1250,4 @@ App.ConfigsSaverMixin = Em.Mixin.create({
return value;
}
}
-});
\ No newline at end of file
+});
ambari git commit: AMBARI-11084 Newlines missing at end of Accumulo command helper files
Repository: ambari
Updated Branches:
refs/heads/trunk e6b3972f4 - 6701cfc17
AMBARI-11084 Newlines missing at end of Accumulo command helper files
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6701cfc1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6701cfc1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6701cfc1
Branch: refs/heads/trunk
Commit: 6701cfc172a5cea92766a125e707ee439c0a7686
Parents: e6b3972
Author: Billie Rinaldi billie.rina...@gmail.com
Authored: Tue May 12 13:52:47 2015 -0700
Committer: Billie Rinaldi billie.rina...@gmail.com
Committed: Tue May 12 13:53:42 2015 -0700
--
.../package/scripts/accumulo_configuration.py | 12 ++--
.../1.6.1.2.2.0/package/scripts/service_check.py| 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6701cfc1/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
index f26fdd0..d30a460 100644
---
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
+++
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
@@ -196,7 +196,7 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or
'monitor' or 'gc' or '
group=params.user_group,
owner=params.accumulo_user,
content=InlineTemplate('{{root_password}}\n'
-'{{root_password}}\n')
+'{{root_password}}\n\n')
)
Execute( format(cat {passfile} | {params.daemon_script} init
--instance-name {params.instance_name}
@@ -252,7 +252,7 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or
'monitor' or 'gc' or '
owner=params.accumulo_user,
content=InlineTemplate('grant -t trace -u {{trace_user}}
Table.ALTER_TABLE\n'
'grant -t trace -u {{trace_user}}
Table.READ\n'
- 'grant -t trace -u {{trace_user}}
Table.WRITE\n')
+ 'grant -t trace -u {{trace_user}}
Table.WRITE\n\n')
)
if params.security_enabled and params.has_secure_user_auth:
Execute( format({params.kinit_cmd} {params.daemon_script} shell -f
@@ -273,7 +273,7 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or
'monitor' or 'gc' or '
mode=0600,
group=params.user_group,
owner=params.accumulo_user,
- content=InlineTemplate('{{root_password}}\n')
+ content=InlineTemplate('{{root_password}}\n\n')
)
Execute( format(cat {rpassfile} | {params.daemon_script} shell -f
{cmdfile} -u root),
@@ -308,7 +308,7 @@ def create_user(user, password):
group=params.user_group,
owner=params.accumulo_user,
content=InlineTemplate(format(createuser {user}\n
- grant -s System.CREATE_TABLE -u
{user}\n))
+ grant -s System.CREATE_TABLE -u
{user}\n\n))
)
if params.security_enabled and params.has_secure_user_auth:
Execute( format({params.kinit_cmd} {params.daemon_script} shell -f
@@ -323,7 +323,7 @@ def create_user(user, password):
mode=0600,
group=params.user_group,
owner=params.accumulo_user,
- content=InlineTemplate('{{root_password}}\n')
+ content=InlineTemplate('{{root_password}}\n\n')
)
File(passfile,
mode=0600,
@@ -331,7 +331,7 @@ def create_user(user, password):
owner=params.accumulo_user,
content=InlineTemplate(format({params.root_password}\n
{password}\n
- {password}\n))
+ {password}\n\n))
)
Execute( format(cat {passfile} | {params.daemon_script} shell -u root
-f {cmdfile}),
http://git-wip-us.apache.org/repos/asf/ambari/blob/6701cfc1/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py
--
diff --git
ambari git commit: AMBARI-11005-PART2. Widgets: UI changes v4.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 449818c67 - af0debf52
AMBARI-11005-PART2. Widgets: UI changes v4.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af0debf5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af0debf5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af0debf5
Branch: refs/heads/trunk
Commit: af0debf52f576bb9736c0f73f5dae5ee36ca07a4
Parents: 449818c
Author: Xi Wang xiw...@apache.org
Authored: Tue May 12 14:42:07 2015 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Tue May 12 17:40:18 2015 -0700
--
.../app/styles/enhanced_service_dashboard.less | 26 +++
.../main/service/widgets/create/expression.hbs | 7 +++
.../service/widgets/create/expression_view.js | 47
3 files changed, 80 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/af0debf5/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less
b/ambari-web/app/styles/enhanced_service_dashboard.less
index f95bdec..5ea0c08 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -377,6 +377,32 @@
.controls.is-invalid {
border-color: red;
}
+ .add-item-input {
+display: inline-block!important;
+.ember-text-field{
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ position: relative;
+ font-weight: bold;
+ margin: 8px 0 10px 10px;
+ padding: 5px;
+ border: 1px solid #dd;
+ width: 50px;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ border-radius: 0px;
+ -webkit-border-radius: 0px;
+ -moz-border-radius: 0px;
+ -webkit-transition: none;
+ -moz-transition: none;
+ -o-transition: none;
+ transition: none;
+}
+.ember-text-field.is-invalid {
+ border: 1px solid red;
+}
+ }
}
.template {
margin-bottom: 10px;
http://git-wip-us.apache.org/repos/asf/ambari/blob/af0debf5/ambari-web/app/templates/main/service/widgets/create/expression.hbs
--
diff --git
a/ambari-web/app/templates/main/service/widgets/create/expression.hbs
b/ambari-web/app/templates/main/service/widgets/create/expression.hbs
index 353ddff..3398725 100644
--- a/ambari-web/app/templates/main/service/widgets/create/expression.hbs
+++ b/ambari-web/app/templates/main/service/widgets/create/expression.hbs
@@ -40,8 +40,15 @@
a href=# {{action removeElement element target=view}}i
class=icon-remove/i/a
/div
{{/each}}
+div class=add-item-input
+ {{view App.InputCursorTextfieldView parentViewBinding=view}}
+/div
{{else}}
+div class=add-item-input
+ {{view App.InputCursorTextfieldView parentViewBinding=view}}
+/div
div class=placeholder{{t
dashboard.widgets.wizard.step2.addMetrics}}/div
{{/if}}
+
/div
http://git-wip-us.apache.org/repos/asf/ambari/blob/af0debf5/ambari-web/app/views/main/service/widgets/create/expression_view.js
--
diff --git
a/ambari-web/app/views/main/service/widgets/create/expression_view.js
b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 1a11577..079d420 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -334,3 +334,50 @@ App.AddMetricExpressionView = Em.View.extend({
return result;
}.property('controller.filteredMetrics')
});
+
+App.InputCursorTextfieldView = Ember.TextField.extend({
+ placeholder: ,
+ classNameBindings: ['isInvalid'],
+ isInvalid: false,
+
+ didInsertElement: function () {
+this.focusCursor();
+ },
+
+ focusCursor: function () {
+Em.run.next( function() { $('.add-item-input .ember-text-field').focus();
});
+ }.observes('parentView.expression.data.length'),
+
+ validateInput: function () {
+var value = this.get('value');
+var parentView = this.get('parentView');
+this.set('isInvalid', false);
+if (value parentView.get('OPERATORS').contains(value)) {
+ // add operator
+ var data = parentView.get('expression.data');
+ var lastId = (data.length 0) ? Math.max.apply(parentView,
data.mapProperty('id')) : 0;
+ data.pushObject(Em.Object.create({
+id: ++lastId,
+name: value,
+isOperator: true
+ }));
+ this.set('value', '');
+} else if
ambari git commit: AMBARI-11088. Integrate the API response change done for supporting multiple aggregation type for same metrics. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 875bcfe4a - 449818c67
AMBARI-11088. Integrate the API response change done for supporting multiple
aggregation type for same metrics. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/449818c6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/449818c6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/449818c6
Branch: refs/heads/trunk
Commit: 449818c6752eb3bdc9ba9da3255006385618ccb2
Parents: 875bcfe
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Tue May 12 17:25:52 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Tue May 12 17:26:00 2015 -0700
--
.../app/mixins/common/widgets/widget_mixin.js | 32 +---
.../views/common/widget/graph_widget_view.js| 4 +++
2 files changed, 25 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/449818c6/ambari-web/app/mixins/common/widgets/widget_mixin.js
--
diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js
b/ambari-web/app/mixins/common/widgets/widget_mixin.js
index f307335..94fe63f 100644
--- a/ambari-web/app/mixins/common/widgets/widget_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js
@@ -259,18 +259,28 @@ App.WidgetMixin = Ember.Mixin.create({
var metrics = [];
if (this.get('content.metrics')) {
this.get('content.metrics').forEach(function (_metric) {
-var metric_path;
-this.aggregatorFunc.forEach(function (_func) {
- if (_metric.metric_path.endsWith(_func)) {
-// truncate aggregator function suffixed at the end of the metric
-metric_path = _metric.metric_path.substring(0,
_metric.metric_path.indexOf(_func));
- }
-}, this);
-if (!metric_path) {
- metric_path = _metric.metric_path;
+var metric_path = _metric.metric_path;
+var isAggregatorFunc = false;
+var metric_data = Em.get(data, metric_path.replace(/\//g, '.'));
+if (Em.isNone(metric_data)) {
+ this.aggregatorFunc.forEach(function (_item) {
+if (metric_path.endsWith(_item) !isAggregatorFunc) {
+ isAggregatorFunc = true;
+ var metricBeanProperty = metric_path.split(/).pop();
+ var metricBean;
+ metric_path = metric_path.substring(0,
metric_path.indexOf(metricBeanProperty));
+ if (metric_path.endsWith(/)) {
+metric_path = metric_path.slice(0, -1);
+ }
+ metricBean = Em.get(data, metric_path.replace(/\//g, '.'));
+ if (!Em.isNone(metricBean)) {
+metric_data = metricBean[metricBeanProperty];
+ }
+}
+ }, this);
}
-if (!Em.isNone(Em.get(data, metric_path.replace(/\//g, '.' {
- _metric.data = Em.get(data, metric_path.replace(/\//g, '.'));
+if (!Em.isNone(metric_data)) {
+ _metric.data = metric_data;
this.get('metrics').pushObject(_metric);
}
}, this);
http://git-wip-us.apache.org/repos/asf/ambari/blob/449818c6/ambari-web/app/views/common/widget/graph_widget_view.js
--
diff --git a/ambari-web/app/views/common/widget/graph_widget_view.js
b/ambari-web/app/views/common/widget/graph_widget_view.js
index 72da9dc51..f135636 100644
--- a/ambari-web/app/views/common/widget/graph_widget_view.js
+++ b/ambari-web/app/views/common/widget/graph_widget_view.js
@@ -135,6 +135,10 @@ App.GraphWidgetView = Em.View.extend(App.WidgetMixin, {
return dataLinks[match][i][0];
});
var dataLinkPointValue = isPointNull ? null :
Number(window.eval(beforeCompute));
+// expression resulting into `0/0` will produce NaN Object which is
not a valid series data value for RickShaw graphs
+if (isNaN(dataLinkPointValue)) {
+ dataLinkPointValue = 0;
+}
value.push([dataLinkPointValue, timestamp]);
}
}
ambari git commit: AMBARI-11091. unable to see complete non-master node name at step 6 (Assign Slaves and Clients) if more than 23 characters. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk af0debf52 - 54e22bc94
AMBARI-11091. unable to see complete non-master node name at step 6 (Assign
Slaves and Clients) if more than 23 characters. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/54e22bc9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54e22bc9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54e22bc9
Branch: refs/heads/trunk
Commit: 54e22bc941f74d1fac9e07b052079a77c5dd53db
Parents: af0debf
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Tue May 12 17:52:03 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Tue May 12 17:52:09 2015 -0700
--
ambari-web/app/views/wizard/step6_view.js | 22 +---
ambari-web/test/views/wizard/step6_view_test.js | 4 ++--
2 files changed, 12 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/54e22bc9/ambari-web/app/views/wizard/step6_view.js
--
diff --git a/ambari-web/app/views/wizard/step6_view.js
b/ambari-web/app/views/wizard/step6_view.js
index 4efea53..2c590b0 100644
--- a/ambari-web/app/views/wizard/step6_view.js
+++ b/ambari-web/app/views/wizard/step6_view.js
@@ -119,17 +119,15 @@ App.WizardStep6HostView = Em.View.extend({
*/
didInsertElement: function () {
var components =
this.get('controller').getMasterComponentsForHost(this.get('host.hostName'));
-if (components components.length 0) {
- components = components.map(function (_component) {
-return App.format.role(_component);
- });
- components = components.join( /\n);
- App.popover(this.$(), {
-title:
Em.I18n.t('installer.step6.wizardStep6Host.title').format(this.get('host.hostName')),
-content: components,
-placement: 'right',
-trigger: 'hover'
- });
-}
+components = components.map(function (_component) {
+ return App.format.role(_component);
+});
+components = components.join( /\n);
+App.popover(this.$(), {
+ title:
Em.I18n.t('installer.step6.wizardStep6Host.title').format(this.get('host.hostName')),
+ content: components,
+ placement: 'right',
+ trigger: 'hover'
+});
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/54e22bc9/ambari-web/test/views/wizard/step6_view_test.js
--
diff --git a/ambari-web/test/views/wizard/step6_view_test.js
b/ambari-web/test/views/wizard/step6_view_test.js
index 81628d8..082d153 100644
--- a/ambari-web/test/views/wizard/step6_view_test.js
+++ b/ambari-web/test/views/wizard/step6_view_test.js
@@ -136,11 +136,11 @@ describe('App.WizardStep6HostView', function() {
expect(App.popover.calledOnce).to.equal(true);
view.get('controller').getMasterComponentsForHost.restore();
});
-it('shouldn\'t create popover if controller.getMasterComponentsForHost
returns empty array', function() {
+it('should create popover even if controller.getMasterComponentsForHost is
an empty array', function() {
sinon.stub(view.get('controller'), 'getMasterComponentsForHost',
function() {return [];});
view.set('controller.isMasters', true);
view.didInsertElement();
- expect(App.popover.called).to.equal(false);
+ expect(App.popover.calledOnce).to.equal(true);
view.get('controller').getMasterComponentsForHost.restore();
});
});
ambari git commit: AMBARI-11089. Auto recovery commands should not be scheduled till the execution commands are complete
Repository: ambari
Updated Branches:
refs/heads/trunk 54e22bc94 - e7fdb7146
AMBARI-11089. Auto recovery commands should not be scheduled till the execution
commands are complete
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7fdb714
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7fdb714
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7fdb714
Branch: refs/heads/trunk
Commit: e7fdb7146bc278aafd3d9530b7c9f824e4716cb2
Parents: 54e22bc
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Tue May 12 19:55:20 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Tue May 12 19:55:20 2015 -0700
--
.../src/main/python/ambari_agent/ActionQueue.py | 30 +-
.../python/ambari_agent/CommandStatusDict.py| 5 +
.../src/main/python/ambari_agent/Controller.py | 2 +-
.../main/python/ambari_agent/RecoveryManager.py | 14 +++
.../test/python/ambari_agent/TestActionQueue.py | 99 +++-
.../python/ambari_agent/TestRecoveryManager.py | 14 ++-
6 files changed, 160 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e7fdb714/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index bdaefd0..59a5720 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -193,7 +193,13 @@ class ActionQueue(threading.Thread):
logger.debug(Took an element of Queue (command type = %s). % commandType)
try:
if commandType in [self.EXECUTION_COMMAND,
self.BACKGROUND_EXECUTION_COMMAND, self.AUTO_EXECUTION_COMMAND]:
-self.execute_command(command)
+try:
+ if self.controller.recovery_manager.enabled():
+self.controller.recovery_manager.start_execution_command()
+ self.execute_command(command)
+finally:
+ if self.controller.recovery_manager.enabled():
+self.controller.recovery_manager.stop_execution_command()
elif commandType == self.STATUS_COMMAND:
self.execute_status_command(command)
else:
@@ -203,6 +209,15 @@ class ActionQueue(threading.Thread):
traceback.print_exc()
logger.warn(err)
+ def tasks_in_progress_or_pending(self):
+return_val = False
+if not self.commandQueue.empty():
+ return_val = True
+if self.controller.recovery_manager.has_active_command():
+ return_val = True
+return return_val
+pass
+
def execute_command(self, command):
'''
Executes commands of type EXECUTION_COMMAND
@@ -248,6 +263,8 @@ class ActionQueue(threading.Thread):
maxAttempts =
int(command['commandParams']['command_retry_max_attempt_count'])
if 'command_retry_enabled' in command['commandParams']:
retryAble = command['commandParams']['command_retry_enabled'] == true
+if isAutoExecuteCommand:
+ retryAble = False
logger.debug(Command execution metadata - retry enabled = {retryAble},
max attempt count = {maxAttemptCount}.
format(retryAble = retryAble, maxAttemptCount = maxAttempts))
@@ -296,6 +313,17 @@ class ActionQueue(threading.Thread):
# let ambari know that configuration tags were applied
if status == self.COMPLETED_STATUS:
+ if self.controller.recovery_manager.enabled() and
command.has_key('roleCommand'):
+if command['roleCommand'] == self.ROLE_COMMAND_START:
+
self.controller.recovery_manager.update_current_status(command['role'],
LiveStatus.LIVE_STATUS)
+elif command['roleCommand'] == self.ROLE_COMMAND_STOP or
command['roleCommand'] == self.ROLE_COMMAND_INSTALL:
+
self.controller.recovery_manager.update_current_status(command['role'],
LiveStatus.DEAD_STATUS)
+elif command['roleCommand'] == self.ROLE_COMMAND_CUSTOM_COMMAND:
+ if command['hostLevelParams'].has_key('custom_command') and \
+ command['hostLevelParams']['custom_command'] ==
self.CUSTOM_COMMAND_RESTART:
+
self.controller.recovery_manager.update_current_status(command['role'],
LiveStatus.LIVE_STATUS)
+ pass
+
configHandler = ActualConfigHandler(self.config, self.configTags)
#update
if command.has_key('forceRefreshConfigTags') and
len(command['forceRefreshConfigTags']) 0 :
http://git-wip-us.apache.org/repos/asf/ambari/blob/e7fdb714/ambari-agent/src/main/python/ambari_agent/CommandStatusDict.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/CommandStatusDict.py
ambari git commit: AMBARI-10987. Error loading deferred resources when making metric API requests with null padding. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 4ae8d6459 - 5ba9a426e
AMBARI-10987. Error loading deferred resources when making metric API requests
with null padding. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5ba9a426
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5ba9a426
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5ba9a426
Branch: refs/heads/trunk
Commit: 5ba9a426e93273ba3cc0c962804f2ca4894d3224
Parents: 4ae8d64
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Tue May 12 16:14:14 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Tue May 12 16:17:10 2015 -0700
--
.../MetricsDownsamplingMethodFactory.java | 38
1 file changed, 32 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ba9a426/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethodFactory.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethodFactory.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethodFactory.java
index 2d22643..f7d3457 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethodFactory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethodFactory.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.controller.metrics;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
@@ -75,30 +76,55 @@ class MetricsAveragePerSecondDownsampling extends
MetricsDownsamplingMethod {
ArrayListAccumulo cache = new ArrayListAccumulo();
final IteratorMap.EntryLong, Double ci =
metricData.getMetricValues().entrySet().iterator();
-if (ci.hasNext()) {
- Map.EntryLong, Double e0 = ci.next();
+
+// Skip null padding at the beginning of the series.
+Map.EntryLong, Double e0 = null;
+while (ci.hasNext()) {
+ e0 = ci.next();
+ if (e0.getValue() == null) {
+cache.add(new Accumulo(e0.getKey() / 1000, null));
+ } else {
+break;
+ }
+}
+
+if (e0 != null) {
long t0 = e0.getKey() / 1000;
Double s0 = e0.getValue();
int nSamples = 1;
+ boolean lastNonNullEntryAdded = false;
while(ci.hasNext()) {
e0 = ci.next();
+// Skip null padding at the end of the series.
+if (e0.getValue() == null) {
+ if (!lastNonNullEntryAdded) {
+// Add last non null entry
+cache.add(new Accumulo(t0, dataTransferMethod.getData(s0 /
nSamples)));
+lastNonNullEntryAdded = true;
+ }
+ // We do not pad below an interval of a second.
+ // Add the null entry
+ cache.add(new Accumulo(e0.getKey() / 1000, null));
+ continue;
+}
long t = e0.getKey() / 1000;
if (t != t0) {
- cache.add(new Accumulo(t0, s0 != null ?
dataTransferMethod.getData(s0 / nSamples) : null));
+ cache.add(new Accumulo(t0, dataTransferMethod.getData(s0 /
nSamples)));
t0 = t;
s0 = e0.getValue();
nSamples = 1;
} else {
- // Zero value contributes to nothing for downsampling method
- s0 += e0.getValue() != null ? e0.getValue() : 0;
+ s0 += e0.getValue();
nSamples++;
}
}
//Add the last entry into the cache
- cache.add(new Accumulo(t0, s0 != null ? dataTransferMethod.getData(s0 /
nSamples) : null));
+ if (!lastNonNullEntryAdded) {
+cache.add(new Accumulo(t0, dataTransferMethod.getData(s0 / nSamples)));
+ }
}
Number[][] datapointsArray = new Number[cache.size()][2];
ambari git commit: AMBARI-11090. Oozie start is not idempotent
Repository: ambari
Updated Branches:
refs/heads/trunk 5ba9a426e - 875bcfe4a
AMBARI-11090. Oozie start is not idempotent
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/875bcfe4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/875bcfe4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/875bcfe4
Branch: refs/heads/trunk
Commit: 875bcfe4a4ebd78d4415d8d7ff6c2e6722a0fafb
Parents: 5ba9a42
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Tue May 12 17:07:13 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Tue May 12 17:07:13 2015 -0700
--
.../common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py | 2 +-
.../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py| 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/875bcfe4/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index ae66eb0..c773fca 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -179,7 +179,7 @@ def oozie_server_specific():
File(params.pid_file,
action=delete,
-not_if=ls {pid_file} /dev/null 21 !(ps `cat {pid_file}` /dev/null
21)
+not_if=format(ls {pid_file} /dev/null 21 ps -p `cat {pid_file}`
/dev/null 21)
)
oozie_server_directories = [format({oozie_home}/{oozie_tmp_dir}),
params.oozie_pid_dir, params.oozie_log_dir, params.oozie_tmp_dir,
params.oozie_data_dir, params.oozie_lib_dir, params.oozie_webapps_dir,
params.oozie_webapps_conf_dir, params.oozie_server_dir]
http://git-wip-us.apache.org/repos/asf/ambari/blob/875bcfe4/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index 4a6c5ab..fdcafdb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -121,7 +121,7 @@ class TestOozieServer(RMFTestCase):
)
self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
action = ['delete'],
- not_if = 'ls {pid_file} /dev/null 21 !(ps
`cat {pid_file}` /dev/null 21)',
+ not_if = u'ls /var/run/oozie/oozie.pid
/dev/null 21 ps -p `cat /var/run/oozie/oozie.pid` /dev/null 21',
)
self.assertResourceCalled('Directory', '/usr/lib/oozie//var/tmp/oozie',
owner = 'oozie',
@@ -402,7 +402,7 @@ class TestOozieServer(RMFTestCase):
)
self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
action=[delete],
- not_if=ls {pid_file} /dev/null 21 !(ps
`cat {pid_file}` /dev/null 21)
+ not_if=ls /var/run/oozie/oozie.pid /dev/null
21 ps -p `cat /var/run/oozie/oozie.pid` /dev/null 21
)
self.assertResourceCalled('Directory', '/usr/lib/oozie//var/tmp/oozie',
owner = 'oozie',
@@ -570,7 +570,7 @@ class TestOozieServer(RMFTestCase):
)
self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
action=[delete],
- not_if=ls {pid_file} /dev/null 21 !(ps
`cat {pid_file}` /dev/null 21)
+ not_if=ls /var/run/oozie/oozie.pid /dev/null
21 ps -p `cat /var/run/oozie/oozie.pid` /dev/null 21
)
self.assertResourceCalled('Directory', '/usr/lib/oozie//var/tmp/oozie',
owner = 'oozie',
ambari git commit: AMBARI-11057. Configs: Misc config widget control fixes (Richard Zang via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 628812a16 - 4ae8d6459
AMBARI-11057. Configs: Misc config widget control fixes (Richard Zang via
srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4ae8d645
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4ae8d645
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4ae8d645
Branch: refs/heads/trunk
Commit: 4ae8d645999450b47e75663cb1212ce60d3eda6d
Parents: 628812a
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Tue May 12 15:22:01 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Tue May 12 15:22:01 2015 -0700
--
.../configs/objects/service_config_property.js | 1 +
.../common/configs/config_history_flow.hbs | 2 +-
.../common/configs/service_version_box.hbs | 2 +-
.../common/configs/widgets/combo_config_widget.hbs | 2 +-
.../templates/common/configs/widgets/controls.hbs | 6 +++---
.../common/configs/widgets/list_config_widget.hbs | 2 +-
.../common/configs/widgets/slider_config_widget.hbs | 2 +-
.../configs/widgets/time_interval_spinner.hbs | 2 +-
.../common/configs/widgets/toggle_config_widget.hbs | 2 +-
.../common/configs/widgets/config_widget_view.js| 16 +---
10 files changed, 16 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ae8d645/ambari-web/app/models/configs/objects/service_config_property.js
--
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js
b/ambari-web/app/models/configs/objects/service_config_property.js
index eeec1b1..c04b85b 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -73,6 +73,7 @@ App.ServiceConfigProperty = Em.Object.extend({
hasInitialValue: false, //if true then property value is defined and saved
to server
isHiddenByFilter: false, //if true then hide this property (filtered out)
rowStyleClass: null, // CSS-Class to be applied on the row showing this
config
+ showAsTextBox: false,
/**
* value that is returned from server as recommended
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ae8d645/ambari-web/app/templates/common/configs/config_history_flow.hbs
--
diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs
b/ambari-web/app/templates/common/configs/config_history_flow.hbs
index a1f610d..7a2d50b 100644
--- a/ambari-web/app/templates/common/configs/config_history_flow.hbs
+++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs
@@ -102,7 +102,7 @@
span class=label
label-info{{view.displayedServiceVersion.versionText}}/span
{{/if}}
{{#if view.displayedServiceVersion.isCurrent}}
- span class=label-current label label-success icon-ok
data-toggle=tooltip title=Current/span
+ span class=label-current label label-success icon-ok
data-toggle=tooltip {{translateAttr title=common.current}}/span
{{/if}}
{{#if view.displayedServiceVersion.author}}
strong{{view.displayedServiceVersion.author}}/strongnbsp;{{t
dashboard.configHistory.info-bar.authoredOn}}nbsp;strong{{view.displayedServiceVersion.createdDate}}/strong
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ae8d645/ambari-web/app/templates/common/configs/service_version_box.hbs
--
diff --git a/ambari-web/app/templates/common/configs/service_version_box.hbs
b/ambari-web/app/templates/common/configs/service_version_box.hbs
index 354ed8d..f2c769e 100644
--- a/ambari-web/app/templates/common/configs/service_version_box.hbs
+++ b/ambari-web/app/templates/common/configs/service_version_box.hbs
@@ -28,7 +28,7 @@
div class=stack-label{{serviceVersion.stackVersion}}/div
{{#if serviceVersion.isCurrent}}
div class=current-label
- span class=label label-success label-current icon-ok
data-toggle=tooltip title=Current
+ span class=label label-success label-current icon-ok
data-toggle=tooltip {{translateAttr title=common.current}}
/span
/div
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ae8d645/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
--
diff --git
a/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
b/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
index
ambari git commit: AMBARI-11061. Select stacks page : Next button is disabled forever (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c3690fecf - a1b19ea27
AMBARI-11061. Select stacks page : Next button is disabled forever
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1b19ea2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1b19ea2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1b19ea2
Branch: refs/heads/trunk
Commit: a1b19ea27f9d1cdf7999f1ce079efd29fd907b4a
Parents: c3690fe
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Tue May 12 15:09:56 2015 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Tue May 12 15:09:56 2015 +0300
--
ambari-web/app/controllers/installer.js | 16 +++
ambari-web/app/mappers/stack_mapper.js | 4 +--
ambari-web/app/views/wizard/step1_view.js| 34 ---
ambari-web/test/mappers/stack_mapper_test.js | 1 +
4 files changed, 31 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1b19ea2/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js
b/ambari-web/app/controllers/installer.js
index bf11c09..92fb2f0 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -515,9 +515,11 @@ App.InstallerController = App.WizardController.extend({
selectedStack.get('operatingSystems').forEach(function (os) {
if (os.get('isSelected')) {
os.get('repositories').forEach(function (repo) {
-repo.set('errorTitle', '');
-repo.set('errorContent', '');
-repo.set('validation', App.Repository.validation['INPROGRESS']);
+repo.setProperties({
+ errorTitle: '',
+ errorContent: '',
+ validation: App.Repository.validation['INPROGRESS']
+});
this.set('content.isCheckInProgress', true);
App.ajax.send({
name: 'wizard.advanced_repositories.valid_url',
@@ -575,9 +577,11 @@ App.InstallerController = App.WizardController.extend({
var os = selectedStack.get('operatingSystems').findProperty('id',
params.osId);
var repo = os.get('repositories').findProperty('repoId', params.repoId);
if (repo) {
-repo.set('validation', App.Repository.validation['INVALID']);
-repo.set('errorTitle', request.status + : + request.statusText);
-repo.set('errorContent', $.parseJSON(request.responseText) ?
$.parseJSON(request.responseText).message : );
+repo.setProperties({
+ validation: App.Repository.validation['INVALID'],
+ errorTitle: request.status + : + request.statusText,
+ errorContent: $.parseJSON(request.responseText) ?
$.parseJSON(request.responseText).message :
+});
}
}
this.set('content.isCheckInProgress', false);
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1b19ea2/ambari-web/app/mappers/stack_mapper.js
--
diff --git a/ambari-web/app/mappers/stack_mapper.js
b/ambari-web/app/mappers/stack_mapper.js
index df6f8f4..eb64ef6 100644
--- a/ambari-web/app/mappers/stack_mapper.js
+++ b/ambari-web/app/mappers/stack_mapper.js
@@ -85,8 +85,8 @@ App.stackMapper = App.QuickDataMapper.create({
var repositoriesArray = [];
ops.repositories.forEach(function(repo) {
- repo.Repositories.id = repo.Repositories.os_type + - +
repo.Repositories.repo_id;
- repo.Repositories.os_id = repo.Repositories.stack_name + - +
repo.Repositories.stack_version + - + repo.Repositories.os_type;
+ repo.Repositories.id = [repo.Repositories.stack_name,
repo.Repositories.stack_version, repo.Repositories.os_type,
repo.Repositories.repo_id].join('-');
+ repo.Repositories.os_id = [repo.Repositories.stack_name,
repo.Repositories.stack_version, repo.Repositories.os_type].join('-');
resultRepo.push(this.parseIt(repo.Repositories,
this.get('configRepository')));
repositoriesArray.pushObject(repo.Repositories);
}, this);
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1b19ea2/ambari-web/app/views/wizard/step1_view.js
--
diff --git a/ambari-web/app/views/wizard/step1_view.js
b/ambari-web/app/views/wizard/step1_view.js
index 60725f1..76174a0 100644
--- a/ambari-web/app/views/wizard/step1_view.js
+++ b/ambari-web/app/views/wizard/step1_view.js
@@ -49,10 +49,7 @@ App.WizardStep1View = Em.View.extend({
operatingSystems: function () {
var selectedStack = this.get('controller.selectedStack');
-var result = [];
-if
ambari git commit: AMBARI-11063. Can not upgrade ambari 2.0.0-2.0.1 on sles113 (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.maint 524a8e303 - a21a69e73
AMBARI-11063. Can not upgrade ambari 2.0.0-2.0.1 on sles113 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a21a69e7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a21a69e7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a21a69e7
Branch: refs/heads/branch-2.0.maint
Commit: a21a69e73418031c5a32b213c1fd6202d86ca1a2
Parents: 524a8e3
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Tue May 12 15:17:29 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Tue May 12 15:17:29 2015 +0300
--
.../apache/ambari/server/orm/DBAccessor.java| 11
.../ambari/server/orm/DBAccessorImpl.java | 21 +++-
.../server/upgrade/UpgradeCatalog200.java | 55 +++-
.../server/upgrade/UpgradeCatalog200Test.java | 2 +
4 files changed, 74 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a21a69e7/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index 2b01c72..c39a806 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -352,6 +352,17 @@ public interface DBAccessor {
public DatabaseSession getNewDatabaseSession();
/**
+ * Gets list of index names from database metadata
+ * @param tableName
+ *the name of the table (not {@code null}).
+ * @param unique
+ *list only unique indexes (not {@code null}).
+ * @return the string list of index names
+ * @throws SQLException
+ */
+ public ListString getIndexesList(String tableName, boolean unique) throws
SQLException;
+
+ /**
* Gets the column's SQL type
*
* @param tableName
http://git-wip-us.apache.org/repos/asf/ambari/blob/a21a69e7/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 279c78f..b40ca27 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -180,7 +180,7 @@ public class DBAccessorImpl implements DBAccessor {
boolean result = false;
DatabaseMetaData metaData = getDatabaseMetaData();
-ResultSet res = metaData.getTables(null, null,
convertObjectName(tableName), new String[] { TABLE });
+ResultSet res = metaData.getTables(null, null,
convertObjectName(tableName), new String[]{TABLE});
if (res != null) {
try {
@@ -335,7 +335,7 @@ public class DBAccessorImpl implements DBAccessor {
String referenceColumn, boolean ignoreFailure)
throws SQLException {
addFKConstraint(tableName, constraintName, new String[]{keyColumn},
referenceTableName,
-new String[]{referenceColumn}, false, ignoreFailure);
+ new String[]{referenceColumn}, false, ignoreFailure);
}
@Override
public void addFKConstraint(String tableName, String constraintName,
@@ -627,6 +627,23 @@ public class DBAccessorImpl implements DBAccessor {
return new DatabaseSessionImpl(login);
}
+ @Override
+ public ListString getIndexesList(String tableName, boolean unique)
+ throws SQLException{
+ResultSet rs = getDatabaseMetaData().getIndexInfo(null, null, tableName,
unique, false);
+ListString index_list = new ArrayListString();
+if (rs != null){
+ try{
+while (rs.next()) {
+ index_list.add(rs.getString(index_name));
+}
+ }finally {
+rs.close();
+ }
+}
+return index_list;
+ }
+
public int getColumnType(String tableName, String columnName)
throws SQLException {
String query = SELECT + columnName + FROM + tableName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/a21a69e7/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
index dd6d6dd..4e444b9 100644
---
ambari git commit: AMBARI-11058 - Check oozie.https properties to generate oozie war -secure (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk ce407e621 - bb9963c78
AMBARI-11058 - Check oozie.https properties to generate oozie war -secure
(tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb9963c7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb9963c7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb9963c7
Branch: refs/heads/trunk
Commit: bb9963c7833b5441c83bbae544edea028377a2fd
Parents: ce407e6
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Tue May 12 11:23:34 2015 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Tue May 12 11:23:49 2015 -0400
--
.../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 2 +-
.../src/test/python/stacks/2.0.6/configs/secured.json | 7 +--
2 files changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb9963c7/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 59d0097..bc168c6 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -139,7 +139,7 @@ oozie_log_dir =
config['configurations']['oozie-env']['oozie_log_dir']
oozie_data_dir = config['configurations']['oozie-env']['oozie_data_dir']
oozie_server_port =
get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
oozie_server_admin_port =
config['configurations']['oozie-env']['oozie_admin_port']
-if
config['configurations']['oozie-site']['oozie.base.url'].startswith('https'):
+if 'oozie.https.port' in config['configurations']['oozie-site'] or
'oozie.https.keystore.file' in config['configurations']['oozie-site'] or
'oozie.https.keystore.pass' in config['configurations']['oozie-site']:
oozie_secure = '-secure'
else:
oozie_secure = ''
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb9963c7/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 0b54d8c..8616f3d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -97,7 +97,7 @@
oozie.service.ActionService.executor.ext.classes: \n
org.apache.oozie.action.email.EmailActionExecutor,\n
org.apache.oozie.action.hadoop.HiveActionExecutor,\n
org.apache.oozie.action.hadoop.ShellActionExecutor,\n
org.apache.oozie.action.hadoop.SqoopActionExecutor,\n
org.apache.oozie.action.hadoop.DistcpActionExecutor,
oozie.service.HadoopAccessorService.kerberos.principal:
oozie/c6402.ambari.apache@example.com,
oozie.service.AuthorizationService.authorization.enabled:
true,
-oozie.base.url: https://c6402.ambari.apache.org:11000/oozie;,
+oozie.base.url: http://c6402.ambari.apache.org:11000/oozie;,
oozie.service.JPAService.jdbc.password: asd,
oozie.service.coord.normal.default.timeout: 120,
oozie.service.AuthorizationService.security.enabled: true,
@@ -117,7 +117,10 @@
oozie.service.URIHandlerService.uri.handlers:
org.apache.oozie.dependency.FSURIHandler,org.apache.oozie.dependency.HCatURIHandler,
oozie.authentication.type: kerberos,
oozie.authentication.kerberos.principal:
HTTP/c6402.ambari.apache@example.com,
-oozie.system.id: oozie-${user.name}
+oozie.system.id: oozie-${user.name},
+oozie.https.port: 11443,
+oozie.https.keystore.file: /home/oozie/oozie.keystore,
+oozie.https.keystore.pass: password
},
storm-site: {
topology.tuple.serializer:
backtype.storm.serialization.types.ListDelegateSerializer,
ambari git commit: AMBARI-11064 Widgets: Graph change API calls to use null padding rather than zero padding (graphs are misleading for recent data points as they are shown as zero when there's no dat
Repository: ambari
Updated Branches:
refs/heads/trunk e65579818 - 89cbc4594
AMBARI-11064 Widgets: Graph change API calls to use null padding rather than
zero padding (graphs are misleading for recent data points as they are shown as
zero when there's no data). (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/89cbc459
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/89cbc459
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/89cbc459
Branch: refs/heads/trunk
Commit: 89cbc4594b91ba010934a2d8e15ad3810ac83728
Parents: e655798
Author: Andrii Tkach atk...@hortonworks.com
Authored: Tue May 12 17:21:32 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Tue May 12 18:31:41 2015 +0300
--
ambari-web/app/utils/ajax/ajax.js | 6 +-
.../app/views/common/chart/linear_time.js | 69 +++-
.../views/common/widget/graph_widget_view.js| 9 ++-
.../common/widget/graph_widget_view_test.js | 12 ++--
4 files changed, 83 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/89cbc459/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 4637063..cbc0370 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2496,7 +2496,7 @@ var urls = {
},
'widgets.serviceComponent.metrics.get': {
-real:
'/clusters/{clusterName}/services/{serviceName}/components/{componentName}?fields={metricPaths}',
+real:
'/clusters/{clusterName}/services/{serviceName}/components/{componentName}?fields={metricPaths}format=null_padding',
mock: '/data/metrics/{serviceName}/Append_num_ops__Delete_num_ops.json'
},
@@ -2506,12 +2506,12 @@ var urls = {
},
'widgets.hostComponent.metrics.get': {
-real:
'/clusters/{clusterName}/hosts/{hostName}/host_components/{componentName}?fields={metricPaths}',
+real:
'/clusters/{clusterName}/hosts/{hostName}/host_components/{componentName}?fields={metricPaths}format=null_padding',
mock: '/data/metrics/{serviceName}/Append_num_ops.json'
},
'widgets.hosts.metrics.get': {
-real: '/clusters/{clusterName}/hosts?fields={metricPaths}',
+real:
'/clusters/{clusterName}/hosts?fields={metricPaths}format=null_padding',
mock: '/data/metrics/{serviceName}/Append_num_ops.json'
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/89cbc459/ambari-web/app/views/common/chart/linear_time.js
--
diff --git a/ambari-web/app/views/common/chart/linear_time.js
b/ambari-web/app/views/common/chart/linear_time.js
index 35e2a33..5f00cbc 100644
--- a/ambari-web/app/views/common/chart/linear_time.js
+++ b/ambari-web/app/views/common/chart/linear_time.js
@@ -539,7 +539,7 @@ App.ChartLinearTimeView = Ember.View.extend({
}
}
-var _graph = new Rickshaw.Graph({
+var _graph = new Rickshaw.GraphReopened({
height: height,
width: width,
element: chartElement,
@@ -923,4 +923,71 @@ App.ChartLinearTimeView.CreateRateFormatter = function
(unitsPrefix, valueFormat
value = valueFormatter(value) + suffix;
return value;
};
+};
+
+Rickshaw.GraphReopened = function(a){
+ Rickshaw.Graph.call(this, a);
+};
+
+//reopened in order to exclude null value from validation
+Rickshaw.GraphReopened.prototype = Object.create(Rickshaw.Graph.prototype, {
+ validateSeries : {
+value: function(series) {
+
+ if (!(series instanceof Array) !(series instanceof Rickshaw.Series)) {
+var seriesSignature = Object.prototype.toString.apply(series);
+throw series is not an array: + seriesSignature;
+ }
+
+ var pointsCount;
+
+ series.forEach( function(s) {
+
+if (!(s instanceof Object)) {
+ throw series element is not an object: + s;
+}
+if (!(s.data)) {
+ throw series has no data: + JSON.stringify(s);
+}
+if (!(s.data instanceof Array)) {
+ throw series data is not an array: + JSON.stringify(s.data);
+}
+
+pointsCount = pointsCount || s.data.length;
+
+if (pointsCount s.data.length != pointsCount) {
+ throw series cannot have differing numbers of points: +
+ pointsCount + vs + s.data.length + ; see
Rickshaw.Series.zeroFill();
+}
+ })
+},
+enumerable: true,
+configurable: false,
+writable: false
+ }
+});
+
+//show no line if point is null
+Rickshaw.Graph.Renderer.Line.prototype.seriesPathFactory = function() {
+
+ var graph = this.graph;
+
+ return d3.svg.line()
+.x( function(d) { return graph.x(d.x) } )
ambari git commit: AMBARI-11022. Kerberos: Keytab files are not distributed during add host if a retry is necessary during installation (Emil Anca via rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk c2f35d489 - dd218d20b
AMBARI-11022. Kerberos: Keytab files are not distributed during add host if a
retry is necessary during installation (Emil Anca via rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dd218d20
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dd218d20
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dd218d20
Branch: refs/heads/trunk
Commit: dd218d20b085edb1b4fc0d04164303e0b04c4bcd
Parents: c2f35d4
Author: Emil Anca ea...@hortonworks.com
Authored: Tue May 12 10:58:27 2015 -0400
Committer: Robert Levas rle...@hortonworks.com
Committed: Tue May 12 10:58:50 2015 -0400
--
.../server/controller/AmbariManagementControllerImpl.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dd218d20/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index bb8f088..09adf51 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -2034,11 +2034,14 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
// If the state is transitioning from INIT TO INSTALLED and
the cluster has Kerberos
// enabled, mark this ServiceComponentHost to see if
anything needs to be done to
- // make sure it is properly configured. The
Kerberos-related stages needs to be
+ // make sure it is properly configured.
+ // If the component is transitioning from an INSTALL_FAILED
to an INSTALLED state indicates a failure attempt on install
+ // followed by a new installation attempt and will also need
Kerberos related configuration addressing
+ // The Kerberos-related stages needs to be
// between the INSTALLED and STARTED states because some
services need to set up
// the host (i,e, create user accounts, etc...) before
Kerberos-related tasks an
// occur (like distribute keytabs)
- if((oldSchState == State.INIT)
kerberosHelper.isClusterKerberosEnabled(cluster)) {
+ if((oldSchState == State.INIT || oldSchState ==
State.INSTALL_FAILED) kerberosHelper.isClusterKerberosEnabled(cluster)) {
try {
kerberosHelper.configureService(cluster, scHost);
} catch (KerberosInvalidConfigurationException e) {
[5/5] ambari git commit: AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk)
AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2f35d48 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2f35d48 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2f35d48 Branch: refs/heads/trunk Commit: c2f35d48976aa02d73a34a56be256dbd8946fa23 Parents: 6f6c383 Author: Andrew Onishuk aonis...@hortonworks.com Authored: Tue May 12 17:51:33 2015 +0300 Committer: Andrew Onishuk aonis...@hortonworks.com Committed: Tue May 12 17:52:50 2015 +0300 -- ambari-agent/pom.xml| 7 + .../resource_management/TestContentSources.py | 6 +- .../resource_management/TestCopyFromLocal.py| 68 --- .../TestPropertiesFileResource.py | 10 +- .../TestRepositoryResource.py | 6 +- .../TestXmlConfigResource.py| 8 +- .../python/resource_management/core/source.py | 11 +- .../libraries/functions/__init__.py | 1 - .../libraries/functions/get_hdp_version.py | 8 +- .../libraries/providers/__init__.py | 3 +- .../libraries/providers/copy_from_local.py | 94 .../libraries/providers/hdfs_directory.py | 112 - .../libraries/providers/hdfs_resource.py| 118 + .../libraries/resources/__init__.py | 3 +- .../libraries/resources/copy_from_local.py | 41 -- .../libraries/resources/hdfs_directory.py | 45 -- .../libraries/resources/hdfs_resource.py| 76 .../libraries/script/script.py | 2 + .../1.6.1.2.2.0/package/scripts/accumulo.py | 6 +- .../package/scripts/accumulo_configuration.py | 14 +- .../1.6.1.2.2.0/package/scripts/params.py | 17 +- .../0.1.0/package/scripts/hbase.py | 14 +- .../0.1.0/package/scripts/params.py | 16 +- .../FALCON/0.5.0.2.1/package/scripts/falcon.py | 23 +- .../0.5.0.2.1/package/scripts/params_linux.py | 20 +- .../HBASE/0.96.0.2.0/package/scripts/hbase.py | 14 +- .../0.96.0.2.0/package/scripts/params_linux.py | 22 +- .../0.96.0.2.0/package/scripts/service_check.py | 1 - .../package/files/fast-hdfs-resource.jar| Bin 0 - 19285282 bytes .../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 5 + .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 15 +- .../package/scripts/hdfs_nfsgateway.py | 1 - .../2.1.0.2.0/package/scripts/hdfs_snamenode.py | 1 - .../2.1.0.2.0/package/scripts/params_linux.py | 20 +- .../2.1.0.2.0/package/scripts/service_check.py | 53 +-- .../0.12.0.2.0/package/files/templetonSmoke.sh | 22 +- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 116 +++-- .../0.12.0.2.0/package/scripts/hive_server.py | 13 +- .../0.12.0.2.0/package/scripts/params_linux.py | 64 ++- .../HIVE/0.12.0.2.0/package/scripts/webhcat.py | 71 --- .../package/scripts/webhcat_service_check.py| 28 +- .../package/templates/templeton_smoke.pig.j2| 24 + .../MAHOUT/1.0.0.2.3/package/scripts/params.py | 17 +- .../1.0.0.2.3/package/scripts/service_check.py | 49 +- .../4.0.0.2.0/package/files/oozieSmoke2.sh | 52 +-- .../files/prepareOozieHdfsDirectories.sh| 45 ++ .../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 6 +- .../package/scripts/oozie_server_upgrade.py | 16 +- .../4.0.0.2.0/package/scripts/params_linux.py | 22 +- .../4.0.0.2.0/package/scripts/service_check.py | 40 +- .../0.12.0.2.0/package/scripts/params_linux.py | 25 +- .../0.12.0.2.0/package/scripts/service_check.py | 67 +-- .../package/scripts/job_history_server.py | 10 +- .../SPARK/1.2.0.2.2/package/scripts/params.py | 21 +- .../1.2.0.2.2/package/scripts/setup_spark.py| 6 +- .../1.2.0.2.2/package/scripts/spark_service.py | 9 +- .../STORM/0.9.1.2.1/configuration/storm-env.xml | 12 +- .../0.4.0.2.1/package/scripts/params_linux.py | 25 +- .../0.4.0.2.1/package/scripts/service_check.py | 53 +-- .../2.1.0.2.0/package/scripts/historyserver.py | 25 +- .../2.1.0.2.0/package/scripts/install_jars.py | 68 ++- .../package/scripts/mapred_service_check.py | 27 +- .../2.1.0.2.0/package/scripts/params_linux.py | 32 +- .../package/scripts/resourcemanager.py | 14 +- .../2.1.0.2.0/package/scripts/service_check.py | 2 +- .../YARN/2.1.0.2.0/package/scripts/yarn.py | 38 +- .../stacks/2.0.6/HBASE/test_hbase_master.py | 192 .../2.0.6/HBASE/test_hbase_regionserver.py | 91 .../python/stacks/2.0.6/HDFS/test_datanode.py | 6 + .../stacks/2.0.6/HDFS/test_journalnode.py | 6 + .../python/stacks/2.0.6/HDFS/test_namenode.py | 448 ++- .../python/stacks/2.0.6/HDFS/test_nfsgateway.py | 6 + .../stacks/2.0.6/HDFS/test_service_check.py | 59 +--
[3/5] ambari git commit: AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk)
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2f35d48/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
--
diff --git
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
index 583e6e9..1e75eb0 100644
---
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
+++
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
@@ -61,37 +61,35 @@ def yarn(name = None):
@OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
def yarn(name = None):
import params
- if name in [nodemanager,historyserver]:
+ if name == historyserver:
if params.yarn_log_aggregation_enabled:
- params.HdfsDirectory(params.yarn_nm_app_log_dir,
- action=create_delayed,
+ params.HdfsResource(params.yarn_nm_app_log_dir,
+ action=create_on_execute,
+ type=directory,
owner=params.yarn_user,
group=params.user_group,
mode=0777,
recursive_chmod=True
)
-params.HdfsDirectory(/mapred,
- action=create_delayed,
+params.HdfsResource(/mapred,
+ type=directory,
+ action=create_on_execute,
owner=params.mapred_user
)
-params.HdfsDirectory(/mapred/system,
- action=create_delayed,
+params.HdfsResource(/mapred/system,
+ type=directory,
+ action=create_on_execute,
owner=params.hdfs_user
)
-params.HdfsDirectory(params.mapreduce_jobhistory_intermediate_done_dir,
- action=create_delayed,
+params.HdfsResource(params.mapreduce_jobhistory_done_dir,
+ type=directory,
+ action=create_on_execute,
owner=params.mapred_user,
group=params.user_group,
+ change_permissions_for_parents=True,
mode=0777
)
-
-params.HdfsDirectory(params.mapreduce_jobhistory_done_dir,
- action=create_delayed,
- owner=params.mapred_user,
- group=params.user_group,
- mode=01777
-)
-params.HdfsDirectory(None, action=create)
+params.HdfsResource(None, action=execute)
if name == nodemanager:
Directory(params.nm_local_dirs.split(',') + params.nm_log_dirs.split(','),
@@ -178,12 +176,14 @@ def yarn(name = None):
group=params.user_group
)
if not is_empty(params.node_label_enable) and params.node_label_enable or
is_empty(params.node_label_enable) and params.node_labels_dir:
- params.HdfsDirectory(params.node_labels_dir,
- action=create,
+ params.HdfsResource(params.node_labels_dir,
+ type=directory,
+ action=create_on_execute,
owner=params.yarn_user,
group=params.user_group,
mode=0700
)
+ params.HdfsResource(None, action=execute)
elif name == 'apptimelineserver':
Directory(params.ats_leveldb_dir,
owner=params.yarn_user,
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2f35d48/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index b56d15a..cc404eb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -280,36 +280,42 @@ class TestHBaseMaster(RMFTestCase):
owner='hbase',
content='log4jproperties\nline2'
)
-self.assertResourceCalled('HdfsDirectory',
'hdfs://c6401.ambari.apache.org:8020/apps/hbase/data',
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = /usr/bin/kinit,
- owner = 'hbase',
- bin_dir = '/usr/bin',
- action = ['create_delayed'],
- )
-
[1/5] ambari git commit: AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 6f6c38310 - c2f35d489
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2f35d48/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
index 60d7924..4e8ec42 100644
--- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
+++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
@@ -93,6 +93,28 @@ class TestJobHistoryServer(RMFTestCase):
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt
/etc/security/keytabs/spark.service.keytab spark/localh...@example.com; ',
user = 'spark',
)
+self.assertResourceCalled('HdfsResource',
'hdfs:///hdp/apps/2.2.0.0/tez//tez.tar.gz',
+security_enabled = True,
+hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+keytab = UnknownConfigurationMock(),
+source = '/usr/hdp/current/tez-client/lib/tez.tar.gz',
+kinit_path_local = '/usr/bin/kinit',
+user = UnknownConfigurationMock(),
+owner = UnknownConfigurationMock(),
+group = 'hadoop',
+hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+type = 'file',
+action = ['create_on_execute'],
+)
+self.assertResourceCalled('HdfsResource', None,
+security_enabled = True,
+hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+keytab = UnknownConfigurationMock(),
+kinit_path_local = '/usr/bin/kinit',
+user = UnknownConfigurationMock(),
+action = ['execute'],
+hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+)
self.assertResourceCalled('Execute',
'/usr/hdp/current/spark-client/sbin/start-history-server.sh',
environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
not_if = 'ls
/var/run/spark/spark-spark-org.apache.spark.deploy.history.HistoryServer-1.pid
/dev/null 21 ps -p `cat
/var/run/spark/spark-spark-org.apache.spark.deploy.history.HistoryServer-1.pid`
/dev/null 21',
@@ -128,16 +150,26 @@ class TestJobHistoryServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
-self.assertResourceCalled('HdfsDirectory', '/user/spark',
+self.assertResourceCalled('HdfsResource', '/user/spark',
security_enabled = False,
+hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
-conf_dir = '/usr/hdp/current/hadoop-client/conf',
-hdfs_user = 'hdfs',
kinit_path_local = '/usr/bin/kinit',
-mode = 0775,
+user = 'hdfs',
owner = 'spark',
-bin_dir = '/usr/hdp/current/hadoop-client/bin',
-action = ['create'],
+hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+type = 'directory',
+action = ['create_on_execute'],
+mode = 0775,
+)
+self.assertResourceCalled('HdfsResource', None,
+security_enabled = False,
+hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+keytab = UnknownConfigurationMock(),
+kinit_path_local = '/usr/bin/kinit',
+user = 'hdfs',
+action = ['execute'],
+hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
self.assertResourceCalled('PropertiesFile',
'/usr/hdp/current/spark-client/conf/spark-defaults.conf',
key_value_delimiter = ' ',
@@ -175,16 +207,26 @@ class TestJobHistoryServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
-self.assertResourceCalled('HdfsDirectory', '/user/spark',
+self.assertResourceCalled('HdfsResource', '/user/spark',
security_enabled = True,
+hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
-conf_dir = '/usr/hdp/current/hadoop-client/conf',
-hdfs_user = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
-mode = 0775,
+user = UnknownConfigurationMock(),
owner = 'spark',
-bin_dir = '/usr/hdp/current/hadoop-client/bin',
-action = ['create'],
+hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+type = 'directory',
+action = ['create_on_execute'],
+mode = 0775,
+)
+self.assertResourceCalled('HdfsResource', None,
+security_enabled = True,
+hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+keytab = UnknownConfigurationMock(),
+kinit_path_local = '/usr/bin/kinit',
+user = UnknownConfigurationMock(),
+action = ['execute'],
+hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
self.assertResourceCalled('PropertiesFile',
[2/5] ambari git commit: AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk)
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2f35d48/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
index 3fa1c9c..f2d7edb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
@@ -117,37 +117,6 @@ class TestWebHCatServer(RMFTestCase):
self.assertNoMoreResources()
def assert_configure_default(self):
-self.assertResourceCalled('HdfsDirectory', '/apps/webhcat',
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = /usr/bin/kinit,
- mode = 0755,
- owner = 'hcat',
- bin_dir = '/usr/bin',
- action = ['create_delayed'],
- )
-self.assertResourceCalled('HdfsDirectory', '/user/hcat',
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = /usr/bin/kinit,
- mode = 0755,
- owner = 'hcat',
- bin_dir = '/usr/bin',
- action = ['create_delayed'],
- )
-self.assertResourceCalled('HdfsDirectory', None,
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = /usr/bin/kinit,
- bin_dir = '/usr/bin',
- action = ['create'],
- )
self.assertResourceCalled('Directory', '/var/run/webhcat',
owner = 'hcat',
group = 'hadoop',
@@ -165,42 +134,6 @@ class TestWebHCatServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
-self.assertResourceCalled('CopyFromLocal',
'/usr/lib/hadoop-mapreduce/hadoop-streaming-*.jar',
- owner='hcat',
- mode=0755,
- dest_dir='/apps/webhcat',
- kinnit_if_needed='',
- hadoop_conf_dir='/etc/hadoop/conf',
- hadoop_bin_dir='/usr/bin',
- hdfs_user='hdfs'
-)
-self.assertResourceCalled('CopyFromLocal',
'/usr/share/HDP-webhcat/pig.tar.gz',
- owner='hcat',
- mode=0755,
- dest_dir='/apps/webhcat',
- kinnit_if_needed='',
- hadoop_conf_dir='/etc/hadoop/conf',
- hadoop_bin_dir='/usr/bin',
- hdfs_user='hdfs'
-)
-self.assertResourceCalled('CopyFromLocal',
'/usr/share/HDP-webhcat/hive.tar.gz',
- owner='hcat',
- mode=0755,
- dest_dir='/apps/webhcat',
- kinnit_if_needed='',
- hadoop_bin_dir='/usr/bin',
- hadoop_conf_dir='/etc/hadoop/conf',
- hdfs_user='hdfs'
-)
-self.assertResourceCalled('CopyFromLocal',
'/usr/share/HDP-webhcat/sqoop*.tar.gz',
- owner='hcat',
- mode=0755,
- dest_dir='/apps/webhcat',
- kinnit_if_needed='',
- hadoop_bin_dir='/usr/bin',
- hadoop_conf_dir='/etc/hadoop/conf',
- hdfs_user='hdfs'
-)
self.assertResourceCalled('XmlConfig', 'webhcat-site.xml',
owner = 'hcat',
group = 'hadoop',
@@ -225,37 +158,6 @@ class TestWebHCatServer(RMFTestCase):
)
def assert_configure_secured(self):
-self.assertResourceCalled('HdfsDirectory', '/apps/webhcat',
-
[4/5] ambari git commit: AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk)
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2f35d48/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py -- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py index bfd4e74..6edca7d 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py @@ -22,6 +22,7 @@ from resource_management import * from resource_management.libraries import functions import sys import os +import glob from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst from urlparse import urlparse @@ -81,18 +82,96 @@ def hive(name=None): if name == 'hiveserver2': -params.HdfsDirectory(params.hive_apps_whs_dir, - action=create_delayed, - owner=params.hive_user, - mode=0777 +if params.hdp_stack_version_major != and compare_versions(params.hdp_stack_version_major, '2.2') =0: + params.HdfsResource(InlineTemplate(params.mapreduce_tar_destination).get_content(), + type=file, + action=create_on_execute, + source=params.mapreduce_tar_source, + group=params.user_group, + mode=params.tarballs_mode + ) + +if params.hdp_stack_version_major != and compare_versions(params.hdp_stack_version_major, 2.2.0.0) 0: + params.HdfsResource(params.webhcat_apps_dir, + type=directory, + action=create_on_execute, + owner=params.webhcat_user, + mode=0755 + ) + +if params.hcat_hdfs_user_dir != params.webhcat_hdfs_user_dir: + params.HdfsResource(params.hcat_hdfs_user_dir, + type=directory, + action=create_on_execute, + owner=params.hcat_user, + mode=params.hcat_hdfs_user_mode + ) +params.HdfsResource(params.webhcat_hdfs_user_dir, + type=directory, + action=create_on_execute, + owner=params.webhcat_user, + mode=params.webhcat_hdfs_user_mode +) + +for src_filepath in glob.glob(params.hadoop_streaming_tar_source): + src_filename = os.path.basename(src_filepath) + params.HdfsResource(InlineTemplate(params.hadoop_streaming_tar_destination_dir).get_content() + '/' + src_filename, + type=file, + action=create_on_execute, + source=src_filepath, + group=params.user_group, + mode=params.tarballs_mode + ) + +if (os.path.isfile(params.pig_tar_source)): + params.HdfsResource(InlineTemplate(params.pig_tar_destination).get_content(), + type=file, + action=create_on_execute, + source=params.pig_tar_source, + group=params.user_group, + mode=params.tarballs_mode + ) + + params.HdfsResource(InlineTemplate(params.hive_tar_destination).get_content(), +type=file, +action=create_on_execute, +source=params.hive_tar_source, +group=params.user_group, +mode=params.tarballs_mode +) + +for src_filepath in glob.glob(params.sqoop_tar_source): + src_filename = os.path.basename(src_filepath) + params.HdfsResource(InlineTemplate(params.sqoop_tar_destination_dir).get_content() + '/' + src_filename, + type=file, + action=create_on_execute, + source=src_filepath, + group=params.user_group, + mode=params.tarballs_mode + ) + +params.HdfsResource(params.hive_apps_whs_dir, + type=directory, + action=create_on_execute, + owner=params.hive_user, + mode=0777 ) -params.HdfsDirectory(params.hive_hdfs_user_dir, - action=create_delayed, - owner=params.hive_user, - mode=params.hive_hdfs_user_mode +params.HdfsResource(params.hive_hdfs_user_dir, + type=directory, + action=create_on_execute, +
ambari git commit: AMBARI-11065. Make sure that KMS related configs are updated when a new KMS is added to the cluster (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk dd218d20b - ce407e621
AMBARI-11065. Make sure that KMS related configs are updated when a new KMS is
added to the cluster (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce407e62
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce407e62
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce407e62
Branch: refs/heads/trunk
Commit: ce407e6216b0f9d4154d3bcebe10d9d21c003dd4
Parents: dd218d2
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Tue May 12 17:37:33 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Tue May 12 18:06:41 2015 +0300
--
ambari-web/app/controllers/main/host/details.js | 168 +++
ambari-web/app/controllers/main/service/item.js | 4 +-
ambari-web/app/messages.js | 5 +-
.../main/host/details/deleteComponentPopup.hbs | 22 ++-
4 files changed, 123 insertions(+), 76 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce407e62/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js
b/ambari-web/app/controllers/main/host/details.js
index 15df59f..02d02ad 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -239,6 +239,12 @@ App.MainHostDetailsController = Em.Controller.extend({
deleteNimbusMsg: Em.View.extend({
template:
Em.Handlebars.compile(Em.I18n.t('hosts.host.deleteComponent.popup.deleteNimbus'))
}),
+ isRangerKMSServer: function () {
+return componentName == 'RANGER_KMS_SERVER';
+ }.property(),
+ deleteRangerKMSServereMsg: Em.View.extend({
+template:
Em.Handlebars.compile(Em.I18n.t('hosts.host.deleteComponent.popup.deleteRangerKMSServer'))
+ }),
isChecked: false,
disablePrimary: function () {
return !this.get('isChecked');
@@ -338,6 +344,9 @@ App.MainHostDetailsController = Em.Controller.extend({
} else if(data.componentName == 'NIMBUS') {
this.set('deleteNimbusHost', true);
this.loadConfigs('loadStormConfigs');
+} else if(data.componentName == 'RANGER_KMS_SERVER') {
+ this.set('deleteRangerKMSServer', true);
+ this.loadConfigs('loadRangerConfigs');
}
},
@@ -456,11 +465,10 @@ App.MainHostDetailsController = Em.Controller.extend({
var
returnFunc,
self = this,
- hiveHost = event.hiveMetastoreHost ? event.hiveMetastoreHost : ;
component = event.context,
- hostName = this.get('content.hostName'),
+ hostName = event.selectedHost || this.get('content.hostName'),
componentName = component.get('componentName'),
- missedComponents = !!hiveHost ? [] :
componentsUtils.checkComponentDependencies(componentName, {
+ missedComponents = event.selectedHost ? [] :
componentsUtils.checkComponentDependencies(componentName, {
scope: 'host',
installedComponents:
this.get('content.hostComponents').mapProperty('componentName')
});
@@ -480,7 +488,7 @@ App.MainHostDetailsController = Em.Controller.extend({
break;
case 'HIVE_METASTORE':
returnFunc = App.showConfirmationPopup(function () {
- self.set('hiveMetastoreHost', hiveHost);
+ self.set('hiveMetastoreHost', hostName);
self.loadConfigs(loadHiveConfigs);
}, Em.I18n.t('hosts.host.addComponent.' + componentName ));
break;
@@ -490,6 +498,12 @@ App.MainHostDetailsController = Em.Controller.extend({
self.loadConfigs(loadStormConfigs);
}, Em.I18n.t('hosts.host.addComponent.' + componentName));
break;
+ case 'RANGER_KMS_SERVER':
+returnFunc = App.showConfirmationPopup(function() {
+ self.set('rangerKMSServerHost', hostName);
+ self.loadConfigs(loadRangerConfigs);
+}, Em.I18n.t('hosts.host.addComponent.' + componentName));
+break;
default:
returnFunc = this.addClientComponent(component);
}
@@ -698,59 +712,9 @@ App.MainHostDetailsController = Em.Controller.extend({
}
}
];
-this.saveStormConfigsBatch(groups, nimbusHost);
+this.saveConfigsBatch(groups, 'NIMBUS', nimbusHost);
},
- /**
- * save configs' sites in batch
- * @param nimbusHost
- * @param groups
- */
- saveStormConfigsBatch: function (groups, nimbusHost) {
-groups.forEach(function (group) {
- var desiredConfigs = [],
-tag = 'version' + (new Date).getTime(),
-properties = group.properties;
-
- for (var site in properties) {
-if
ambari git commit: AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk)
Repository: ambari Updated Branches: refs/heads/trunk bb9963c78 - e65579818 AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6557981 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6557981 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6557981 Branch: refs/heads/trunk Commit: e65579818b077a3c803f672c9a05203bc5c3e056 Parents: bb9963c Author: Andrew Onishuk aonis...@hortonworks.com Authored: Tue May 12 18:28:00 2015 +0300 Committer: Andrew Onishuk aonis...@hortonworks.com Committed: Tue May 12 18:29:22 2015 +0300 -- .../OOZIE/4.0.0.2.0/package/scripts/service_check.py | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/e6557981/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py -- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py index eb55f07..a2195d8 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py @@ -27,9 +27,6 @@ from ambari_commons.os_family_impl import OsFamilyImpl from ambari_commons import OSConst import os import glob -import sys -sys.exit(0) - class OozieServiceCheck(Script): pass
ambari git commit: AMBARI-11001. Ambari uses users' interactive ticket cache (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 89cbc4594 - eaaef9a1f
AMBARI-11001. Ambari uses users' interactive ticket cache (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eaaef9a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eaaef9a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eaaef9a1
Branch: refs/heads/trunk
Commit: eaaef9a1f64daf66e0934e382025d0fd694cfa96
Parents: 89cbc45
Author: Robert Levas rle...@hortonworks.com
Authored: Tue May 12 11:42:42 2015 -0400
Committer: Robert Levas rle...@hortonworks.com
Committed: Tue May 12 11:42:42 2015 -0400
--
ambari-server/conf/unix/krb5JAASLogin.conf| 11 ---
ambari-server/conf/windows/krb5JAASLogin.conf | 8 +++-
2 files changed, 7 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/eaaef9a1/ambari-server/conf/unix/krb5JAASLogin.conf
--
diff --git a/ambari-server/conf/unix/krb5JAASLogin.conf
b/ambari-server/conf/unix/krb5JAASLogin.conf
index b667081..d266e19 100644
--- a/ambari-server/conf/unix/krb5JAASLogin.conf
+++ b/ambari-server/conf/unix/krb5JAASLogin.conf
@@ -1,13 +1,10 @@
-com.sun.security.jgss.initiate {
-com.sun.security.auth.module.Krb5LoginModule required
-renewTGT=true
+com.sun.security.jgss.krb5.initiate {
+com.sun.security.auth.module.Krb5LoginModule required
+renewTGT=false
doNotPrompt=true
useKeyTab=true
keyTab=/etc/security/keytabs/ambari.keytab
principal=amb...@example.com
-isInitiator=true
storeKey=true
-useTicketCache=true
-client=true;
+useTicketCache=false;
};
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/eaaef9a1/ambari-server/conf/windows/krb5JAASLogin.conf
--
diff --git a/ambari-server/conf/windows/krb5JAASLogin.conf
b/ambari-server/conf/windows/krb5JAASLogin.conf
index 2db9959..ba3e565 100644
--- a/ambari-server/conf/windows/krb5JAASLogin.conf
+++ b/ambari-server/conf/windows/krb5JAASLogin.conf
@@ -1,12 +1,10 @@
-com.sun.security.jgss.initiate {
+com.sun.security.jgss.krb5.initiate {
com.sun.security.auth.module.Krb5LoginModule required
-renewTGT=true
+renewTGT=false
doNotPrompt=true
useKeyTab=true
keyTab=etc\\security\\keytabs\\ambari.keytab
principal=amb...@example.com
-isInitiator=true
storeKey=true
-useTicketCache=true
-client=true;
+useTicketCache=false;
};
ambari git commit: AMBARI-11068. Output file for webhcat test is hardcoded to /apps/hive/warehouse/hcatsmoke.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk eaaef9a1f - 294268060
AMBARI-11068. Output file for webhcat test is hardcoded to
/apps/hive/warehouse/hcatsmoke.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/29426806
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/29426806
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/29426806
Branch: refs/heads/trunk
Commit: 294268060cd35e6cdc716b7673f3ac86a2e9332c
Parents: eaaef9a
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Sat May 9 02:57:05 2015 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Sat May 9 02:57:05 2015 +0300
--
.../HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/29426806/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py
index e69d420..e8bad81 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hcat_service_check.py
@@ -35,7 +35,7 @@ def hcat_service_check():
def hcat_service_check():
import params
unique = get_unique_id_and_date()
-output_file = format(/apps/hive/warehouse/hcatsmoke{unique})
+output_file = format({hive_apps_whs_dir}/hcatsmoke{unique})
test_cmd = format(fs -test -e {output_file})
if params.security_enabled:
ambari git commit: AMBARI-11069 Kafka config port is deprecated but still shows up in the UI config page. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 294268060 - df513801b
AMBARI-11069 Kafka config port is deprecated but still shows up in the UI
config page. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df513801
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df513801
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df513801
Branch: refs/heads/trunk
Commit: df513801b3de4ee7901d2891a53dba4c80f0eafa
Parents: 2942680
Author: aBabiichuk ababiic...@hortonworks.com
Authored: Tue May 12 18:39:58 2015 +0300
Committer: aBabiichuk ababiic...@hortonworks.com
Committed: Tue May 12 18:49:21 2015 +0300
--
ambari-web/app/data/BIGTOP/site_properties.js | 7
ambari-web/app/data/HDP2/site_properties.js | 37 ++
ambari-web/app/data/PHD/site_properties.js| 12 +++
ambari-web/app/utils/config.js| 27 +++-
ambari-web/test/utils/config_test.js | 15 -
5 files changed, 54 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/df513801/ambari-web/app/data/BIGTOP/site_properties.js
--
diff --git a/ambari-web/app/data/BIGTOP/site_properties.js
b/ambari-web/app/data/BIGTOP/site_properties.js
index 36a7084..3485bed 100644
--- a/ambari-web/app/data/BIGTOP/site_properties.js
+++ b/ambari-web/app/data/BIGTOP/site_properties.js
@@ -2491,6 +2491,7 @@ module.exports =
displayType: masterHost,
isOverridable: false,
isVisible: false,
+ isRequiredByAgent: false,
isReconfigurable: false,
serviceName: HIVE,
filename: hive-env.xml,
@@ -2508,6 +2509,7 @@ module.exports =
displayType: masterHost,
isOverridable: false,
isVisible: false,
+ isRequiredByAgent: false,
isReconfigurable: false,
serviceName: HIVE,
filename: hive-env.xml,
@@ -2524,6 +2526,7 @@ module.exports =
description: Using an existing Oracle database for Hive Metastore,
displayType: masterHost,
isVisible: false,
+ isRequiredByAgent: false,
isOverridable: false,
isReconfigurable: false,
serviceName: HIVE,
@@ -2542,6 +2545,7 @@ module.exports =
displayType: masterHost,
isOverridable: false,
isVisible: false,
+ isRequiredByAgent: false,
serviceName: HIVE,
filename: hive-env.xml,
category: HIVE_METASTORE,
@@ -2607,6 +2611,7 @@ module.exports =
displayType: host,
isOverridable: false,
isVisible: false,
+ isRequiredByAgent: false,
isObserved: true,
serviceName: HIVE,
filename: hive-env.xml,
@@ -2622,6 +2627,7 @@ module.exports =
displayType: host,
isOverridable: false,
isVisible: false,
+ isRequiredByAgent: false,
isObserved: true,
serviceName: HIVE,
filename: hive-env.xml,
@@ -2637,6 +2643,7 @@ module.exports =
displayType: host,
isOverridable: false,
isVisible: false,
+ isRequiredByAgent: false,
isObserved: true,
serviceName: HIVE,
filename: hive-env.xml,
http://git-wip-us.apache.org/repos/asf/ambari/blob/df513801/ambari-web/app/data/HDP2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2/site_properties.js
b/ambari-web/app/data/HDP2/site_properties.js
index 7fd2c26..140e899 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -119,9 +119,6 @@ var hdp2properties = [
category: NFS_GATEWAY,
serviceName: HDFS,
filename: hdfs-site.xml,
-stack: {
- HDP: 2.3
-},
index: 1
},
{
@@ -144,9 +141,6 @@ var hdp2properties = [
category: NFS_GATEWAY,
serviceName: HDFS,
filename: hdfs-site.xml,
-stack: {
- HDP: 2.3
-},
index: 3
},
{
@@ -1037,10 +1031,7 @@ var hdp2properties = [
displayType: masterHosts,
serviceName: STORM,
filename: storm-site.xml,
-category: NIMBUS,
-stack: {
- HDP: 2.3
-}
+category: NIMBUS
},
{
id: site property,
@@ -1874,10 +1865,7 @@ var hdp2properties = [
displayType: advanced,
serviceName: KAFKA,
filename: kafka-broker.xml,
-category: KAFKA_BROKER,
-stack: {
- HDP: 2.3
-}
+category: KAFKA_BROKER
},
{
id: site property,
@@ -3323,6 +3311,7 @@ var hdp2properties = [
isOverridable: false,
isVisible: false,
isReconfigurable: false,
+isRequiredByAgent: false,
serviceName: HIVE,
filename: hive-env.xml,
category: HIVE_METASTORE,
@@ -3339,6 +3328,7 @@ var hdp2properties = [
isOverridable: false,
