SOLR-18413: Handle deleted MIGRATE routing targets - #4862

Open
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target
Open

SOLR-18413: Handle deleted MIGRATE routing targets#4862
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target

Conversation

@JHSUYU

Copy link
Copy Markdown

JIRA: SOLR-18413

Description

A SolrCloud MIGRATE adds a temporary routing rule to the source slice so that matching updates are also forwarded to the target collection.

For example, migrating route key a! from source to target creates state similar to:

source/shard1.routingRules["a!"].targetCollection = "target"

The routing rule stores the target collection name as a string. Deleting target does not remove routing rules in other collections that refer to it, so the source can retain an unexpired rule whose target is no longer present in ClusterState.

A subsequent matching update, such as adding id=a!2 to source, is first applied locally on the source shard leader. DistributedZkUpdateProcessor.doDistribAdd() then resolves routing-rule destinations before distributing the update to the source shard replicas:

finalList<SolrCmdDistributor.Node> nodesByRoutingRules =
getNodesByRoutingRules(
clusterState, coll, cmd.getIndexedIdStr(), cmd.getSolrInputDocument());
...
if (nodes != null) {
cmdDistrib.distribAdd(...);
}

getNodesByRoutingRules() previously resolved the target using:

DocCollectiontargetColl =
cstate.getCollection(rule.getTargetCollectionName());

If the target had been deleted, this threw:

HTTP 400
Could not find collection : target

Because the source leader had already applied the update, but the exception occurred before source-replica distribution, the request could leave the shard in this state:

source shard leader: a!2 exists
source shard replica: a!2 is missing
client: HTTP 400

No request was sent to the source replica, so SolrCmdDistributor did not record a replica failure and this update did not trigger term demotion or recovery. Queries can then return different results depending on which replica serves them. If leadership subsequently moves to a replica that never received the update, the document is lost.

Solution

Resolve the routing-rule target with getCollectionOrNull():

DocCollectiontargetColl =
cstate.getCollectionOrNull(rule.getTargetCollectionName());
if (targetColl == null) {
removeRoutingRule(myShardId, routeKey);
break;
}

When the target collection no longer exists, the routing rule is treated as invalid. The existing routing-rule removal logic used for expired rules was extracted into removeRoutingRule(). Expired rules and rules with missing targets now share the same cleanup path. The cleanup remains guarded by the core's routing-rule lock.

The behavior for a target collection that exists but has no active slices is unchanged. That condition may be temporary and continues to produce an error rather than permanently removing the routing rule.

Tests

Added:

  • MigrateRouteKeyTest.updateSucceedsAfterMigrateTargetIsDeleted

The test uses a real two-node MiniSolrCloudCluster and performs this sequence:

  1. Creates a source collection.
  2. Creates a target collection.
  3. Adds and commits id=a!1 to the source.
  4. Migrates route key a! from the source to the target.
  5. Confirms that the source shard contains an active routing rule targeting the target collection.
  6. Deletes the target collection and waits for it to disappear from ClusterState.
  7. Adds id=a!2 to the source and commits.
  8. Queries each source replica directly with distrib=false.
  9. Confirms that both the leader and non-leader replica contain a!2.
  10. Confirms that the dangling routing rule is removed.

Without the fix, the add in step 7 fails with:

Could not find collection : deletedMigrateTarget-target

@dsmileydsmiley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I love your detailed explanation.

Note that you kept referring to "replica" in a way that meant to imply a "follower replica" (instead of the "leader replica"). Basically, the leader is a replica too!

