Skip to content

fix(network): reconcile eRPC overlay replacements - #815

Draft
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace
Draft

fix(network): reconcile eRPC overlay replacements#815
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace

Conversation

@bussyjd

Copy link
Copy Markdown
Contributor

Summary

  • treat the persisted eRPC operator overlay as desired state for overlay-owned networks and upstreams
  • remove or restore keys owned by the previous overlay when a replacement omits them
  • preserve union provenance before changing the cluster so interrupted replacements can be retried safely
  • retain the overlay and provenance files when erpc reset cannot clean the live ConfigMap
  • add regressions for disjoint replacement, restoration of chart-owned entries, and failed-reset recovery

Problem

obol network erpc set replaced the host-side overlay file but only merged the new document into the existing eRPC ConfigMap.

Given overlay A followed by disjoint overlay B, the resulting state was effectively:

saved overlay: B
live config: chart base + A + B

A subsequent reset read only B, removed only B-owned entries, and deleted provenance. Entries from A remained live without any durable ownership record, so an old RPC upstream could continue receiving traffic after the operator believed it had been replaced and reset.

Reset had a related failure mode: cluster cleanup was best-effort, but the durable overlay and provenance files were deleted even when cleanup failed. That made a transient Kubernetes failure permanently discard the information needed for a later retry.

Implementation

Replacement reconciliation now follows this model:

current live - retired overlay keys + desired overlay = desired live

Before merging the desired overlay, reconciliation:

  1. identifies provenance-tracked network and upstream keys absent from the desired document
  2. removes keys originally added by the overlay or restores chart/recorded entries that were replaced
  3. captures provenance for newly owned keys against the restored base state
  4. persists union provenance before writing the ConfigMap
  5. writes the desired live configuration
  6. prunes retired provenance after the cluster write succeeds

Persisting union provenance first makes the intermediate states recoverable. If the process or cluster write fails, the saved desired overlay and union ownership record allow the next stack-up reconcile to complete the transition.

For overlays created before provenance tracking, SetERPC records legacy drop markers before replacing the old document so their keys are not forgotten.

Reset now returns an error and retains both durable files when live cleanup fails.

Scope

This changes replacement and reset semantics for overlay-owned networks and upstreams, the entries that control routing. The existing intentional behavior for rate limiters and cache policies is unchanged.

Validation

  • go test ./internal/network -count=1
  • go test -race ./internal/network -count=1
  • go vet ./internal/network
  • go test ./cmd/obol ./internal/stack -count=1
  • go test ./... -count=1
  • just build
  • git diff --check

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@bussyjd
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(network): reconcile eRPC overlay replacements by bussyjd · Pull Request #815 · ObolNetwork/obol-stack · GitHub
Skip to content

fix(network): reconcile eRPC overlay replacements - #815

Draft
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace
Draft

fix(network): reconcile eRPC overlay replacements#815
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace

Conversation

@bussyjd

Copy link
Copy Markdown
Contributor

Summary

  • treat the persisted eRPC operator overlay as desired state for overlay-owned networks and upstreams
  • remove or restore keys owned by the previous overlay when a replacement omits them
  • preserve union provenance before changing the cluster so interrupted replacements can be retried safely
  • retain the overlay and provenance files when erpc reset cannot clean the live ConfigMap
  • add regressions for disjoint replacement, restoration of chart-owned entries, and failed-reset recovery

Problem

obol network erpc set replaced the host-side overlay file but only merged the new document into the existing eRPC ConfigMap.

Given overlay A followed by disjoint overlay B, the resulting state was effectively:

saved overlay: B
live config: chart base + A + B

A subsequent reset read only B, removed only B-owned entries, and deleted provenance. Entries from A remained live without any durable ownership record, so an old RPC upstream could continue receiving traffic after the operator believed it had been replaced and reset.

Reset had a related failure mode: cluster cleanup was best-effort, but the durable overlay and provenance files were deleted even when cleanup failed. That made a transient Kubernetes failure permanently discard the information needed for a later retry.

Implementation

Replacement reconciliation now follows this model:

current live - retired overlay keys + desired overlay = desired live

Before merging the desired overlay, reconciliation:

  1. identifies provenance-tracked network and upstream keys absent from the desired document
  2. removes keys originally added by the overlay or restores chart/recorded entries that were replaced
  3. captures provenance for newly owned keys against the restored base state
  4. persists union provenance before writing the ConfigMap
  5. writes the desired live configuration
  6. prunes retired provenance after the cluster write succeeds

