ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-10482: Ambari Web UI issues on Windows (jluniya)
Date Wed, 15 Apr 2015 05:39:36 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c6d8afddb -> 64850bb77


AMBARI-10482: Ambari Web UI issues on Windows (jluniya)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/64850bb7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/64850bb7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/64850bb7

Branch: refs/heads/trunk
Commit: 64850bb77dba38437d4981541d35d8344ce5b9ef
Parents: c6d8afd
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Tue Apr 14 22:36:37 2015 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Tue Apr 14 22:36:37 2015 -0700

----------------------------------------------------------------------
 .../services/HIVE/configuration/hive-env.xml    |   2 +-
 .../services/HIVE/configuration/hive-site.xml   |   2 +-
 .../services/OOZIE/configuration/oozie-env.xml  |   2 +-
 .../services/OOZIE/configuration/oozie-site.xml |   2 +-
 .../services/HIVE/configuration/hive-site.xml   |   4 +-
 ambari-web/app/data/HDP2/site_properties.js     | 112 ++++++++++++++-----
 ambari-web/app/views/common/controls_view.js    |   3 +
 7 files changed, 90 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/64850bb7/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
index 6bdb8f3..6fa7a08 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
@@ -28,7 +28,7 @@
   </property>
   <property>
     <name>hive_database</name>
-    <value>Existing MSSQL Server database with sql auth</value>
+    <value>Existing MSSQL Server database with SQL authentication</value>
     <description>
       Property that determines whether the HIVE DB is managed by Ambari.
     </description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/64850bb7/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
index 5b657ae..8b17f33 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
@@ -6,7 +6,7 @@
   <!-- Windows specific properties -->
   <property>
     <name>javax.jdo.option.ConnectionURL</name>
-    <value></value>
+    <value>jdbc:sqlserver://localhost;databaseName=hive</value>
     <description>JDBC connect string for a JDBC metastore</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/64850bb7/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
index 4f690b5..138e3e2 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
@@ -34,7 +34,7 @@
   </property>
   <property>
     <name>oozie_database</name>
-    <value>Existing MSSQL Server database with sql auth</value>
+    <value>Existing MSSQL Server database with SQL authentication</value>
     <description>Oozie Server Database.</description>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/64850bb7/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
index 739d59b..1693648 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
@@ -31,7 +31,7 @@
   </property>
   <property>
     <name>oozie.service.JPAService.jdbc.url</name>
-    <value></value>
+    <value>jdbc:sqlserver://localhost;databaseName=oozie</value>
     <description>
       JDBC URL.
     </description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/64850bb7/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml
index 1c72f70..a24fcfc 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml
@@ -273,7 +273,7 @@ limitations under the License.
 
   <property>
     <name>javax.jdo.option.ConnectionURL</name>
-    <value>jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true</value>
+    <value>jdbc:sqlserver://localhost;databaseName=hive</value>
     <description>JDBC connect string for a JDBC metastore</description>
   </property>
 
@@ -329,7 +329,7 @@ limitations under the License.
 
   <property>
     <name>javax.jdo.option.ConnectionDriverName</name>
-    <value>com.mysql.jdbc.Driver</value>
+    <value>com.microsoft.sqlserver.jdbc.SQLServerDriver</value>
     <description>Driver class name for a JDBC metastore</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/64850bb7/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 733e0ac..1eb73df 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -3008,32 +3008,22 @@ var hdp2properties = [
       {
         displayName: 'New MySQL Database',
         foreignKeys: ['hive_ambari_database', 'hive_ambari_host'],
-        hidden: App.get('isHadoopWindowsStack')
+        hidden: false
       },
       {
         displayName: 'Existing MySQL Database',
         foreignKeys: ['hive_existing_mysql_database', 'hive_existing_mysql_host'],
-        hidden: App.get('isHadoopWindowsStack')
+        hidden: false
       },
       {
         displayName: 'Existing PostgreSQL Database',
         foreignKeys: ['hive_existing_postgresql_database', 'hive_existing_postgresql_host'],
-        hidden: App.get('isHadoopWindowsStack')
+        hidden: false
       },
       {
         displayName: 'Existing Oracle Database',
         foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'],
-        hidden: App.get('isHadoopWindowsStack')
-      },
-      {
-        displayName: 'Existing MSSQL Server database with SQL authentication',
-        foreignKeys: ['hive_existing_mssql_server_database', 'hive_existing_mssql_server_host'],
-        hidden: !App.get('isHadoopWindowsStack')
-      },
-      {
-        displayName: 'Existing MSSQL Server database with integrated authentication',
-        foreignKeys: ['hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'],
-        hidden: !App.get('isHadoopWindowsStack')
+        hidden: false
       }
     ],
     "description": "MySQL will be installed by Ambari",
