ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mithm...@apache.org
Subject ambari git commit: AMBARI-17070: Change HAWQ DFS Url from hawq_default to hawq_data (mithmatt)
Date Tue, 07 Jun 2016 03:53:14 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 93757a40f -> a3b4be1de


AMBARI-17070: Change HAWQ DFS Url from hawq_default to hawq_data (mithmatt)


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

Branch: refs/heads/branch-2.4
Commit: a3b4be1de90979eac5f33958d587c23fb3285a37
Parents: 93757a4
Author: Matt <mmathew@pivotal.io>
Authored: Mon Jun 6 20:52:47 2016 -0700
Committer: Matt <mmathew@pivotal.io>
Committed: Mon Jun 6 20:52:47 2016 -0700

----------------------------------------------------------------------
 .../common-services/HAWQ/2.0.0/configuration/hawq-site.xml       | 2 +-
 .../common-services/HAWQ/2.0.0/package/scripts/params.py         | 3 +--
 .../controller/internal/BlueprintConfigurationProcessorTest.java | 4 ++--
 ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py | 2 +-
 .../src/test/python/stacks/2.3/configs/hawq_default.json         | 2 +-
 ambari-web/app/data/HDP2/ha_properties.js                        | 4 ++--
 .../admin/highAvailability/nameNode/step3_controller_test.js     | 4 ++--
 ambari-web/test/utils/configs/config_initializer_test.js         | 4 ++--
 8 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a3b4be1d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index 9bdf62d..cdfb493 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -75,7 +75,7 @@
   <property>
     <name>hawq_dfs_url</name>
     <display-name>HAWQ DFS URL</display-name>
-    <value>localhost:8020/hawq_default</value>
+    <value>localhost:8020/hawq_data</value>
     <description>
       URL for accessing HDFS.
     </description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3b4be1d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
index a8a4487..440a3e6 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
@@ -144,8 +144,7 @@ hawq_master_dir = hawq_site.get('hawq_master_directory')
 hawq_segment_dir = hawq_site.get('hawq_segment_directory')
 hawq_master_temp_dirs = hawq_site.get('hawq_master_temp_directory')
 hawq_segment_temp_dirs = hawq_site.get('hawq_segment_temp_directory')