Persisting union provenance first makes the intermediate states recoverable. If the process or cluster write fails, the saved desired overlay and union ownership record allow the next stack-up reconcile to complete the transition.

For overlays created before provenance tracking, SetERPC records legacy drop markers before replacing the old document so their keys are not forgotten.

Reset now returns an error and retains both durable files when live cleanup fails.

Scope

This changes replacement and reset semantics for overlay-owned networks and upstreams, the entries that control routing. The existing intentional behavior for rate limiters and cache policies is unchanged.

Validation

  • go test ./internal/network -count=1
  • go test -race ./internal/network -count=1
  • go vet ./internal/network
  • go test ./cmd/obol ./internal/stack -count=1
  • go test ./... -count=1
  • just build
  • git diff --check

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@bussyjd
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(network): reconcile eRPC overlay replacements by bussyjd · Pull Request #815 · ObolNetwork/obol-stack · GitHub
Skip to content

fix(network): reconcile eRPC overlay replacements - #815

Draft
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace
Draft

fix(network): reconcile eRPC overlay replacements#815
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace

Conversation

@bussyjd

Copy link
Copy Markdown
Contributor

Summary

  • treat the persisted eRPC operator overlay as desired state for overlay-owned networks and upstreams
  • remove or restore keys owned by the previous overlay when a replacement omits them
  • preserve union provenance before changing the cluster so interrupted replacements can be retried safely
  • retain the overlay and provenance files when erpc reset cannot clean the live ConfigMap
  • add regressions for disjoint replacement, restoration of chart-owned entries, and failed-reset recovery

Problem

obol network erpc set replaced the host-side overlay file but only merged the new document into the existing eRPC ConfigMap.

Given overlay A followed by disjoint overlay B, the resulting state was effectively:

saved overlay: B
live config: chart base + A + B

A subsequent reset read only B, removed only B-owned entries, and deleted provenance. Entries from A remained live without any durable ownership record, so an old RPC upstream could continue receiving traffic after the operator believed it had been replaced and reset.

Reset had a related failure mode: cluster cleanup was best-effort, but the durable overlay and provenance files were deleted even when cleanup failed. That made a transient Kubernetes failure permanently discard the information needed for a later retry.

Implementation

Replacement reconciliation now follows this model:

current live - retired overlay keys + desired overlay = desired live

Before merging the desired overlay, reconciliation:

  1. identifies provenance-tracked network and upstream keys absent from the desired document
  2. removes keys originally added by the overlay or restores chart/recorded entries that were replaced
  3. captures provenance for newly owned keys against the restored base state
  4. persists union provenance before writing the ConfigMap
  5. writes the desired live configuration
  6. prunes retired provenance after the cluster write succeeds

Persisting union provenance first makes the intermediate states recoverable. If the process or cluster write fails, the saved desired overlay and union ownership record allow the next stack-up reconcile to complete the transition.

For overlays created before provenance tracking, SetERPC records legacy drop markers before replacing the old document so their keys are not forgotten.

Reset now returns an error and retains both durable files when live cleanup fails.

Scope

This changes replacement and reset semantics for overlay-owned networks and upstreams, the entries that control routing. The existing intentional behavior for rate limiters and cache policies is unchanged.

Validation

  • go test ./internal/network -count=1
  • go test -race ./internal/network -count=1
  • go vet ./internal/network
  • go test ./cmd/obol ./internal/stack -count=1
  • go test ./... -count=1
  • just build
  • git diff --check

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@bussyjd
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(network): reconcile eRPC overlay replacements by bussyjd · Pull Request #815 · ObolNetwork/obol-stack · GitHub
Skip to content

fix(network): reconcile eRPC overlay replacements - #815

Draft
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace
Draft

fix(network): reconcile eRPC overlay replacements#815
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace

Conversation

@bussyjd

Copy link
Copy Markdown
Contributor

Summary

  • treat the persisted eRPC operator overlay as desired state for overlay-owned networks and upstreams
  • remove or restore keys owned by the previous overlay when a replacement omits them
  • preserve union provenance before changing the cluster so interrupted replacements can be retried safely
  • retain the overlay and provenance files when erpc reset cannot clean the live ConfigMap
  • add regressions for disjoint replacement, restoration of chart-owned entries, and failed-reset recovery

