ambari git commit: AMBARI-12315. Incorrect alert shown for oozie server with wire encryption on.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 e85d345e0 - f8a05d636
AMBARI-12315. Incorrect alert shown for oozie server with wire encryption
on.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f8a05d63
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f8a05d63
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f8a05d63
Branch: refs/heads/branch-2.1
Commit: f8a05d636c407cb0d0f7ef838faf180e2b28f563
Parents: e85d345
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Tue Jul 7 19:55:17 2015 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Tue Jul 7 19:55:17 2015 +0300
--
.../package/alerts/alert_check_oozie_server.py | 8 +++---
.../4.0.0.2.0/package/files/oozieSmoke2.sh | 19 +++---
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 16 +---
.../4.0.0.2.0/package/scripts/params_linux.py | 26 +++-
.../4.0.0.2.0/package/scripts/service_check.py | 4 +--
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 23 ++---
.../stacks/2.0.6/OOZIE/test_service_check.py| 2 +-
7 files changed, 74 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8a05d63/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
index e29dfb0..1dbf3f9 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
@@ -178,11 +178,13 @@ def execute(configurations={}, parameters={},
host_name=None):
parsed_url = urlparse(oozie_url)
oozie_url = oozie_url.replace(parsed_url.scheme, https)
if parsed_url.port is None:
- oozie_url.replace(parsed_url.hostname, :.join([parsed_url.hostname,
https_port]))
+ oozie_url.replace(parsed_url.hostname, :.join([parsed_url.hostname,
str(https_port)]))
else:
- oozie_url = oozie_url.replace(str(parsed_url.port), https_port)
+ oozie_url = oozie_url.replace(str(parsed_url.port), str(https_port))
- oozie_url = oozie_url.replace(urlparse(oozie_url).hostname,
localhost_address)
+ # https will not work with localhost address, we need put fqdn
+ if https_port is None:
+oozie_url = oozie_url.replace(urlparse(oozie_url).hostname,
localhost_address)
try:
command, env, oozie_user = get_check_command(oozie_url, host_name,
configurations)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8a05d63/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
index d8cceb6..42b507b 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
@@ -24,14 +24,15 @@ export os_family=$1
export oozie_lib_dir=$2
export oozie_conf_dir=$3
export oozie_bin_dir=$4
-export oozie_examples_dir=$5
-export hadoop_conf_dir=$6
-export hadoop_bin_dir=$7
-export smoke_test_user=$8
-export security_enabled=$9
-export smoke_user_keytab=${10}
-export kinit_path_local=${11}
-export smokeuser_principal=${12}
+export oozie_server_url=$5
+export oozie_examples_dir=$6
+export hadoop_conf_dir=$7
+export hadoop_bin_dir=$8
+export smoke_test_user=$9
+export security_enabled=$10
+export smoke_user_keytab=${11}
+export kinit_path_local=${12}
+export smokeuser_principal=${13}
function getValueFromField {
xmllint $1 | grep name$2/name -C 2 | grep 'value' | cut -d -f2 |
cut -d -f1
@@ -68,7 +69,7 @@ function checkOozieJobStatus {
}
export OOZIE_EXIT_CODE=0
-export OOZIE_SERVER=`getValueFromField ${oozie_conf_dir}/oozie-site.xml
oozie.base.url | tr '[:upper:]' '[:lower:]'`
+export OOZIE_SERVER=$oozie_server_url
cd $oozie_examples_dir
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8a05d63/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git
[2/2] ambari git commit: AMBARI-12305. Ambari-server upgrade from 1.6.1 to 2.1.0 fails, dml update error (aonishuk)
AMBARI-12305. Ambari-server upgrade from 1.6.1 to 2.1.0 fails, dml update error
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ff96ed45
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ff96ed45
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ff96ed45
Branch: refs/heads/branch-2.1
Commit: ff96ed451d6dccaf211e69db1a391cf7009b5803
Parents: 22740e1
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Tue Jul 7 11:37:16 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Tue Jul 7 11:37:16 2015 +0300
--
.../apache/ambari/server/orm/DBAccessor.java| 4 +-
.../ambari/server/orm/DBAccessorImpl.java | 96 ++--
.../server/upgrade/UpgradeCatalog170.java | 84 ++---
.../server/upgrade/UpgradeCatalog200.java | 8 +-
.../server/upgrade/UpgradeCatalog210.java | 8 +-
.../server/upgrade/UpgradeCatalog200Test.java | 4 +-
.../server/upgrade/UpgradeCatalog210Test.java | 19 +++-
7 files changed, 124 insertions(+), 99 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ff96ed45/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 a5960a0..9104624 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
@@ -464,7 +464,7 @@ public interface DBAccessor {
* @return the string list of index names
* @throws SQLException
*/
- //ListString getIndexesList(String tableName, boolean unique) throws
SQLException;
+ ListString getIndexesList(String tableName, boolean unique) throws
SQLException;
/**
* Check if index is already in scheme
@@ -476,7 +476,7 @@ public interface DBAccessor {
*name of the index to check
* @return true if index present in the schema
*/
- //boolean tableHasIndex(String tableName, boolean unique, String indexName)
throws SQLException;
+ boolean tableHasIndex(String tableName, boolean unique, String indexName)
throws SQLException;
/**
* Gets the column's SQL type
http://git-wip-us.apache.org/repos/asf/ambari/blob/ff96ed45/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 3a1d237..ef65853 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
@@ -350,11 +350,23 @@ public class DBAccessorImpl implements DBAccessor {
}
@Override
+ public boolean tableHasIndex(String tableName, boolean unique, String
indexName) throws SQLException{
+if (tableExists(tableName)){
+ ListString indexList = getIndexesList(tableName, false);
+ return (CustomStringUtils.containsCaseInsensitive(indexName, indexList));
+}
+return false;
+ }
+
+ @Override
public void createIndex(String indexName, String tableName,
String... columnNames) throws SQLException {
-String query = dbmsHelper.getCreateIndexStatement(indexName, tableName,
columnNames);
-
-executeQuery(query);
+ if (!tableHasIndex(tableName, false, indexName)) {
+ String query = dbmsHelper.getCreateIndexStatement(indexName, tableName,
columnNames);
+ executeQuery(query);
+ } else {
+ LOG.info(Index {} already exist, skipping creation, table = {},
indexName, tableName);
+ }
}
@Override
@@ -440,7 +452,7 @@ public class DBAccessorImpl implements DBAccessor {
@Override
public void addUniqueConstraint(String tableName, String constraintName,
String... columnNames)
throws SQLException {
-if (!tableHasConstraint(tableName, constraintName)) {
+if (!tableHasConstraint(tableName, constraintName)
tableHasColumn(tableName, columnNames)) {
String query = dbmsHelper.getAddUniqueConstraintStatement(tableName,
constraintName, columnNames);
try {
executeQuery(query);
@@ -449,7 +461,7 @@ public class DBAccessorImpl implements DBAccessor {
throw e;
}
} else {
- LOG.info(Unique constraint {} already exists, skipping,
constraintName);
+ LOG.info(Unique constraint {} already exists or columns {} not found,
skipping, constraintName, StringUtils.join(columnNames, , ));
}
}
@@
[1/2] ambari git commit: AMBARI-12305. Ambari-server upgrade from 1.6.1 to 2.1.0 fails, dml update error (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 22740e180 - ff96ed451
refs/heads/trunk b234664cd - c46d25398
AMBARI-12305. Ambari-server upgrade from 1.6.1 to 2.1.0 fails, dml update error
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c46d2539
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c46d2539
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c46d2539
Branch: refs/heads/trunk
Commit: c46d25398ea168a4e666cc380eae3b742d9cb6df
Parents: b234664
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Tue Jul 7 11:37:14 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Tue Jul 7 11:37:14 2015 +0300
--
.../apache/ambari/server/orm/DBAccessor.java| 4 +-
.../ambari/server/orm/DBAccessorImpl.java | 96 ++--
.../server/upgrade/UpgradeCatalog170.java | 84 ++---
.../server/upgrade/UpgradeCatalog200.java | 8 +-
.../server/upgrade/UpgradeCatalog210.java | 8 +-
.../server/upgrade/UpgradeCatalog200Test.java | 4 +-
.../server/upgrade/UpgradeCatalog210Test.java | 19 +++-
7 files changed, 124 insertions(+), 99 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c46d2539/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 a5960a0..9104624 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
@@ -464,7 +464,7 @@ public interface DBAccessor {
* @return the string list of index names
* @throws SQLException
*/
- //ListString getIndexesList(String tableName, boolean unique) throws
SQLException;
+ ListString getIndexesList(String tableName, boolean unique) throws
SQLException;
/**
* Check if index is already in scheme
@@ -476,7 +476,7 @@ public interface DBAccessor {
*name of the index to check
* @return true if index present in the schema
*/
- //boolean tableHasIndex(String tableName, boolean unique, String indexName)
throws SQLException;
+ boolean tableHasIndex(String tableName, boolean unique, String indexName)
throws SQLException;
/**
* Gets the column's SQL type
http://git-wip-us.apache.org/repos/asf/ambari/blob/c46d2539/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 3a1d237..ef65853 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
@@ -350,11 +350,23 @@ public class DBAccessorImpl implements DBAccessor {
}
@Override
+ public boolean tableHasIndex(String tableName, boolean unique, String
indexName) throws SQLException{
+if (tableExists(tableName)){
+ ListString indexList = getIndexesList(tableName, false);
+ return (CustomStringUtils.containsCaseInsensitive(indexName, indexList));
+}
+return false;
+ }
+
+ @Override
public void createIndex(String indexName, String tableName,
String... columnNames) throws SQLException {
-String query = dbmsHelper.getCreateIndexStatement(indexName, tableName,
columnNames);
-
-executeQuery(query);
+ if (!tableHasIndex(tableName, false, indexName)) {
+ String query = dbmsHelper.getCreateIndexStatement(indexName, tableName,
columnNames);
+ executeQuery(query);
+ } else {
+ LOG.info(Index {} already exist, skipping creation, table = {},
indexName, tableName);
+ }
}
@Override
@@ -440,7 +452,7 @@ public class DBAccessorImpl implements DBAccessor {
@Override
public void addUniqueConstraint(String tableName, String constraintName,
String... columnNames)
throws SQLException {
-if (!tableHasConstraint(tableName, constraintName)) {
+if (!tableHasConstraint(tableName, constraintName)
tableHasColumn(tableName, columnNames)) {
String query = dbmsHelper.getAddUniqueConstraintStatement(tableName,
constraintName, columnNames);
try {
executeQuery(query);
@@ -449,7 +461,7 @@ public class DBAccessorImpl implements DBAccessor {
throw e;
}
} else {
- LOG.info(Unique constraint {} already exists, skipping,
constraintName);
+ LOG.info(Unique constraint {}
ambari git commit: AMBARI-12280. HiveServer2 upgrade/downgrade should deregister old server after new one is started (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 6f2b5c2f9 - 23cdd769a
AMBARI-12280. HiveServer2 upgrade/downgrade should deregister old server after
new one is started (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/23cdd769
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23cdd769
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23cdd769
Branch: refs/heads/trunk
Commit: 23cdd769ae1ef056b2afc770fea672ca4421f447
Parents: 6f2b5c2
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Sat Jul 4 19:11:06 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Tue Jul 7 13:04:25 2015 -0700
--
.../libraries/functions/hdp_select.py | 29 +-
.../libraries/script/script.py | 16 -
.../internal/UpgradeResourceProvider.java | 14 +
.../ambari/server/orm/dao/UpgradeDAO.java | 17 ++
.../server/orm/entities/UpgradeEntity.java | 2 +
.../ambari/server/state/UpgradeContext.java | 17 ++
.../0.12.0.2.0/package/scripts/hive_server.py | 9 ++-
.../package/scripts/hive_server_upgrade.py | 61 +++-
.../0.12.0.2.0/package/scripts/params_linux.py | 4 ++
.../ambari/server/orm/dao/UpgradeDAOTest.java | 37
.../stacks/2.0.6/HIVE/test_hive_server.py | 11 ++--
11 files changed, 187 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/23cdd769/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
index 4583808..d0ee9ad 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
@@ -26,6 +26,7 @@ from resource_management.libraries.functions.default import
default
from resource_management.libraries.functions.get_hdp_version import
get_hdp_version
from resource_management.libraries.script.script import Script
from resource_management.core.shell import call
+from resource_management.libraries.functions.version import
format_hdp_stack_version
# hdp-select set oozie-server 2.2.0.0-1234
TEMPLATE = ('hdp-select', 'set')
@@ -149,7 +150,7 @@ def get_role_component_current_hdp_version():
return current_hdp_version
-def get_hadoop_dir(target, force_latest_on_upgrade=False,
upgrade_stack_only=False):
+def get_hadoop_dir(target, force_latest_on_upgrade=False):
Return the hadoop shared directory in the following override order
1. Use default for 2.1 and lower
@@ -160,7 +161,6 @@ def get_hadoop_dir(target, force_latest_on_upgrade=False,
upgrade_stack_only=Fal
:target: the target directory
:force_latest_on_upgrade: if True, then this will return the current
directory
without the HDP version built into the path, such as
/usr/hdp/current/hadoop-client
- :upgrade_stack_only: if True, provides upgrade stack target if present and
not current
if not target in HADOOP_DIR_DEFAULTS:
@@ -186,7 +186,7 @@ def get_hadoop_dir(target, force_latest_on_upgrade=False,
upgrade_stack_only=Fal
# determine if hdp-select has been run and if not, then use the current
# hdp version until this component is upgraded
current_hdp_version = get_role_component_current_hdp_version()
-if current_hdp_version is not None and stack_version !=
current_hdp_version and not upgrade_stack_only:
+if current_hdp_version is not None and stack_version !=
current_hdp_version:
stack_version = current_hdp_version
if target == home:
@@ -197,6 +197,29 @@ def get_hadoop_dir(target, force_latest_on_upgrade=False,
upgrade_stack_only=Fal
return hadoop_dir
+def get_hadoop_dir_for_stack_version(target, stack_version):
+
+ Return the hadoop shared directory for the provided stack version. This is
necessary
+ when folder paths of downgrade-source stack-version are needed after
hdp-select.
+ :target: the target directory
+ :stack_version: stack version to get hadoop dir for
+
+
+ if not target in HADOOP_DIR_DEFAULTS:
+raise Fail(Target {0} not defined.format(target))
+
+ hadoop_dir = HADOOP_DIR_DEFAULTS[target]
+
+ formatted_stack_version = format_hdp_stack_version(stack_version)
+ if Script.is_hdp_stack_greater_or_equal_to(formatted_stack_version, 2.2):
+# home uses a different template
+if target == home:
+ hadoop_dir = HADOOP_HOME_DIR_TEMPLATE.format(stack_version, hadoop)
+else:
+ hadoop_dir =
ambari git commit: AMBARI-12314. Downgrade fails with 'Cannot create action for Execute HDFS Finalize with no hosts' (ncole)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 ff5599e78 - 3788777ed
AMBARI-12314. Downgrade fails with 'Cannot create action for Execute HDFS
Finalize with no hosts' (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3788777e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3788777e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3788777e
Branch: refs/heads/branch-2.1
Commit: 3788777edd53ce12773036e5857f4217bbfce30a
Parents: ff5599e
Author: Nate Cole nc...@hortonworks.com
Authored: Tue Jul 7 14:25:07 2015 -0400
Committer: Nate Cole nc...@hortonworks.com
Committed: Tue Jul 7 14:31:56 2015 -0400
--
.../state/stack/upgrade/ClusterGrouping.java| 12 +++-
.../state/stack/upgrade/TaskWrapperBuilder.java | 5 +-
.../ambari/server/state/UpgradeHelperTest.java | 73
.../server/state/stack/UpgradePackTest.java | 2 +-
.../HDP/2.1.1/upgrades/upgrade_direction.xml| 8 +++
5 files changed, 94 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3788777e/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
index 0cb0353..5b6bc50 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
@@ -203,16 +203,22 @@ public class ClusterGrouping extends Grouping {
HostsType hosts = ctx.getResolver().getMasterAndHosts(service,
component);
if (hosts != null) {
-SetString realHosts = new LinkedHashSetString(hosts.hosts);
-if (null != et.hosts master.equals(et.hosts) null !=
hosts.master) {
+SetString realHosts = new LinkedHashSetString(hosts.hosts);
+if (ExecuteHostType.MASTER == et.hosts null != hosts.master) {
realHosts = Collections.singleton(hosts.master);
}
+
// Pick a random host.
-if (null != et.hosts any.equals(et.hosts)
!hosts.hosts.isEmpty()) {
+if (ExecuteHostType.ANY == et.hosts !hosts.hosts.isEmpty()) {
realHosts = Collections.singleton(hosts.hosts.iterator().next());
}
+// !!! cannot execute against empty hosts (safety net)
+if (realHosts.isEmpty()) {
+ return null;
+}
+
return new StageWrapper(
StageWrapper.Type.RU_TASKS,
execution.title,
http://git-wip-us.apache.org/repos/asf/ambari/blob/3788777e/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
index 9a5ba8c..a5813e3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
@@ -48,7 +48,8 @@ public class TaskWrapperBuilder {
ListTaskWrapper collection = new ArrayListTaskWrapper();
for (Task t : tasks) {
if (t.getType().equals(Task.Type.EXECUTE)) {
-if (((ExecuteTask) t).hosts != null ((ExecuteTask) t).hosts ==
ExecuteHostType.MASTER) {
+ExecuteTask et = (ExecuteTask) t;
+if (et.hosts == ExecuteHostType.MASTER) {
if (hostsType.master != null) {
collection.add(new TaskWrapper(service, component,
Collections.singleton(hostsType.master), t));
continue;
@@ -58,7 +59,7 @@ public class TaskWrapperBuilder {
}
}
// Pick a random host.
-if (((ExecuteTask) t).hosts != null ((ExecuteTask) t).hosts ==
ExecuteHostType.ANY) {
+if (et.hosts == ExecuteHostType.ANY) {
if (hostsType.hosts != null !hostsType.hosts.isEmpty()) {
collection.add(new TaskWrapper(service, component,
Collections.singleton(hostsType.hosts.iterator().next()), t));
continue;
http://git-wip-us.apache.org/repos/asf/ambari/blob/3788777e/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
[1/2] ambari git commit: AMBARI-12278. Pre RU - install failed and attempts to re-install continue to fail (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 3788777ed - 069a34ced
refs/heads/trunk cbb80f68f - 6f2b5c2f9
AMBARI-12278. Pre RU - install failed and attempts to re-install continue to
fail (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/069a34ce
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/069a34ce
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/069a34ce
Branch: refs/heads/branch-2.1
Commit: 069a34cedf035cbfd5a6ace0f2a113c69f60a5ec
Parents: 3788777
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Tue Jul 7 21:43:07 2015 +0300
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Tue Jul 7 21:43:07 2015 +0300
--
.../libraries/functions/hdp_select.py | 12 +
.../libraries/functions/repo_version_history.py | 90 +++
.../custom_actions/scripts/install_packages.py | 111 +---
.../custom_actions/TestInstallPackages.py | 610 ++-
4 files changed, 717 insertions(+), 106 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/069a34ce/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
index 5fdc35d..4583808 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
@@ -25,6 +25,7 @@ from resource_management.core.resources.system import Execute
from resource_management.libraries.functions.default import default
from resource_management.libraries.functions.get_hdp_version import
get_hdp_version
from resource_management.libraries.script.script import Script
+from resource_management.core.shell import call
# hdp-select set oozie-server 2.2.0.0-1234
TEMPLATE = ('hdp-select', 'set')
@@ -212,3 +213,14 @@ def _get_upgrade_stack():
return (stack_name, stack_version)
return None
+
+
+def get_hdp_versions():
+ code, out = call(hdp-select versions)
+ if 0 == code:
+versions = []
+for line in out.splitlines():
+ versions.append(line.rstrip('\n'))
+return versions
+ else:
+return []
http://git-wip-us.apache.org/repos/asf/ambari/blob/069a34ce/ambari-common/src/main/python/resource_management/libraries/functions/repo_version_history.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/repo_version_history.py
b/ambari-common/src/main/python/resource_management/libraries/functions/repo_version_history.py
new file mode 100644
index 000..f8ea7c9
--- /dev/null
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/repo_version_history.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python
+
+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.
+
+
+
+import os
+from resource_management.core.logger import Logger
+
+
+Repository version file is used while executing install_packages.py
+That allows us to get actual installed version even during reinstalling
existing
+ repository version (when hdp-select output does not change before and after
+ installing packages).
+
+Format:
+2.3.0.0,2.3.0.0-5678
+2.2.0.0,2.2.0.0-1699
+
+First value in each string should be normalized (contain no build number)
+
+
+
+# Mapping file used to store repository versions without a build number, and
the actual version it corresponded to.
+# E.g., HDP 2.2.0.0 = HDP 2.2.0.0-2041
+REPO_VERSION_HISTORY_FILE =
/var/lib/ambari-agent/data/repo_version_history.csv
+
+
+def read_actual_version_from_history_file(repository_version):
+
+ :param repository_version: normalized repo version (without build number) as
received from the server
+ Search the repository version history file for a line that contains
repository_version,actual_version
+
ambari git commit: AMBARI-12280. HiveServer2 upgrade/downgrade should deregister old server after new one is started (srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 069a34ced - 91c6464e8
AMBARI-12280. HiveServer2 upgrade/downgrade should deregister old server after
new one is started (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/91c6464e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/91c6464e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/91c6464e
Branch: refs/heads/branch-2.1
Commit: 91c6464e8a93a06ec25a66332082ff7d9aa291c4
Parents: 069a34c
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Sat Jul 4 19:11:06 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Tue Jul 7 13:02:10 2015 -0700
--
.../libraries/functions/hdp_select.py | 29 +-
.../libraries/script/script.py | 16 -
.../internal/UpgradeResourceProvider.java | 14 +
.../ambari/server/orm/dao/UpgradeDAO.java | 17 ++
.../server/orm/entities/UpgradeEntity.java | 2 +
.../ambari/server/state/UpgradeContext.java | 17 ++
.../0.12.0.2.0/package/scripts/hive_server.py | 9 ++-
.../package/scripts/hive_server_upgrade.py | 61 +++-
.../0.12.0.2.0/package/scripts/params_linux.py | 4 ++
.../ambari/server/orm/dao/UpgradeDAOTest.java | 37
.../stacks/2.0.6/HIVE/test_hive_server.py | 11 ++--
11 files changed, 187 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/91c6464e/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
index 4583808..d0ee9ad 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
@@ -26,6 +26,7 @@ from resource_management.libraries.functions.default import
default
from resource_management.libraries.functions.get_hdp_version import
get_hdp_version
from resource_management.libraries.script.script import Script
from resource_management.core.shell import call
+from resource_management.libraries.functions.version import
format_hdp_stack_version
# hdp-select set oozie-server 2.2.0.0-1234
TEMPLATE = ('hdp-select', 'set')
@@ -149,7 +150,7 @@ def get_role_component_current_hdp_version():
return current_hdp_version
-def get_hadoop_dir(target, force_latest_on_upgrade=False,
upgrade_stack_only=False):
+def get_hadoop_dir(target, force_latest_on_upgrade=False):
Return the hadoop shared directory in the following override order
1. Use default for 2.1 and lower
@@ -160,7 +161,6 @@ def get_hadoop_dir(target, force_latest_on_upgrade=False,
upgrade_stack_only=Fal
:target: the target directory
:force_latest_on_upgrade: if True, then this will return the current
directory
without the HDP version built into the path, such as
/usr/hdp/current/hadoop-client
- :upgrade_stack_only: if True, provides upgrade stack target if present and
not current
if not target in HADOOP_DIR_DEFAULTS:
@@ -186,7 +186,7 @@ def get_hadoop_dir(target, force_latest_on_upgrade=False,
upgrade_stack_only=Fal
# determine if hdp-select has been run and if not, then use the current
# hdp version until this component is upgraded
current_hdp_version = get_role_component_current_hdp_version()
-if current_hdp_version is not None and stack_version !=
current_hdp_version and not upgrade_stack_only:
+if current_hdp_version is not None and stack_version !=
current_hdp_version:
stack_version = current_hdp_version
if target == home:
@@ -197,6 +197,29 @@ def get_hadoop_dir(target, force_latest_on_upgrade=False,
upgrade_stack_only=Fal
return hadoop_dir
+def get_hadoop_dir_for_stack_version(target, stack_version):
+
+ Return the hadoop shared directory for the provided stack version. This is
necessary
+ when folder paths of downgrade-source stack-version are needed after
hdp-select.
+ :target: the target directory
+ :stack_version: stack version to get hadoop dir for
+
+
+ if not target in HADOOP_DIR_DEFAULTS:
+raise Fail(Target {0} not defined.format(target))
+
+ hadoop_dir = HADOOP_DIR_DEFAULTS[target]
+
+ formatted_stack_version = format_hdp_stack_version(stack_version)
+ if Script.is_hdp_stack_greater_or_equal_to(formatted_stack_version, 2.2):
+# home uses a different template
+if target == home:
+ hadoop_dir = HADOOP_HOME_DIR_TEMPLATE.format(stack_version, hadoop)
+else:
+ hadoop_dir =
ambari git commit: AMBARI-12304. Summary:500 error when attempting to add service (too much data being stored via persist) (rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk 23cdd769a - 26dcf89c6
AMBARI-12304. Summary:500 error when attempting to add service (too much data
being stored via persist) (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/26dcf89c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/26dcf89c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/26dcf89c
Branch: refs/heads/trunk
Commit: 26dcf89c67afc5729f4e8a89ffbec13c379a73f9
Parents: 23cdd76
Author: Richard Zang rz...@apache.org
Authored: Tue Jul 7 13:21:22 2015 -0700
Committer: Richard Zang rz...@apache.org
Committed: Tue Jul 7 13:24:39 2015 -0700
--
ambari-web/app/controllers/installer.js | 3 ---
.../controllers/main/admin/kerberos/wizard_controller.js | 1 -
ambari-web/app/controllers/wizard.js | 1 -
ambari-web/app/routes/add_kerberos_routes.js | 1 -
ambari-web/app/routes/installer.js | 1 -
ambari-web/app/utils/db.js | 11 ---
6 files changed, 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js
b/ambari-web/app/controllers/installer.js
index 08c417c..a311e99 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -65,7 +65,6 @@ App.InstallerController = App.WizardController.extend({
'installOptions',
'allHostNamesPattern',
'serviceComponents',
-'advancedServiceConfig',
'clientInfo',
'selectedServiceNames',
'serviceConfigGroups',
@@ -484,8 +483,6 @@ App.InstallerController = App.WizardController.extend({
var serviceConfigProperties =
this.getDBProperty('serviceConfigProperties');
this.set('content.serviceConfigProperties', serviceConfigProperties);
console.log(InstallerController.loadServiceConfigProperties: loaded
config , serviceConfigProperties);
-
-this.set('content.advancedServiceConfig',
this.getDBProperty('advancedServiceConfig'));
},
/**
* Generate clients list for selected services and save it to model
http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index 510d1a0..5251b66 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -164,7 +164,6 @@ App.KerberosWizardController = App.WizardController.extend({
App.config.loadAdvancedConfig(serviceName, function (properties) {
loadAdvancedConfigResult.pushObjects(properties);
self.set('content.advancedServiceConfig', loadAdvancedConfigResult);
- self.setDBProperty('advancedServiceConfig', loadAdvancedConfigResult);
dependentController.set('isAdvancedConfigLoaded', true);
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/controllers/wizard.js
--
diff --git a/ambari-web/app/controllers/wizard.js
b/ambari-web/app/controllers/wizard.js
index 49b9700..205c56a 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -854,7 +854,6 @@ App.WizardController =
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
});
loadAdvancedConfigResult.pushObjects(clusterProperties);
self.set('content.advancedServiceConfig', loadAdvancedConfigResult);
-self.setDBProperty('advancedServiceConfig', loadAdvancedConfigResult);
dependentController.set('isAdvancedConfigLoaded', true);
});
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/routes/add_kerberos_routes.js
--
diff --git a/ambari-web/app/routes/add_kerberos_routes.js
b/ambari-web/app/routes/add_kerberos_routes.js
index c7ad43d..e3a40f8 100644
--- a/ambari-web/app/routes/add_kerberos_routes.js
+++ b/ambari-web/app/routes/add_kerberos_routes.js
@@ -140,7 +140,6 @@ module.exports = App.WizardRoute.extend({
kerberosWizardController.saveKerberosOption(kerberosStep1controller);
kerberosWizardController.setDBProperty('serviceConfigProperties', null);
- kerberosWizardController.setDBProperty('advancedServiceConfig', null);
router.transitionTo('step2');
}
}),
ambari git commit: AMBARI-12304. Summary:500 error when attempting to add service (too much data being stored via persist) (rzang)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 91c6464e8 - 94bc6aaec
AMBARI-12304. Summary:500 error when attempting to add service (too much data
being stored via persist) (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/94bc6aae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/94bc6aae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/94bc6aae
Branch: refs/heads/branch-2.1
Commit: 94bc6aaecbe0b74249ec83979a5ed9e3b9f5975e
Parents: 91c6464
Author: Richard Zang rz...@apache.org
Authored: Tue Jul 7 13:21:22 2015 -0700
Committer: Richard Zang rz...@apache.org
Committed: Tue Jul 7 13:21:22 2015 -0700
--
ambari-web/app/controllers/installer.js | 3 ---
.../controllers/main/admin/kerberos/wizard_controller.js | 1 -
ambari-web/app/controllers/wizard.js | 1 -
ambari-web/app/routes/add_kerberos_routes.js | 1 -
ambari-web/app/routes/installer.js | 1 -
ambari-web/app/utils/db.js | 11 ---
6 files changed, 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/94bc6aae/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js
b/ambari-web/app/controllers/installer.js
index 08c417c..a311e99 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -65,7 +65,6 @@ App.InstallerController = App.WizardController.extend({
'installOptions',
'allHostNamesPattern',
'serviceComponents',
-'advancedServiceConfig',
'clientInfo',
'selectedServiceNames',
'serviceConfigGroups',
@@ -484,8 +483,6 @@ App.InstallerController = App.WizardController.extend({
var serviceConfigProperties =
this.getDBProperty('serviceConfigProperties');
this.set('content.serviceConfigProperties', serviceConfigProperties);
console.log(InstallerController.loadServiceConfigProperties: loaded
config , serviceConfigProperties);
-
-this.set('content.advancedServiceConfig',
this.getDBProperty('advancedServiceConfig'));
},
/**
* Generate clients list for selected services and save it to model
http://git-wip-us.apache.org/repos/asf/ambari/blob/94bc6aae/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index 510d1a0..5251b66 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -164,7 +164,6 @@ App.KerberosWizardController = App.WizardController.extend({
App.config.loadAdvancedConfig(serviceName, function (properties) {
loadAdvancedConfigResult.pushObjects(properties);
self.set('content.advancedServiceConfig', loadAdvancedConfigResult);
- self.setDBProperty('advancedServiceConfig', loadAdvancedConfigResult);
dependentController.set('isAdvancedConfigLoaded', true);
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/94bc6aae/ambari-web/app/controllers/wizard.js
--
diff --git a/ambari-web/app/controllers/wizard.js
b/ambari-web/app/controllers/wizard.js
index 457e7bf..bf579ba 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -852,7 +852,6 @@ App.WizardController =
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
});
loadAdvancedConfigResult.pushObjects(clusterProperties);
self.set('content.advancedServiceConfig', loadAdvancedConfigResult);
-self.setDBProperty('advancedServiceConfig', loadAdvancedConfigResult);
dependentController.set('isAdvancedConfigLoaded', true);
});
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/94bc6aae/ambari-web/app/routes/add_kerberos_routes.js
--
diff --git a/ambari-web/app/routes/add_kerberos_routes.js
b/ambari-web/app/routes/add_kerberos_routes.js
index c7ad43d..e3a40f8 100644
--- a/ambari-web/app/routes/add_kerberos_routes.js
+++ b/ambari-web/app/routes/add_kerberos_routes.js
@@ -140,7 +140,6 @@ module.exports = App.WizardRoute.extend({
kerberosWizardController.saveKerberosOption(kerberosStep1controller);
kerberosWizardController.setDBProperty('serviceConfigProperties', null);
- kerberosWizardController.setDBProperty('advancedServiceConfig', null);
router.transitionTo('step2');
[1/2] ambari git commit: Vivek's changes
Repository: ambari
Updated Branches:
refs/heads/trunk 26dcf89c6 - 7d059e7dc
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d059e7d/contrib/views/hive/src/main/resources/ui/hive-web/vendor/vega-lite.js
--
diff --git
a/contrib/views/hive/src/main/resources/ui/hive-web/vendor/vega-lite.js
b/contrib/views/hive/src/main/resources/ui/hive-web/vendor/vega-lite.js
new file mode 100644
index 000..f5ea13b
--- /dev/null
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/vendor/vega-lite.js
@@ -0,0 +1,6177 @@
+!function(e){if(object==typeof exportsundefined!=typeof
module)module.exports=e();else if(function==typeof
definedefine.amd)define([],e);else{var f;undefined!=typeof
window?f=window:undefined!=typeof global?f=global:undefined!=typeof
self(f=self),f.vl=e()}}(function(){var define,module,exports;return (function
e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof
require==functionrequire;if(!ua)return a(o,!0);if(i)return i(o,!0);var
f=new Error(Cannot find module '+o+');throw f.code=MODULE_NOT_FOUND,f}var
l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return
s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof
require==functionrequire;for(var o=0;or.length;o++)s(r[o]);return
s})({1:[function(require,module,exports){
+'use strict';
+
+require('./globals');
+
+var util = require('./util'),
+consts = require('./consts');
+
+var vl = {};
+
+util.extend(vl, consts, util);
+
+vl.Encoding = require('./Encoding');
+vl.compiler = require('./compiler/compiler');
+vl.compile = vl.compiler.compile;
+vl.data = require('./data');
+vl.enc = require('./enc');
+vl.field = require('./field');
+vl.schema = require('./schema/schema');
+vl.toShorthand = vl.Encoding.shorthand;
+
+module.exports = vl;
+},{./Encoding:13,./compiler/compiler:17,./consts:31,./data:32,./enc:33,./field:34,./globals:35,./schema/schema:36,./util:38}],2:[function(require,module,exports){
+
+},{}],3:[function(require,module,exports){
+// This product includes color specifications and designs developed by Cynthia
Brewer (http://colorbrewer.org/).
+// JavaScript specs as packaged in the D3 library (d3js.org). Please see
license at http://colorbrewer.org/export/LICENSE.txt
+!function() {
+
+var colorbrewer = {YlGn: {
+3: [#f7fcb9,#addd8e,#31a354],
+4: [#cc,#c2e699,#78c679,#238443],
+5: [#cc,#c2e699,#78c679,#31a354,#006837],
+6: [#cc,#d9f0a3,#addd8e,#78c679,#31a354,#006837],
+7: [#cc,#d9f0a3,#addd8e,#78c679,#41ab5d,#238443,#005a32],
+8:
[#e5,#f7fcb9,#d9f0a3,#addd8e,#78c679,#41ab5d,#238443,#005a32],
+9:
[#e5,#f7fcb9,#d9f0a3,#addd8e,#78c679,#41ab5d,#238443,#006837,#004529]
+},YlGnBu: {
+3: [#edf8b1,#7fcdbb,#2c7fb8],
+4: [#cc,#a1dab4,#41b6c4,#225ea8],
+5: [#cc,#a1dab4,#41b6c4,#2c7fb8,#253494],
+6: [#cc,#c7e9b4,#7fcdbb,#41b6c4,#2c7fb8,#253494],
+7: [#cc,#c7e9b4,#7fcdbb,#41b6c4,#1d91c0,#225ea8,#0c2c84],
+8:
[#d9,#edf8b1,#c7e9b4,#7fcdbb,#41b6c4,#1d91c0,#225ea8,#0c2c84],
+9:
[#d9,#edf8b1,#c7e9b4,#7fcdbb,#41b6c4,#1d91c0,#225ea8,#253494,#081d58]
+},GnBu: {
+3: [#e0f3db,#a8ddb5,#43a2ca],
+4: [#f0f9e8,#bae4bc,#7bccc4,#2b8cbe],
+5: [#f0f9e8,#bae4bc,#7bccc4,#43a2ca,#0868ac],
+6: [#f0f9e8,#ccebc5,#a8ddb5,#7bccc4,#43a2ca,#0868ac],
+7: [#f0f9e8,#ccebc5,#a8ddb5,#7bccc4,#4eb3d3,#2b8cbe,#08589e],
+8:
[#f7fcf0,#e0f3db,#ccebc5,#a8ddb5,#7bccc4,#4eb3d3,#2b8cbe,#08589e],
+9:
[#f7fcf0,#e0f3db,#ccebc5,#a8ddb5,#7bccc4,#4eb3d3,#2b8cbe,#0868ac,#084081]
+},BuGn: {
+3: [#e5f5f9,#99d8c9,#2ca25f],
+4: [#edf8fb,#b2e2e2,#66c2a4,#238b45],
+5: [#edf8fb,#b2e2e2,#66c2a4,#2ca25f,#006d2c],
+6: [#edf8fb,#ccece6,#99d8c9,#66c2a4,#2ca25f,#006d2c],
+7: [#edf8fb,#ccece6,#99d8c9,#66c2a4,#41ae76,#238b45,#005824],
+8:
[#f7fcfd,#e5f5f9,#ccece6,#99d8c9,#66c2a4,#41ae76,#238b45,#005824],
+9:
[#f7fcfd,#e5f5f9,#ccece6,#99d8c9,#66c2a4,#41ae76,#238b45,#006d2c,#00441b]
+},PuBuGn: {
+3: [#ece2f0,#a6bddb,#1c9099],
+4: [#f6eff7,#bdc9e1,#67a9cf,#02818a],
+5: [#f6eff7,#bdc9e1,#67a9cf,#1c9099,#016c59],
+6: [#f6eff7,#d0d1e6,#a6bddb,#67a9cf,#1c9099,#016c59],
+7: [#f6eff7,#d0d1e6,#a6bddb,#67a9cf,#3690c0,#02818a,#016450],
+8:
[#fff7fb,#ece2f0,#d0d1e6,#a6bddb,#67a9cf,#3690c0,#02818a,#016450],
+9:
[#fff7fb,#ece2f0,#d0d1e6,#a6bddb,#67a9cf,#3690c0,#02818a,#016c59,#014636]
+},PuBu: {
+3: [#ece7f2,#a6bddb,#2b8cbe],
+4: [#f1eef6,#bdc9e1,#74a9cf,#0570b0],
+5: [#f1eef6,#bdc9e1,#74a9cf,#2b8cbe,#045a8d],
+6: [#f1eef6,#d0d1e6,#a6bddb,#74a9cf,#2b8cbe,#045a8d],
+7: [#f1eef6,#d0d1e6,#a6bddb,#74a9cf,#3690c0,#0570b0,#034e7b],
+8:
[#fff7fb,#ece7f2,#d0d1e6,#a6bddb,#74a9cf,#3690c0,#0570b0,#034e7b],
+9:
[#fff7fb,#ece7f2,#d0d1e6,#a6bddb,#74a9cf,#3690c0,#0570b0,#045a8d,#023858]
+},BuPu: {
+3: [#e0ecf4,#9ebcda,#8856a7],
+4: [#edf8fb,#b3cde3,#8c96c6,#88419d],
+5: [#edf8fb,#b3cde3,#8c96c6,#8856a7,#810f7c],
+6: [#edf8fb,#bfd3e6,#9ebcda,#8c96c6,#8856a7,#810f7c],
+7: [#edf8fb,#bfd3e6,#9ebcda,#8c96c6,#8c6bb1,#88419d,#6e016b],
+8:
[2/2] ambari git commit: Vivek's changes
Vivek's changes
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d059e7d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d059e7d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d059e7d
Branch: refs/heads/trunk
Commit: 7d059e7dc184b3828e1f5f5dc291a9b064dfa5cd
Parents: 26dcf89
Author: Vivek Ratnavel vivekratnave...@gmail.com
Authored: Tue Jul 7 14:11:35 2015 -0700
Committer: Vivek Ratnavel vivekratnave...@gmail.com
Committed: Tue Jul 7 14:11:35 2015 -0700
--
.../src/main/resources/ui/hive-web/.jshintrc|3 +-
.../src/main/resources/ui/hive-web/Brocfile.js | 12 +
.../hive-web/app/components/draggable-view.js | 34 +
.../hive-web/app/components/droppable-view.js | 53 +
.../app/components/visualization-view.js| 149 +
.../ui/hive-web/app/controllers/query-tabs.js | 10 +
.../app/controllers/visualization-ui.js | 109 +
.../ui/hive-web/app/initializers/i18n.js|4 +-
.../ui/hive-web/app/mixins/draggable.js | 26 +
.../ui/hive-web/app/mixins/droppable.js | 25 +
.../hive-web/app/mixins/jquery-drag-widget.js | 109 +
.../hive-web/app/mixins/jquery-drop-widget.js | 111 +
.../ui/hive-web/app/mixins/jquery-ui.js | 110 +
.../resources/ui/hive-web/app/styles/app.scss |1 +
.../resources/ui/hive-web/app/styles/vars.scss |4 +
.../hive-web/app/styles/visualization-view.scss | 103 +
.../app/templates/components/draggable-view.hbs | 19 +
.../app/templates/components/droppable-view.hbs | 19 +
.../templates/components/visualization-view.hbs | 39 +
.../hive-web/app/templates/visualization-ui.hbs | 56 +
.../ui/hive-web/app/views/visualization-ui.js | 37 +
.../src/main/resources/ui/hive-web/bower.json |5 +-
.../resources/ui/hive-web/vendor/vega-lite.js | 6177 ++
23 files changed, 7212 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d059e7d/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
--
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
b/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
index c1fe863..0195538 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
@@ -2,7 +2,8 @@
predef: [
document,
window,
--Promise
+-Promise,
+d3
],
browser : true,
boss : true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d059e7d/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
--
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
b/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
index 318d1f8..223a581 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
@@ -51,4 +51,16 @@ app.import('vendor/codemirror/codemirror.css');
app.import('vendor/codemirror/show-hint.css');
app.import('vendor/dagre.min.js');
+app.import('bower_components/d3/d3.js');
+app.import('bower_components/vega/vega.js');
+//app.import('bower_components/vega-lite/vega-lite.js');
+app.import('vendor/vega-lite.js');
+app.import('bower_components/eventEmitter/eventEmitter.js');
+app.import('bower_components/get-size/get-size.js');
+app.import('bower_components/eventie/eventie.js');
+app.import('bower_components/unipointer/unipointer.js');
+app.import('bower_components/unidragger/unidragger.js');
+app.import('bower_components/classie/classie.js');
+app.import('bower_components/get-style-property/get-style-property.js');
+app.import('bower_components/draggabilly/draggabilly.js');
module.exports = app.toTree();
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d059e7d/contrib/views/hive/src/main/resources/ui/hive-web/app/components/draggable-view.js
--
diff --git
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/draggable-view.js
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/draggable-view.js
new file mode 100644
index 000..d98d722
--- /dev/null
+++
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/draggable-view.js
@@ -0,0 +1,34 @@
+/**
+ * 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
ambari git commit: AMBARI-12297. When in the Tez view, you cannot switch to the Hive view. (Erik via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 94bc6aaec - 62fa3550d
AMBARI-12297. When in the Tez view, you cannot switch to the Hive view. (Erik
via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/62fa3550
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/62fa3550
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/62fa3550
Branch: refs/heads/branch-2.1
Commit: 62fa3550d11655e854863027ffe83acad887b464
Parents: 94bc6aa
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Tue Jul 7 16:18:49 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Tue Jul 7 16:18:49 2015 -0700
--
ambari-web/app/routes/views.js | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/62fa3550/ambari-web/app/routes/views.js
--
diff --git a/ambari-web/app/routes/views.js b/ambari-web/app/routes/views.js
index 051d218..08396eb 100644
--- a/ambari-web/app/routes/views.js
+++ b/ambari-web/app/routes/views.js
@@ -39,7 +39,11 @@ module.exports = Em.Route.extend({
var href = ['/views', params.viewName, params.version,
params.instanceName + /].join('/');
var viewPath =
this.parseViewPath(window.location.href.slice(window.location.href.indexOf('?')));
if (viewPath) {
-href = ['/views', params.viewName, params.version,
params.instanceName.slice(0, params.instanceName.lastIndexOf('?')) +
/].join('/');
+var slicedInstanceName =
this._getSlicedInstanceName(params.instanceName);
+if (slicedInstanceName === params.instanceName) {
+ viewPath = '';
+}
+href = ['/views', params.viewName, params.version, slicedInstanceName
+ /].join('/');
//remove slash from viewPath since href already contains it at the end
if (viewPath.charAt(0) === '/') viewPath = viewPath.slice(1);
}
@@ -50,6 +54,22 @@ module.exports = Em.Route.extend({
router.get('mainController').connectOutlet('mainViewsDetails',
content);
});
},
+
+/**
+ * parse the instance name and slice if needed
+ *
+ * @param {string}
+ * @returns {string}
+ * @private
+ */
+_getSlicedInstanceName: function (instanceName) {
+ if (instanceName.lastIndexOf('?') -1) {
+return instanceName.slice(0, instanceName.lastIndexOf('?'));
+ }
+
+ return instanceName;
+},
+
/**
* parse internal view path
* viewPath - used as a key of additional path
ambari git commit: AMBARI-12316. Phoenix system tests fail before finalize
Repository: ambari
Updated Branches:
refs/heads/trunk 978fd3512 - 12dbf92b8
AMBARI-12316. Phoenix system tests fail before finalize
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12dbf92b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12dbf92b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12dbf92b
Branch: refs/heads/trunk
Commit: 12dbf92b8529f904ba2218f5cd307ff32600780f
Parents: 978fd35
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Tue Jul 7 17:34:58 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Tue Jul 7 17:34:58 2015 -0700
--
.../HBASE/0.96.0.2.0/package/scripts/hbase_client.py | 8
.../src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 6 --
2 files changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/12dbf92b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
index 9036bb3..f772a11 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
@@ -59,6 +59,14 @@ class HbaseClientDefault(HbaseClient):
conf_select.select(params.stack_name, hbase, params.version)
hdp_select.select(hbase-client, params.version)
+ # phoenix may not always be deployed
+ try:
+hdp_select.select(phoenix-client, params.version)
+ except Exception as e:
+print Ignoring error due to missing phoenix-client
+print str(e)
+
+
# set all of the hadoop clients since hbase client is upgraded as part
# of the final CLIENTS group and we need to ensure that hadoop-client
# is also set
http://git-wip-us.apache.org/repos/asf/ambari/blob/12dbf92b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
index cf923f1..d2fa8ab 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
@@ -201,6 +201,7 @@ class TestHBaseClient(RMFTestCase):
mocks_dict = mocks_dict)
self.assertResourceCalled(Execute, ('hdp-select', 'set', 'hbase-client',
'2.2.1.0-2067'), sudo=True)
+self.assertResourceCalled('Execute', ('hdp-select', 'set',
'phoenix-client', '2.2.1.0-2067'), sudo=True)
self.assertResourceCalled(Execute, ('hdp-select', 'set',
'hadoop-client', '2.2.1.0-2067'), sudo=True)
self.assertEquals(1, mocks_dict['call'].call_count)
@@ -226,10 +227,11 @@ class TestHBaseClient(RMFTestCase):
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-client',
version), sudo=True)
+self.assertResourceCalled('Execute', ('hdp-select', 'set',
'phoenix-client', version), sudo=True)
self.assertResourceCalled('Execute', ('hdp-select', 'set',
'hadoop-client', version), sudo=True)
self.assertEquals(3, mocks_dict['call'].call_count)
-self.assertEquals(5, mocks_dict['checked_call'].call_count)
+self.assertEquals(6, mocks_dict['checked_call'].call_count)
self.assertEquals(
('conf-select', 'set-conf-dir', '--package', 'hbase', '--stack-version',
'2.3.0.0-1234', '--conf-version', '0'),
mocks_dict['checked_call'].call_args_list[1][0][0])
@@ -238,7 +240,7 @@ class TestHBaseClient(RMFTestCase):
mocks_dict['call'].call_args_list[0][0][0])
self.assertEquals(
('conf-select', 'set-conf-dir', '--package', 'hadoop',
'--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
- mocks_dict['checked_call'].call_args_list[3][0][0])
+ mocks_dict['checked_call'].call_args_list[4][0][0])
self.assertEquals(
('conf-select', 'create-conf-dir', '--package', 'hadoop',
'--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
mocks_dict['call'].call_args_list[1][0][0])
ambari git commit: AMBARI-12297. When in the Tez view, you cannot switch to the Hive view. (Erik via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk b800592c4 - 63164d9b8
AMBARI-12297. When in the Tez view, you cannot switch to the Hive view. (Erik
via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/63164d9b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/63164d9b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/63164d9b
Branch: refs/heads/trunk
Commit: 63164d9b82655b8f6c0dee362b6c3110b1f2b007
Parents: b800592
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Tue Jul 7 16:18:49 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Tue Jul 7 16:19:38 2015 -0700
--
ambari-web/app/routes/views.js | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/63164d9b/ambari-web/app/routes/views.js
--
diff --git a/ambari-web/app/routes/views.js b/ambari-web/app/routes/views.js
index 051d218..08396eb 100644
--- a/ambari-web/app/routes/views.js
+++ b/ambari-web/app/routes/views.js
@@ -39,7 +39,11 @@ module.exports = Em.Route.extend({
var href = ['/views', params.viewName, params.version,
params.instanceName + /].join('/');
var viewPath =
this.parseViewPath(window.location.href.slice(window.location.href.indexOf('?')));
if (viewPath) {
-href = ['/views', params.viewName, params.version,
params.instanceName.slice(0, params.instanceName.lastIndexOf('?')) +
/].join('/');
+var slicedInstanceName =
this._getSlicedInstanceName(params.instanceName);
+if (slicedInstanceName === params.instanceName) {
+ viewPath = '';
+}
+href = ['/views', params.viewName, params.version, slicedInstanceName
+ /].join('/');
//remove slash from viewPath since href already contains it at the end
if (viewPath.charAt(0) === '/') viewPath = viewPath.slice(1);
}
@@ -50,6 +54,22 @@ module.exports = Em.Route.extend({
router.get('mainController').connectOutlet('mainViewsDetails',
content);
});
},
+
+/**
+ * parse the instance name and slice if needed
+ *
+ * @param {string}
+ * @returns {string}
+ * @private
+ */
+_getSlicedInstanceName: function (instanceName) {
+ if (instanceName.lastIndexOf('?') -1) {
+return instanceName.slice(0, instanceName.lastIndexOf('?'));
+ }
+
+ return instanceName;
+},
+
/**
* parse internal view path
* viewPath - used as a key of additional path
ambari git commit: AMBARI-12316. Phoenix system tests fail before finalize
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 bf9a82b39 - 8379fb8f4
AMBARI-12316. Phoenix system tests fail before finalize
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8379fb8f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8379fb8f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8379fb8f
Branch: refs/heads/branch-2.1
Commit: 8379fb8f44de3d78ebf9dcd655d54125d0fc85d8
Parents: bf9a82b
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Tue Jul 7 17:34:58 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Tue Jul 7 17:37:09 2015 -0700
--
.../HBASE/0.96.0.2.0/package/scripts/hbase_client.py | 8
.../src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 6 --
2 files changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8379fb8f/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
index 9036bb3..f772a11 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py
@@ -59,6 +59,14 @@ class HbaseClientDefault(HbaseClient):
conf_select.select(params.stack_name, hbase, params.version)
hdp_select.select(hbase-client, params.version)
+ # phoenix may not always be deployed
+ try:
+hdp_select.select(phoenix-client, params.version)
+ except Exception as e:
+print Ignoring error due to missing phoenix-client
+print str(e)
+
+
# set all of the hadoop clients since hbase client is upgraded as part
# of the final CLIENTS group and we need to ensure that hadoop-client
# is also set
http://git-wip-us.apache.org/repos/asf/ambari/blob/8379fb8f/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
index cf923f1..d2fa8ab 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py
@@ -201,6 +201,7 @@ class TestHBaseClient(RMFTestCase):
mocks_dict = mocks_dict)
self.assertResourceCalled(Execute, ('hdp-select', 'set', 'hbase-client',
'2.2.1.0-2067'), sudo=True)
+self.assertResourceCalled('Execute', ('hdp-select', 'set',
'phoenix-client', '2.2.1.0-2067'), sudo=True)
self.assertResourceCalled(Execute, ('hdp-select', 'set',
'hadoop-client', '2.2.1.0-2067'), sudo=True)
self.assertEquals(1, mocks_dict['call'].call_count)
@@ -226,10 +227,11 @@ class TestHBaseClient(RMFTestCase):
mocks_dict = mocks_dict)
self.assertResourceCalled('Execute', ('hdp-select', 'set', 'hbase-client',
version), sudo=True)
+self.assertResourceCalled('Execute', ('hdp-select', 'set',
'phoenix-client', version), sudo=True)
self.assertResourceCalled('Execute', ('hdp-select', 'set',
'hadoop-client', version), sudo=True)
self.assertEquals(3, mocks_dict['call'].call_count)
-self.assertEquals(5, mocks_dict['checked_call'].call_count)
+self.assertEquals(6, mocks_dict['checked_call'].call_count)
self.assertEquals(
('conf-select', 'set-conf-dir', '--package', 'hbase', '--stack-version',
'2.3.0.0-1234', '--conf-version', '0'),
mocks_dict['checked_call'].call_args_list[1][0][0])
@@ -238,7 +240,7 @@ class TestHBaseClient(RMFTestCase):
mocks_dict['call'].call_args_list[0][0][0])
self.assertEquals(
('conf-select', 'set-conf-dir', '--package', 'hadoop',
'--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
- mocks_dict['checked_call'].call_args_list[3][0][0])
+ mocks_dict['checked_call'].call_args_list[4][0][0])
self.assertEquals(
('conf-select', 'create-conf-dir', '--package', 'hadoop',
'--stack-version', '2.3.0.0-1234', '--conf-version', '0'),
mocks_dict['call'].call_args_list[1][0][0])
ambari git commit: AMBARI-12107. Moving RM on a RM HA enabled cluster does not update the yarn.resourcemanager.webapp.address and yarn.resourcemanager.webapp.https.address. (Di Li via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 63164d9b8 - 978fd3512
AMBARI-12107. Moving RM on a RM HA enabled cluster does not update the
yarn.resourcemanager.webapp.address and
yarn.resourcemanager.webapp.https.address. (Di Li via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/978fd351
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/978fd351
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/978fd351
Branch: refs/heads/trunk
Commit: 978fd351293f7d61184095fedffc9169afc34de7
Parents: 63164d9
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Tue Jul 7 16:56:36 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Tue Jul 7 16:57:55 2015 -0700
--
.../main/service/reassign/step4_controller.js | 38 +++
.../service/reassign/step4_controller_test.js | 67 ++--
2 files changed, 101 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/978fd351/ambari-web/app/controllers/main/service/reassign/step4_controller.js
--
diff --git
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index edc9b8f..4a58804 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -677,13 +677,51 @@ App.ReassignMasterWizardStep4Controller =
App.HighAvailabilityProgressPageContro
if (App.get('isRMHaEnabled')) {
if (configs['yarn-site']['yarn.resourcemanager.hostname.rm1'] ===
sourceHostName) {
configs['yarn-site']['yarn.resourcemanager.hostname.rm1'] =
targetHostName;
+
+var webAddressPort = this.getWebAddressPort(configs,
'yarn.resourcemanager.webapp.address.rm1');
+if(webAddressPort != null)
+ configs['yarn-site']['yarn.resourcemanager.webapp.address.rm1'] =
targetHostName +:+ webAddressPort;
+
+var httpsWebAddressPort = this.getWebAddressPort(configs,
'yarn.resourcemanager.webapp.https.address.rm1');
+if(httpsWebAddressPort != null)
+
configs['yarn-site']['yarn.resourcemanager.webapp.https.address.rm1'] =
targetHostName +:+ httpsWebAddressPort;
} else {
configs['yarn-site']['yarn.resourcemanager.hostname.rm2'] =
targetHostName;
+
+var webAddressPort = this.getWebAddressPort(configs,
'yarn.resourcemanager.webapp.address.rm2');
+if(webAddressPort != null)
+ configs['yarn-site']['yarn.resourcemanager.webapp.address.rm2'] =
targetHostName +:+ webAddressPort;
+
+var httpsWebAddressPort = this.getWebAddressPort(configs,
'yarn.resourcemanager.webapp.https.address.rm2');
+if(httpsWebAddressPort != null)
+
configs['yarn-site']['yarn.resourcemanager.webapp.https.address.rm2'] =
targetHostName +:+ httpsWebAddressPort;
}
}
},
/**
+ * Get the web address port when RM HA is enabled.
+ * @param configs
+ * @param webAddressKey (http vs https)
+ * */
+ getWebAddressPort: function (configs, webAddressKey){
+var result = null;
+var rmWebAddressValue = configs['yarn-site'][webAddressKey];
+if(rmWebAddressValue){
+ var tokens = rmWebAddressValue.split(:);
+ if(tokens.length 1){
+result = tokens[1];
+result = result.replace(/^\s+|\s+$/g, '');
+ }
+}
+
+if(result) //only return non-empty result
+ return result;
+else
+ return null;
+ },
+
+ /**
* set specific configs which applies only to Hive related configs
* @param configs
* @param targetHostName
http://git-wip-us.apache.org/repos/asf/ambari/blob/978fd351/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
--
diff --git
a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
index 0713abf..849af6e 100644
--- a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
@@ -582,6 +582,7 @@ describe('App.ReassignMasterWizardStep4Controller',
function () {
sinon.stub(controller, 'setSecureConfigs', Em.K);
sinon.stub(controller, 'setSpecificNamenodeConfigs', Em.K);
sinon.stub(controller, 'setSpecificResourceMangerConfigs', Em.K);
+ sinon.stub(controller, 'getWebAddressPort', Em.K);
sinon.stub(controller, 'getComponentDir', Em.K);
sinon.stub(controller, 'saveClusterStatus', Em.K);
sinon.stub(controller,
ambari git commit: AMBARI-12107. Moving RM on a RM HA enabled cluster does not update the yarn.resourcemanager.webapp.address and yarn.resourcemanager.webapp.https.address. (Di Li via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 62fa3550d - bf9a82b39
AMBARI-12107. Moving RM on a RM HA enabled cluster does not update the
yarn.resourcemanager.webapp.address and
yarn.resourcemanager.webapp.https.address. (Di Li via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bf9a82b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf9a82b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf9a82b3
Branch: refs/heads/branch-2.1
Commit: bf9a82b3981333f84788f62e519b506e9b7d2e1a
Parents: 62fa355
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Tue Jul 7 16:56:36 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Tue Jul 7 16:56:36 2015 -0700
--
.../main/service/reassign/step4_controller.js | 38 +++
.../service/reassign/step4_controller_test.js | 67 ++--
2 files changed, 101 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf9a82b3/ambari-web/app/controllers/main/service/reassign/step4_controller.js
--
diff --git
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index edc9b8f..4a58804 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -677,13 +677,51 @@ App.ReassignMasterWizardStep4Controller =
App.HighAvailabilityProgressPageContro
if (App.get('isRMHaEnabled')) {
if (configs['yarn-site']['yarn.resourcemanager.hostname.rm1'] ===
sourceHostName) {
configs['yarn-site']['yarn.resourcemanager.hostname.rm1'] =
targetHostName;
+
+var webAddressPort = this.getWebAddressPort(configs,
'yarn.resourcemanager.webapp.address.rm1');
+if(webAddressPort != null)
+ configs['yarn-site']['yarn.resourcemanager.webapp.address.rm1'] =
targetHostName +:+ webAddressPort;
+
+var httpsWebAddressPort = this.getWebAddressPort(configs,
'yarn.resourcemanager.webapp.https.address.rm1');
+if(httpsWebAddressPort != null)
+
configs['yarn-site']['yarn.resourcemanager.webapp.https.address.rm1'] =
targetHostName +:+ httpsWebAddressPort;
} else {
configs['yarn-site']['yarn.resourcemanager.hostname.rm2'] =
targetHostName;
+
+var webAddressPort = this.getWebAddressPort(configs,
'yarn.resourcemanager.webapp.address.rm2');
+if(webAddressPort != null)
+ configs['yarn-site']['yarn.resourcemanager.webapp.address.rm2'] =
targetHostName +:+ webAddressPort;
+
+var httpsWebAddressPort = this.getWebAddressPort(configs,
'yarn.resourcemanager.webapp.https.address.rm2');
+if(httpsWebAddressPort != null)
+
configs['yarn-site']['yarn.resourcemanager.webapp.https.address.rm2'] =
targetHostName +:+ httpsWebAddressPort;
}
}
},
/**
+ * Get the web address port when RM HA is enabled.
+ * @param configs
+ * @param webAddressKey (http vs https)
+ * */
+ getWebAddressPort: function (configs, webAddressKey){
+var result = null;
+var rmWebAddressValue = configs['yarn-site'][webAddressKey];
+if(rmWebAddressValue){
+ var tokens = rmWebAddressValue.split(:);
+ if(tokens.length 1){
+result = tokens[1];
+result = result.replace(/^\s+|\s+$/g, '');
+ }
+}
+
+if(result) //only return non-empty result
+ return result;
+else
+ return null;
+ },
+
+ /**
* set specific configs which applies only to Hive related configs
* @param configs
* @param targetHostName
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf9a82b3/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
--
diff --git
a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
index 0713abf..849af6e 100644
--- a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
@@ -582,6 +582,7 @@ describe('App.ReassignMasterWizardStep4Controller',
function () {
sinon.stub(controller, 'setSecureConfigs', Em.K);
sinon.stub(controller, 'setSpecificNamenodeConfigs', Em.K);
sinon.stub(controller, 'setSpecificResourceMangerConfigs', Em.K);
+ sinon.stub(controller, 'getWebAddressPort', Em.K);
sinon.stub(controller, 'getComponentDir', Em.K);
sinon.stub(controller, 'saveClusterStatus', Em.K);
[1/2] ambari git commit: AMBARI-12306. Some alerts report cluster name to be null (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 ef71690b5 - 6f097c93a
refs/heads/trunk 913121389 - 31159474a
AMBARI-12306. Some alerts report cluster name to be null (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/31159474
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31159474
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31159474
Branch: refs/heads/trunk
Commit: 31159474a2f4dcc85e1808f8a5e20c138bd34c76
Parents: 9131213
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Tue Jul 7 15:49:37 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Tue Jul 7 15:49:37 2015 +0300
--
.../listeners/alerts/AlertAggregateListener.java | 14 ++
1 file changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/31159474/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
index ac2f907..0bcfa2f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import com.google.inject.Provider;
+import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.EagerSingleton;
import org.apache.ambari.server.events.AggregateAlertRecalculateEvent;
import org.apache.ambari.server.events.AlertReceivedEvent;
@@ -32,6 +34,7 @@ import org.apache.ambari.server.orm.dao.AlertSummaryDTO;
import org.apache.ambari.server.orm.dao.AlertsDAO;
import org.apache.ambari.server.state.Alert;
import org.apache.ambari.server.state.AlertState;
+import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.alert.AggregateDefinitionMapping;
import org.apache.ambari.server.state.alert.AggregateSource;
import org.apache.ambari.server.state.alert.AlertDefinition;
@@ -68,6 +71,12 @@ public class AlertAggregateListener {
private AlertsDAO m_alertsDao = null;
/**
+ * Used for looking cluster name by cluster id
+ */
+ @Inject
+ ProviderClusters m_clusters;
+
+ /**
* The event publisher used to receive incoming events and publish new events
* when an aggregate alert is run.
*/
@@ -168,6 +177,11 @@ public class AlertAggregateListener {
aggregateAlert.setLabel(aggregateDefinition.getLabel());
aggregateAlert.setTimestamp(System.currentTimeMillis());
+try {
+
aggregateAlert.setCluster(m_clusters.get().getClusterById(clusterId).getClusterName());
+} catch (AmbariException exception) {
+ LOG.error(Unable to lookup cluster with ID {}, clusterId, exception);
+}
if (0 == totalCount) {
aggregateAlert.setText(There are no instances of the aggregated
alert.);
[2/2] ambari git commit: AMBARI-12306. Some alerts report cluster name to be null (aonishuk)
AMBARI-12306. Some alerts report cluster name to be null (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f097c93
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f097c93
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f097c93
Branch: refs/heads/branch-2.1
Commit: 6f097c93a38d6573c4713ed420c1a8d6e85c878f
Parents: ef71690
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Tue Jul 7 15:49:39 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Tue Jul 7 15:49:39 2015 +0300
--
.../listeners/alerts/AlertAggregateListener.java | 14 ++
1 file changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f097c93/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
index ac2f907..0bcfa2f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import com.google.inject.Provider;
+import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.EagerSingleton;
import org.apache.ambari.server.events.AggregateAlertRecalculateEvent;
import org.apache.ambari.server.events.AlertReceivedEvent;
@@ -32,6 +34,7 @@ import org.apache.ambari.server.orm.dao.AlertSummaryDTO;
import org.apache.ambari.server.orm.dao.AlertsDAO;
import org.apache.ambari.server.state.Alert;
import org.apache.ambari.server.state.AlertState;
+import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.alert.AggregateDefinitionMapping;
import org.apache.ambari.server.state.alert.AggregateSource;
import org.apache.ambari.server.state.alert.AlertDefinition;
@@ -68,6 +71,12 @@ public class AlertAggregateListener {
private AlertsDAO m_alertsDao = null;
/**
+ * Used for looking cluster name by cluster id
+ */
+ @Inject
+ ProviderClusters m_clusters;
+
+ /**
* The event publisher used to receive incoming events and publish new events
* when an aggregate alert is run.
*/
@@ -168,6 +177,11 @@ public class AlertAggregateListener {
aggregateAlert.setLabel(aggregateDefinition.getLabel());
aggregateAlert.setTimestamp(System.currentTimeMillis());
+try {
+
aggregateAlert.setCluster(m_clusters.get().getClusterById(clusterId).getClusterName());
+} catch (AmbariException exception) {
+ LOG.error(Unable to lookup cluster with ID {}, clusterId, exception);
+}
if (0 == totalCount) {
aggregateAlert.setText(There are no instances of the aggregated
alert.);
ambari git commit: AMBARI-12309. Kerberos: After partitially enabling manual kerb, start all fails (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 ff96ed451 - 261fd7f76
AMBARI-12309. Kerberos: After partitially enabling manual kerb, start all fails
(akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/261fd7f7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/261fd7f7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/261fd7f7
Branch: refs/heads/branch-2.1
Commit: 261fd7f7628d9a36135188a1d3a5fc3677d94f10
Parents: ff96ed4
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Tue Jul 7 13:47:09 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Tue Jul 7 13:47:09 2015 +0300
--
.../main/admin/kerberos/step2_controller.js | 70
.../main/admin/kerberos/wizard_controller.js| 54 +++
ambari-web/app/routes/add_kerberos_routes.js| 15 +++--
3 files changed, 78 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/261fd7f7/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
index 77ab68f..c843d9a 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -17,7 +17,6 @@
*/
var App = require('app');
-var componentsUtils = require('utils/components');
require('controllers/wizard/step7_controller');
App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend({
@@ -133,7 +132,7 @@ App.KerberosWizardStep2Controller =
App.WizardStep7Controller.extend({
var self = this;
this.deleteKerberosService().always(function (data) {
self.removeLocalKerberosComponentData();
- self.createKerberosResources();
+ self.configureKerberos();
});
},
@@ -141,19 +140,21 @@ App.KerberosWizardStep2Controller =
App.WizardStep7Controller.extend({
App.serviceComponents.removeObject('KERBEROS_CLIENT');
},
- createKerberosResources: function () {
+ configureKerberos: function () {
var self = this;
-this.createKerberosService().done(function () {
- componentsUtils.createServiceComponent('KERBEROS_CLIENT').done(function
() {
-self.createKerberosHostComponents().done(function () {
- self.createConfigurations().done(function () {
-self.createKerberosAdminSession().done(function () {
- App.router.send('next');
-});
- });
+var wizardController = App.router.get(this.get('content.controllerName'));
+var callback = function () {
+ self.createConfigurations().done(function () {
+self.createKerberosAdminSession().done(function () {
+ App.router.send('next');
});
});
-});
+};
+if (wizardController.get('skipClientInstall')) {
+ callback();
+} else {
+ wizardController.createKerberosResources(callback);
+}
},
/**
@@ -170,51 +171,6 @@ App.KerberosWizardStep2Controller =
App.WizardStep7Controller.extend({
});
},
- createKerberosService: function () {
-return App.ajax.send({
- name: 'wizard.step8.create_selected_services',
- sender: this,
- data: {
-data: '{ServiceInfo: { service_name: KERBEROS}}',
-cluster: App.get('clusterName') || App.clusterStatus.get('clusterName')
- }
-});
- },
-
- createKerberosHostComponents: function () {
-var hostNames = this.get('hostNames');
-var queryStr = '';
-hostNames.forEach(function (hostName) {
- queryStr += 'Hosts/host_name=' + hostName + '|';
-});
-//slice off last symbol '|'
-queryStr = queryStr.slice(0, -1);
-
-var data = {
- RequestInfo: {
-query: queryStr
- },
- Body: {
-host_components: [
- {
-HostRoles: {
- component_name: this.componentName
-}
- }
-]
- }
-};
-
-return App.ajax.send({
- name: 'wizard.step8.register_host_to_component',
- sender: this,
- data: {
-cluster: App.router.getClusterName(),
-data: JSON.stringify(data)
- }
-});
- },
-
createConfigurations: function () {
var service = App.StackService.find().findProperty('serviceName',
'KERBEROS');
var serviceConfigTags = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/261fd7f7/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
[1/2] ambari git commit: AMBARI-12310. Yarn Service check from Ambari fails on WireEncrypted Cluster (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 261fd7f76 - ef71690b5
refs/heads/trunk 6ca17505b - 913121389
AMBARI-12310. Yarn Service check from Ambari fails on WireEncrypted Cluster
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/91312138
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/91312138
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/91312138
Branch: refs/heads/trunk
Commit: 9131213895c9bf9cb05023f4ffba74e21a41549e
Parents: 6ca1750
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Tue Jul 7 14:10:58 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Tue Jul 7 14:10:58 2015 +0300
--
.../YARN/2.1.0.2.0/package/scripts/params_linux.py | 11 ++-
.../YARN/2.1.0.2.0/package/scripts/service_check.py | 4 ++--
.../test/python/stacks/2.0.6/configs/client-upgrade.json | 3 ++-
.../src/test/python/stacks/2.0.6/configs/default.json| 3 ++-
.../src/test/python/stacks/2.0.6/configs/secured.json| 3 ++-
5 files changed, 14 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/91312138/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index 790c51b..0b1bec5 100644
---
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -281,6 +281,11 @@ else:
ranger_admin_log_dir =
default(/configurations/ranger-env/ranger_admin_log_dir,/var/log/ranger/admin)
+yarn_http_policy = config['configurations']['yarn-site']['yarn.http.policy']
+yarn_https_on = (yarn_http_policy.upper() == 'HTTPS_ONLY')
+scheme = 'http' if not yarn_https_on else 'https'
+yarn_rm_address =
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'] if
not yarn_https_on else
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.https.address']
+
#ranger yarn properties
if has_ranger_admin:
is_supported_yarn_ranger =
config['configurations']['yarn-env']['is_supported_yarn_ranger']
@@ -299,11 +304,7 @@ if has_ranger_admin:
ranger_env = config['configurations']['ranger-env']
ranger_plugin_properties =
config['configurations']['ranger-yarn-plugin-properties']
policy_user =
config['configurations']['ranger-yarn-plugin-properties']['policy_user']
-yarn_rest_url =
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address']
-yarn_http_policy =
config['configurations']['yarn-site']['yarn.http.policy']
-scheme = 'http'
-if yarn_http_policy.upper() == 'HTTPS_ONLY':
- scheme = 'https'
+yarn_rest_url =
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address']
ranger_plugin_config = {
'username' :
config['configurations']['ranger-yarn-plugin-properties']['REPOSITORY_CONFIG_USERNAME'],
http://git-wip-us.apache.org/repos/asf/ambari/blob/91312138/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
index f4b0969..a58db1d 100644
---
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/service_check.py
@@ -114,9 +114,9 @@ class ServiceCheckDefault(ServiceCheck):
json_response_received = False
for rm_host in params.rm_hosts:
- info_app_url = http://; + rm_host + : + params.rm_port +
/ws/v1/cluster/apps/ + application_name
+ info_app_url = params.scheme + :// + params.yarn_rm_address +
/ws/v1/cluster/apps/ + application_name
- get_app_info_cmd = curl --negotiate -u : -sL --connect-timeout +
CURL_CONNECTION_TIMEOUT + + info_app_url
+ get_app_info_cmd = curl --negotiate -u : -ksL --connect-timeout +
CURL_CONNECTION_TIMEOUT + + info_app_url
return_code, stdout = shell.checked_call(get_app_info_cmd,
path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
ambari git commit: AMBARI-12309. Kerberos: After partitially enabling manual kerb, start all fails (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c46d25398 - 6ca17505b
AMBARI-12309. Kerberos: After partitially enabling manual kerb, start all fails
(akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ca17505
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ca17505
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ca17505
Branch: refs/heads/trunk
Commit: 6ca17505bb78db830ef21e169e54551110561ad0
Parents: c46d253
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Tue Jul 7 14:06:33 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Tue Jul 7 14:06:33 2015 +0300
--
.../main/admin/kerberos/step2_controller.js | 70
.../main/admin/kerberos/wizard_controller.js| 54 +++
ambari-web/app/routes/add_kerberos_routes.js| 15 +++--
3 files changed, 78 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ca17505/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
index 77ab68f..c843d9a 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -17,7 +17,6 @@
*/
var App = require('app');
-var componentsUtils = require('utils/components');
require('controllers/wizard/step7_controller');
App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend({
@@ -133,7 +132,7 @@ App.KerberosWizardStep2Controller =
App.WizardStep7Controller.extend({
var self = this;
this.deleteKerberosService().always(function (data) {
self.removeLocalKerberosComponentData();
- self.createKerberosResources();
+ self.configureKerberos();
});
},
@@ -141,19 +140,21 @@ App.KerberosWizardStep2Controller =
App.WizardStep7Controller.extend({
App.serviceComponents.removeObject('KERBEROS_CLIENT');
},
- createKerberosResources: function () {
+ configureKerberos: function () {
var self = this;
-this.createKerberosService().done(function () {
- componentsUtils.createServiceComponent('KERBEROS_CLIENT').done(function
() {
-self.createKerberosHostComponents().done(function () {
- self.createConfigurations().done(function () {
-self.createKerberosAdminSession().done(function () {
- App.router.send('next');
-});
- });
+var wizardController = App.router.get(this.get('content.controllerName'));
+var callback = function () {
+ self.createConfigurations().done(function () {
+self.createKerberosAdminSession().done(function () {
+ App.router.send('next');
});
});
-});
+};
+if (wizardController.get('skipClientInstall')) {
+ callback();
+} else {
+ wizardController.createKerberosResources(callback);
+}
},
/**
@@ -170,51 +171,6 @@ App.KerberosWizardStep2Controller =
App.WizardStep7Controller.extend({
});
},
- createKerberosService: function () {
-return App.ajax.send({
- name: 'wizard.step8.create_selected_services',
- sender: this,
- data: {
-data: '{ServiceInfo: { service_name: KERBEROS}}',
-cluster: App.get('clusterName') || App.clusterStatus.get('clusterName')
- }
-});
- },
-
- createKerberosHostComponents: function () {
-var hostNames = this.get('hostNames');
-var queryStr = '';
-hostNames.forEach(function (hostName) {
- queryStr += 'Hosts/host_name=' + hostName + '|';
-});
-//slice off last symbol '|'
-queryStr = queryStr.slice(0, -1);
-
-var data = {
- RequestInfo: {
-query: queryStr
- },
- Body: {
-host_components: [
- {
-HostRoles: {
- component_name: this.componentName
-}
- }
-]
- }
-};
-
-return App.ajax.send({
- name: 'wizard.step8.register_host_to_component',
- sender: this,
- data: {
-cluster: App.router.getClusterName(),
-data: JSON.stringify(data)
- }
-});
- },
-
createConfigurations: function () {
var service = App.StackService.find().findProperty('serviceName',
'KERBEROS');
var serviceConfigTags = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ca17505/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
ambari git commit: Revert AMBARI-11192 - The Default hdfs-site.xml Should Have Client Retry Logic Enabled For Rolling Upgrade (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 12dbf92b8 - dc3b8d120
Revert AMBARI-11192 - The Default hdfs-site.xml Should Have Client Retry Logic
Enabled For Rolling Upgrade (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dc3b8d12
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dc3b8d12
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dc3b8d12
Branch: refs/heads/trunk
Commit: dc3b8d1206e4a198674481e75694a9286c2e98ec
Parents: 12dbf92
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Tue Jul 7 17:43:03 2015 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Tue Jul 7 17:43:05 2015 -0700
--
.../apache/ambari/server/checks/ClientRetryPropertyCheckTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dc3b8d12/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
index 23926f8..20242ec 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
@@ -111,7 +111,7 @@ public class ClientRetryPropertyCheckTest {
PrerequisiteCheck check = new PrerequisiteCheck(null, null);
m_check.perform(check, new PrereqCheckRequest(cluster));
-Assert.assertEquals(PrereqCheckStatus.FAIL, check.getStatus());
+Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
// add hive
services.put(HIVE, Mockito.mock(Service.class));
ambari git commit: AMBARI-12299: Modified default value for ranger-policymgr-ssl.xml for hive and kms plugins (Velmurugan Periasamy via alejandro)
Repository: ambari Updated Branches: refs/heads/trunk 0b20c1d36 - 508c9d187 AMBARI-12299: Modified default value for ranger-policymgr-ssl.xml for hive and kms plugins (Velmurugan Periasamy via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/508c9d18 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/508c9d18 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/508c9d18 Branch: refs/heads/trunk Commit: 508c9d18728fc39408545f1b7a1cd446b8c573e4 Parents: 0b20c1d Author: Alejandro Fernandez afernan...@hortonworks.com Authored: Tue Jul 7 19:28:25 2015 -0700 Committer: Alejandro Fernandez afernan...@hortonworks.com Committed: Tue Jul 7 19:28:25 2015 -0700 -- .../RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml | 2 +- .../HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/508c9d18/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml -- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml index b063ec8..cdb0c11 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml @@ -40,7 +40,7 @@ property nameranger.plugin.kms.policy.rest.ssl.config.file/name -value/etc/kms/conf/ranger-policymgr-ssl.xml/value +value/etc/ranger/kms/conf/ranger-policymgr-ssl.xml/value descriptionPath to the file containing SSL details to contact Ranger Admin/description /property http://git-wip-us.apache.org/repos/asf/ambari/blob/508c9d18/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml index b7425dd..5407ccf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml @@ -40,7 +40,7 @@ property nameranger.plugin.hive.policy.rest.ssl.config.file/name -value/usr/hdp/current/hive-server2/conf/ranger-policymgr-ssl.xml/value + value/usr/hdp/current/hive-server2/conf/conf.server/ranger-policymgr-ssl.xml/value descriptionPath to the file containing SSL details to contact Ranger Admin/description /property @@ -62,4 +62,4 @@ descriptionShould Hive plugin update Ranger policies for updates to permissions done using GRANT/REVOKE?/description /property -/configuration \ No newline at end of file +/configuration
ambari git commit: Revert AMBARI-11192 - The Default hdfs-site.xml Should Have Client Retry Logic Enabled For Rolling Upgrade (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 8379fb8f4 - f9aa19fa8
Revert AMBARI-11192 - The Default hdfs-site.xml Should Have Client Retry Logic
Enabled For Rolling Upgrade (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f9aa19fa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f9aa19fa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f9aa19fa
Branch: refs/heads/branch-2.1
Commit: f9aa19fa8cba98bb9a75467e52ac9b59c13ca506
Parents: 8379fb8
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Tue Jul 7 17:51:14 2015 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Tue Jul 7 17:51:17 2015 -0700
--
.../apache/ambari/server/checks/ClientRetryPropertyCheckTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f9aa19fa/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
index 23926f8..20242ec 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
@@ -111,7 +111,7 @@ public class ClientRetryPropertyCheckTest {
PrerequisiteCheck check = new PrerequisiteCheck(null, null);
m_check.perform(check, new PrereqCheckRequest(cluster));
-Assert.assertEquals(PrereqCheckStatus.FAIL, check.getStatus());
+Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
// add hive
services.put(HIVE, Mockito.mock(Service.class));
ambari git commit: AMBARI-11919. After wire encryption, KMS client config (hdfs-site.xml and core-site.xml) should be updated to include https in URI - kms_port fix
Repository: ambari Updated Branches: refs/heads/trunk dc3b8d120 - 0b20c1d36 AMBARI-11919. After wire encryption, KMS client config (hdfs-site.xml and core-site.xml) should be updated to include https in URI - kms_port fix Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b20c1d3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b20c1d3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b20c1d3 Branch: refs/heads/trunk Commit: 0b20c1d3665e339c826f4821ba760c768a46e6e4 Parents: dc3b8d1 Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Tue Jul 7 14:56:31 2015 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Tue Jul 7 18:00:08 2015 -0700 -- .../services/HDFS/configuration/core-site.xml | 4 .../services/HDFS/configuration/hdfs-site.xml | 4 .../stacks/HDP/2.2/services/stack_advisor.py| 20 ++-- .../stacks/2.2/common/test_stack_advisor.py | 4 ++-- .../app/mixins/common/configs/configs_saver.js | 2 +- 5 files changed, 21 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/0b20c1d3/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml index 80a1944..1e68146 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml @@ -41,6 +41,10 @@ namekeyserver_port/name /property property +typekms-env/type +namekms_port/name + /property + property typeranger-kms-site/type nameranger.service.https.attrib.ssl.enabled/name /property http://git-wip-us.apache.org/repos/asf/ambari/blob/0b20c1d3/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml index 0c06301..ee5566b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml @@ -53,6 +53,10 @@ namekeyserver_port/name /property property +typekms-env/type +namekms_port/name + /property + property typeranger-kms-site/type nameranger.service.https.attrib.ssl.enabled/name /property http://git-wip-us.apache.org/repos/asf/ambari/blob/0b20c1d3/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 864b5cc..23e5f35 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 @@ -208,16 +208,16 @@ class HDP22StackAdvisor(HDP21StackAdvisor): if hadoop-env in services[configurations] and keyserver_host in services[configurations][hadoop-env][properties] and keyserver_port in services[configurations][hadoop-env][properties]: keyserverHostsString = services[configurations][hadoop-env][properties][keyserver_host] keyserverPortString = services[configurations][hadoop-env][properties][keyserver_port] -if keyserverHostsString is None or len(keyserverHostsString.strip()) 1 : - # Caller did not specify any value - so we recommend where they are installed - rangerKMSServerHosts = self.getHostsWithComponent(RANGER_KMS, RANGER_KMS_SERVER, services, hosts) - if rangerKMSServerHosts is not None and len(rangerKMSServerHosts) 0: -rangerKMSServerHostsArray = [] -for rangeKMSServerHost in rangerKMSServerHosts: - rangerKMSServerHostsArray.append(rangeKMSServerHost[Hosts][host_name]) -keyserverHostsString = ,.join(rangerKMSServerHostsArray) -if kms-env in services[configurations] and kms_port in services[configurations][kms-env][properties]: - keyserverPortString = services[configurations][kms-env][properties][kms_port] + +# Irrespective of what hadoop-env has, if Ranger-KMS is
ambari git commit: AMBARI-11919. After wire encryption, KMS client config (hdfs-site.xml and core-site.xml) should be updated to include https in URI - kms_port fix
Repository: ambari Updated Branches: refs/heads/branch-2.1 f9aa19fa8 - a89a35924 AMBARI-11919. After wire encryption, KMS client config (hdfs-site.xml and core-site.xml) should be updated to include https in URI - kms_port fix Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a89a3592 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a89a3592 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a89a3592 Branch: refs/heads/branch-2.1 Commit: a89a35924e2809c6c74cf1b1f4abd4ce219e118b Parents: f9aa19f Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Tue Jul 7 14:56:31 2015 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Tue Jul 7 17:59:25 2015 -0700 -- .../services/HDFS/configuration/core-site.xml | 4 .../services/HDFS/configuration/hdfs-site.xml | 4 .../stacks/HDP/2.2/services/stack_advisor.py| 20 ++-- .../stacks/2.2/common/test_stack_advisor.py | 4 ++-- .../app/mixins/common/configs/configs_saver.js | 2 +- 5 files changed, 21 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a89a3592/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml index 80a1944..1e68146 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml @@ -41,6 +41,10 @@ namekeyserver_port/name /property property +typekms-env/type +namekms_port/name + /property + property typeranger-kms-site/type nameranger.service.https.attrib.ssl.enabled/name /property http://git-wip-us.apache.org/repos/asf/ambari/blob/a89a3592/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml index 0c06301..ee5566b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml @@ -53,6 +53,10 @@ namekeyserver_port/name /property property +typekms-env/type +namekms_port/name + /property + property typeranger-kms-site/type nameranger.service.https.attrib.ssl.enabled/name /property http://git-wip-us.apache.org/repos/asf/ambari/blob/a89a3592/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 864b5cc..23e5f35 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 @@ -208,16 +208,16 @@ class HDP22StackAdvisor(HDP21StackAdvisor): if hadoop-env in services[configurations] and keyserver_host in services[configurations][hadoop-env][properties] and keyserver_port in services[configurations][hadoop-env][properties]: keyserverHostsString = services[configurations][hadoop-env][properties][keyserver_host] keyserverPortString = services[configurations][hadoop-env][properties][keyserver_port] -if keyserverHostsString is None or len(keyserverHostsString.strip()) 1 : - # Caller did not specify any value - so we recommend where they are installed - rangerKMSServerHosts = self.getHostsWithComponent(RANGER_KMS, RANGER_KMS_SERVER, services, hosts) - if rangerKMSServerHosts is not None and len(rangerKMSServerHosts) 0: -rangerKMSServerHostsArray = [] -for rangeKMSServerHost in rangerKMSServerHosts: - rangerKMSServerHostsArray.append(rangeKMSServerHost[Hosts][host_name]) -keyserverHostsString = ,.join(rangerKMSServerHostsArray) -if kms-env in services[configurations] and kms_port in services[configurations][kms-env][properties]: - keyserverPortString = services[configurations][kms-env][properties][kms_port] + +# Irrespective of what hadoop-env has, if Ranger-KMS is
ambari git commit: AMBARI-12311. Add Host Wizard appears on every login and cannot get it to go away (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 6f097c93a - e85d345e0
AMBARI-12311. Add Host Wizard appears on every login and cannot get it to go
away (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e85d345e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e85d345e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e85d345e
Branch: refs/heads/branch-2.1
Commit: e85d345e0cdcdfe4dae13f8ae8d340930bbdcdb2
Parents: 6f097c9
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Tue Jul 7 16:04:56 2015 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Tue Jul 7 16:04:56 2015 +0300
--
ambari-web/app/controllers/main/host/add_controller.js | 1 -
ambari-web/app/routes/add_host_routes.js | 8 +++-
ambari-web/app/templates/application.hbs | 6 --
ambari-web/test/controllers/main/host/add_controller_test.js | 3 ---
4 files changed, 11 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e85d345e/ambari-web/app/controllers/main/host/add_controller.js
--
diff --git a/ambari-web/app/controllers/main/host/add_controller.js
b/ambari-web/app/controllers/main/host/add_controller.js
index 3f2c0f9..c474c72 100644
--- a/ambari-web/app/controllers/main/host/add_controller.js
+++ b/ambari-web/app/controllers/main/host/add_controller.js
@@ -377,7 +377,6 @@ App.AddHostController = App.WizardController.extend({
* Clear all temporary data
*/
finish: function () {
-this.setCurrentStep('1');
this.clearAllSteps();
this.clearStorageData();
App.router.get('updateController').updateAll();
http://git-wip-us.apache.org/repos/asf/ambari/blob/e85d345e/ambari-web/app/routes/add_host_routes.js
--
diff --git a/ambari-web/app/routes/add_host_routes.js
b/ambari-web/app/routes/add_host_routes.js
index b497cdf..7bfe04c 100644
--- a/ambari-web/app/routes/add_host_routes.js
+++ b/ambari-web/app/routes/add_host_routes.js
@@ -29,7 +29,13 @@ module.exports = App.WizardRoute.extend({
clusterName: App.router.get('content.cluster.name'),
clusterState: 'DEFAULT',
localdb: App.db.data
-}, {alwaysCallback: function()
{context.hide();App.router.transitionTo('hosts.index');location.reload();}});
+}, {
+ alwaysCallback: function() {
+context.hide();
+App.router.transitionTo('hosts.index');
+location.reload();
+ }
+});
},
enter: function (router) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/e85d345e/ambari-web/app/templates/application.hbs
--
diff --git a/ambari-web/app/templates/application.hbs
b/ambari-web/app/templates/application.hbs
index e6de54e..f9f70f4 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -81,8 +81,10 @@
lia href= {{action showSettingsPopup
target=controller}}{{t app.settings}}/a/li
{{/isAccessible}}
{{/if}}
-li class=break/li
-lia href= id=sign-out {{action logoff}}{{t
app.signout}}/a/li
+{{#if isClusterDataLoaded}}
+ li class=break/li
+ lia href= id=sign-out {{action logoff}}{{t
app.signout}}/a/li
+{{/if}}
/ul
/div
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e85d345e/ambari-web/test/controllers/main/host/add_controller_test.js
--
diff --git a/ambari-web/test/controllers/main/host/add_controller_test.js
b/ambari-web/test/controllers/main/host/add_controller_test.js
index 826a415..2fe4341 100644
--- a/ambari-web/test/controllers/main/host/add_controller_test.js
+++ b/ambari-web/test/controllers/main/host/add_controller_test.js
@@ -1282,7 +1282,6 @@ describe('App.AddHostController', function () {
getAllHostNames: Em.K
};
beforeEach(function () {
- sinon.stub(controller, 'setCurrentStep', Em.K);
sinon.stub(controller, 'clearAllSteps', Em.K);
sinon.stub(controller, 'clearStorageData', Em.K);
sinon.stub(App.updater, 'immediateRun', Em.K);
@@ -1291,7 +1290,6 @@ describe('App.AddHostController', function () {
sinon.spy(mock, 'getAllHostNames');
});
afterEach(function () {
- controller.setCurrentStep.restore();
controller.clearAllSteps.restore();
controller.clearStorageData.restore();
App.updater.immediateRun.restore();
@@ -1301,7 +1299,6 @@
[1/2] ambari git commit: Revert Vivek's changes
Repository: ambari
Updated Branches:
refs/heads/trunk 7d059e7dc - b800592c4
http://git-wip-us.apache.org/repos/asf/ambari/blob/b800592c/contrib/views/hive/src/main/resources/ui/hive-web/vendor/vega-lite.js
--
diff --git
a/contrib/views/hive/src/main/resources/ui/hive-web/vendor/vega-lite.js
b/contrib/views/hive/src/main/resources/ui/hive-web/vendor/vega-lite.js
deleted file mode 100644
index f5ea13b..000
--- a/contrib/views/hive/src/main/resources/ui/hive-web/vendor/vega-lite.js
+++ /dev/null
@@ -1,6177 +0,0 @@
-!function(e){if(object==typeof exportsundefined!=typeof
module)module.exports=e();else if(function==typeof
definedefine.amd)define([],e);else{var f;undefined!=typeof
window?f=window:undefined!=typeof global?f=global:undefined!=typeof
self(f=self),f.vl=e()}}(function(){var define,module,exports;return (function
e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof
require==functionrequire;if(!ua)return a(o,!0);if(i)return i(o,!0);var
f=new Error(Cannot find module '+o+');throw f.code=MODULE_NOT_FOUND,f}var
l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return
s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof
require==functionrequire;for(var o=0;or.length;o++)s(r[o]);return
s})({1:[function(require,module,exports){
-'use strict';
-
-require('./globals');
-
-var util = require('./util'),
-consts = require('./consts');
-
-var vl = {};
-
-util.extend(vl, consts, util);
-
-vl.Encoding = require('./Encoding');
-vl.compiler = require('./compiler/compiler');
-vl.compile = vl.compiler.compile;
-vl.data = require('./data');
-vl.enc = require('./enc');
-vl.field = require('./field');
-vl.schema = require('./schema/schema');
-vl.toShorthand = vl.Encoding.shorthand;
-
-module.exports = vl;
-},{./Encoding:13,./compiler/compiler:17,./consts:31,./data:32,./enc:33,./field:34,./globals:35,./schema/schema:36,./util:38}],2:[function(require,module,exports){
-
-},{}],3:[function(require,module,exports){
-// This product includes color specifications and designs developed by Cynthia
Brewer (http://colorbrewer.org/).
-// JavaScript specs as packaged in the D3 library (d3js.org). Please see
license at http://colorbrewer.org/export/LICENSE.txt
-!function() {
-
-var colorbrewer = {YlGn: {
-3: [#f7fcb9,#addd8e,#31a354],
-4: [#cc,#c2e699,#78c679,#238443],
-5: [#cc,#c2e699,#78c679,#31a354,#006837],
-6: [#cc,#d9f0a3,#addd8e,#78c679,#31a354,#006837],
-7: [#cc,#d9f0a3,#addd8e,#78c679,#41ab5d,#238443,#005a32],
-8:
[#e5,#f7fcb9,#d9f0a3,#addd8e,#78c679,#41ab5d,#238443,#005a32],
-9:
[#e5,#f7fcb9,#d9f0a3,#addd8e,#78c679,#41ab5d,#238443,#006837,#004529]
-},YlGnBu: {
-3: [#edf8b1,#7fcdbb,#2c7fb8],
-4: [#cc,#a1dab4,#41b6c4,#225ea8],
-5: [#cc,#a1dab4,#41b6c4,#2c7fb8,#253494],
-6: [#cc,#c7e9b4,#7fcdbb,#41b6c4,#2c7fb8,#253494],
-7: [#cc,#c7e9b4,#7fcdbb,#41b6c4,#1d91c0,#225ea8,#0c2c84],
-8:
[#d9,#edf8b1,#c7e9b4,#7fcdbb,#41b6c4,#1d91c0,#225ea8,#0c2c84],
-9:
[#d9,#edf8b1,#c7e9b4,#7fcdbb,#41b6c4,#1d91c0,#225ea8,#253494,#081d58]
-},GnBu: {
-3: [#e0f3db,#a8ddb5,#43a2ca],
-4: [#f0f9e8,#bae4bc,#7bccc4,#2b8cbe],
-5: [#f0f9e8,#bae4bc,#7bccc4,#43a2ca,#0868ac],
-6: [#f0f9e8,#ccebc5,#a8ddb5,#7bccc4,#43a2ca,#0868ac],
-7: [#f0f9e8,#ccebc5,#a8ddb5,#7bccc4,#4eb3d3,#2b8cbe,#08589e],
-8:
[#f7fcf0,#e0f3db,#ccebc5,#a8ddb5,#7bccc4,#4eb3d3,#2b8cbe,#08589e],
-9:
[#f7fcf0,#e0f3db,#ccebc5,#a8ddb5,#7bccc4,#4eb3d3,#2b8cbe,#0868ac,#084081]
-},BuGn: {
-3: [#e5f5f9,#99d8c9,#2ca25f],
-4: [#edf8fb,#b2e2e2,#66c2a4,#238b45],
-5: [#edf8fb,#b2e2e2,#66c2a4,#2ca25f,#006d2c],
-6: [#edf8fb,#ccece6,#99d8c9,#66c2a4,#2ca25f,#006d2c],
-7: [#edf8fb,#ccece6,#99d8c9,#66c2a4,#41ae76,#238b45,#005824],
-8:
[#f7fcfd,#e5f5f9,#ccece6,#99d8c9,#66c2a4,#41ae76,#238b45,#005824],
-9:
[#f7fcfd,#e5f5f9,#ccece6,#99d8c9,#66c2a4,#41ae76,#238b45,#006d2c,#00441b]
-},PuBuGn: {
-3: [#ece2f0,#a6bddb,#1c9099],
-4: [#f6eff7,#bdc9e1,#67a9cf,#02818a],
-5: [#f6eff7,#bdc9e1,#67a9cf,#1c9099,#016c59],
-6: [#f6eff7,#d0d1e6,#a6bddb,#67a9cf,#1c9099,#016c59],
-7: [#f6eff7,#d0d1e6,#a6bddb,#67a9cf,#3690c0,#02818a,#016450],
-8:
[#fff7fb,#ece2f0,#d0d1e6,#a6bddb,#67a9cf,#3690c0,#02818a,#016450],
-9:
[#fff7fb,#ece2f0,#d0d1e6,#a6bddb,#67a9cf,#3690c0,#02818a,#016c59,#014636]
-},PuBu: {
-3: [#ece7f2,#a6bddb,#2b8cbe],
-4: [#f1eef6,#bdc9e1,#74a9cf,#0570b0],
-5: [#f1eef6,#bdc9e1,#74a9cf,#2b8cbe,#045a8d],
-6: [#f1eef6,#d0d1e6,#a6bddb,#74a9cf,#2b8cbe,#045a8d],
-7: [#f1eef6,#d0d1e6,#a6bddb,#74a9cf,#3690c0,#0570b0,#034e7b],
-8:
[#fff7fb,#ece7f2,#d0d1e6,#a6bddb,#74a9cf,#3690c0,#0570b0,#034e7b],
-9:
[#fff7fb,#ece7f2,#d0d1e6,#a6bddb,#74a9cf,#3690c0,#0570b0,#045a8d,#023858]
-},BuPu: {
-3: [#e0ecf4,#9ebcda,#8856a7],
-4: [#edf8fb,#b3cde3,#8c96c6,#88419d],
-5: [#edf8fb,#b3cde3,#8c96c6,#8856a7,#810f7c],
-6: [#edf8fb,#bfd3e6,#9ebcda,#8c96c6,#8856a7,#810f7c],
-7: [#edf8fb,#bfd3e6,#9ebcda,#8c96c6,#8c6bb1,#88419d,#6e016b],
-8:
[2/2] ambari git commit: Revert Vivek's changes
Revert Vivek's changes
This reverts commit 7d059e7dc184b3828e1f5f5dc291a9b064dfa5cd.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b800592c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b800592c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b800592c
Branch: refs/heads/trunk
Commit: b800592c4e58f34acdd84ab4da4e8fedbf50a31f
Parents: 7d059e7
Author: Vivek Ratnavel vivekratnave...@gmail.com
Authored: Tue Jul 7 14:15:29 2015 -0700
Committer: Vivek Ratnavel vivekratnave...@gmail.com
Committed: Tue Jul 7 14:15:29 2015 -0700
--
.../src/main/resources/ui/hive-web/.jshintrc|3 +-
.../src/main/resources/ui/hive-web/Brocfile.js | 12 -
.../hive-web/app/components/draggable-view.js | 34 -
.../hive-web/app/components/droppable-view.js | 53 -
.../app/components/visualization-view.js| 149 -
.../ui/hive-web/app/controllers/query-tabs.js | 10 -
.../app/controllers/visualization-ui.js | 109 -
.../ui/hive-web/app/initializers/i18n.js|4 +-
.../ui/hive-web/app/mixins/draggable.js | 26 -
.../ui/hive-web/app/mixins/droppable.js | 25 -
.../hive-web/app/mixins/jquery-drag-widget.js | 109 -
.../hive-web/app/mixins/jquery-drop-widget.js | 111 -
.../ui/hive-web/app/mixins/jquery-ui.js | 110 -
.../resources/ui/hive-web/app/styles/app.scss |1 -
.../resources/ui/hive-web/app/styles/vars.scss |4 -
.../hive-web/app/styles/visualization-view.scss | 103 -
.../app/templates/components/draggable-view.hbs | 19 -
.../app/templates/components/droppable-view.hbs | 19 -
.../templates/components/visualization-view.hbs | 39 -
.../hive-web/app/templates/visualization-ui.hbs | 56 -
.../ui/hive-web/app/views/visualization-ui.js | 37 -
.../src/main/resources/ui/hive-web/bower.json |5 +-
.../resources/ui/hive-web/vendor/vega-lite.js | 6177 --
23 files changed, 3 insertions(+), 7212 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b800592c/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
--
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
b/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
index 0195538..c1fe863 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/.jshintrc
@@ -2,8 +2,7 @@
predef: [
document,
window,
--Promise,
-d3
+-Promise
],
browser : true,
boss : true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/b800592c/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
--
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
b/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
index 223a581..318d1f8 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/Brocfile.js
@@ -51,16 +51,4 @@ app.import('vendor/codemirror/codemirror.css');
app.import('vendor/codemirror/show-hint.css');
app.import('vendor/dagre.min.js');
-app.import('bower_components/d3/d3.js');
-app.import('bower_components/vega/vega.js');
-//app.import('bower_components/vega-lite/vega-lite.js');
-app.import('vendor/vega-lite.js');
-app.import('bower_components/eventEmitter/eventEmitter.js');
-app.import('bower_components/get-size/get-size.js');
-app.import('bower_components/eventie/eventie.js');
-app.import('bower_components/unipointer/unipointer.js');
-app.import('bower_components/unidragger/unidragger.js');
-app.import('bower_components/classie/classie.js');
-app.import('bower_components/get-style-property/get-style-property.js');
-app.import('bower_components/draggabilly/draggabilly.js');
module.exports = app.toTree();
http://git-wip-us.apache.org/repos/asf/ambari/blob/b800592c/contrib/views/hive/src/main/resources/ui/hive-web/app/components/draggable-view.js
--
diff --git
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/draggable-view.js
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/draggable-view.js
deleted file mode 100644
index d98d722..000
---
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/draggable-view.js
+++ /dev/null
@@ -1,34 +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,
ambari git commit: AMBARI-12318. Phoenix rolling upgrade should use hbase specific configs
Repository: ambari Updated Branches: refs/heads/branch-2.1 b81b8f7ff - d81c31ed0 AMBARI-12318. Phoenix rolling upgrade should use hbase specific configs Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d81c31ed Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d81c31ed Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d81c31ed Branch: refs/heads/branch-2.1 Commit: d81c31ed08681dcc7983b557ed1f289324d92ec9 Parents: b81b8f7 Author: Sumit Mohanty smoha...@hortonworks.com Authored: Tue Jul 7 22:05:45 2015 -0700 Committer: Sumit Mohanty smoha...@hortonworks.com Committed: Tue Jul 7 22:31:46 2015 -0700 -- .../HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d81c31ed/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py index 5b3ed34..17c0014 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py @@ -58,7 +58,8 @@ class PhoenixQueryServer(Script): env.set_params(params) if Script.is_hdp_stack_greater_or_equal(2.3): - conf_select.select(params.stack_name, phoenix, params.version) + # phoenix uses hbase configs + conf_select.select(params.stack_name, hbase, params.version) hdp_select.select(phoenix-server, params.version)
