hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject incubator-hawq git commit: HAWQ-809:change libhdfs function test default hdfs port from 9000 to 8020
Date Tue, 14 Jun 2016 03:06:36 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 0d754a437 -> e3933e7b3


HAWQ-809:change libhdfs function test default hdfs port from 9000 to 8020


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

Branch: refs/heads/master
Commit: e3933e7b32ecd7173bfa6a7888bb3837dd18c39d
Parents: 0d754a4
Author: yaoj2 <jyao@pivotal.io>
Authored: Mon Jun 13 16:00:07 2016 +0800
Committer: yaoj2 <jyao@pivotal.io>
Committed: Tue Jun 14 11:03:18 2016 +0800

----------------------------------------------------------------------
 depends/libhdfs3/src/client/hdfs.h                    | 2 +-
 depends/libhdfs3/src/common/SessionConfig.cpp         | 2 +-
 depends/libhdfs3/test/data/function-secure.xml        | 6 +++---
 depends/libhdfs3/test/data/function-secure.xml.sample | 6 +++---
 depends/libhdfs3/test/data/function-test.xml          | 6 +++---
 depends/libhdfs3/test/data/function-test.xml.sample   | 6 +++---
 depends/libhdfs3/test/data/invalidha.xml              | 6 +++---
 depends/libhdfs3/test/data/validha.xml                | 6 +++---
 depends/libhdfs3/test/function/TestCInterface.cpp     | 4 ++--
 depends/libhdfs3/test/unit/TestGetHANamenodes.cpp     | 4 ++--
 depends/libhdfs3/test/unit/TestSessionConfig.cpp      | 2 +-
 11 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/src/client/hdfs.h
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/src/client/hdfs.h b/depends/libhdfs3/src/client/hdfs.h
index d03e30b..97329cf 100644
--- a/depends/libhdfs3/src/client/hdfs.h
+++ b/depends/libhdfs3/src/client/hdfs.h
@@ -660,7 +660,7 @@ int64_t hdfsRenewDelegationToken(hdfsFS fs, const char * token);
 int hdfsCancelDelegationToken(hdfsFS fs, const char * token);
 
 typedef struct Namenode {
-    char * rpc_addr;    // namenode rpc address and port, such as "host:9000"
+    char * rpc_addr;    // namenode rpc address and port, such as "host:8020"
     char * http_addr;   // namenode http address and port, such as "host:50070"
 } Namenode;
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/src/common/SessionConfig.cpp
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/src/common/SessionConfig.cpp b/depends/libhdfs3/src/common/SessionConfig.cpp
index 0292be2..68d3f3f 100644
--- a/depends/libhdfs3/src/common/SessionConfig.cpp
+++ b/depends/libhdfs3/src/common/SessionConfig.cpp
@@ -140,7 +140,7 @@ SessionConfig::SessionConfig(const Config & conf) {
         }
     };
     ConfigDefault<std::string> strValues [] = {
-        {&defaultUri, "dfs.default.uri", "hdfs://localhost:9000" },
+        {&defaultUri, "dfs.default.uri", "hdfs://localhost:8020" },
         {&rpcAuthMethod, "hadoop.security.authentication", "simple" },
         {&kerberosCachePath, "hadoop.security.kerberos.ticket.cache.path", "" },
         {&logSeverity, "dfs.client.log.severity", "INFO" },

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/test/data/function-secure.xml
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/test/data/function-secure.xml b/depends/libhdfs3/test/data/function-secure.xml
index ed8921d..65018aa 100644
--- a/depends/libhdfs3/test/data/function-secure.xml
+++ b/depends/libhdfs3/test/data/function-secure.xml
@@ -2,7 +2,7 @@
 
 	<property>
 		<name>dfs.default.uri</name>
-		<value>hdfs://localhost:9000</value>
+		<value>hdfs://localhost:8020</value>
 	</property>
 
 	<property>
@@ -22,12 +22,12 @@
 	
 	<property>
 		<name>dfs.namenode.rpc-address.gphd-cluster.nn1</name>
-		<value>smdw:9000</value>
+		<value>smdw:8020</value>
 	</property>
 	
 	<property>
 		<name>dfs.namenode.rpc-address.gphd-cluster.nn2</name>
-		<value>mdw:9000</value>
+		<value>mdw:8020</value>
 	</property>
 
 	<property>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/test/data/function-secure.xml.sample
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/test/data/function-secure.xml.sample b/depends/libhdfs3/test/data/function-secure.xml.sample
index ed8921d..65018aa 100644
--- a/depends/libhdfs3/test/data/function-secure.xml.sample
+++ b/depends/libhdfs3/test/data/function-secure.xml.sample
@@ -2,7 +2,7 @@
 
 	<property>
 		<name>dfs.default.uri</name>
-		<value>hdfs://localhost:9000</value>
+		<value>hdfs://localhost:8020</value>
 	</property>
 
 	<property>
@@ -22,12 +22,12 @@
 	
 	<property>
 		<name>dfs.namenode.rpc-address.gphd-cluster.nn1</name>
-		<value>smdw:9000</value>
+		<value>smdw:8020</value>
 	</property>
 	
 	<property>
 		<name>dfs.namenode.rpc-address.gphd-cluster.nn2</name>
-		<value>mdw:9000</value>
+		<value>mdw:8020</value>
 	</property>
 
 	<property>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/test/data/function-test.xml
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/test/data/function-test.xml b/depends/libhdfs3/test/data/function-test.xml
index d6800b9..4e982ab 100644
--- a/depends/libhdfs3/test/data/function-test.xml
+++ b/depends/libhdfs3/test/data/function-test.xml
@@ -2,7 +2,7 @@
 
 	<property>
 		<name>dfs.default.uri</name>
-		<value>hdfs://localhost:9000</value>
+		<value>hdfs://localhost:8020</value>
 	</property>
 
 	<property>
@@ -67,12 +67,12 @@
 	
 	<property>
 		<name>dfs.namenode.rpc-address.phdcluster.nn1</name>
-		<value>mdw:9000</value>
+		<value>mdw:8020</value>
 	</property>
 	
 	<property>
 		<name>dfs.namenode.rpc-address.phdcluster.nn2</name>
-		<value>smdw:9000</value>
+		<value>smdw:8020</value>
 	</property>
 
 	<property>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/test/data/function-test.xml.sample
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/test/data/function-test.xml.sample b/depends/libhdfs3/test/data/function-test.xml.sample
index df8de7c..cf990c1 100644
--- a/depends/libhdfs3/test/data/function-test.xml.sample
+++ b/depends/libhdfs3/test/data/function-test.xml.sample
@@ -2,7 +2,7 @@
 
 	<property>
 		<name>dfs.default.uri</name>
-		<value>hdfs://localhost:9000</value>
+		<value>hdfs://localhost:8020</value>
 	</property>
 
 	<property>
@@ -67,12 +67,12 @@
 	
 	<property>
 		<name>dfs.namenode.rpc-address.phdcluster.nn1</name>
-		<value>mdw:9000</value>
+		<value>mdw:8020</value>
 	</property>
 	
 	<property>
 		<name>dfs.namenode.rpc-address.phdcluster.nn2</name>
-		<value>smdw:9000</value>
+		<value>smdw:8020</value>
 	</property>
 
 	<property>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/test/data/invalidha.xml
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/test/data/invalidha.xml b/depends/libhdfs3/test/data/invalidha.xml
index 99014a5..b252975 100644
--- a/depends/libhdfs3/test/data/invalidha.xml
+++ b/depends/libhdfs3/test/data/invalidha.xml
@@ -15,15 +15,15 @@
 
         <property>
                 <name>dfs.namenode.rpc-address.phdcluster.nn1</name>
-                <value>mdw:9000</value>
+                <value>mdw:8020</value>
         </property>
 
                 <name>dfs.namenode.rpc-address.phdcluster.nn2</name>
-                <value>smdw:9000</value>
+                <value>smdw:8020</value>
         </property>
 
         <property>
                 <name>dfs.client.failover.proxy.provider.phdcluster</name>
                 <value>org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider</value>
         </property>
-</configuration>
\ No newline at end of file
+</configuration>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/test/data/validha.xml
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/test/data/validha.xml b/depends/libhdfs3/test/data/validha.xml
index 0e5eb58..a338bc7 100644
--- a/depends/libhdfs3/test/data/validha.xml
+++ b/depends/libhdfs3/test/data/validha.xml
@@ -15,12 +15,12 @@
 
         <property>
                 <name>dfs.namenode.rpc-address.phdcluster.nn1</name>
-                <value> 	mdw:9000</value>
+                <value> 	mdw:8020</value>
         </property>
 
         <property>
                 <name>dfs.namenode.rpc-address.phdcluster.nn2</name>
-                <value>smdw:9000 </value>
+                <value>smdw:8020 </value>
         </property>
 
         <property>
@@ -32,4 +32,4 @@
                 <name>dfs.client.failover.proxy.provider.phdcluster</name>
                 <value>org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider</value>
         </property>
-</configuration>
\ No newline at end of file
+</configuration>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/test/function/TestCInterface.cpp
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/test/function/TestCInterface.cpp b/depends/libhdfs3/test/function/TestCInterface.cpp
index 62df32a..97dd120 100644
--- a/depends/libhdfs3/test/function/TestCInterface.cpp
+++ b/depends/libhdfs3/test/function/TestCInterface.cpp
@@ -1497,9 +1497,9 @@ TEST_F(TestCInterface, TestGetHANamenode) {
     EXPECT_TRUE(errno == EINVAL);
     ASSERT_TRUE(NULL != (namenodes = hdfsGetHANamenodes("phdcluster", &size)));
     ASSERT_EQ(2, size);
-    EXPECT_STREQ("mdw:9000", namenodes[0].rpc_addr);
+    EXPECT_STREQ("mdw:8020", namenodes[0].rpc_addr);
     EXPECT_STREQ("mdw:50070", namenodes[0].http_addr);
-    EXPECT_STREQ("smdw:9000", namenodes[1].rpc_addr);
+    EXPECT_STREQ("smdw:8020", namenodes[1].rpc_addr);
     EXPECT_STREQ("smdw:50070", namenodes[1].http_addr);
     EXPECT_NO_THROW(hdfsFreeNamenodeInformation(namenodes, size));
 }

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/test/unit/TestGetHANamenodes.cpp
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/test/unit/TestGetHANamenodes.cpp b/depends/libhdfs3/test/unit/TestGetHANamenodes.cpp
index 7aa5079..b0120da 100644
--- a/depends/libhdfs3/test/unit/TestGetHANamenodes.cpp
+++ b/depends/libhdfs3/test/unit/TestGetHANamenodes.cpp
@@ -52,9 +52,9 @@ TEST(TestGetHAANamenodes, GetHANamenodes) {
     Namenode * namenodes = NULL;
     ASSERT_TRUE(NULL != (namenodes = hdfsGetHANamenodesWithConfig("validha.xml", "phdcluster",
&size)));
     ASSERT_EQ(2, size);
-    EXPECT_STREQ("mdw:9000", namenodes[0].rpc_addr);
+    EXPECT_STREQ("mdw:8020", namenodes[0].rpc_addr);
     EXPECT_STREQ("mdw:50070", namenodes[0].http_addr);
-    EXPECT_STREQ("smdw:9000", namenodes[1].rpc_addr);
+    EXPECT_STREQ("smdw:8020", namenodes[1].rpc_addr);
     EXPECT_EQ((char *)NULL, namenodes[1].http_addr);
     EXPECT_NO_THROW(hdfsFreeNamenodeInformation(namenodes, size));
 }

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e3933e7b/depends/libhdfs3/test/unit/TestSessionConfig.cpp
----------------------------------------------------------------------
diff --git a/depends/libhdfs3/test/unit/TestSessionConfig.cpp b/depends/libhdfs3/test/unit/TestSessionConfig.cpp
index 503e6ef..8afaf21 100644
--- a/depends/libhdfs3/test/unit/TestSessionConfig.cpp
+++ b/depends/libhdfs3/test/unit/TestSessionConfig.cpp
@@ -35,5 +35,5 @@ using namespace Hdfs::Internal;
 TEST(TestSessionConfig, TestSelect) {
     Config conf;
     SessionConfig session(conf);
-    ASSERT_STREQ("hdfs://localhost:9000", session.getDefaultUri().c_str());
+    ASSERT_STREQ("hdfs://localhost:8020", session.getDefaultUri().c_str());
 }


Mime
View raw message