@@ -3437,32 +3427,22 @@ var hdp2properties = [
       {
         displayName: 'New Derby Database',
         foreignKeys: ['oozie_derby_database'],
-        hidden: App.get('isHadoopWindowsStack')
+        hidden: false
       },
       {
         displayName: 'Existing MySQL Database',
         foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'],
-        hidden: App.get('isHadoopWindowsStack')
+        hidden: false
       },
       {
         displayName: 'Existing PostgreSQL Database',
         foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host'],
-        hidden: App.get('isHadoopWindowsStack')
+        hidden: false
       },
       {
         displayName: 'Existing Oracle Database',
         foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'],
-        hidden: App.get('isHadoopWindowsStack')
-      },
-      {
-        displayName: 'Existing MSSQL Server database with SQL authentication',
-        foreignKeys: ['oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host'],
-        hidden: !App.get('isHadoopWindowsStack')
-      },
-      {
-        displayName: 'Existing MSSQL Server database with integrated authentication',
-        foreignKeys: ['oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'],
-        hidden: !App.get('isHadoopWindowsStack')
+        hidden: false
       }
     ],
     "description": "Current Derby Database will be installed by Ambari",
@@ -4046,7 +4026,7 @@ var hdp2properties = [
     "displayType": "checkbox",
     "isReconfigurable": true,
     "isOverridable": false,
-    "isVisible": !App.get('isHadoopWindowsStack'),
+    "isVisible": true,
     "filename": "cluster-env.xml",
     "category": "Users and Groups"
   },
@@ -4659,6 +4639,18 @@ var hdp2properties = [
 ];
 
 if (App.get('isHadoopWindowsStack')) {
+  var excludedWindowsConfigs = [
+    'dfs.client.read.shortcircuit',
+    'knox_pid_dir',
+    'ignore_groupsusers_create',
+    'hive_database',
+    'oozie_database'
+  ];
+
+  hdp2properties = hdp2properties.filter(function (item) {
+    return !excludedWindowsConfigs.contains(item.name);
+  });
+
   hdp2properties.push(
     {
       "id": "puppet var",
@@ -4669,7 +4661,7 @@ if (App.get('isHadoopWindowsStack')) {
       "isReconfigurable": false,
       "displayType": "user",
       "isOverridable": false,
-      "isVisible": App.get('isHadoopWindowsStack'),
+      "isVisible": true,
       "serviceName": "MISC",
       "filename": "cluster-env.xml",
       "category": "Users and Groups",
@@ -4684,12 +4676,70 @@ if (App.get('isHadoopWindowsStack')) {
       "isReconfigurable": false,
       "displayType": "password",
       "isOverridable": false,
-      "isVisible": App.get('isHadoopWindowsStack'),
+      "isVisible": true,
       "serviceName": "MISC",
       "filename": "cluster-env.xml",
       "category": "Users and Groups",
       "belongsToService": ["HDFS"],
       "index": 1
+    },
+    {
+      "id": "puppet var",
+      "name": "hive_database",
+      "displayName": "Hive Database",
+      "value": "",
+      "defaultValue": "Existing MSSQL Server database with SQL authentication",
+      "options": [
+        {
+          displayName: 'Existing MSSQL Server database with SQL authentication',
+          foreignKeys: ['hive_existing_mssql_server_database', 'hive_existing_mssql_server_host'],
+          hidden: false
+        },
+        {
+          displayName: 'Existing MSSQL Server database with integrated authentication',
+          foreignKeys: ['hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host'],
+          hidden: false
+        }
+      ],
+      "description": "",
+      "displayType": "radio button",
+      "isReconfigurable": true,
+      "radioName": "hive-database",
+      "isOverridable": false,
+      "isVisible": true,
+      "serviceName": "HIVE",
+      "filename": "hive-env.xml",
+      "category": "HIVE_METASTORE",
+      "index": 2
+    },
+    {
+      "id": "puppet var",
+      "name": "oozie_database",
+      "displayName": "Oozie Database",
+      "value": "",
+      "defaultValue": "Existing MSSQL Server database with SQL authentication",
+      "options": [
+        {
+          displayName: 'Existing MSSQL Server database with SQL authentication',
+          foreignKeys: ['oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host'],
+          hidden: false
+        },
+        {
+          displayName: 'Existing MSSQL Server database with integrated authentication',
+          foreignKeys: ['oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host'],
+          hidden: false
+        }
+      ],
+      "description": "",
+      "displayType": "radio button",
+      "isReconfigurable": true,
+      "isOverridable": false,
+      "radioName": "oozie-database",
+      "isVisible": true,
+      "serviceName": "OOZIE",
+      "filename": "oozie-env.xml",
+      "category": "OOZIE_SERVER",
+      "index": 2
     }
   );
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/64850bb7/ambari-web/app/views/common/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index 284f479..e710421 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -386,6 +386,9 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId,
       if (/^New\s\w+\sDatabase$/.test(this.get('serviceConfig.value')) || this.dontUseHandleDbConnection.contains(this.get('serviceConfig.name')))
{
         this.onOptionsChange();
       } else {
+        if (App.get('isHadoopWindowsStack') && /SQL\sauthentication/.test(this.get('serviceConfig.value')))
{
+          this.onOptionsChange();
+        }
         this.handleDBConnectionProperty();
       }
     }


Mime
View raw message