[kylin] branch kylin4_on_cloud updated: # minor fix, enhance log error

[xx...@apache.org]

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

xxyu pushed a commit to branch kylin4_on_cloud
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin4_on_cloud by this push:
     new 209eb4f0b0 # minor fix, enhance log error
209eb4f0b0 is described below

commit 209eb4f0b05c3db76a5d99f3184f2de814813861
Author: Mukvin <bo...@163.com>
AuthorDate: Thu Apr 7 11:53:49 2022 +0800

    # minor fix, enhance log error
---
 instances/aws_instance.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/instances/aws_instance.py b/instances/aws_instance.py
index 9260e7933b..6d311fc5f3 100644
--- a/instances/aws_instance.py
+++ b/instances/aws_instance.py
@@ -1966,8 +1966,11 @@ class AWSInstance:
             if output['Status'] in ['Delayed', 'Success', 'Cancelled', 'TimedOut', 'Failed']:
                 break
             time.sleep(10)
+        if not output or output['Status'] != 'Success':
+            logger.error(output)
+
         assert output and output['Status'] == 'Success', \
-            f"execute script failed, failed info: {output['StandardErrorContent']}"
+            f"execute script failed, failed details message: {output}"
         return output
 
     def stop_ec2_instance(self, instance_id: str):
@@ -2046,7 +2049,8 @@ class AWSInstance:
         try:
             self.iam_client.get_role(RoleName=self.iam_role)
             return True
-        except self.iam_client.exceptions.NoSuchEntityException:
+        except self.iam_client.exceptions.NoSuchEntityException as err:
+            logger.error(f"check iam role error: {err}")
             return False
 
     def valid_key_pair(self) -> None:
@@ -2063,7 +2067,8 @@ class AWSInstance:
         try:
             self.ec2_client.describe_key_pairs(KeyNames=[self.key_pair])
             return True
-        except ClientError:
+        except ClientError as ce:
+            logger.error(f"check key pair error: {ce}")
             return False
 
     def is_valid_cidr_ip(self) -> bool:
@@ -2082,10 +2087,11 @@ class AWSInstance:
             response = self.s3_client.head_object(Bucket=bucket, Key=bucket_dir + filename)
             Utils.is_uploaded_success(filename=filename, size_in_bytes=response['ContentLength'])
         except botocore.exceptions.ClientError as ex:
+            logger.error(f"check object exists on s3 error:{ex}")
             assert ex.response['Error']['Code'] == '404'
             return False
         except AssertionError as ex:
-            logger.error(ex)
+            logger.error(f"check object exists on s3 error:{ex}")
             return False
         return True
 
@@ -2205,37 +2211,39 @@ class AWSInstance:
                 }
             )
         except WaiterError as wx:
+            logger.error(f"check rds available error: {wx}")
             return False
         return True
 
     def _validate_spark_worker_scale(self, stack_name: str) -> None:
         if stack_name not in self.scaled_spark_workers_stacks:
-            msg = f'{stack_name} not in scaled list, please check.'
+            msg = f'{stack_name} not in scaled list, please check kylin_configs.yml.'
             logger.error(msg)
             raise Exception(msg)
 
     def _validate_spark_worker_of_target_cluster_scale(self, stack_name: str, cluster_num: int) -> None:
         if stack_name not in self.scaled_target_spark_workers_stacks(cluster_num):
-            msg = f'{stack_name} not in scaled list of target cluster {cluster_num}, please check.'
+            msg = f'{stack_name} not in scaled list of target cluster {cluster_num}, please check kylin_configs.yml.'
             logger.error(msg)
             raise Exception(msg)
 
     def _validate_kylin_scale(self, stack_name: str) -> None:
         if stack_name not in self.scaled_kylin_stacks:
-            msg = f'{stack_name} not in scaled list, please check.'
+            msg = f'{stack_name} not in scaled list, please check kylin_configs.yml.'
             logger.error(msg)
             raise Exception(msg)
 
     def _validate_kylin_of_target_cluster_scale(self, stack_name: str, cluster_num: int) -> None:
         if stack_name not in self.scaled_target_kylin_stacks(cluster_num):
-            msg = f'{stack_name} not in scaled list of target cluster {cluster_num}, please check.'
+            msg = f'{stack_name} not in scaled list of target cluster {cluster_num}, please check kylin_configs.yml.'
             logger.error(msg)
             raise Exception(msg)
 
     def _stack_status_check(self, name_or_id: str, status: str) -> bool:
         try:
             resp: Dict = self.cf_client.describe_stacks(StackName=name_or_id)
-        except ClientError:
+        except ClientError as ce:
+            logger.error(f"check stack status error: {ce}")
             return False
         return resp['Stacks'][0]['StackStatus'] == status
 
@@ -2263,6 +2271,7 @@ class AWSInstance:
                 }
             )
         except WaiterError:
+            # logger.error(wx)
             return False
         return True