refactor: streamline module refresh process and enhance revision handling
CI / changes (push) Successful in 7s
CI / openapi (push) Has been skipped
CI / go (push) Successful in 40s
CI / docker-web (deploy/docker/evobgp-web/Dockerfile, , evobgp-web) (push) Has been skipped
CI / docker-web (deploy/docker/evobgp-web/Dockerfile, evobgp-all, evobgp-web-all) (push) Has been skipped
CI / docker-bird (push) Has been skipped
CI / bird2 (push) Successful in 15s
CI / docker-go-prime (push) Successful in 23s
CI / docker-go (deploy/docker/evobgp-agent/Dockerfile, , evobgp-agent) (push) Successful in 1m1s
CI / docker-go (evobgp-all, 1, deploy/docker/gobinary/Dockerfile, , evobgp-all) (push) Successful in 2m11s
CI / docker-go (evobgp-api, 1, deploy/docker/gobinary/Dockerfile, , evobgp-api) (push) Successful in 1m26s
CI / docker-go (evobgp-deploy, 0, deploy/docker/gobinary/Dockerfile, , evobgp-deploy) (push) Successful in 1m25s
CI / docker-go (evobgp-ingest, 0, deploy/docker/gobinary/Dockerfile, , evobgp-ingest) (push) Successful in 1m24s
CI / docker-go (evobgp-node, 0, deploy/docker/gobinary/Dockerfile, , evobgp-node) (push) Successful in 1m9s
CI / docker-go (evobgp-render, 0, deploy/docker/gobinary/Dockerfile, , evobgp-render) (push) Successful in 1m21s
CI / docker-go (evobgp-scheduler, 0, deploy/docker/gobinary/Dockerfile, , evobgp-scheduler) (push) Successful in 1m21s
CI / changes (push) Successful in 7s
CI / openapi (push) Has been skipped
CI / go (push) Successful in 40s
CI / docker-web (deploy/docker/evobgp-web/Dockerfile, , evobgp-web) (push) Has been skipped
CI / docker-web (deploy/docker/evobgp-web/Dockerfile, evobgp-all, evobgp-web-all) (push) Has been skipped
CI / docker-bird (push) Has been skipped
CI / bird2 (push) Successful in 15s
CI / docker-go-prime (push) Successful in 23s
CI / docker-go (deploy/docker/evobgp-agent/Dockerfile, , evobgp-agent) (push) Successful in 1m1s
CI / docker-go (evobgp-all, 1, deploy/docker/gobinary/Dockerfile, , evobgp-all) (push) Successful in 2m11s
CI / docker-go (evobgp-api, 1, deploy/docker/gobinary/Dockerfile, , evobgp-api) (push) Successful in 1m26s
CI / docker-go (evobgp-deploy, 0, deploy/docker/gobinary/Dockerfile, , evobgp-deploy) (push) Successful in 1m25s
CI / docker-go (evobgp-ingest, 0, deploy/docker/gobinary/Dockerfile, , evobgp-ingest) (push) Successful in 1m24s
CI / docker-go (evobgp-node, 0, deploy/docker/gobinary/Dockerfile, , evobgp-node) (push) Successful in 1m9s
CI / docker-go (evobgp-render, 0, deploy/docker/gobinary/Dockerfile, , evobgp-render) (push) Successful in 1m21s
CI / docker-go (evobgp-scheduler, 0, deploy/docker/gobinary/Dockerfile, , evobgp-scheduler) (push) Successful in 1m21s
Updated the worker's job processing to utilize a new `RefreshModuleIngest` function, which simplifies the module refresh logic by separating ingestion from revision rendering. The `finishModuleRefreshSuccess` method now handles the aggregation of revision logs and enqueues deploy actions more efficiently. Additionally, refactored the `RefreshModule` function to maintain backward compatibility while improving clarity and functionality in the pipeline's revision management.
This commit is contained in:
@@ -37,28 +37,34 @@ func MaterializedASPrefixKey(asn int64) string {
|
||||
return fmt.Sprintf("as:%d", asn)
|
||||
}
|
||||
|
||||
// RefreshModule runs ingest (where applicable) for one module, then renders a new revision whose
|
||||
// BIRD materialization includes prefixes from all enabled modules of the tenant (others via live collect).
|
||||
// If the tenant-wide materialized prefix set is unchanged from the latest revision, returns that
|
||||
// revision id and does not insert a duplicate config_revision.
|
||||
func RefreshModule(ctx context.Context, st store.Backend, hc *http.Client, tenantID, moduleID string) (revisionID string, err error) {
|
||||
// RefreshModuleIngest runs ingest for one module and persists side-effects (ASN metadata, CDN etags, etc).
|
||||
// It does not create a new config revision.
|
||||
func RefreshModuleIngest(ctx context.Context, st store.Backend, hc *http.Client, tenantID, moduleID string) error {
|
||||
if hc == nil {
|
||||
hc = http.DefaultClient
|
||||
}
|
||||
mod, err := st.GetModule(tenantID, moduleID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
return err
|
||||
}
|
||||
if !mod.Enabled {
|
||||
return "", fmt.Errorf("module disabled")
|
||||
return fmt.Errorf("module disabled")
|
||||
}
|
||||
|
||||
rows, err := collectModulePrefixRows(ctx, st, hc, tenantID, mod)
|
||||
_, err = collectModulePrefixRows(ctx, st, hc, tenantID, mod)
|
||||
if err != nil {
|
||||
return "", err
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
agg, err := aggregateTenantPrefixRows(ctx, st, hc, tenantID, moduleID, rows)
|
||||
// RenderTenantRevision renders one tenant-wide revision using current data from all enabled modules.
|
||||
// If materialized prefixes are unchanged, returns latest revision id without creating a duplicate.
|
||||
func RenderTenantRevision(ctx context.Context, st store.Backend, hc *http.Client, tenantID, triggerModuleID string) (revisionID string, err error) {
|
||||
if hc == nil {
|
||||
hc = http.DefaultClient
|
||||
}
|
||||
agg, err := aggregateTenantPrefixRowsAll(ctx, st, hc, tenantID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
@@ -69,17 +75,25 @@ func RefreshModule(ctx context.Context, st store.Backend, hc *http.Client, tenan
|
||||
agg = smartAggregatePrefixRows(agg)
|
||||
|
||||
revisionID = uuid.NewString()
|
||||
parent := parentRevision(st, tenantID, moduleID)
|
||||
preview, err := buildPreviewFragments(st, tenantID, moduleID, revisionID, agg)
|
||||
parent := parentRevision(st, tenantID, triggerModuleID)
|
||||
preview, err := buildPreviewFragments(st, tenantID, triggerModuleID, revisionID, agg)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if err := st.CreateRenderRevision(revisionID, tenantID, moduleID, parent, hash, preview, agg); err != nil {
|
||||
if err := st.CreateRenderRevision(revisionID, tenantID, triggerModuleID, parent, hash, preview, agg); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return revisionID, nil
|
||||
}
|
||||
|
||||
// RefreshModule keeps backwards-compatible behavior: module ingest + immediate tenant render.
|
||||
func RefreshModule(ctx context.Context, st store.Backend, hc *http.Client, tenantID, moduleID string) (revisionID string, err error) {
|
||||
if err := RefreshModuleIngest(ctx, st, hc, tenantID, moduleID); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return RenderTenantRevision(ctx, st, hc, tenantID, moduleID)
|
||||
}
|
||||
|
||||
// collectModulePrefixRows returns materialized prefix rows for a single module (source of truth from store / ASN resolve / CDN fetch).
|
||||
func collectModulePrefixRows(ctx context.Context, st store.Backend, hc *http.Client, tenantID string, mod *store.Module) ([]store.PrefixRow, error) {
|
||||
moduleID := mod.ID
|
||||
@@ -452,21 +466,15 @@ func ipToHostPrefix(ip netip.Addr) string {
|
||||
return netip.PrefixFrom(ip, bits).Masked().String()
|
||||
}
|
||||
|
||||
// aggregateTenantPrefixRows builds the union of materialized prefixes for all enabled modules.
|
||||
// The module that triggered refresh contributes freshRows; every other module is collected live from the store
|
||||
// (same logic as refresh). We do not reuse other modules' saved revisions as prefix sources, because each revision
|
||||
// already stores the full tenant-wide aggregate — mixing them with freshRows would duplicate prefixes.
|
||||
func aggregateTenantPrefixRows(ctx context.Context, st store.Backend, hc *http.Client, tenantID, changedModuleID string, freshRows []store.PrefixRow) ([]store.PrefixRow, error) {
|
||||
// aggregateTenantPrefixRowsAll builds the union of materialized prefixes for all enabled modules
|
||||
// using current source data from store/external resolvers.
|
||||
func aggregateTenantPrefixRowsAll(ctx context.Context, st store.Backend, hc *http.Client, tenantID string) ([]store.PrefixRow, error) {
|
||||
mods := st.ListModules(tenantID)
|
||||
var out []store.PrefixRow
|
||||
for _, m := range mods {
|
||||
if m == nil || !m.Enabled {
|
||||
continue
|
||||
}
|
||||
if m.ID == changedModuleID {
|
||||
out = append(out, freshRows...)
|
||||
continue
|
||||
}
|
||||
omod, err := st.GetModule(tenantID, m.ID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user