-# Extract hawq hdfs directory from hdfs url. Ex: /hawq/hawq_default from
-# host:8080/hawq/hawq_default
+# Extract hawq hdfs directory from hdfs url. Ex: /hawq/hawq_data from host:8080/hawq/hawq_data
 hawq_hdfs_data_dir = "/{0}".format(hawq_site.get('hawq_dfs_url').split('/', 1)[1])
 hawq_master_address_port = hawq_site.get('hawq_master_address_port')
 hawq_segment_address_port = hawq_site.get('hawq_segment_address_port')

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3b4be1d/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index ec04fd2..8b1a9a6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -7335,7 +7335,7 @@ public class BlueprintConfigurationProcessorTest {
     // setup properties that include host information
     hawqSite.put("hawq_master_address_host", "localhost");
     hawqSite.put("hawq_standby_address_host", "localhost");
-    hawqSite.put("hawq_dfs_url", createHostAddress("localhost", expectedPortNamenode) + "/hawq_default");
+    hawqSite.put("hawq_dfs_url", createHostAddress("localhost", expectedPortNamenode) + "/hawq_data");
 
     Configuration clusterConfig = new Configuration(properties, Collections.<String, Map<String,
Map<String, String>>>emptyMap());
 
@@ -7366,7 +7366,7 @@ public class BlueprintConfigurationProcessorTest {
 
     assertEquals(expectedHostNameHawqMaster, hawqSite.get("hawq_master_address_host"));
     assertEquals(expectedHostNameHawqStandby, hawqSite.get("hawq_standby_address_host"));
-    assertEquals(createHostAddress(expectedHostNameNamenode, expectedPortNamenode) + "/hawq_default",
hawqSite.get("hawq_dfs_url"));
+    assertEquals(createHostAddress(expectedHostNameNamenode, expectedPortNamenode) + "/hawq_data",
hawqSite.get("hawq_dfs_url"));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3b4be1d/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py
index 70d7ed1..aa63004 100644
--- a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py
+++ b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py
@@ -170,7 +170,7 @@ class TestHawqMaster(RMFTestCase):
 
     self.__asserts_for_configure()
 
-    self.assertResourceCalled('HdfsResource', '/hawq_default',
+    self.assertResourceCalled('HdfsResource', '/hawq_data',
         immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
         default_fs = u'hdfs://c6401.ambari.apache.org:8020',
         hdfs_site = self.getConfig()['configurations']['hdfs-site'],

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3b4be1d/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json b/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json
index b839de6..ebff461 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hawq_default.json
@@ -660,7 +660,7 @@
             "hawq_rm_yarn_queue_name": "default", 
             "hawq_rm_yarn_address": "c6402.ambari.apache.org:8032", 
             "hawq_re_cgroup_mount_point": "/sys/fs/cgroup", 
-            "hawq_dfs_url": "c6401.ambari.apache.org:8020/hawq_default", 
+            "hawq_dfs_url": "c6401.ambari.apache.org:8020/hawq_data", 
             "hawq_global_rm_type": "none", 
             "hawq_segment_directory": "/data/hawq/segment", 
             "hawq_rm_memory_limit_perseg": "64GB", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3b4be1d/ambari-web/app/data/HDP2/ha_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/ha_properties.js b/ambari-web/app/data/HDP2/ha_properties.js
index 18c5a68..388f85d 100644
--- a/ambari-web/app/data/HDP2/ha_properties.js
+++ b/ambari-web/app/data/HDP2/ha_properties.js
@@ -270,8 +270,8 @@ module.exports =
         "displayName": "hawq_dfs_url",
         "description": "URL for Accessing HDFS",
         "isReconfigurable": false,
-        "recommendedValue": "haCluster/hawq_default",
-        "value": "haCluster/hawq_default",
+        "recommendedValue": "haCluster/hawq_data",
+        "value": "haCluster/hawq_data",
         "category": "HAWQ",
         "filename": "hawq-site",
         "serviceName": 'MISC'

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3b4be1d/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
b/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
index ca55a32..dfe2076 100644
--- a/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
@@ -61,7 +61,7 @@ describe('App.HighAvailabilityWizardStep3Controller', function() {
       {
         type: 'hawq-site',
         properties: {
-          'hawq_dfs_url': 'localhost:8020/hawq_default'
+          'hawq_dfs_url': 'localhost:8020/hawq_data'
         }
       }
     ]
@@ -364,7 +364,7 @@ describe('App.HighAvailabilityWizardStep3Controller', function() {
           name: 'hawq_dfs_url',
           filename: 'hawq-site'
         },
-        value: nameServiceId + '/hawq_default'
+        value: nameServiceId + '/hawq_data'
       }
     ]).forEach(function (test) {
       describe(test.config.name, function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3b4be1d/ambari-web/test/utils/configs/config_initializer_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/configs/config_initializer_test.js b/ambari-web/test/utils/configs/config_initializer_test.js
index 48eae23..a5031b1 100644
--- a/ambari-web/test/utils/configs/config_initializer_test.js
+++ b/ambari-web/test/utils/configs/config_initializer_test.js
@@ -617,8 +617,8 @@ describe('App.ConfigInitializer', function () {
       {
         config: 'hawq_dfs_url',
         localDB: getLocalDBForSingleComponent('NAMENODE'),
-        rValue: 'localhost:8020/hawq_default',
-        expectedValue: 'h1:8020/hawq_default'
+        rValue: 'localhost:8020/hawq_data',
+        expectedValue: 'h1:8020/hawq_data'
       },
       {
         config: 'hawq_rm_yarn_address',


Mime
View raw message