[hawq] 02/02: HAWQ-1785. Fix HDFS metadata mismatch in GitHub Action

[chiyang10000]

This is an automated email from the ASF dual-hosted git repository.

chiyang10000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git

commit 2a80d792acb7f2f7abce9f158e6199dcb3a85e11
Author: Chiyang Wan <chiyang10...@gmail.com>
AuthorDate: Tue Feb 23 10:06:16 2021 +0800

    HAWQ-1785. Fix HDFS metadata mismatch in GitHub Action
---
 .github/workflows/build.yml                     | 2 ++
 .github/workflows/scripts/gtest_filter_negative | 2 --
 src/Makefile.global.in                          | 5 +++--
 src/backend/cdb/cdbdatalocality.c               | 2 +-
 src/test/feature/lib/compent_config.cpp         | 2 ++
 src/test/feature/lib/hdfs_config.cpp            | 3 +++
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 11899d1..41de4ac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,6 +42,8 @@ jobs:
           fi
         done
         install_name_tool -add_rpath 
$GITHUB_WORKSPACE/dependency-Darwin/package/lib/perl5/5.28.0/darwin-thread-multi-2level/CORE/
 $GITHUB_WORKSPACE/dependency-Darwin/package/bin/perl
+        rm -rf $GITHUB_WORKSPACE/dependency-Darwin/package/include/hdfs
+        rm -rf $GITHUB_WORKSPACE/dependency-Darwin/package/lib/libhdfs3*
 
     - name: configure
       timeout-minutes: 10
diff --git a/.github/workflows/scripts/gtest_filter_negative 
b/.github/workflows/scripts/gtest_filter_negative
index b20aa7f..d46d369 100644
--- a/.github/workflows/scripts/gtest_filter_negative
+++ b/.github/workflows/scripts/gtest_filter_negative
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 export GTEST_FILTER_NEGATIVE=\
-TestCommonLib.TestHdfsConfig:\
 TestExtOrc.TestNormalPath:\
 TestExtOrc.BoolTypeTest:\
 TestExtOrc.DateTypeTest:\
@@ -28,7 +27,6 @@ TestVexecutor.ProjAndQual:\
 TestVexecutor.date:\
 TestVexecutor.vagg:\
 TestCloud.*:\
-TestAlterTable.*:\
 TestHawqExtract.*:\
 TestHawqRegister.*:\
 TestRangerPolicyHelper.*:\
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 2b47748..0d98b73 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -220,8 +220,9 @@ COLLATEINDEX        = @COLLATEINDEX@
 # Compilers
 
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CPPFLAGS += -I/usr/local/hawq/include
+CPPFLAGS = -I$(abs_top_srcdir)/depends/libhdfs3/build/install$(prefix)/include
+CPPFLAGS += -I$(abs_top_srcdir)/depends/libyarn/build/install$(prefix)/include
+CPPFLAGS += @CPPFLAGS@
 
 ifdef PGXS
 override CPPFLAGS := -I$(includedir_server) -I$(includedir_internal) 
$(CPPFLAGS)
diff --git a/src/backend/cdb/cdbdatalocality.c 
b/src/backend/cdb/cdbdatalocality.c
index a54527e..8858735 100644
--- a/src/backend/cdb/cdbdatalocality.c
+++ b/src/backend/cdb/cdbdatalocality.c
@@ -1183,7 +1183,7 @@ static void 
double_check_hdfs_metadata_logic_length(BlockLocation * locations,in
                hdfs_file_len += locations[i].length;
        }
        if(logic_len > hdfs_file_len) {
-               elog(ERROR, "hdfs file length does not equal to metadata logic 
length!");
+               elog(ERROR, "hdfs file length does not equal to metadata logic 
length! (%ld != %ld)", hdfs_file_len, logic_len);
        }
 }
 
diff --git a/src/test/feature/lib/compent_config.cpp 
b/src/test/feature/lib/compent_config.cpp
index b018ff6..21b64c5 100644
--- a/src/test/feature/lib/compent_config.cpp
+++ b/src/test/feature/lib/compent_config.cpp
@@ -202,6 +202,8 @@ void CompentConfig::runCommandAndGetNodesPorts(
     auto lines = hawq::test::split(result, '\n');
     for (size_t i = 0; i < lines.size(); i++) {
       string valueLine = lines[i];
+      if (valueLine.find("ssh:") != string::npos)
+        continue;
       if (valueLine.find("WARNING") != string::npos)
         continue;
       auto datanodeInfo = hawq::test::split(valueLine, ':');
diff --git a/src/test/feature/lib/hdfs_config.cpp 
b/src/test/feature/lib/hdfs_config.cpp
index 24938bb..d5598af 100644
--- a/src/test/feature/lib/hdfs_config.cpp
+++ b/src/test/feature/lib/hdfs_config.cpp
@@ -316,6 +316,9 @@ void HdfsConfig::getNamenodes(std::vector<string> 
&namenodes,
     auto lines = hawq::test::split(result, '\n');
     for (size_t i = 0; i < lines.size(); i++) {
         string valueLine = lines[i];
+        if (valueLine.find("ssh:") != string::npos ||
+            valueLine.find("Warning:") != string::npos)
+          continue;
         auto namenodeInfo = hawq::test::split(valueLine, ':');
         if (namenodeInfo.size() == 2) {
             namenodes.push_back(hawq::test::trim(namenodeInfo[0]));