From 02d8f0b02ea328ca18d726d0138facd7303d657b Mon Sep 17 00:00:00 2001 From: Mohammadreza Khani Date: Fri, 13 Dec 2024 19:51:26 +0330 Subject: [PATCH] fix: resolve remain jar file after upload --- internal/jar/jar.go | 15 +++++++++------ internal/managed_job/upload.go | 4 ---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/jar/jar.go b/internal/jar/jar.go index 53f2d00..f579c33 100644 --- a/internal/jar/jar.go +++ b/internal/jar/jar.go @@ -30,9 +30,9 @@ func NewJarFile(URI string) (*JarFile, error) { return jarFile, nil } -func (JarFile *JarFile) Upload(flinkClient *api.Client) (fileName string, err error) { +func (jarFile *JarFile) Upload(flinkClient *api.Client) (fileName string, err error) { - resp, err := flinkClient.UploadJar(JarFile.filePath) + resp, err := flinkClient.UploadJar(jarFile.filePath) if err != nil { pkg.Logger.Error("[main] error uploading jar", zap.Error(err)) } @@ -41,13 +41,14 @@ func (JarFile *JarFile) Upload(flinkClient *api.Client) (fileName string, err er if resp.Status != "success" { err = errors.New("jar upload was not success") } - JarFile.filePath = fileName + jarFile.filePath = fileName + jarFile.delete() return } func (jarFile *JarFile) Download() error { fileName, _ := gonanoid.New() - jarFile.filePath = fileName + ".jar" + jarFile.filePath = "/tmp/" + fileName + ".jar" out, err := os.Create(jarFile.filePath) if err != nil { return err @@ -68,6 +69,8 @@ func (jarFile *JarFile) Download() error { return nil } -func (jarFile *JarFile) Delete() error { - return os.Remove(jarFile.filePath) +func (jarFile *JarFile) delete() error { + err := os.Remove(jarFile.filePath) + pkg.Logger.Debug("[jar] [delete]", zap.Error(err)) + return err } diff --git a/internal/managed_job/upload.go b/internal/managed_job/upload.go index fb2ebb3..7f3097a 100644 --- a/internal/managed_job/upload.go +++ b/internal/managed_job/upload.go @@ -20,10 +20,6 @@ func (job *ManagedJob) upload() error { pkg.Logger.Debug("[manage-job] [upload] error on upload jar", zap.Error(err)) return err } - err = jarFile.Delete() - if err != nil { - pkg.Logger.Debug("[manage-job] [upload] error on delete jar", zap.Error(err)) - } pkg.Logger.Info("[manage-job] [upload] uploaded", zap.Any("upload-jar-resp", jarId)) job.def.Status.JarId = &jarId