rules: suppress a dep-rule in special case #87196
Conversation
|
This change is |
1. changed one comment; 2. changed one function locaiton in file to be more consistent; 3. added a code change that is consistent with the error message but won't affect correctness. Release justification:
Xiang-Gu
force-pushed
the
fix_dropping_row_level_ttl_tables_in_mixed_version_state_forward_compatibility_issue
branch
2 times, most recently
from
3f65dbb to
c112476
Compare
There was a problem hiding this comment.
Reviewed 3 of 3 files at r1, 1 of 4 files at r2.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @ajwerner and @Xiang-Gu)
pkg/sql/schemachanger/scplan/internal/rules/dep_drop_object.go line 86 at r2 (raw file):
public.Eq(scpb.Status_PUBLIC), n.AttrEqVar(screl.CurrentStatus, public), }
Can you statically define this rules in helpers? Also, can you make these rule names not have spaces?
Code quote:
screl.Schema.DefNotJoin1("node does not have a PUBLIC status", "n", func(n rel.Var) rel.Clauses {
public := rel.Var("public")
return rel.Clauses{
public.Eq(scpb.Status_PUBLIC),
n.AttrEqVar(screl.CurrentStatus, public),
}
})(n),
Xiang-Gu
force-pushed
the
fix_dropping_row_level_ttl_tables_in_mixed_version_state_forward_compatibility_issue
branch
from
c112476 to
b38ff1c
Compare
There was a problem hiding this comment.
TFTR!
bors r+
Reviewable status:
pkg/sql/schemachanger/scplan/internal/rules/dep_drop_object.go line 86 at r2 (raw file):
Previously, ajwerner wrote…
Can you statically define this rules in
helpers? Also, can you make these rule names not have spaces?
done!
|
Build failed (retrying...): |
|
Build failed (retrying...): |
Release justification: fixed a release blocker bug. Previously, in a mixed version state (v22.1 and v22.2), if a old node drops a rowLevelTTL table and the new shcema changer job was adopted by a new node, then there is a dep rule that cannot satisfied and hence causes forward incompatibility. This PR fixes this by suppressing this dep rule if this particular case happens (namely, it suppress the rule if `from` is Table element, `to` is a RowLevelTTL element, and there is no `PUBLIC` status of the table element anywhere in the graph). Fixes: cockroachdb#86672 Release note: None
Xiang-Gu
force-pushed
the
fix_dropping_row_level_ttl_tables_in_mixed_version_state_forward_compatibility_issue
branch
from
b38ff1c to
660efc7
Compare
|
Canceled. |
|
bors r+ |
|
Build failed (retrying...): |
|
Build failed (retrying...): |
|
Build succeeded: |
Xiang-Gu
deleted the
fix_dropping_row_level_ttl_tables_in_mixed_version_state_forward_compatibility_issue
branch
|
blathers backport 22.2 |
Commit 1: very minor comment, function location, code changes;
Commit 2: suppress a dep-rule that causes forward incompatibility
for dropping a table with rowLevelTTL in the mixed version state.
Previously, in a mixed version state (v22.1 and v22.2), if a old node
drops a rowLevelTTL table and the new shcema changer job was adopted
by a new node, then there is a dep rule that cannot satisfied and hence
causes forward incompatibility. This PR fixes this by suppressing this
dep rule if this particular case happens (namely, it suppress the rule
if
fromis Table element,tois a RowLevelTTL element, and there isno
PUBLICstatus of the table element anywhere in the graph).Fixes: #86672
Release note: None
Release justification: fixed a release blocker bug.