perf: remove lc dependency

This commit is contained in:
2024-12-12 23:13:54 +03:30
parent 3912ecef44
commit d3fd04b20c
19 changed files with 182 additions and 500 deletions

View File

@@ -5,7 +5,8 @@ import (
"flink-kube-operator/internal/crd/v1alpha1"
"flink-kube-operator/internal/jar"
"gitea.com/logicamp/lc"
"flink-kube-operator/pkg"
api "github.com/logi-camp/go-flink-client"
"go.uber.org/zap"
)
@@ -14,19 +15,19 @@ import (
func (job *ManagedJob) upload() error {
jarFile, err := jar.NewJarFile(job.def.Spec.JarURI)
if err != nil {
lc.Logger.Debug("[main] error on download jar", zap.Error(err))
pkg.Logger.Debug("[main] error on download jar", zap.Error(err))
return err
}
fileName, err := jarFile.Upload(job.client)
if err != nil {
lc.Logger.Debug("[main] error on upload jar", zap.Error(err))
pkg.Logger.Debug("[main] error on upload jar", zap.Error(err))
return err
}
err = jarFile.Delete()
if err != nil {
lc.Logger.Debug("[main] error on delete jar", zap.Error(err))
pkg.Logger.Debug("[main] error on delete jar", zap.Error(err))
}
lc.Logger.Debug("[main] after upload jar", zap.Any("upload-jar-resp", fileName))
pkg.Logger.Debug("[main] after upload jar", zap.Any("upload-jar-resp", fileName))
job.def.Status.JarId = &fileName
job.crd.Patch(job.def.UID, map[string]interface{}{
@@ -41,20 +42,20 @@ func (job *ManagedJob) upload() error {
func (job *ManagedJob) run() error {
if job.def.Status.JarId == nil {
err := errors.New("missing jar id")
lc.Logger.Error("[managed-job] [run]", zap.Error(err))
pkg.Logger.Error("[managed-job] [run]", zap.Error(err))
return err
}
lc.Logger.Info("[managed-job] [run] starting job", zap.String("name", job.def.GetName()))
pkg.Logger.Info("[managed-job] [run] starting job", zap.String("name", job.def.GetName()))
runJarResp, err := job.client.RunJar(api.RunOpts{
JarID: *job.def.Status.JarId,
AllowNonRestoredState: true,
EntryClass: job.def.Spec.EntryClass,
})
if err != nil {
lc.Logger.Error("[managed-job] [run]", zap.Error(err))
pkg.Logger.Error("[managed-job] [run]", zap.Error(err))
return err
}
lc.Logger.Debug("[main] after run jar", zap.Any("run-jar-resp", runJarResp))
pkg.Logger.Debug("[main] after run jar", zap.Any("run-jar-resp", runJarResp))
// if job.state == nil {
// job.state = &jobState{}