[atlas] branch branch-2.0 updated: ATLAS-4475: Fixed log messages for Import Hive V2 when running with set of tables

[sidmishra]

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

sidmishra pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 6370ee6  ATLAS-4475: Fixed log messages for Import Hive V2 when 
running with set of tables
6370ee6 is described below

commit 6370ee6137a284dbeaea0c3c8fb86d7575763e36
Author: Sidharth Mishra <sidharthkmis...@gmail.com>
AuthorDate: Tue Nov 16 17:02:00 2021 -0800

    ATLAS-4475: Fixed log messages for Import Hive V2 when running with set of 
tables
    
    Signed-off-by: Sidharth Mishra <sidmis...@apache.org>
    (cherry picked from commit 14e81aa648a950043ec09d4221c1f8551d50860c)
---
 .../atlas/hive/bridge/HiveMetaStoreBridgeV2.java       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git 
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeV2.java
 
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeV2.java
index 0627c0e..94d1f31 100644
--- 
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeV2.java
+++ 
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeV2.java
@@ -404,7 +404,7 @@ public class HiveMetaStoreBridgeV2 {
     public void importHiveTables(boolean failOnError) throws HiveException, 
AtlasBaseException {
         LOG.info("Importing Hive Tables");
 
-        int tablesImported = 0;
+        int totalTablesImported = 0;
 
         if (CollectionUtils.isNotEmpty(databaseAndTableListToImport) && 
MapUtils.isNotEmpty(dbEntities)) {
             for (Map<String, String> eachEntry : databaseAndTableListToImport) 
{
@@ -430,18 +430,21 @@ public class HiveMetaStoreBridgeV2 {
                 if (!CollectionUtils.isEmpty(tableObjects)) {
                     LOG.info("Found {} tables to import in database {}", 
tableObjects.size(), databaseName);
 
+                    int importedInOneRun = 0;
                     try {
                         for (Table table : tableObjects) {
                             int imported = 
importTable(dbEntities.get(databaseName), table, failOnError);
 
-                            tablesImported += imported;
+                            totalTablesImported += imported;
+                            importedInOneRun += imported;
                         }
                     } finally {
-                        if (tablesImported == tableObjects.size()) {
-                            LOG.info("Successfully imported {} tables from 
database {}", tablesImported, databaseName);
+                        if (importedInOneRun == tableObjects.size()) {
+                            LOG.info("Successfully imported {} tables from 
database {}", importedInOneRun, databaseName);
+                            LOG.info("Successfully total {} tables imported", 
totalTablesImported);
                         } else {
                             LOG.error("Imported {} of {} tables from database 
{}. Please check logs for errors during import",
-                                    tablesImported, tableObjects.size(), 
databaseName);
+                                    importedInOneRun, tableObjects.size(), 
databaseName);
                         }
                     }
                 } else {
@@ -562,8 +565,9 @@ public class HiveMetaStoreBridgeV2 {
             } else {
                 LOG.error("Failed to import or get the status of import for 
the zip file {} at Atlas. Number of entities to be imported {}.", 
this.outZipFileName, totalProcessedEntities);
             }
-        } catch (AtlasServiceException e) {
-            LOG.error("Failed to import or get the status of import for the 
zip file {} at Atlas. Number of entities to be imported {}.", 
this.outZipFileName, totalProcessedEntities, e);
+        } catch (Exception e) {
+            LOG.error("Failed to get the status or import the zip file {} at 
Atlas. Number of entities to be imported {}.", this.outZipFileName, 
totalProcessedEntities, e);
+            LOG.info("Please check Atlas for the import status of the zip file 
{}.", this.outZipFileName);
         }
     }