From 1d118e98777d816e77fdb8c051216e289eda9a52 Mon Sep 17 00:00:00 2001
From: Zhang Lei <xiaolei.zl@alibaba-inc.com>
Date: Thu, 28 Nov 2024 17:11:41 +0800
Subject: [PATCH] fix(coordinator): Minor fix for coordinator (#4331)

Some minor bug fix for coordinator.
---
 .../templates/portal/statefulset.yaml               |  2 ++
 charts/graphscope-store/values.yaml                 |  3 +++
 coordinator/gscoordinator/flex/core/insight/job.py  | 13 +++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/charts/graphscope-store/templates/portal/statefulset.yaml b/charts/graphscope-store/templates/portal/statefulset.yaml
index 1e8c5ee471cb..17a5b975cbc3 100644
--- a/charts/graphscope-store/templates/portal/statefulset.yaml
+++ b/charts/graphscope-store/templates/portal/statefulset.yaml
@@ -115,6 +115,8 @@ spec:
               value: {{ .Values.portal.runtimePath | quote }}
             - name: STUDIO_WRAPPER_ENDPOINT
               value: {{ .Values.portal.studioWrapperEndpoint | quote }}
+            - name: BASEID
+              value: {{ .Values.portal.baseId | quote }}
             - name: SOLUTION
               value: "GRAPHSCOPE_INSIGHT"
             {{- range $key, $value := .Values.env }}
diff --git a/charts/graphscope-store/values.yaml b/charts/graphscope-store/values.yaml
index 915f2f66d53d..5f8126aae4f0 100644
--- a/charts/graphscope-store/values.yaml
+++ b/charts/graphscope-store/values.yaml
@@ -295,6 +295,9 @@ portal:
   ## Request for data loading
   ##
   studioWrapperEndpoint: ""
+  ##
+  ## baseId is the id used for creating odps dataloading job
+  baseId: ""
   ## @param hostIPC Specify if host IPC should be enabled for pods
   ##
   hostIPC: false
diff --git a/coordinator/gscoordinator/flex/core/insight/job.py b/coordinator/gscoordinator/flex/core/insight/job.py
index dad498e78852..c5eeeb121b1a 100644
--- a/coordinator/gscoordinator/flex/core/insight/job.py
+++ b/coordinator/gscoordinator/flex/core/insight/job.py
@@ -19,6 +19,7 @@
 import datetime
 import http.client
 import json
+import logging
 import time
 import urllib.parse
 
@@ -35,6 +36,7 @@
 from gscoordinator.flex.core.utils import encode_datetime
 from gscoordinator.flex.models import JobStatus
 
+logger = logging.getLogger("graphscope")
 
 class FetchDataloadingJobStatus(object):
     def __init__(self, graph, status: JobStatus):
@@ -307,12 +309,14 @@ def run(self):
                     json.dumps(configini),
                     headers={"Content-type": "application/json"},
                 )
-                r = conn.getresponse()
-                if r.status > 400 and r.status < 600:
+                resp = conn.getresponse()
+                data = resp.read().decode("utf-8")
+                if resp.status != 200:
+                    logger.error("Failed to submit dataloading job, code: ", resp.status, ", data: ", data)
                     raise RuntimeError(
-                        "Failed to submit dataloading job: " + r.read().decode("utf-8")
+                        "Failed to submit dataloading job, code: ", resp.status, ", data: ", data
                     )
-                rlt = json.loads(r.read().decode("utf-8"))
+                rlt = json.loads(data)
                 if rlt["success"]:
                     self._jobid = rlt["data"]
                     status = self.generate_job_status(
@@ -325,6 +329,7 @@ def run(self):
                         log=rlt["message"],
                     )
         except Exception as e:
+            logger.error("Exception occured: ", str(e))
             status = self.generate_job_status(
                 status="FAILED", end_time=datetime.datetime.now(), log=str(e)
             )