ambari git commit: AMBARI-10448: Add Microsoft SQL Server support for Ambari (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk b0d1c232a - 9c1c722f0
AMBARI-10448: Add Microsoft SQL Server support for Ambari (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c1c722f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c1c722f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c1c722f
Branch: refs/heads/trunk
Commit: 9c1c722f0339a8257f4d0b1192fef8be4b8faa68
Parents: b0d1c23
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Mon Apr 13 12:27:26 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Mon Apr 13 12:27:26 2015 -0700
--
.../TestRepositoryResource.py | 1 +
ambari-server/src/main/python/ambari-server.py | 4 +-
.../python/ambari_server/dbConfiguration.py | 26 +-
.../ambari_server/dbConfiguration_linux.py | 50 +++-
.../ambari_server/dbConfiguration_windows.py| 40
.../python/ambari_server/serverConfiguration.py | 11 +++--
.../src/test/python/TestAmbariServer.py | 34 +
.../2.0.6/HBASE/test_hbase_service_check.py | 1 +
8 files changed, 121 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c1c722f/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
--
diff --git
a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
index 0539d25..82a185a 100644
--- a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
@@ -276,6 +276,7 @@ class TestRepositoryResource(TestCase):
@patch.object(OSCheck, is_suse_family)
@patch.object(OSCheck, is_ubuntu_family)
@patch.object(OSCheck, is_redhat_family)
+@patch.object(System, os_family, new='redhat')
@patch(resource_management.libraries.providers.repository.File)
def test_remove_repo_redhat(self, file_mock,
is_redhat_family, is_ubuntu_family,
is_suse_family):
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c1c722f/ambari-server/src/main/python/ambari-server.py
--
diff --git a/ambari-server/src/main/python/ambari-server.py
b/ambari-server/src/main/python/ambari-server.py
index 70c4232..f1f005d 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -343,7 +343,7 @@ def init_parser_options(parser):
dest=ldap_sync_users)
parser.add_option('--groups', default=None, help=LDAP sync groups option.
Specifies the path to a CSV file of group names to be synchronized.,
dest=ldap_sync_groups)
- parser.add_option('--database', default=None, help=Database to use
embedded|oracle|mysql|postgres, dest=dbms)
+ parser.add_option('--database', default=None, help=Database to use
embedded|oracle|mysql|mssql|postgres, dest=dbms)
parser.add_option('--databasehost', default=None, help=Hostname of database
server, dest=database_host)
parser.add_option('--databaseport', default=None, help=Database port,
dest=database_port)
parser.add_option('--databasename', default=None, help=Database/Service
name or ServiceID,
@@ -357,7 +357,7 @@ def init_parser_options(parser):
parser.add_option('--jdbc-driver', default=None, help=Specifies the path to
the JDBC driver JAR file for the \
database type
specified with the --jdbc-db option. Used only with --jdbc-db option.,
dest=jdbc_driver)
- parser.add_option('--jdbc-db', default=None, help=Specifies the database
type [postgres|mysql|oracle|hsqldb] for the \
+ parser.add_option('--jdbc-db', default=None, help=Specifies the database
type [postgres|mysql|mssql|oracle|hsqldb] for the \
JDBC driver specified
with the --jdbc-driver option. Used only with --jdbc-driver option.,
dest=jdbc_db)
parser.add_option('--cluster-name', default=None, help=Cluster name,
dest=cluster_name)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c1c722f/ambari-server/src/main/python/ambari_server/dbConfiguration.py
--
diff --git a/ambari-server/src/main/python/ambari_server/dbConfiguration.py
b/ambari-server/src/main/python/ambari_server/dbConfiguration.py
index 5e26096..363e056 100644
--- a/ambari-server/src/main/python/ambari_server/dbConfiguration.py
+++
ambari git commit: AMBARI-10445. Populate cluster widgets from stack-defined widgets on cluster/service create. Unit test fix. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 5a60fa18a - e5efc57ae
AMBARI-10445. Populate cluster widgets from stack-defined widgets on
cluster/service create. Unit test fix. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5efc57a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5efc57a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5efc57a
Branch: refs/heads/trunk
Commit: e5efc57ae7828ce379079385454d58142db9b44b
Parents: 5a60fa1
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Mon Apr 13 16:57:46 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Mon Apr 13 16:57:53 2015 -0700
--
.../server/controller/AmbariManagementControllerImpl.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e5efc57a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 07ac1d3..c442349 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -388,7 +388,8 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
clusters.mapHostsToCluster(request.getHostNames(),
request.getClusterName());
}
-
+// Create cluster widgets and layouts
+initializeWidgetsAndLayouts(c, null);
}
@Override
@@ -3832,7 +3833,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
@SuppressWarnings(unchecked)
@Override
public void initializeWidgetsAndLayouts(Cluster cluster, Service service)
throws AmbariException {
-StackId stackId = cluster.getCurrentStackVersion();
+StackId stackId = cluster.getDesiredStackVersion();
Type widgetLayoutType = new TypeTokenMapString,
ListWidgetLayout(){}.getType();
try {
@@ -3868,7 +3869,7 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
}
}
if (widgetDescriptor != null) {
-LOG.debug(Loaded widgest descriptor: + widgetDescriptor);
+LOG.debug(Loaded widget descriptor: + widgetDescriptor);
for (Object artifact : widgetDescriptor.values()) {
ListWidgetLayout widgetLayouts = (ListWidgetLayout) artifact;
createWidgetsAndLayouts(cluster, widgetLayouts);
ambari git commit: AMBARI-10455. Multible active tabs showing on service config section (Richard Zang via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 922cf0773 - ad1ad9318
AMBARI-10455. Multible active tabs showing on service config section (Richard
Zang via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ad1ad931
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ad1ad931
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ad1ad931
Branch: refs/heads/trunk
Commit: ad1ad93181a569213364668c995af423ea97698d
Parents: 922cf07
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Mon Apr 13 20:55:09 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Mon Apr 13 20:55:09 2015 -0700
--
.../configs/service_config_layout_tab_view.js | 8 +---
.../app/views/common/configs/service_config_view.js | 16 ++--
2 files changed, 15 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad1ad931/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
--
diff --git
a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
index 98a0e8d..9e48ab0 100644
--- a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
+++ b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
@@ -189,13 +189,7 @@ App.ServiceConfigLayoutTabView =
Em.View.extend(App.ConfigOverridable, {
}
}
// no more active tab? pick the first non hidden tab and make it active
-var activeTab = this.get('parentView.tabs').findProperty('isActive', true);
-if (!activeTab) {
- var nonHiddenTabs = this.get('parentView.tabs').filter(function (tab) {
-return !(tab.get('isHiddenByFilter') === true);
- });
- nonHiddenTabs.get('firstObject').set('isActive', true);
-}
+this.get('parentView').pickActiveTab(this.get('parentView.tabs'));
}.observes('parentView.filter', 'parentView.columns.@each.selected'),
willInsertElement: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad1ad931/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_view.js
b/ambari-web/app/views/common/configs/service_config_view.js
index 97d74f3..1db6d59 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -109,12 +109,24 @@ App.ServiceConfigView = Em.View.extend({
}
var tabs = App.Tab.find().filterProperty('serviceName',
this.get('controller.selectedService.serviceName'));
this.processTabs(tabs);
-// make first tab active
-tabs.get('firstObject').set('isActive', true);
+this.pickActiveTab(tabs);
return tabs;
}.property('controller.selectedService.serviceName'),
/**
+ * Pick the first non hidden tab and make it active when there is no active
tab
+ */
+ pickActiveTab : function (tabs) {
+var activeTab = tabs.findProperty('isActive', true);
+if (!activeTab) {
+ var nonHiddenTabs = tabs.filter(function (tab) {
+return !(tab.get('isHiddenByFilter') === true);
+ });
+ nonHiddenTabs.get('firstObject').set('isActive', true);
+}
+ },
+
+ /**
* Data reordering before rendering.
* Reorder all sections/subsections into rows based on their rowIndex
* @param tabs
ambari git commit: AMBARI-10460. Last sub-section configs should have hovers to their left (Richard Zang via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk dc69558c8 - 922cf0773
AMBARI-10460. Last sub-section configs should have hovers to their left
(Richard Zang via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/922cf077
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/922cf077
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/922cf077
Branch: refs/heads/trunk
Commit: 922cf0773479d818cc258cd42922866c1efc1773
Parents: dc69558
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Mon Apr 13 20:45:23 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Mon Apr 13 20:45:23 2015 -0700
--
.../stacks/HDP/2.2/services/HBASE/themes/theme.json | 4 ++--
.../stacks/HDP/2.2/services/HDFS/themes/theme.json | 2 +-
.../stacks/HDP/2.2/services/YARN/themes/theme.json | 2 +-
.../main/service/configs/widget_popover_support.js | 12 +++-
.../common/configs/service_config_layout_tab.hbs| 2 +-
5 files changed, 16 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/922cf077/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
index 9c76b11..38c298e 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/themes/theme.json
@@ -44,7 +44,7 @@
name: section-hbase-client,
display-name: Client,
row-index: 0,
-column-index: 1,
+column-index: 2,
row-span: 1,
column-span: 1,
section-columns: 1,
@@ -86,7 +86,7 @@
{
name: subsection-hbase-disk-col3,
row-index: 0,
-column-index: 1,
+column-index: 2,
row-span: 1,
column-span: 1
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/922cf077/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/themes/theme.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/themes/theme.json
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/themes/theme.json
index e55d1d4..3d97149 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/themes/theme.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/themes/theme.json
@@ -43,7 +43,7 @@
name: section-datanode,
display-name: DataNode,
row-index: 0,
-column-index: 1,
+column-index: 2,
row-span: 1,
column-span: 1,
section-columns: 1,
http://git-wip-us.apache.org/repos/asf/ambari/blob/922cf077/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json
index 6074029..8132d03 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json
@@ -44,7 +44,7 @@
name: section-yarn-platform-features,
display-name: YARN Platform Features,
row-index: 0,
-column-index: 1,
+column-index: 2,
row-span: 1,
column-span: 1,
section-columns: 1,
http://git-wip-us.apache.org/repos/asf/ambari/blob/922cf077/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
--
diff --git
a/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
b/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
index 0068f47..3ae1d6c 100644
--- a/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
+++ b/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
@@ -41,7 +41,17 @@ App.WidgetPopoverSupport = Em.Mixin.create({
*
ambari git commit: AMBARI-10422 [WinTP2] Error executing HDP setup task results in file not found
Repository: ambari Updated Branches: refs/heads/trunk e59089b40 - b0d1c232a AMBARI-10422 [WinTP2] Error executing HDP setup task results in file not found Added missing parameter, which was invalidating the whole script Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0d1c232 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0d1c232 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0d1c232 Branch: refs/heads/trunk Commit: b0d1c232ae6a1e855fd9f4fcee1d4855727a9a9c Parents: e59089b Author: Florian Barca fba...@hortonworks.com Authored: Mon Apr 13 08:34:22 2015 -0700 Committer: Florian Barca fba...@hortonworks.com Committed: Mon Apr 13 08:34:22 2015 -0700 -- .../TEZ/0.4.0.2.1/package/scripts/params_windows.py| 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b0d1c232/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_windows.py -- diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_windows.py index db34c9f..767ed1c 100644 --- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_windows.py +++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_windows.py @@ -25,6 +25,8 @@ tez_user = hadoop tez_home_dir = None tez_conf_dir = conf +hdp_root = os.path.abspath(os.path.join(os.environ[HADOOP_HOME], ..)) + if os.environ.has_key(TEZ_HOME): tez_home_dir = os.environ[TEZ_HOME] tez_conf_dir = os.path.join(tez_home_dir, conf)
