[hive] branch master updated: HIVE-25714: docker logs commands timeout regularily during testing (#2801) (Zoltan Haindrich reviewed by Stamatis Zampetakis)

[kgyrtkirk]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 79098a7  HIVE-25714: docker logs commands timeout regularily during 
testing (#2801) (Zoltan Haindrich reviewed by Stamatis Zampetakis)
79098a7 is described below

commit 79098a75baeffc683f73afb4788d4cb2b2484ad6
Author: Zoltan Haindrich <k...@rxd.hu>
AuthorDate: Fri Nov 19 11:54:55 2021 +0100

    HIVE-25714: docker logs commands timeout regularily during testing (#2801) 
(Zoltan Haindrich reviewed by Stamatis Zampetakis)
---
 .../apache/hadoop/hive/ql/externalDB/AbstractExternalDB.java  | 11 ++++++-----
 .../hadoop/hive/metastore/dbinstall/rules/DatabaseRule.java   |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/AbstractExternalDB.java
 
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/AbstractExternalDB.java
index ba0c7ad..f328bfc 100644
--- 
a/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/AbstractExternalDB.java
+++ 
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/AbstractExternalDB.java
@@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * The class is in charge of connecting and populating dockerized databases 
for qtest.
- * 
+ *
  * The database should have at least one root user (admin/superuser) able to 
modify every aspect of the system. The user
  * either exists by default when the database starts or must created right 
after startup.
  */
@@ -99,6 +99,7 @@ public abstract class AbstractExternalDB {
         reader = new BufferedReader(new 
InputStreamReader(proc.getErrorStream()));
         final StringBuilder errLines = new StringBuilder();
         reader.lines().forEach(s -> errLines.append(s).append('\n'));
+        LOG.info("Result size: " + lines.length() + ";" + errLines.length());
         return new ProcessResults(lines.toString(), errLines.toString(), 
proc.exitValue());
     }
 
@@ -120,7 +121,7 @@ public abstract class AbstractExternalDB {
         ProcessResults pr;
         do {
             Thread.sleep(1000);
-            pr = runCmd(buildLogCmd(), 5);
+            pr = runCmd(buildLogCmd(), 30);
             if (pr.rc != 0) {
                 throw new RuntimeException("Failed to get docker logs");
             }
@@ -149,7 +150,7 @@ public abstract class AbstractExternalDB {
 
     /**
      * Return the name of the root user.
-     * 
+     *
      * Override the method if the name of the root user must be different than 
the default.
      */
     protected String getRootUser() {
@@ -158,13 +159,13 @@ public abstract class AbstractExternalDB {
 
     /**
      * Return the password of the root user.
-     * 
+     *
      * Override the method if the password must be different than the default.
      */
     protected String getRootPassword() {
         return  "qtestpassword";
     }
-    
+
     protected abstract String getJdbcUrl();
 
     protected abstract String getJdbcDriver();
diff --git 
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/DatabaseRule.java
 
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/DatabaseRule.java
index f4e4388..4fc8d50 100644
--- 
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/DatabaseRule.java
+++ 
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/DatabaseRule.java
@@ -132,7 +132,7 @@ public abstract class DatabaseRule extends ExternalResource 
{
     ProcessResults pr;
     do {
       Thread.sleep(1000);
-      pr = runCmd(buildLogCmd(), 5);
+      pr = runCmd(buildLogCmd(), 30);
       if (pr.rc != 0) {
         throw new RuntimeException("Failed to get docker logs");
       }
@@ -185,6 +185,7 @@ public abstract class DatabaseRule extends ExternalResource 
{
     reader = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
     final StringBuilder errLines = new StringBuilder();
     reader.lines().forEach(s -> errLines.append(s).append('\n'));
+    LOG.info("Result size: " + lines.length() + ";" + errLines.length());
     return new ProcessResults(lines.toString(), errLines.toString(), 
proc.exitValue());
   }