feat: Add version to offload nodes. Fixes #1944 and #1946 #1974
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package sqldb | ||
|
|
||
| import "upper.io/db.v3/lib/sqlbuilder" | ||
|
|
||
| // represent a straight forward change that is compatible with all database providers | ||
| type ansiSQLChange string | ||
|
|
||
| func (s ansiSQLChange) Apply(session sqlbuilder.Database) error { | ||
| _, err := session.Exec(string(s)) | ||
| return err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package sqldb | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| log "github.com/sirupsen/logrus" | ||
| "upper.io/db.v3" | ||
| "upper.io/db.v3/lib/sqlbuilder" | ||
| ) | ||
|
|
||
| type backfillClusterName struct { | ||
| clusterName string | ||
| tableName string | ||
| } | ||
|
|
||
| func (s backfillClusterName) String() string { | ||
| return fmt.Sprintf("backfillClusterName{%s,%s}", s.clusterName, s.tableName) | ||
| } | ||
|
|
||
| func (s backfillClusterName) Apply(session sqlbuilder.Database) error { | ||
| log.WithField("clustername", s.clusterName).Info("Back-filling cluster name") | ||
| rs, err := session. | ||
| Select("uid"). | ||
| From(s.tableName). | ||
| Where(db.Cond{"clustername": nil}). | ||
| Query() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| for rs.Next() { | ||
| uid := "" | ||
| err := rs.Scan(&uid) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| logCtx := log.WithFields(log.Fields{"clustername": s.clusterName, "uid": uid}) | ||
| logCtx.Info("Back-filling cluster name") | ||
| res, err := session. | ||
| Update(s.tableName). | ||
| Set("clustername", s.clusterName). | ||
| Where(db.Cond{"clustername": nil}). | ||
| And(db.Cond{"uuid": uid}). | ||
| Exec() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| rowsAffected, err := res.RowsAffected() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if rowsAffected != 1 { | ||
| logCtx.WithField("rowsAffected", rowsAffected).Warn("Expected exactly one row affected") | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package sqldb | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| log "github.com/sirupsen/logrus" | ||
| "upper.io/db.v3" | ||
| "upper.io/db.v3/lib/sqlbuilder" | ||
|
|
||
| wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" | ||
| ) | ||
|
|
||
| type backfillNodes struct { | ||
| tableName string | ||
| } | ||
|
|
||
| func (s backfillNodes) String() string { | ||
| return fmt.Sprintf("backfillNodes{%s}", s.tableName) | ||
| } | ||
|
|
||
| func (s backfillNodes) Apply(session sqlbuilder.Database) error { | ||
| log.Info("Backfill node status") | ||
| rs, err := session.SelectFrom(s.tableName). | ||
| Columns("workflow"). | ||
| Where(db.Cond{"version": nil}). | ||
| Query() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| for rs.Next() { | ||
| workflow := "" | ||
| err := rs.Scan(&workflow) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| var wf *wfv1.Workflow | ||
| err = json.Unmarshal([]byte(workflow), &wf) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| marshalled, version, err := nodeStatusVersion(wf.Status.Nodes) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| logCtx := log.WithFields(log.Fields{"name": wf.Name, "namespace": wf.Namespace, "version": version}) | ||
| logCtx.Info("Back-filling node status") | ||
| res, err := session.Update(archiveTableName). | ||
| Set("version", wf.ResourceVersion). | ||
|
There was a problem hiding this comment. Also this line - the archive table doesn't have a version column |
||
| Set("nodes", marshalled). | ||
| Where(db.Cond{"name": wf.Name}). | ||
| And(db.Cond{"namespace": wf.Namespace}). | ||
| Exec() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| rowsAffected, err := res.RowsAffected() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if rowsAffected != 1 { | ||
| logCtx.WithField("rowsAffected", rowsAffected).Warn("Expected exactly one row affected") | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this line read the following? (as there is no uuid column)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes - though why exactly any SQL framework would not throw some kind of exception at this clear error is beyond me 😠 😠 😠 😠
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually - maybe this code never runs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's running for me on migrating a legacy database ...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
did it migrate successfully? give that it'l likely that every record should have "default" it may be just luckily - though I ask again - who writes framework that allows such a big error thought?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no reviewing the code - this backfill is really implemented stupidly - I think I'll make a patch fix and then a re-write
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#2141