Needs a changelog (see writeChangelog task). I'm not sure this is a bug, maybe it's just a "changed" (improvement). Assuming a user could repair the situation on their own with the HTTP API. If they delete the collection, they ought to first undo the migration. If they can't, then I'm more sympathetic to this being a bug.

}
try {
if (ruleExpiryLock.tryLock(10, TimeUnit.MILLISECONDS)) {
log.info("Going to remove routing rule");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be clearer. I suggest "Removing shard update routing rule because the target collection ____ doesn't exist".

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@JHSUYU@dsmiley
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

SOLR-18413: Handle deleted MIGRATE routing targets - #4862

Open
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target
Open

SOLR-18413: Handle deleted MIGRATE routing targets#4862
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target

Conversation

@JHSUYU

Copy link
Copy Markdown

JIRA: SOLR-18413

Description

A SolrCloud MIGRATE adds a temporary routing rule to the source slice so that matching updates are also forwarded to the target collection.

For example, migrating route key a! from source to target creates state similar to:

source/shard1.routingRules["a!"].targetCollection = "target"

The routing rule stores the target collection name as a string. Deleting target does not remove routing rules in other collections that refer to it, so the source can retain an unexpired rule whose target is no longer present in ClusterState.

A subsequent matching update, such as adding id=a!2 to source, is first applied locally on the source shard leader. DistributedZkUpdateProcessor.doDistribAdd() then resolves routing-rule destinations before distributing the update to the source shard replicas:

finalList<SolrCmdDistributor.Node> nodesByRoutingRules =
getNodesByRoutingRules(
clusterState, coll, cmd.getIndexedIdStr(), cmd.getSolrInputDocument());
...
if (nodes != null) {
cmdDistrib.distribAdd(...);
}

getNodesByRoutingRules() previously resolved the target using:

DocCollectiontargetColl =
cstate.getCollection(rule.getTargetCollectionName());

If the target had been deleted, this threw:

HTTP 400
Could not find collection : target

Because the source leader had already applied the update, but the exception occurred before source-replica distribution, the request could leave the shard in this state:

source shard leader: a!2 exists
source shard replica: a!2 is missing
client: HTTP 400

No request was sent to the source replica, so SolrCmdDistributor did not record a replica failure and this update did not trigger term demotion or recovery. Queries can then return different results depending on which replica serves them. If leadership subsequently moves to a replica that never received the update, the document is lost.

Solution

Resolve the routing-rule target with getCollectionOrNull():

DocCollectiontargetColl =
cstate.getCollectionOrNull(rule.getTargetCollectionName());
if (targetColl == null) {
removeRoutingRule(myShardId, routeKey);
break;
}

When the target collection no longer exists, the routing rule is treated as invalid. The existing routing-rule removal logic used for expired rules was extracted into removeRoutingRule(). Expired rules and rules with missing targets now share the same cleanup path. The cleanup remains guarded by the core's routing-rule lock.

The behavior for a target collection that exists but has no active slices is unchanged. That condition may be temporary and continues to produce an error rather than permanently removing the routing rule.

Tests

Added:

  • MigrateRouteKeyTest.updateSucceedsAfterMigrateTargetIsDeleted

The test uses a real two-node MiniSolrCloudCluster and performs this sequence:

  1. Creates a source collection.
  2. Creates a target collection.
  3. Adds and commits id=a!1 to the source.
  4. Migrates route key a! from the source to the target.
  5. Confirms that the source shard contains an active routing rule targeting the target collection.
  6. Deletes the target collection and waits for it to disappear from ClusterState.
  7. Adds id=a!2 to the source and commits.
  8. Queries each source replica directly with distrib=false.
  9. Confirms that both the leader and non-leader replica contain a!2.
  10. Confirms that the dangling routing rule is removed.

Without the fix, the add in step 7 fails with:

Could not find collection : deletedMigrateTarget-target

@dsmileydsmiley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I love your detailed explanation.

Note that you kept referring to "replica" in a way that meant to imply a "follower replica" (instead of the "leader replica"). Basically, the leader is a replica too!

Needs a changelog (see writeChangelog task). I'm not sure this is a bug, maybe it's just a "changed" (improvement). Assuming a user could repair the situation on their own with the HTTP API. If they delete the collection, they ought to first undo the migration. If they can't, then I'm more sympathetic to this being a bug.

}
try {
if (ruleExpiryLock.tryLock(10, TimeUnit.MILLISECONDS)) {
log.info("Going to remove routing rule");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be clearer. I suggest "Removing shard update routing rule because the target collection ____ doesn't exist".

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

SOLR-18413: Handle deleted MIGRATE routing targets - #4862

Open
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target
Open

SOLR-18413: Handle deleted MIGRATE routing targets#4862
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target

Conversation

@JHSUYU

Copy link
Copy Markdown

JIRA: SOLR-18413

Description

A SolrCloud MIGRATE adds a temporary routing rule to the source slice so that matching updates are also forwarded to the target collection.

For example, migrating route key a! from source to target creates state similar to:

source/shard1.routingRules["a!"].targetCollection = "target"

The routing rule stores the target collection name as a string. Deleting target does not remove routing rules in other collections that refer to it, so the source can retain an unexpired rule whose target is no longer present in ClusterState.

A subsequent matching update, such as adding id=a!2 to source, is first applied locally on the source shard leader. DistributedZkUpdateProcessor.doDistribAdd() then resolves routing-rule destinations before distributing the update to the source shard replicas:

finalList<SolrCmdDistributor.Node> nodesByRoutingRules =
getNodesByRoutingRules(
clusterState, coll, cmd.getIndexedIdStr(), cmd.getSolrInputDocument());
...
if (nodes != null) {
cmdDistrib.distribAdd(...);
}

getNodesByRoutingRules() previously resolved the target using:

DocCollectiontargetColl =
cstate.getCollection(rule.getTargetCollectionName());

If the target had been deleted, this threw:

HTTP 400
Could not find collection : target

Because the source leader had already applied the update, but the exception occurred before source-replica distribution, the request could leave the shard in this state:

source shard leader: a!2 exists
source shard replica: a!2 is missing
client: HTTP 400

No request was sent to the source replica, so SolrCmdDistributor did not record a replica failure and this update did not trigger term demotion or recovery. Queries can then return different results depending on which replica serves them. If leadership subsequently moves to a replica that never received the update, the document is lost.

Solution

Resolve the routing-rule target with getCollectionOrNull():

DocCollectiontargetColl =
cstate.getCollectionOrNull(rule.getTargetCollectionName());
if (targetColl == null) {
removeRoutingRule(myShardId, routeKey);
break;
}

When the target collection no longer exists, the routing rule is treated as invalid. The existing routing-rule removal logic used for expired rules was extracted into removeRoutingRule(). Expired rules and rules with missing targets now share the same cleanup path. The cleanup remains guarded by the core's routing-rule lock.

The behavior for a target collection that exists but has no active slices is unchanged. That condition may be temporary and continues to produce an error rather than permanently removing the routing rule.

Tests

Added:

  • MigrateRouteKeyTest.updateSucceedsAfterMigrateTargetIsDeleted

The test uses a real two-node MiniSolrCloudCluster and performs this sequence:

  1. Creates a source collection.
  2. Creates a target collection.
  3. Adds and commits id=a!1 to the source.
  4. Migrates route key a! from the source to the target.
  5. Confirms that the source shard contains an active routing rule targeting the target collection.
  6. Deletes the target collection and waits for it to disappear from ClusterState.
  7. Adds id=a!2 to the source and commits.
  8. Queries each source replica directly with distrib=false.
  9. Confirms that both the leader and non-leader replica contain a!2.
  10. Confirms that the dangling routing rule is removed.

Without the fix, the add in step 7 fails with:

Could not find collection : deletedMigrateTarget-target

@dsmileydsmiley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I love your detailed explanation.

Note that you kept referring to "replica" in a way that meant to imply a "follower replica" (instead of the "leader replica"). Basically, the leader is a replica too!

Needs a changelog (see writeChangelog task). I'm not sure this is a bug, maybe it's just a "changed" (improvement). Assuming a user could repair the situation on their own with the HTTP API. If they delete the collection, they ought to first undo the migration. If they can't, then I'm more sympathetic to this being a bug.

}
try {
if (ruleExpiryLock.tryLock(10, TimeUnit.MILLISECONDS)) {
log.info("Going to remove routing rule");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be clearer. I suggest "Removing shard update routing rule because the target collection ____ doesn't exist".

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

SOLR-18413: Handle deleted MIGRATE routing targets - #4862

Open
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target
Open

SOLR-18413: Handle deleted MIGRATE routing targets#4862
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target

Conversation

@JHSUYU

Copy link
Copy Markdown

JIRA: SOLR-18413

Description

A SolrCloud MIGRATE adds a temporary routing rule to the source slice so that matching updates are also forwarded to the target collection.

For example, migrating route key a! from source to target creates state similar to:

source/shard1.routingRules["a!"].targetCollection = "target"

The routing rule stores the target collection name as a string. Deleting target does not remove routing rules in other collections that refer to it, so the source can retain an unexpired rule whose target is no longer present in ClusterState.

A subsequent matching update, such as adding id=a!2 to source, is first applied locally on the source shard leader. DistributedZkUpdateProcessor.doDistribAdd() then resolves routing-rule destinations before distributing the update to the source shard replicas:

finalList<SolrCmdDistributor.Node> nodesByRoutingRules =
getNodesByRoutingRules(
clusterState, coll, cmd.getIndexedIdStr(), cmd.getSolrInputDocument());
...
if (nodes != null) {
cmdDistrib.distribAdd(...);
}

getNodesByRoutingRules() previously resolved the target using:

DocCollectiontargetColl =
cstate.getCollection(rule.getTargetCollectionName());

If the target had been deleted, this threw:

HTTP 400
Could not find collection : target

Because the source leader had already applied the update, but the exception occurred before source-replica distribution, the request could leave the shard in this state:

source shard leader: a!2 exists
source shard replica: a!2 is missing
client: HTTP 400

No request was sent to the source replica, so SolrCmdDistributor did not record a replica failure and this update did not trigger term demotion or recovery. Queries can then return different results depending on which replica serves them. If leadership subsequently moves to a replica that never received the update, the document is lost.

Solution

Resolve the routing-rule target with getCollectionOrNull():

DocCollectiontargetColl =
cstate.getCollectionOrNull(rule.getTargetCollectionName());
if (targetColl == null) {
removeRoutingRule(myShardId, routeKey);
break;
}

When the target collection no longer exists, the routing rule is treated as invalid. The existing routing-rule removal logic used for expired rules was extracted into removeRoutingRule(). Expired rules and rules with missing targets now share the same cleanup path. The cleanup remains guarded by the core's routing-rule lock.

The behavior for a target collection that exists but has no active slices is unchanged. That condition may be temporary and continues to produce an error rather than permanently removing the routing rule.

Tests

Added:

  • MigrateRouteKeyTest.updateSucceedsAfterMigrateTargetIsDeleted

The test uses a real two-node MiniSolrCloudCluster and performs this sequence:

  1. Creates a source collection.
  2. Creates a target collection.
  3. Adds and commits id=a!1 to the source.
  4. Migrates route key a! from the source to the target.
  5. Confirms that the source shard contains an active routing rule targeting the target collection.
  6. Deletes the target collection and waits for it to disappear from ClusterState.
  7. Adds id=a!2 to the source and commits.
  8. Queries each source replica directly with distrib=false.
  9. Confirms that both the leader and non-leader replica contain a!2.
  10. Confirms that the dangling routing rule is removed.

Without the fix, the add in step 7 fails with:

Could not find collection : deletedMigrateTarget-target

@dsmileydsmiley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I love your detailed explanation.

Note that you kept referring to "replica" in a way that meant to imply a "follower replica" (instead of the "leader replica"). Basically, the leader is a replica too!

Needs a changelog (see writeChangelog task). I'm not sure this is a bug, maybe it's just a "changed" (improvement). Assuming a user could repair the situation on their own with the HTTP API. If they delete the collection, they ought to first undo the migration. If they can't, then I'm more sympathetic to this being a bug.

}
try {
if (ruleExpiryLock.tryLock(10, TimeUnit.MILLISECONDS)) {
log.info("Going to remove routing rule");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be clearer. I suggest "Removing shard update routing rule because the target collection ____ doesn't exist".

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

SOLR-18413: Handle deleted MIGRATE routing targets - #4862

Open
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target
Open

SOLR-18413: Handle deleted MIGRATE routing targets#4862
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target

Conversation

@JHSUYU

Copy link
Copy Markdown

JIRA: SOLR-18413

Description

A SolrCloud MIGRATE adds a temporary routing rule to the source slice so that matching updates are also forwarded to the target collection.

For example, migrating route key a! from source to target creates state similar to:

source/shard1.routingRules["a!"].targetCollection = "target"

The routing rule stores the target collection name as a string. Deleting target does not remove routing rules in other collections that refer to it, so the source can retain an unexpired rule whose target is no longer present in ClusterState.

A subsequent matching update, such as adding id=a!2 to source, is first applied locally on the source shard leader. DistributedZkUpdateProcessor.doDistribAdd() then resolves routing-rule destinations before distributing the update to the source shard replicas:

finalList<SolrCmdDistributor.Node> nodesByRoutingRules =
getNodesByRoutingRules(
clusterState, coll, cmd.getIndexedIdStr(), cmd.getSolrInputDocument());
...
if (nodes != null) {
cmdDistrib.distribAdd(...);
}

getNodesByRoutingRules() previously resolved the target using:

DocCollectiontargetColl =
cstate.getCollection(rule.getTargetCollectionName());

If the target had been deleted, this threw:

HTTP 400
Could not find collection : target

Because the source leader had already applied the update, but the exception occurred before source-replica distribution, the request could leave the shard in this state:

source shard leader: a!2 exists
source shard replica: a!2 is missing
client: HTTP 400

No request was sent to the source replica, so SolrCmdDistributor did not record a replica failure and this update did not trigger term demotion or recovery. Queries can then return different results depending on which replica serves them. If leadership subsequently moves to a replica that never received the update, the document is lost.

Solution

Resolve the routing-rule target with getCollectionOrNull():

DocCollectiontargetColl =
cstate.getCollectionOrNull(rule.getTargetCollectionName());
if (targetColl == null) {
removeRoutingRule(myShardId, routeKey);
break;
}

When the target collection no longer exists, the routing rule is treated as invalid. The existing routing-rule removal logic used for expired rules was extracted into removeRoutingRule(). Expired rules and rules with missing targets now share the same cleanup path. The cleanup remains guarded by the core's routing-rule lock.

The behavior for a target collection that exists but has no active slices is unchanged. That condition may be temporary and continues to produce an error rather than permanently removing the routing rule.

Tests

Added:

  • MigrateRouteKeyTest.updateSucceedsAfterMigrateTargetIsDeleted

The test uses a real two-node MiniSolrCloudCluster and performs this sequence:

  1. Creates a source collection.
  2. Creates a target collection.
  3. Adds and commits id=a!1 to the source.
  4. Migrates route key a! from the source to the target.
  5. Confirms that the source shard contains an active routing rule targeting the target collection.
  6. Deletes the target collection and waits for it to disappear from ClusterState.
  7. Adds id=a!2 to the source and commits.
  8. Queries each source replica directly with distrib=false.
  9. Confirms that both the leader and non-leader replica contain a!2.
  10. Confirms that the dangling routing rule is removed.

Without the fix, the add in step 7 fails with:

Could not find collection : deletedMigrateTarget-target

@dsmileydsmiley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I love your detailed explanation.

Note that you kept referring to "replica" in a way that meant to imply a "follower replica" (instead of the "leader replica"). Basically, the leader is a replica too!

Needs a changelog (see writeChangelog task). I'm not sure this is a bug, maybe it's just a "changed" (improvement). Assuming a user could repair the situation on their own with the HTTP API. If they delete the collection, they ought to first undo the migration. If they can't, then I'm more sympathetic to this being a bug.

}
try {
if (ruleExpiryLock.tryLock(10, TimeUnit.MILLISECONDS)) {
log.info("Going to remove routing rule");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be clearer. I suggest "Removing shard update routing rule because the target collection ____ doesn't exist".

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

SOLR-18413: Handle deleted MIGRATE routing targets - #4862

Open
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target
Open

SOLR-18413: Handle deleted MIGRATE routing targets#4862
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target

Conversation

@JHSUYU

Copy link
Copy Markdown

JIRA: SOLR-18413

Description

A SolrCloud MIGRATE adds a temporary routing rule to the source slice so that matching updates are also forwarded to the target collection.

For example, migrating route key a! from source to target creates state similar to:

source/shard1.routingRules["a!"].targetCollection = "target"

The routing rule stores the target collection name as a string. Deleting target does not remove routing rules in other collections that refer to it, so the source can retain an unexpired rule whose target is no longer present in ClusterState.

A subsequent matching update, such as adding id=a!2 to source, is first applied locally on the source shard leader. DistributedZkUpdateProcessor.doDistribAdd() then resolves routing-rule destinations before distributing the update to the source shard replicas:

finalList<SolrCmdDistributor.Node> nodesByRoutingRules =
getNodesByRoutingRules(
clusterState, coll, cmd.getIndexedIdStr(), cmd.getSolrInputDocument());
...
if (nodes != null) {
cmdDistrib.distribAdd(...);
}

getNodesByRoutingRules() previously resolved the target using:

DocCollectiontargetColl =
cstate.getCollection(rule.getTargetCollectionName());

If the target had been deleted, this threw:

HTTP 400
Could not find collection : target

Because the source leader had already applied the update, but the exception occurred before source-replica distribution, the request could leave the shard in this state:

source shard leader: a!2 exists
source shard replica: a!2 is missing
client: HTTP 400

No request was sent to the source replica, so SolrCmdDistributor did not record a replica failure and this update did not trigger term demotion or recovery. Queries can then return different results depending on which replica serves them. If leadership subsequently moves to a replica that never received the update, the document is lost.

Solution

Resolve the routing-rule target with getCollectionOrNull():

DocCollectiontargetColl =
cstate.getCollectionOrNull(rule.getTargetCollectionName());
if (targetColl == null) {
removeRoutingRule(myShardId, routeKey);
break;
}

When the target collection no longer exists, the routing rule is treated as invalid. The existing routing-rule removal logic used for expired rules was extracted into removeRoutingRule(). Expired rules and rules with missing targets now share the same cleanup path. The cleanup remains guarded by the core's routing-rule lock.

The behavior for a target collection that exists but has no active slices is unchanged. That condition may be temporary and continues to produce an error rather than permanently removing the routing rule.

Tests

Added:

  • MigrateRouteKeyTest.updateSucceedsAfterMigrateTargetIsDeleted

The test uses a real two-node MiniSolrCloudCluster and performs this sequence:

  1. Creates a source collection.
  2. Creates a target collection.
  3. Adds and commits id=a!1 to the source.
  4. Migrates route key a! from the source to the target.
  5. Confirms that the source shard contains an active routing rule targeting the target collection.
  6. Deletes the target collection and waits for it to disappear from ClusterState.
  7. Adds id=a!2 to the source and commits.
  8. Queries each source replica directly with distrib=false.
  9. Confirms that both the leader and non-leader replica contain a!2.
  10. Confirms that the dangling routing rule is removed.

Without the fix, the add in step 7 fails with:

Could not find collection : deletedMigrateTarget-target

@dsmileydsmiley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I love your detailed explanation.

Note that you kept referring to "replica" in a way that meant to imply a "follower replica" (instead of the "leader replica"). Basically, the leader is a replica too!

Needs a changelog (see writeChangelog task). I'm not sure this is a bug, maybe it's just a "changed" (improvement). Assuming a user could repair the situation on their own with the HTTP API. If they delete the collection, they ought to first undo the migration. If they can't, then I'm more sympathetic to this being a bug.

}
try {
if (ruleExpiryLock.tryLock(10, TimeUnit.MILLISECONDS)) {
log.info("Going to remove routing rule");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be clearer. I suggest "Removing shard update routing rule because the target collection ____ doesn't exist".

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@JHSUYU@dsmiley
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

SOLR-18413: Handle deleted MIGRATE routing targets - #4862

Open
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target
Open

SOLR-18413: Handle deleted MIGRATE routing targets#4862
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target

Conversation

@JHSUYU

Copy link
Copy Markdown

JIRA: SOLR-18413

Description

A SolrCloud MIGRATE adds a temporary routing rule to the source slice so that matching updates are also forwarded to the target collection.

For example, migrating route key a! from source to target creates state similar to:

source/shard1.routingRules["a!"].targetCollection = "target"

The routing rule stores the target collection name as a string. Deleting target does not remove routing rules in other collections that refer to it, so the source can retain an unexpired rule whose target is no longer present in ClusterState.

A subsequent matching update, such as adding id=a!2 to source, is first applied locally on the source shard leader. DistributedZkUpdateProcessor.doDistribAdd() then resolves routing-rule destinations before distributing the update to the source shard replicas:

finalList<SolrCmdDistributor.Node> nodesByRoutingRules =
getNodesByRoutingRules(
clusterState, coll, cmd.getIndexedIdStr(), cmd.getSolrInputDocument());
...
if (nodes != null) {
cmdDistrib.distribAdd(...);
}

getNodesByRoutingRules() previously resolved the target using:

DocCollectiontargetColl =
cstate.getCollection(rule.getTargetCollectionName());

If the target had been deleted, this threw:

HTTP 400
Could not find collection : target

Because the source leader had already applied the update, but the exception occurred before source-replica distribution, the request could leave the shard in this state:

source shard leader: a!2 exists
source shard replica: a!2 is missing
client: HTTP 400

No request was sent to the source replica, so SolrCmdDistributor did not record a replica failure and this update did not trigger term demotion or recovery. Queries can then return different results depending on which replica serves them. If leadership subsequently moves to a replica that never received the update, the document is lost.

Solution

Resolve the routing-rule target with getCollectionOrNull():

DocCollectiontargetColl =
cstate.getCollectionOrNull(rule.getTargetCollectionName());
if (targetColl == null) {
removeRoutingRule(myShardId, routeKey);
break;
}

When the target collection no longer exists, the routing rule is treated as invalid. The existing routing-rule removal logic used for expired rules was extracted into removeRoutingRule(). Expired rules and rules with missing targets now share the same cleanup path. The cleanup remains guarded by the core's routing-rule lock.

The behavior for a target collection that exists but has no active slices is unchanged. That condition may be temporary and continues to produce an error rather than permanently removing the routing rule.

Tests

Added:

  • MigrateRouteKeyTest.updateSucceedsAfterMigrateTargetIsDeleted

The test uses a real two-node MiniSolrCloudCluster and performs this sequence:

  1. Creates a source collection.
  2. Creates a target collection.
  3. Adds and commits id=a!1 to the source.
  4. Migrates route key a! from the source to the target.
  5. Confirms that the source shard contains an active routing rule targeting the target collection.
  6. Deletes the target collection and waits for it to disappear from ClusterState.
  7. Adds id=a!2 to the source and commits.
  8. Queries each source replica directly with distrib=false.
  9. Confirms that both the leader and non-leader replica contain a!2.
  10. Confirms that the dangling routing rule is removed.

Without the fix, the add in step 7 fails with:

Could not find collection : deletedMigrateTarget-target

@dsmileydsmiley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I love your detailed explanation.

Note that you kept referring to "replica" in a way that meant to imply a "follower replica" (instead of the "leader replica"). Basically, the leader is a replica too!

Needs a changelog (see writeChangelog task). I'm not sure this is a bug, maybe it's just a "changed" (improvement). Assuming a user could repair the situation on their own with the HTTP API. If they delete the collection, they ought to first undo the migration. If they can't, then I'm more sympathetic to this being a bug.

}
try {
if (ruleExpiryLock.tryLock(10, TimeUnit.MILLISECONDS)) {
log.info("Going to remove routing rule");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be clearer. I suggest "Removing shard update routing rule because the target collection ____ doesn't exist".

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

SOLR-18413: Handle deleted MIGRATE routing targets - #4862

Open
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target
Open

SOLR-18413: Handle deleted MIGRATE routing targets#4862
JHSUYU wants to merge 1 commit into
apache:mainfrom
JHSUYU:fix-dangling-routing-rule-target

Conversation

@JHSUYU

Copy link
Copy Markdown

JIRA: SOLR-18413

Description

A SolrCloud MIGRATE adds a temporary routing rule to the source slice so that matching updates are also forwarded to the target collection.

For example, migrating route key a! from source to target creates state similar to:

source/shard1.routingRules["a!"].targetCollection = "target"

The routing rule stores the target collection name as a string. Deleting target does not remove routing rules in other collections that refer to it, so the source can retain an unexpired rule whose target is no longer present in ClusterState.

A subsequent matching update, such as adding id=a!2 to source, is first applied locally on the source shard leader. DistributedZkUpdateProcessor.doDistribAdd() then resolves routing-rule destinations before distributing the update to the source shard replicas:

finalList<SolrCmdDistributor.Node> nodesByRoutingRules =
getNodesByRoutingRules(
clusterState, coll, cmd.getIndexedIdStr(), cmd.getSolrInputDocument());
...
if (nodes != null) {
cmdDistrib.distribAdd(...);
}

getNodesByRoutingRules() previously resolved the target using:

DocCollectiontargetColl =
cstate.getCollection(rule.getTargetCollectionName());

If the target had been deleted, this threw:

HTTP 400
Could not find collection : target

Because the source leader had already applied the update, but the exception occurred before source-replica distribution, the request could leave the shard in this state:

source shard leader: a!2 exists
source shard replica: a!2 is missing
client: HTTP 400

No request was sent to the source replica, so SolrCmdDistributor did not record a replica failure and this update did not trigger term demotion or recovery. Queries can then return different results depending on which replica serves them. If leadership subsequently moves to a replica that never received the update, the document is lost.

Solution

Resolve the routing-rule target with getCollectionOrNull():

DocCollectiontargetColl =
cstate.getCollectionOrNull(rule.getTargetCollectionName());
if (targetColl == null) {
removeRoutingRule(myShardId, routeKey);
break;
}

When the target collection no longer exists, the routing rule is treated as invalid. The existing routing-rule removal logic used for expired rules was extracted into removeRoutingRule(). Expired rules and rules with missing targets now share the same cleanup path. The cleanup remains guarded by the core's routing-rule lock.

The behavior for a target collection that exists but has no active slices is unchanged. That condition may be temporary and continues to produce an error rather than permanently removing the routing rule.

Tests

Added:

  • MigrateRouteKeyTest.updateSucceedsAfterMigrateTargetIsDeleted

The test uses a real two-node MiniSolrCloudCluster and performs this sequence:

  1. Creates a source collection.
  2. Creates a target collection.
  3. Adds and commits id=a!1 to the source.
  4. Migrates route key a! from the source to the target.
  5. Confirms that the source shard contains an active routing rule targeting the target collection.
  6. Deletes the target collection and waits for it to disappear from ClusterState.
  7. Adds id=a!2 to the source and commits.
  8. Queries each source replica directly with distrib=false.
  9. Confirms that both the leader and non-leader replica contain a!2.
  10. Confirms that the dangling routing rule is removed.

Without the fix, the add in step 7 fails with:

Could not find collection : deletedMigrateTarget-target

@dsmileydsmiley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I love your detailed explanation.

Note that you kept referring to "replica" in a way that meant to imply a "follower replica" (instead of the "leader replica"). Basically, the leader is a replica too!

Needs a changelog (see writeChangelog task). I'm not sure this is a bug, maybe it's just a "changed" (improvement). Assuming a user could repair the situation on their own with the HTTP API. If they delete the collection, they ought to first undo the migration. If they can't, then I'm more sympathetic to this being a bug.

}
try {
if (ruleExpiryLock.tryLock(10, TimeUnit.MILLISECONDS)) {
log.info("Going to remove routing rule");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be clearer. I suggest "Removing shard update routing rule because the target collection ____ doesn't exist".

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@JHSUYU@dsmiley