[incubator-devlake] branch main updated: fix: no pipelines data when running pipelines on postgres (#5702)

[klesh]

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

klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new f8ad90e43 fix: no pipelines data when running pipelines on postgres 
(#5702)
f8ad90e43 is described below

commit f8ad90e43b284345ca01d56fcd1c676c579d545f
Author: abeizn <zikuan...@merico.dev>
AuthorDate: Thu Jul 20 14:48:37 2023 +0800

    fix: no pipelines data when running pipelines on postgres (#5702)
    
    * fix: no pipelines data when running pipelines
    
    * fix: add recover() != nil
    
    * fix: add else
---
 backend/helpers/dbhelper/txhelper.go | 13 +++++++------
 backend/server/services/pipeline.go  |  5 ++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/backend/helpers/dbhelper/txhelper.go 
b/backend/helpers/dbhelper/txhelper.go
index dc3c7e125..fc3fb990d 100644
--- a/backend/helpers/dbhelper/txhelper.go
+++ b/backend/helpers/dbhelper/txhelper.go
@@ -19,7 +19,6 @@ package dbhelper
 
 import (
        "fmt"
-       "reflect"
        "time"
 
        "github.com/apache/incubator-devlake/core/context"
@@ -70,17 +69,19 @@ func (l *TxHelper[E]) End() {
        }
        var msg string
        err := *l.perr
-       if !reflect.ValueOf(err).IsValid() {
+       if interface{}(err) == nil {
+               msg = ""
                r := recover()
-               msg = fmt.Sprintf("%v", r)
+               if r != nil {
+                       msg = fmt.Sprintf("%v", r)
+               }
        } else {
                msg = err.Error()
        }
+
        if msg == "" {
                errors.Must(l.tx.Commit())
-       }
-       if msg != "" {
-               // l.basicRes.GetLogger().Error(fmt.Errorf(msg), "TxHelper")
+       } else {
                _ = l.tx.UnlockTables()
                _ = l.tx.Rollback()
        }
diff --git a/backend/server/services/pipeline.go 
b/backend/server/services/pipeline.go
index 530837e3e..f4f07f155 100644
--- a/backend/server/services/pipeline.go
+++ b/backend/server/services/pipeline.go
@@ -206,10 +206,13 @@ func dequeuePipeline(runningParallelLabels []string) 
(pipeline *models.Pipeline,
                }
                return
        }
-       if !tx.IsErrorNotFound(err) {
+       if tx.IsErrorNotFound(err) {
+               err = nil
+       } else {
                // log unexpected err
                globalPipelineLog.Error(err, "dequeue failed")
        }
+
        return
 }