From 9f239f5aee120c39abc1fc2895be7a37200dfdd7 Mon Sep 17 00:00:00 2001 From: Aditya Thebe Date: Thu, 27 Jul 2023 15:21:32 +0545 Subject: [PATCH] chore: bump duty --- go.mod | 4 +--- go.sum | 4 ++-- hack/generate-schemas/go.mod | 2 +- hack/generate-schemas/go.sum | 4 ++-- pkg/jobs/canary/sync_upstream.go | 6 +++--- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index ab48bbdee..87163b543 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/elastic/go-elasticsearch/v8 v8.1.0 github.com/fergusstrange/embedded-postgres v1.21.0 github.com/flanksource/commons v1.10.0 - github.com/flanksource/duty v1.0.129 + github.com/flanksource/duty v1.0.139 github.com/flanksource/is-healthy v0.0.0-20230705092916-3b4cf510c5fc github.com/flanksource/kommons v0.31.1 github.com/friendsofgo/errors v0.9.2 @@ -292,5 +292,3 @@ require ( sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) - -replace "github.com/flanksource/duty" => ../duty \ No newline at end of file diff --git a/go.sum b/go.sum index eaf2d3eef..98dc80ba9 100644 --- a/go.sum +++ b/go.sum @@ -1091,8 +1091,8 @@ github.com/fergusstrange/embedded-postgres v1.21.0 h1:Sups0nR31+OB4iOZ0ZU4IwUDsB github.com/fergusstrange/embedded-postgres v1.21.0/go.mod h1:wL562t1V+iuFwq0UcgMi2e9rp8CROY9wxWZEfP8Y874= github.com/flanksource/commons v1.10.0 h1:Mc+fzxq1rOJ08lapF0cc0bo9ZKNDxA7/81q2D/5jt0Q= github.com/flanksource/commons v1.10.0/go.mod h1:HpVjPtNe7v0UPk97kO/uUhOrYQ8yFD/mGglrTCkc9Ag= -github.com/flanksource/duty v1.0.129 h1:k8aK32vh8FJENIFaTxHqn0Vdjcn+rS292ywHBmrJj9M= -github.com/flanksource/duty v1.0.129/go.mod h1:RJ/kcZ7dbL8/52tem757szVIA3IomS8bOAZIK0xb4rk= +github.com/flanksource/duty v1.0.139 h1:k0fx/uNC8GV4dvOmTrFGudXcjDx/y6udz3VDcQID+/I= +github.com/flanksource/duty v1.0.139/go.mod h1:RJ/kcZ7dbL8/52tem757szVIA3IomS8bOAZIK0xb4rk= github.com/flanksource/gomplate/v3 v3.20.1/go.mod h1:LPpzujBIg9HBXRUngDKK/zNmEjHpEUieKa/2oRjkCzI= github.com/flanksource/gomplate/v3 v3.20.3 h1:mnNaO37uwvv8Kvi4Xswj1tHKP5UMre3FLNaKvAwqhSw= github.com/flanksource/gomplate/v3 v3.20.3/go.mod h1:l4iCvp30TdhZk89eRGuNkPwlRjJLXdUSblr+VyuZfAk= diff --git a/hack/generate-schemas/go.mod b/hack/generate-schemas/go.mod index aeac36262..57b010a9f 100644 --- a/hack/generate-schemas/go.mod +++ b/hack/generate-schemas/go.mod @@ -73,7 +73,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad // indirect github.com/emirpasic/gods v1.18.1 // indirect - github.com/flanksource/duty v1.0.129 // indirect + github.com/flanksource/duty v1.0.139 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-openapi/inflect v0.19.0 // indirect diff --git a/hack/generate-schemas/go.sum b/hack/generate-schemas/go.sum index a9d4d74a3..83ff350a9 100644 --- a/hack/generate-schemas/go.sum +++ b/hack/generate-schemas/go.sum @@ -811,8 +811,8 @@ github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fergusstrange/embedded-postgres v1.21.0 h1:Sups0nR31+OB4iOZ0ZU4IwUDsB+dVGmcqj4S2ko0qTI= github.com/flanksource/commons v1.10.0 h1:Mc+fzxq1rOJ08lapF0cc0bo9ZKNDxA7/81q2D/5jt0Q= github.com/flanksource/commons v1.10.0/go.mod h1:HpVjPtNe7v0UPk97kO/uUhOrYQ8yFD/mGglrTCkc9Ag= -github.com/flanksource/duty v1.0.129 h1:k8aK32vh8FJENIFaTxHqn0Vdjcn+rS292ywHBmrJj9M= -github.com/flanksource/duty v1.0.129/go.mod h1:RJ/kcZ7dbL8/52tem757szVIA3IomS8bOAZIK0xb4rk= +github.com/flanksource/duty v1.0.139 h1:k0fx/uNC8GV4dvOmTrFGudXcjDx/y6udz3VDcQID+/I= +github.com/flanksource/duty v1.0.139/go.mod h1:RJ/kcZ7dbL8/52tem757szVIA3IomS8bOAZIK0xb4rk= github.com/flanksource/gomplate/v3 v3.20.1/go.mod h1:LPpzujBIg9HBXRUngDKK/zNmEjHpEUieKa/2oRjkCzI= github.com/flanksource/gomplate/v3 v3.20.3 h1:mnNaO37uwvv8Kvi4Xswj1tHKP5UMre3FLNaKvAwqhSw= github.com/flanksource/gomplate/v3 v3.20.3/go.mod h1:l4iCvp30TdhZk89eRGuNkPwlRjJLXdUSblr+VyuZfAk= diff --git a/pkg/jobs/canary/sync_upstream.go b/pkg/jobs/canary/sync_upstream.go index 909eef6bd..5c0fb20ab 100644 --- a/pkg/jobs/canary/sync_upstream.go +++ b/pkg/jobs/canary/sync_upstream.go @@ -31,11 +31,11 @@ func SyncWithUpstream() { _ = db.PersistJobHistory(jobHistory.Start()) defer func() { _ = db.PersistJobHistory(jobHistory.End()) }() - syncer := upstream.NewUpstreamSyncer(UpstreamConf, 500) + reconciler := upstream.NewUpstreamReconciler(UpstreamConf, 5) for _, table := range tablesToReconcile { - if err := syncer.SyncTableWithUpstream(ctx, table); err != nil { + if err := reconciler.Sync(ctx, table); err != nil { jobHistory.AddError(err.Error()) - logger.Errorf("failed to sync table %s: %w", table, err) + logger.Errorf("failed to sync table %s: %v", table, err) } else { jobHistory.IncrSuccess() }