Problem

obol network erpc set replaced the host-side overlay file but only merged the new document into the existing eRPC ConfigMap.

Given overlay A followed by disjoint overlay B, the resulting state was effectively:

saved overlay: B
live config: chart base + A + B

A subsequent reset read only B, removed only B-owned entries, and deleted provenance. Entries from A remained live without any durable ownership record, so an old RPC upstream could continue receiving traffic after the operator believed it had been replaced and reset.

Reset had a related failure mode: cluster cleanup was best-effort, but the durable overlay and provenance files were deleted even when cleanup failed. That made a transient Kubernetes failure permanently discard the information needed for a later retry.

Implementation

Replacement reconciliation now follows this model:

current live - retired overlay keys + desired overlay = desired live

Before merging the desired overlay, reconciliation:

  1. identifies provenance-tracked network and upstream keys absent from the desired document
  2. removes keys originally added by the overlay or restores chart/recorded entries that were replaced
  3. captures provenance for newly owned keys against the restored base state
  4. persists union provenance before writing the ConfigMap
  5. writes the desired live configuration
  6. prunes retired provenance after the cluster write succeeds

Persisting union provenance first makes the intermediate states recoverable. If the process or cluster write fails, the saved desired overlay and union ownership record allow the next stack-up reconcile to complete the transition.

For overlays created before provenance tracking, SetERPC records legacy drop markers before replacing the old document so their keys are not forgotten.

Reset now returns an error and retains both durable files when live cleanup fails.

Scope

This changes replacement and reset semantics for overlay-owned networks and upstreams, the entries that control routing. The existing intentional behavior for rate limiters and cache policies is unchanged.

Validation

  • go test ./internal/network -count=1
  • go test -race ./internal/network -count=1
  • go vet ./internal/network
  • go test ./cmd/obol ./internal/stack -count=1
  • go test ./... -count=1
  • just build
  • git diff --check

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@bussyjd
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(network): reconcile eRPC overlay replacements by bussyjd · Pull Request #815 · ObolNetwork/obol-stack · GitHub
Skip to content

fix(network): reconcile eRPC overlay replacements - #815

Draft
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace
Draft

fix(network): reconcile eRPC overlay replacements#815
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace

Conversation

@bussyjd

Copy link
Copy Markdown
Contributor

Summary

  • treat the persisted eRPC operator overlay as desired state for overlay-owned networks and upstreams
  • remove or restore keys owned by the previous overlay when a replacement omits them
  • preserve union provenance before changing the cluster so interrupted replacements can be retried safely
  • retain the overlay and provenance files when erpc reset cannot clean the live ConfigMap
  • add regressions for disjoint replacement, restoration of chart-owned entries, and failed-reset recovery

Problem

obol network erpc set replaced the host-side overlay file but only merged the new document into the existing eRPC ConfigMap.

Given overlay A followed by disjoint overlay B, the resulting state was effectively:

saved overlay: B
live config: chart base + A + B

A subsequent reset read only B, removed only B-owned entries, and deleted provenance. Entries from A remained live without any durable ownership record, so an old RPC upstream could continue receiving traffic after the operator believed it had been replaced and reset.

Reset had a related failure mode: cluster cleanup was best-effort, but the durable overlay and provenance files were deleted even when cleanup failed. That made a transient Kubernetes failure permanently discard the information needed for a later retry.

Implementation

Replacement reconciliation now follows this model:

current live - retired overlay keys + desired overlay = desired live

Before merging the desired overlay, reconciliation:

  1. identifies provenance-tracked network and upstream keys absent from the desired document
  2. removes keys originally added by the overlay or restores chart/recorded entries that were replaced
  3. captures provenance for newly owned keys against the restored base state
  4. persists union provenance before writing the ConfigMap
  5. writes the desired live configuration
  6. prunes retired provenance after the cluster write succeeds

Persisting union provenance first makes the intermediate states recoverable. If the process or cluster write fails, the saved desired overlay and union ownership record allow the next stack-up reconcile to complete the transition.

For overlays created before provenance tracking, SetERPC records legacy drop markers before replacing the old document so their keys are not forgotten.

Reset now returns an error and retains both durable files when live cleanup fails.

