ambari git commit: AMBARI-21371 - Adding ranger failed when user has custom properties (rzang)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 b0271155b -> 777434efb
AMBARI-21371 - Adding ranger failed when user has custom properties (rzang)
Change-Id: Ifbf56a692b66e514eb1e010f44e6942f453a3c7b
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/777434ef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/777434ef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/777434ef
Branch: refs/heads/branch-2.5
Commit: 777434efbc8159f12800eda711258eea11cefcd5
Parents: b027115
Author: Richard Zang
Authored: Wed Jun 28 14:09:39 2017 -0700
Committer: Richard Zang
Committed: Wed Jun 28 14:09:39 2017 -0700
--
ambari-web/app/mixins/common/configs/enhanced_configs.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/777434ef/ambari-web/app/mixins/common/configs/enhanced_configs.js
--
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 3e653ae..e86fb59 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -438,8 +438,9 @@ App.EnhancedConfigsMixin =
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
if (Em.isNone(recommended)) {
stepConfig.get('configs').removeObject(config);
} else if (Em.isNone(initial)) {
+ var stackConfigProperty =
App.configsCollection.getConfigByName(Em.get(p, 'propertyName'), Em.get(p,
'propertyFileName'));
stepConfig.get('configs').pushObject(this._createNewProperty(Em.get(p,
'propertyName'), Em.get(p, 'propertyFileName'),Em.get(p, 'serviceName'),
- recommended, App.configsCollection.getConfigByName(Em.get(p,
'propertyName'), Em.get(p, 'propertyFileName')).propertyDependsOn));
+ recommended, stackConfigProperty?
stackConfigProperty.propertyDependsOn : []));
} else {
Em.set(config, 'value', recommended);
}
ambari git commit: AMBARI-21371 - Adding ranger failed when user has custom properties (rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk 2f0de6919 -> 9d224f73b
AMBARI-21371 - Adding ranger failed when user has custom properties (rzang)
Change-Id: I3b73ade85c7818939e6c384f8b6bcc9966b448cb
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9d224f73
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9d224f73
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9d224f73
Branch: refs/heads/trunk
Commit: 9d224f73b68279bcec834a28c35dd76122d9e73d
Parents: 2f0de69
Author: Richard Zang
Authored: Wed Jun 28 13:50:38 2017 -0700
Committer: Richard Zang
Committed: Wed Jun 28 13:50:38 2017 -0700
--
ambari-web/app/mixins/common/configs/enhanced_configs.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d224f73/ambari-web/app/mixins/common/configs/enhanced_configs.js
--
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 4561f77..8fc7a4c 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -553,12 +553,13 @@ App.EnhancedConfigsMixin =
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
if (Em.isNone(recommended)) {
stepConfig.get('configs').removeObject(config);
} else if (Em.isNone(initial)) {
+ var stackConfigProperty = App.configsCollection.getConfigByName(name,
filename);
stepConfig.get('configs').pushObject(this._createNewProperty(
name,
filename,
Em.get(prop, 'serviceName'),
recommended,
-App.configsCollection.getConfigByName(name,
filename).propertyDependsOn));
+stackConfigProperty? stackConfigProperty.propertyDependsOn : []));
} else {
Em.set(config, 'value', recommended);
}
ambari git commit: AMBARI-21099. Drop JDK 7 support for Ambari Server and Ambari managed services (AMS, LogSearch, Infra) (oleewere)
Repository: ambari Updated Branches: refs/heads/trunk f4fb1742b -> 2f0de6919 AMBARI-21099. Drop JDK 7 support for Ambari Server and Ambari managed services (AMS, LogSearch, Infra) (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2f0de691 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2f0de691 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2f0de691 Branch: refs/heads/trunk Commit: 2f0de6919ba8bb43ae156d66b39335f9860d26b9 Parents: f4fb174 Author: oleewere Authored: Wed Jun 28 21:15:48 2017 +0200 Committer: oleewere Committed: Wed Jun 28 21:16:11 2017 +0200 -- ambari-server/docs/configuration/index.md | 13 ++- .../ambari/server/agent/ExecutionCommand.java | 4 + .../server/configuration/Configuration.java | 65 ++-- .../controller/AmbariActionExecutionHelper.java | 2 + .../AmbariCustomCommandExecutionHelper.java | 12 +-- .../AmbariManagementControllerImpl.java | 2 + .../internal/ClientConfigResourceProvider.java | 9 +- .../apache/ambari/server/utils/StageUtils.java | 54 ++ ambari-server/src/main/python/ambari-server.py | 2 + .../python/ambari_server/serverConfiguration.py | 6 ++ .../main/python/ambari_server/serverSetup.py| 105 +-- .../0.1.0/package/scripts/params.py | 4 +- .../0.1.0/package/scripts/params.py | 10 +- .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 8 +- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 1 + .../LOGSEARCH/0.5.0/package/scripts/params.py | 4 +- .../RANGER/0.4.0/package/scripts/params.py | 1 + .../0.4.0/package/scripts/setup_ranger_xml.py | 10 +- .../2.0.6/hooks/before-ANY/scripts/params.py| 2 + .../before-ANY/scripts/shared_initialization.py | 30 -- .../2.0.6/hooks/before-START/scripts/params.py | 4 + .../scripts/shared_initialization.py| 22 ++-- .../HDP/3.0/hooks/before-ANY/scripts/params.py | 3 + .../before-ANY/scripts/shared_initialization.py | 31 -- .../3.0/hooks/before-START/scripts/params.py| 4 + .../scripts/shared_initialization.py| 22 ++-- .../main/resources/stacks/HDP/3.0/metainfo.xml | 2 +- .../PERF/1.0/hooks/before-ANY/scripts/params.py | 3 + .../before-ANY/scripts/shared_initialization.py | 23 +++- .../ClientConfigResourceProviderTest.java | 8 ++ .../ambari/server/utils/StageUtilsTest.java | 99 + .../src/test/python/TestAmbariServer.py | 49 - 32 files changed, 524 insertions(+), 90 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/2f0de691/ambari-server/docs/configuration/index.md -- diff --git a/ambari-server/docs/configuration/index.md b/ambari-server/docs/configuration/index.md index 2394264..9dbe9c4 100644 --- a/ambari-server/docs/configuration/index.md +++ b/ambari-server/docs/configuration/index.md @@ -142,9 +142,9 @@ The following are the properties which can be used to configure Ambari. | http.x-content-type-options | The value that will be used to set the `X-CONTENT-TYPE` HTTP response header. |`nosniff` | | http.x-frame-options | The value that will be used to set the `X-Frame-Options` HTTP response header. |`DENY` | | http.x-xss-protection | The value that will be used to set the `X-XSS-Protection` HTTP response header. |`1; mode=block` | -| java.home | The location of the JDK on the Ambari Agent hosts.The following are examples of valid values:`/usr/jdk64/jdk1.7.0_45` | | -| jce.name | The name of the JCE policy ZIP file. The following are examples of valid values:`UnlimitedJCEPolicyJDK7.zip` | | -| jdk.name | The name of the JDK installation binary.The following are examples of valid values:`jdk-7u45-linux-x64.tar.gz` | | +| java.home | The location of the JDK on the Ambari Agent hosts. If stack.java.home exists, that is only used by Ambari Server (or you can find that as ambari_java_home in the commandParams on the agent side)The following are examples of valid values:`/usr/jdk64/jdk1.8.0_112` | | +| jce.name | The name of the JCE policy ZIP file. If stack.jce.name exists, that is only used by Ambari Server (or you can find that as ambari_jce_name in the commandParams on the agent side)The following are examples of valid values:`UnlimitedJCEPolicyJDK8.zip` | | +| jdk.name | The name of the JDK installation binary. If stack.jdk.name exists, that is only used by Ambari Server (or you can find that as ambari_jdk_name in the commandParams on the agent side)The following are examples of valid values:`jdk-8u112-linux-x64.tar.gz` | | | kdcserver.connection.check.timeout | The timeout, in milliseconds, to wait when communicating with a Kerbe
ambari git commit: AMBARI-21368 Update Ambari server rat exclude list with BI AMS files (dili)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 bb18f7fe0 -> b928e7aba AMBARI-21368 Update Ambari server rat exclude list with BI AMS files (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b928e7ab Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b928e7ab Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b928e7ab Branch: refs/heads/branch-feature-AMBARI-21348 Commit: b928e7aba03c7f19b63d4b135c8207da42538753 Parents: bb18f7f Author: Di Li Authored: Wed Jun 28 14:35:23 2017 -0400 Committer: Di Li Committed: Wed Jun 28 14:35:23 2017 -0400 -- ambari-server/pom.xml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b928e7ab/ambari-server/pom.xml -- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 51759d4..63e704c 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -299,6 +299,10 @@ src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/balancer-emulator/balancer-err.log src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/package/scripts/balancer-emulator/balancer.log src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/package/scripts/balancer-emulator/balancer-err.log + src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/package/templates/smoketest_metrics.json.j2 + src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/package/files/service-metrics/*.txt + src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/smoketest_metrics.json.j2 + src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/files/service-metrics/*.txt **/SMARTSENSE/** conf/unix/ca.config conf/unix/krb5JAASLogin.conf
ambari git commit: AMBARI-21359 Add JavaVersionCheck check (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 77099797a -> bb18f7fe0
AMBARI-21359 Add JavaVersionCheck check (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb18f7fe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb18f7fe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb18f7fe
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: bb18f7fe0b2624e7f3022de4236983c695619bc2
Parents: 7709979
Author: Di Li
Authored: Wed Jun 28 14:24:21 2017 -0400
Committer: Di Li
Committed: Wed Jun 28 14:24:21 2017 -0400
--
.../ambari/server/checks/CheckDescription.java | 8 ++
.../ambari/server/checks/JavaVersionCheck.java | 102 +++
2 files changed, 110 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb18f7fe/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 71c5857..2be42fc 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
@@ -329,6 +329,14 @@ public class CheckDescription {
"As Ranger is SSL enabled, Ranger SSL configurations will need
to be changed from default value of /etc/ranger/*/conf folder to
/etc/ranger/security. " +
"Since the certificates/keystores/truststores in this path may
affect the upgrade/downgrade process, it is recommended to manually move the
certificates/keystores/truststores out of the conf folders and change the
appropriate config values before proceeding.").build());
+ public static CheckDescription JAVA_VERSION = new
CheckDescription("JAVA_VERSION",
+ PrereqCheckType.CLUSTER,
+ "Verify Java version requirement",
+ new ImmutableMap.Builder()
+.put(AbstractCheckDescriptor.DEFAULT, "Ambari requires JDK with
minimum version %s. Reconfigure Ambari with a JDK that meets the version
requirement.")
+.build()
+);
+
private String m_name;
private PrereqCheckType m_type;
private String m_description;
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb18f7fe/ambari-server/src/main/java/org/apache/ambari/server/checks/JavaVersionCheck.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/JavaVersionCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/JavaVersionCheck.java
new file mode 100644
index 000..882749f
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/JavaVersionCheck.java
@@ -0,0 +1,102 @@
+/*
+ * 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.configuration.Configuration;
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import
org.apache.ambari.server.state.stack.UpgradePack.PrerequisiteCheckConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.Singleton;
+
+/**
+ * The {@link JavaVersionCheck} checks that JDK version used by Ambari meets
the minimal version requirement
+ */
+@Singleton
+@UpgradeCheck(group = UpgradeCheckGroup.DEFAULT)
+public class JavaVersionCheck extends AbstractCheckDescriptor {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(JavaVersionCheck.class);
+ static final String JAVA_VERSION_PROPERTY_NAME = "java-version";
+
+ /**
+ * Constructor.
+ */
+ public JavaVersionCheck() {
+super(CheckDescription.JAVA
ambari git commit: AMBARI-21367 - Fix Unit Test Failures Caused by AMBARI-21358 (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 1863c3b90 -> 77099797a
AMBARI-21367 - Fix Unit Test Failures Caused by AMBARI-21358 (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77099797
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77099797
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77099797
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: 77099797a6326d285245e8af8dd156900804cf31
Parents: 1863c3b
Author: Jonathan Hurley
Authored: Wed Jun 28 12:46:06 2017 -0400
Committer: Jonathan Hurley
Committed: Wed Jun 28 13:53:39 2017 -0400
--
.../actionmanager/ExecutionCommandWrapper.java | 6 +-
.../internal/UpgradeResourceProvider.java | 13 +-
.../upgrades/UpdateDesiredStackAction.java | 6 +-
.../internal/UpgradeResourceProviderTest.java | 18 +--
.../UpgradeSummaryResourceProviderTest.java | 8 +-
.../ComponentVersionCheckActionTest.java| 120 +++-
.../upgrades/UpgradeActionTest.java | 136 ++-
.../ambari/server/state/UpgradeHelperTest.java | 127 +
.../cluster/ClusterEffectiveVersionTest.java| 2 +-
9 files changed, 295 insertions(+), 141 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/77099797/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
index 81bc80f..4773c75 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
@@ -183,8 +183,10 @@ public class ExecutionCommandWrapper {
}
ClusterVersionEntity effectiveClusterVersion =
cluster.getEffectiveClusterVersion();
- executionCommand.getCommandParams().put(KeyNames.VERSION,
- effectiveClusterVersion.getRepositoryVersion().getVersion());
+ if (null != effectiveClusterVersion) {
+executionCommand.getCommandParams().put(KeyNames.VERSION,
+effectiveClusterVersion.getRepositoryVersion().getVersion());
+ }
} catch (ClusterNotFoundException cnfe) {
// it's possible that there are commands without clusters; in such cases,
http://git-wip-us.apache.org/repos/asf/ambari/blob/77099797/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index da716b3..d2573e1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -375,14 +375,14 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
// use a combination of the supplied information to find the target
// repository
-final Long repositoryId = (Long) requestMap.get(UPGRADE_REPO_ID);
+final String repositoryId = (String) requestMap.get(UPGRADE_REPO_ID);
final String repositoryName = (String)
requestMap.get(UPGRADE_REPO_NAME);
final String repositoryVersion = (String)
requestMap.get(UPGRADE_REPO_VERSION);
RepositoryVersionEntity toRepositoryVersion = null;
if (null != repositoryId) {
- toRepositoryVersion = s_repoVersionDAO.findByPK(repositoryId);
+ toRepositoryVersion =
s_repoVersionDAO.findByPK(Long.valueOf(repositoryId));
} else {
if (StringUtils.isNotBlank(repositoryName)) {
toRepositoryVersion =
s_repoVersionDAO.findByStackNameAndVersion(repositoryName,
@@ -665,6 +665,7 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
Direction direction = upgradeContext.getDirection();
Map requestMap = upgradeContext.getUpgradeRequest();
UpgradeType upgradeType = upgradeContext.getType();
+RepositoryVersionEntity targetRepositoryVersion =
upgradeContext.getTargetRepositoryVersion();
/**
* For the unit tests tests, there are multiple upgrade packs for the same
type, so
@@ -672,7 +673,7 @@ public class UpgradeResourceProvider extends
AbstractControllerRe
ambari git commit: AMBARI-21360: Ability to delete a view instance from view instance list (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 5c874ccb4 -> f4fb1742b
AMBARI-21360: Ability to delete a view instance from view instance list
(sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4fb1742
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4fb1742
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4fb1742
Branch: refs/heads/trunk
Commit: f4fb1742b1ba29247da897f4ca1dd67a82a34c1b
Parents: 5c874cc
Author: Sangeeta Ravindran
Authored: Wed Jun 28 10:49:31 2017 -0700
Committer: Sangeeta Ravindran
Committed: Wed Jun 28 10:49:31 2017 -0700
--
AMBARI-21360.patch | 45 -
1 file changed, 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fb1742/AMBARI-21360.patch
--
diff --git a/AMBARI-21360.patch b/AMBARI-21360.patch
deleted file mode 100644
index c26f3a0..000
--- a/AMBARI-21360.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
-index c41e5d4..4e7bae3 100644
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
-+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
-@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole')
- }
- };
-
-+ $scope.deleteInstance = function(instance) {
-+ ConfirmationModal.show(
-+$t('common.delete', {
-+ term: $t('views.viewInstance')
-+}),
-+$t('common.deleteConfirmation', {
-+ instanceType: $t('views.viewInstance'),
-+ instanceName: instance.ViewInstanceInfo.label
-+})
-+ ).then(function() {
-+View.deleteInstance(instance.ViewInstanceInfo.view_name,
instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name)
-+ .then(function() {
-+loadViews();
-+ })
-+ .catch(function(data) {
-+Alert.error($t('views.alerts.cannotDeleteInstance'),
data.data.message);
-+ });
-+ });
-+};
-+
- $scope.reloadViews = function () {
- loadViews();
- };
-diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
-index 59c322f..91b9a93 100644
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
-+++
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
-@@ -81,6 +81,9 @@
-
-
-
-+
-+
-+
-
-
-
[2/2] ambari git commit: AMBARI-21362. Ambari upgrade not idempotent due to column move
AMBARI-21362. Ambari upgrade not idempotent due to column move
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0271155
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0271155
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0271155
Branch: refs/heads/branch-2.5
Commit: b0271155b3a80945aba2b9989caabe9a96428031
Parents: 18b1035
Author: Attila Doroszlai
Authored: Tue Jun 27 14:33:27 2017 +0200
Committer: Attila Doroszlai
Committed: Wed Jun 28 18:33:05 2017 +0200
--
.../ambari/server/orm/DBAccessorImpl.java | 5 +++-
.../ambari/server/orm/DBAccessorImplTest.java | 29
2 files changed, 33 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0271155/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 c11a1dd..f3250b8 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
@@ -1410,7 +1410,10 @@ public class DBAccessorImpl implements DBAccessor {
public void moveColumnToAnotherTable(String sourceTableName, DBColumnInfo
sourceColumn, String sourceIDFieldName,
String targetTableName, DBColumnInfo targetColumn, String
targetIDFieldName, Object initialValue) throws SQLException {
-if (this.tableHasColumn(sourceTableName, sourceIDFieldName)) {
+if (tableHasColumn(sourceTableName, sourceIDFieldName) &&
+ tableHasColumn(sourceTableName, sourceColumn.getName()) &&
+ tableHasColumn(targetTableName, targetIDFieldName)
+) {
final String moveSQL =
dbmsHelper.getCopyColumnToAnotherTableStatement(sourceTableName,
sourceColumn.getName(),
sourceIDFieldName, targetTableName,
targetColumn.getName(),targetIDFieldName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0271155/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
index ea43bb2..d576cc8 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
@@ -639,4 +639,33 @@ public class DBAccessorImplTest {
}
}
+
+ @Test
+ public void testMoveNonexistentColumnIsNoop() throws Exception {
+DBAccessorImpl dbAccessor = injector.getInstance(DBAccessorImpl.class);
+String sourceTableName = getFreeTableName();
+String targetTableName = getFreeTableName();
+int testRowAmount = 10;
+
+createMyTable(sourceTableName, "col1");
+createMyTable(targetTableName, "col1", "col2");
+
+for (Integer i=0; i < testRowAmount; i++){
+ dbAccessor.insertRow(sourceTableName,
+new String[] {"id", "col1"},
+new String[]{i.toString(), String.format("'source,1,%s'", i)}, false);
+
+ dbAccessor.insertRow(targetTableName,
+new String[] {"id", "col1", "col2"},
+new String[]{i.toString(), String.format("'target,1,%s'", i),
String.format("'target,2,%s'", i)}, false);
+}
+
+DBColumnInfo sourceColumn = new DBColumnInfo("col2", String.class, null,
null, false);
+DBColumnInfo targetColumn = new DBColumnInfo("col2", String.class, null,
null, false);
+
+dbAccessor.moveColumnToAnotherTable(sourceTableName, sourceColumn, "id",
+ targetTableName, targetColumn, "id", "initial");
+
+// should not result in exception due to unknown column in source table
+ }
}
[1/2] ambari git commit: AMBARI-21362. Ambari upgrade not idempotent due to column move
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 18b1035c2 -> b0271155b
refs/heads/trunk a3681c019 -> 5c874ccb4
AMBARI-21362. Ambari upgrade not idempotent due to column move
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c874ccb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c874ccb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c874ccb
Branch: refs/heads/trunk
Commit: 5c874ccb40b282e5074588906cb7de1f7eeae614
Parents: a3681c0
Author: Attila Doroszlai
Authored: Tue Jun 27 14:33:27 2017 +0200
Committer: Attila Doroszlai
Committed: Wed Jun 28 18:31:49 2017 +0200
--
.../ambari/server/orm/DBAccessorImpl.java | 5 +++-
.../ambari/server/orm/DBAccessorImplTest.java | 29
2 files changed, 33 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c874ccb/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 13e7d7d..83ea8e1 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
@@ -1411,7 +1411,10 @@ public class DBAccessorImpl implements DBAccessor {
public void moveColumnToAnotherTable(String sourceTableName, DBColumnInfo
sourceColumn, String sourceIDFieldName,
String targetTableName, DBColumnInfo targetColumn, String
targetIDFieldName, Object initialValue) throws SQLException {
-if (this.tableHasColumn(sourceTableName, sourceIDFieldName)) {
+if (tableHasColumn(sourceTableName, sourceIDFieldName) &&
+ tableHasColumn(sourceTableName, sourceColumn.getName()) &&
+ tableHasColumn(targetTableName, targetIDFieldName)
+) {
final String moveSQL =
dbmsHelper.getCopyColumnToAnotherTableStatement(sourceTableName,
sourceColumn.getName(),
sourceIDFieldName, targetTableName,
targetColumn.getName(),targetIDFieldName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c874ccb/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
index ca2674c..b4ffbf1 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
@@ -638,4 +638,33 @@ public class DBAccessorImplTest {
}
}
+
+ @Test
+ public void testMoveNonexistentColumnIsNoop() throws Exception {
+DBAccessorImpl dbAccessor = injector.getInstance(DBAccessorImpl.class);
+String sourceTableName = getFreeTableName();
+String targetTableName = getFreeTableName();
+int testRowAmount = 10;
+
+createMyTable(sourceTableName, "col1");
+createMyTable(targetTableName, "col1", "col2");
+
+for (Integer i=0; i < testRowAmount; i++){
+ dbAccessor.insertRow(sourceTableName,
+new String[] {"id", "col1"},
+new String[]{i.toString(), String.format("'source,1,%s'", i)}, false);
+
+ dbAccessor.insertRow(targetTableName,
+new String[] {"id", "col1", "col2"},
+new String[]{i.toString(), String.format("'target,1,%s'", i),
String.format("'target,2,%s'", i)}, false);
+}
+
+DBColumnInfo sourceColumn = new DBColumnInfo("col2", String.class, null,
null, false);
+DBColumnInfo targetColumn = new DBColumnInfo("col2", String.class, null,
null, false);
+
+dbAccessor.moveColumnToAnotherTable(sourceTableName, sourceColumn, "id",
+ targetTableName, targetColumn, "id", "initial");
+
+// should not result in exception due to unknown column in source table
+ }
}
ambari git commit: AMBARI-21360: Ability to delete a view instance from view instance list (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk 344628314 -> a3681c019
AMBARI-21360: Ability to delete a view instance from view instance list
(sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a3681c01
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a3681c01
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a3681c01
Branch: refs/heads/trunk
Commit: a3681c0199f31511170770d454697206cbeeeda3
Parents: 3446283
Author: Sangeeta Ravindran
Authored: Wed Jun 28 09:29:57 2017 -0700
Committer: Sangeeta Ravindran
Committed: Wed Jun 28 09:29:57 2017 -0700
--
AMBARI-21360.patch | 45
.../controllers/ambariViews/ViewsListCtrl.js| 20 +
.../app/views/ambariViews/listTable.html| 3 ++
3 files changed, 68 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a3681c01/AMBARI-21360.patch
--
diff --git a/AMBARI-21360.patch b/AMBARI-21360.patch
new file mode 100644
index 000..c26f3a0
--- /dev/null
+++ b/AMBARI-21360.patch
@@ -0,0 +1,45 @@
+diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
+index c41e5d4..4e7bae3 100644
+---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
+@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole')
+ }
+ };
+
++ $scope.deleteInstance = function(instance) {
++ ConfirmationModal.show(
++$t('common.delete', {
++ term: $t('views.viewInstance')
++}),
++$t('common.deleteConfirmation', {
++ instanceType: $t('views.viewInstance'),
++ instanceName: instance.ViewInstanceInfo.label
++})
++ ).then(function() {
++View.deleteInstance(instance.ViewInstanceInfo.view_name,
instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name)
++ .then(function() {
++loadViews();
++ })
++ .catch(function(data) {
++Alert.error($t('views.alerts.cannotDeleteInstance'),
data.data.message);
++ });
++ });
++};
++
+ $scope.reloadViews = function () {
+ loadViews();
+ };
+diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
+index 59c322f..91b9a93 100644
+---
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
+@@ -81,6 +81,9 @@
+
+
+
++
++
++
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/a3681c01/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
index c41e5d4..4e7bae3 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole')
}
};
+ $scope.deleteInstance = function(instance) {
+ ConfirmationModal.show(
+$t('common.delete', {
+ term: $t('views.viewInstance')
+}),
+$t('common.deleteConfirmation', {
+ instanceType: $t('views.viewInstance'),
+ instanceName: instance.ViewInstanceInfo.label
+})
+ ).then(function() {
+View.deleteInstance(instance.ViewInstanceInfo.view_name,
instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name)
+ .then(function() {
+loadViews();
+ })
+ .catch(function(data) {
+Alert.error($t('views.alerts.cannotDeleteInstance'),
data.data.message);
+ });
+ });
+};
+
$scope.reloadViews = function () {
loadViews();
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/a3681c01/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
--
ambari git commit: AMBARI-21274: Typo in stack advisor error message for yarn and mr queue config issues (sangeetar)
Repository: ambari
Updated Branches:
refs/heads/trunk aac9fe6e2 -> 344628314
AMBARI-21274: Typo in stack advisor error message for yarn and mr queue config
issues (sangeetar)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34462831
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34462831
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34462831
Branch: refs/heads/trunk
Commit: 34462831450c3f592b3343940c2c623f9bb7489b
Parents: aac9fe6
Author: Sangeeta Ravindran
Authored: Wed Jun 28 09:16:48 2017 -0700
Committer: Sangeeta Ravindran
Committed: Wed Jun 28 09:16:48 2017 -0700
--
ambari-server/src/main/resources/stacks/stack_advisor.py | 2 +-
.../src/test/python/stacks/2.0.6/common/test_stack_advisor.py | 2 +-
.../src/test/python/stacks/2.5/common/test_stack_advisor.py| 2 +-
.../src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/ambari-server/src/main/resources/stacks/stack_advisor.py
--
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py
b/ambari-server/src/main/resources/stacks/stack_advisor.py
index 3a39a34..8e08d82 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -2752,7 +2752,7 @@ class DefaultStackAdvisor(StackAdvisor):
if len(leaf_queue_names) == 0:
return None
elif queue_name not in leaf_queue_names:
- return self.getErrorItem("Queue is not exist or not corresponds to
existing YARN leaf queue")
+ return self.getErrorItem("Queue does not exist or correspond to an
existing YARN leaf queue")
return None
http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
index b6f1965..0c4996b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
@@ -534,7 +534,7 @@ class TestHDP206StackAdvisor(TestCase):
hosts = self.prepareHosts([])
result = self.stackAdvisor.validateConfigurations(services, hosts)
expectedItems = [
- {'message': 'Queue is not exist or not corresponds to existing YARN leaf
queue', 'level': 'ERROR'}
+ {'message': 'Queue does not exist or correspond to an existing YARN leaf
queue', 'level': 'ERROR'}
]
self.assertValidationResult(expectedItems, result)
services["configurations"]["yarn-env"]["properties"]["service_check.queue.name"]
= "ndfqueue"
http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index e62e00c..50f527d 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -5334,7 +5334,7 @@ class TestHDP25StackAdvisor(TestCase):
hosts = self.prepareHosts([])
result = self.stackAdvisor.validateConfigurations(services, hosts)
expectedItems = [
- {'message': 'Queue is not exist or not corresponds to existing YARN leaf
queue', 'level': 'ERROR'}
+ {'message': 'Queue does not exist or correspond to an existing YARN leaf
queue', 'level': 'ERROR'}
]
self.assertValidationResult(expectedItems, result)
services["configurations"]["yarn-env"]["properties"]["service_check.queue.name"]
= "ndfqueue2"
http://git-wip-us.apache.org/repos/asf/ambari/blob/34462831/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
--
diff --git
a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
index 5a95fe3..5f70db2 100755
---
a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
+++
b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
@@ -1395,7 +1395,7
ambari git commit: AMBARI-21352.Workflow Manager view build failure(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 f0136c478 -> 18b1035c2 AMBARI-21352.Workflow Manager view build failure(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18b1035c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18b1035c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18b1035c Branch: refs/heads/branch-2.5 Commit: 18b1035c20c18194d0602e2a81ac69db2b50197f Parents: f0136c4 Author: Venkata Sairam Authored: Wed Jun 28 14:56:09 2017 +0530 Committer: Venkata Sairam Committed: Wed Jun 28 14:57:53 2017 +0530 -- contrib/views/wfmanager/src/main/resources/ui/bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/18b1035c/contrib/views/wfmanager/src/main/resources/ui/bower.json -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/bower.json b/contrib/views/wfmanager/src/main/resources/ui/bower.json index 3f9de44..9812fa6 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/bower.json +++ b/contrib/views/wfmanager/src/main/resources/ui/bower.json @@ -21,7 +21,7 @@ "abdmob/x2js": "~1.2.0", "datatables": "~1.10.11", "vkBeautify": "https://github.com/vkiryukhin/vkBeautify.git";, -"cytoscape": "2.7.20", +"cytoscape": "2.7.18", "cytoscape-dagre": "~1.3.0", "cytoscape-panzoom": "~2.4.0", "codemirror": "~5.15.0",
ambari git commit: AMBARI-21352.Workflow Manager view build failure(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 5e50042a7 -> aac9fe6e2 AMBARI-21352.Workflow Manager view build failure(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aac9fe6e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aac9fe6e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aac9fe6e Branch: refs/heads/trunk Commit: aac9fe6e2e358b4ad1a1cfb0b86c3231897e38f1 Parents: 5e50042 Author: Venkata Sairam Authored: Wed Jun 28 14:56:09 2017 +0530 Committer: Venkata Sairam Committed: Wed Jun 28 14:56:09 2017 +0530 -- contrib/views/wfmanager/src/main/resources/ui/bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/aac9fe6e/contrib/views/wfmanager/src/main/resources/ui/bower.json -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/bower.json b/contrib/views/wfmanager/src/main/resources/ui/bower.json index 3f9de44..9812fa6 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/bower.json +++ b/contrib/views/wfmanager/src/main/resources/ui/bower.json @@ -21,7 +21,7 @@ "abdmob/x2js": "~1.2.0", "datatables": "~1.10.11", "vkBeautify": "https://github.com/vkiryukhin/vkBeautify.git";, -"cytoscape": "2.7.20", +"cytoscape": "2.7.18", "cytoscape-dagre": "~1.3.0", "cytoscape-panzoom": "~2.4.0", "codemirror": "~5.15.0",
ambari git commit: AMBARI-21256 : As part of START_ALL Ranger kms starts after hbase and hive causing their start failure (Vishal Suvagia via mugdha)
Repository: ambari Updated Branches: refs/heads/trunk 4c1ea4c46 -> 5e50042a7 AMBARI-21256 : As part of START_ALL Ranger kms starts after hbase and hive causing their start failure (Vishal Suvagia via mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5e50042a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5e50042a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5e50042a Branch: refs/heads/trunk Commit: 5e50042a78e4ddcb8e50bb28289ba67c50fb502c Parents: 4c1ea4c Author: Vishal Suvagia Authored: Thu Jun 15 15:27:47 2017 +0530 Committer: Mugdha Varadkar Committed: Wed Jun 28 14:00:01 2017 +0530 -- .../common-services/HBASE/0.96.0.2.0/role_command_order.json | 3 +-- .../common-services/HBASE/2.0.0.3.0/role_command_order.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/5e50042a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json index 110b179..58d0c1c 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json @@ -4,7 +4,6 @@ "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"], "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"], "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"], -"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"] - +"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "RANGER_KMS_SERVER-START"] } } http://git-wip-us.apache.org/repos/asf/ambari/blob/5e50042a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json index 44d0c61..69f4bf6 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json +++ b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json @@ -4,7 +4,7 @@ "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"], "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"], "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"], -"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"], +"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "RANGER_KMS_SERVER-START"], "PHOENIX_QUERY_SERVER-START": ["HBASE_MASTER-START"] } }
ambari git commit: Revert "BUG-82124 : As part of START_ALL Ranger kms starts after hbase and hive causing their start failure (Vishal Suvagia via mugdha)"
Repository: ambari Updated Branches: refs/heads/trunk 39efba359 -> 4c1ea4c46 Revert "BUG-82124 : As part of START_ALL Ranger kms starts after hbase and hive causing their start failure (Vishal Suvagia via mugdha)" This reverts commit 39efba35980642b832f79c6afb332716045d859f. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c1ea4c4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c1ea4c4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c1ea4c4 Branch: refs/heads/trunk Commit: 4c1ea4c46c71bcae5d054eb7465283bca85cc9e8 Parents: 39efba3 Author: Mugdha Varadkar Authored: Wed Jun 28 13:58:10 2017 +0530 Committer: Mugdha Varadkar Committed: Wed Jun 28 13:58:10 2017 +0530 -- .../common-services/HBASE/0.96.0.2.0/role_command_order.json | 3 ++- .../common-services/HBASE/2.0.0.3.0/role_command_order.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4c1ea4c4/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json index 58d0c1c..110b179 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json @@ -4,6 +4,7 @@ "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"], "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"], "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"], -"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "RANGER_KMS_SERVER-START"] +"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"] + } } http://git-wip-us.apache.org/repos/asf/ambari/blob/4c1ea4c4/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json index 69f4bf6..44d0c61 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json +++ b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json @@ -4,7 +4,7 @@ "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"], "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"], "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"], -"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "RANGER_KMS_SERVER-START"], +"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"], "PHOENIX_QUERY_SERVER-START": ["HBASE_MASTER-START"] } }
ambari git commit: AMBARI-21256 : As part of START_ALL Ranger kms starts after hbase and hive causing their start failure (Vishal Suvagia via mugdha)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 59aee427e -> f0136c478
AMBARI-21256 : As part of START_ALL Ranger kms starts after hbase and hive
causing their start failure (Vishal Suvagia via mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0136c47
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0136c47
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0136c47
Branch: refs/heads/branch-2.5
Commit: f0136c47836e98880d76d7d83efb33563d32cce3
Parents: 59aee42
Author: Vishal Suvagia
Authored: Thu Jun 15 15:52:35 2017 +0530
Committer: Mugdha Varadkar
Committed: Wed Jun 28 13:34:55 2017 +0530
--
.../HBASE/0.96.0.2.0/role_command_order.json| 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0136c47/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json
new file mode 100644
index 000..58d0c1c
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json
@@ -0,0 +1,9 @@
+{
+ "general_deps" : {
+"_comment" : "dependencies for HBase",
+"HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"],
+"HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START",
"HBASE_REGIONSERVER-START"],
+"HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"],
+"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START",
"ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "RANGER_KMS_SERVER-START"]
+ }
+}
ambari git commit: BUG-82124 : As part of START_ALL Ranger kms starts after hbase and hive causing their start failure (Vishal Suvagia via mugdha)
Repository: ambari Updated Branches: refs/heads/trunk 9aa786f7e -> 39efba359 BUG-82124 : As part of START_ALL Ranger kms starts after hbase and hive causing their start failure (Vishal Suvagia via mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/39efba35 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/39efba35 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/39efba35 Branch: refs/heads/trunk Commit: 39efba35980642b832f79c6afb332716045d859f Parents: 9aa786f Author: Vishal Suvagia Authored: Thu Jun 15 15:27:47 2017 +0530 Committer: Mugdha Varadkar Committed: Wed Jun 28 13:32:37 2017 +0530 -- .../common-services/HBASE/0.96.0.2.0/role_command_order.json | 3 +-- .../common-services/HBASE/2.0.0.3.0/role_command_order.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/39efba35/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json index 110b179..58d0c1c 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json @@ -4,7 +4,6 @@ "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"], "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"], "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"], -"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"] - +"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "RANGER_KMS_SERVER-START"] } } http://git-wip-us.apache.org/repos/asf/ambari/blob/39efba35/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json index 44d0c61..69f4bf6 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json +++ b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json @@ -4,7 +4,7 @@ "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"], "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"], "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"], -"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"], +"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", "ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "RANGER_KMS_SERVER-START"], "PHOENIX_QUERY_SERVER-START": ["HBASE_MASTER-START"] } }