Scope

This changes replacement and reset semantics for overlay-owned networks and upstreams, the entries that control routing. The existing intentional behavior for rate limiters and cache policies is unchanged.

Validation

  • go test ./internal/network -count=1
  • go test -race ./internal/network -count=1
  • go vet ./internal/network
  • go test ./cmd/obol ./internal/stack -count=1
  • go test ./... -count=1
  • just build
  • git diff --check

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@bussyjd
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(network): reconcile eRPC overlay replacements by bussyjd · Pull Request #815 · ObolNetwork/obol-stack · GitHub
Skip to content

fix(network): reconcile eRPC overlay replacements - #815

Draft
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace
Draft

fix(network): reconcile eRPC overlay replacements#815
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace

Conversation

@bussyjd

Copy link
Copy Markdown
Contributor

Summary

  • treat the persisted eRPC operator overlay as desired state for overlay-owned networks and upstreams
  • remove or restore keys owned by the previous overlay when a replacement omits them
  • preserve union provenance before changing the cluster so interrupted replacements can be retried safely
  • retain the overlay and provenance files when erpc reset cannot clean the live ConfigMap
  • add regressions for disjoint replacement, restoration of chart-owned entries, and failed-reset recovery

Problem

obol network erpc set replaced the host-side overlay file but only merged the new document into the existing eRPC ConfigMap.

Given overlay A followed by disjoint overlay B, the resulting state was effectively:

saved overlay: B
live config: chart base + A + B

A subsequent reset read only B, removed only B-owned entries, and deleted provenance. Entries from A remained live without any durable ownership record, so an old RPC upstream could continue receiving traffic after the operator believed it had been replaced and reset.

Reset had a related failure mode: cluster cleanup was best-effort, but the durable overlay and provenance files were deleted even when cleanup failed. That made a transient Kubernetes failure permanently discard the information needed for a later retry.

Implementation

Replacement reconciliation now follows this model:

current live - retired overlay keys + desired overlay = desired live

Before merging the desired overlay, reconciliation:

  1. identifies provenance-tracked network and upstream keys absent from the desired document
  2. removes keys originally added by the overlay or restores chart/recorded entries that were replaced
  3. captures provenance for newly owned keys against the restored base state
  4. persists union provenance before writing the ConfigMap
  5. writes the desired live configuration
  6. prunes retired provenance after the cluster write succeeds

Persisting union provenance first makes the intermediate states recoverable. If the process or cluster write fails, the saved desired overlay and union ownership record allow the next stack-up reconcile to complete the transition.

For overlays created before provenance tracking, SetERPC records legacy drop markers before replacing the old document so their keys are not forgotten.

Reset now returns an error and retains both durable files when live cleanup fails.

Scope

This changes replacement and reset semantics for overlay-owned networks and upstreams, the entries that control routing. The existing intentional behavior for rate limiters and cache policies is unchanged.

Validation

  • go test ./internal/network -count=1
  • go test -race ./internal/network -count=1
  • go vet ./internal/network
  • go test ./cmd/obol ./internal/stack -count=1
  • go test ./... -count=1
  • just build
  • git diff --check

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@bussyjd
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(network): reconcile eRPC overlay replacements by bussyjd · Pull Request #815 · ObolNetwork/obol-stack · GitHub
Skip to content

fix(network): reconcile eRPC overlay replacements - #815

Draft
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace
Draft

fix(network): reconcile eRPC overlay replacements#815
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace

Conversation

@bussyjd

Copy link
Copy Markdown
Contributor

Summary

  • treat the persisted eRPC operator overlay as desired state for overlay-owned networks and upstreams
  • remove or restore keys owned by the previous overlay when a replacement omits them
  • preserve union provenance before changing the cluster so interrupted replacements can be retried safely
  • retain the overlay and provenance files when erpc reset cannot clean the live ConfigMap
  • add regressions for disjoint replacement, restoration of chart-owned entries, and failed-reset recovery

Problem

obol network erpc set replaced the host-side overlay file but only merged the new document into the existing eRPC ConfigMap.

Given overlay A followed by disjoint overlay B, the resulting state was effectively:

saved overlay: B
live config: chart base + A + B

A subsequent reset read only B, removed only B-owned entries, and deleted provenance. Entries from A remained live without any durable ownership record, so an old RPC upstream could continue receiving traffic after the operator believed it had been replaced and reset.

Reset had a related failure mode: cluster cleanup was best-effort, but the durable overlay and provenance files were deleted even when cleanup failed. That made a transient Kubernetes failure permanently discard the information needed for a later retry.

Implementation

Replacement reconciliation now follows this model:

current live - retired overlay keys + desired overlay = desired live

Before merging the desired overlay, reconciliation:

  1. identifies provenance-tracked network and upstream keys absent from the desired document
  2. removes keys originally added by the overlay or restores chart/recorded entries that were replaced
  3. captures provenance for newly owned keys against the restored base state
  4. persists union provenance before writing the ConfigMap
  5. writes the desired live configuration
  6. prunes retired provenance after the cluster write succeeds

Persisting union provenance first makes the intermediate states recoverable. If the process or cluster write fails, the saved desired overlay and union ownership record allow the next stack-up reconcile to complete the transition.

For overlays created before provenance tracking, SetERPC records legacy drop markers before replacing the old document so their keys are not forgotten.

Reset now returns an error and retains both durable files when live cleanup fails.

Scope

This changes replacement and reset semantics for overlay-owned networks and upstreams, the entries that control routing. The existing intentional behavior for rate limiters and cache policies is unchanged.

Validation

  • go test ./internal/network -count=1
  • go test -race ./internal/network -count=1
  • go vet ./internal/network
  • go test ./cmd/obol ./internal/stack -count=1
  • go test ./... -count=1
  • just build
  • git diff --check

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@bussyjd
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(network): reconcile eRPC overlay replacements by bussyjd · Pull Request #815 · ObolNetwork/obol-stack · GitHub
Skip to content

fix(network): reconcile eRPC overlay replacements - #815

Draft
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace
Draft

fix(network): reconcile eRPC overlay replacements#815
bussyjd wants to merge 1 commit into
mainfrom
fix/erpc-overlay-replace

Conversation

@bussyjd

Copy link
Copy Markdown
Contributor

Summary

  • treat the persisted eRPC operator overlay as desired state for overlay-owned networks and upstreams
  • remove or restore keys owned by the previous overlay when a replacement omits them
  • preserve union provenance before changing the cluster so interrupted replacements can be retried safely
  • retain the overlay and provenance files when erpc reset cannot clean the live ConfigMap
  • add regressions for disjoint replacement, restoration of chart-owned entries, and failed-reset recovery

Problem

obol network erpc set replaced the host-side overlay file but only merged the new document into the existing eRPC ConfigMap.

Given overlay A followed by disjoint overlay B, the resulting state was effectively:

saved overlay: B
live config: chart base + A + B

A subsequent reset read only B, removed only B-owned entries, and deleted provenance. Entries from A remained live without any durable ownership record, so an old RPC upstream could continue receiving traffic after the operator believed it had been replaced and reset.

Reset had a related failure mode: cluster cleanup was best-effort, but the durable overlay and provenance files were deleted even when cleanup failed. That made a transient Kubernetes failure permanently discard the information needed for a later retry.

Implementation

Replacement reconciliation now follows this model:

current live - retired overlay keys + desired overlay = desired live

Before merging the desired overlay, reconciliation:

  1. identifies provenance-tracked network and upstream keys absent from the desired document
  2. removes keys originally added by the overlay or restores chart/recorded entries that were replaced
  3. captures provenance for newly owned keys against the restored base state
  4. persists union provenance before writing the ConfigMap
  5. writes the desired live configuration
  6. prunes retired provenance after the cluster write succeeds

Persisting union provenance first makes the intermediate states recoverable. If the process or cluster write fails, the saved desired overlay and union ownership record allow the next stack-up reconcile to complete the transition.

For overlays created before provenance tracking, SetERPC records legacy drop markers before replacing the old document so their keys are not forgotten.

Reset now returns an error and retains both durable files when live cleanup fails.

Scope

This changes replacement and reset semantics for overlay-owned networks and upstreams, the entries that control routing. The existing intentional behavior for rate limiters and cache policies is unchanged.

Validation

  • go test ./internal/network -count=1
  • go test -race ./internal/network -count=1
  • go vet ./internal/network
  • go test ./cmd/obol ./internal/stack -count=1
  • go test ./... -count=1
  • just build
  • git diff --check

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@bussyjd