[
https://issues.apache.org/jira/browse/CASSANDRA-21595?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=18124913#comment-18124913
]
Erick Ramirez edited comment on CASSANDRA-21595 at 10/8/26 9:00 AM:
--------------------------------------------------------------------
h2. Conflict resolution
GitHub flagged identical merge conflicts on the three PRs for {{CHANGES.txt}}
because the fork was behind.
Here's an example for the {{5.0}} PR:
{noformat}
% git fetch -q upstream pull/5047/head:refs/pr/5047
% git merge-tree --write-tree --name-only upstream/cassandra-5.0 refs/pr/5047
5bf3a8bf52502984b3d60c440e05c8743deb1218
CHANGES.txt
Auto-merging CHANGES.txt
CONFLICT (content): Merge conflict in CHANGES.txt
{noformat}
{noformat}
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
=======
* Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
{noformat}
Below are the steps for resolving the conflicts on each PR.
----
h3. Local prep
Updated local remote-tracking refs:
{noformat}
% cd path_to_local_fork_clone/cassandra
% git fetch upstream cassandra-5.0 cassandra-6.0 trunk
>From https://github.com/apache/cassandra
* branch cassandra-5.0 -> FETCH_HEAD
* branch cassandra-6.0 -> FETCH_HEAD
* branch trunk -> FETCH_HEAD
{noformat}
Downloaded the heads of the PRs from {{{}upstream{}}}:
{noformat}
% git fetch upstream pull/5047/head:refs/pr/5047 pull/5224/head:refs/pr/5224
pull/5225/head:refs/pr/5225 -f
{noformat}
Mapped the commit hash to the branches/refs:
{noformat}
% for r in upstream/cassandra-5.0 upstream/cassandra-6.0 upstream/trunk
refs/pr/5047 refs/pr/5224 refs/pr/5225; do printf '%-24s %s\n' "$r" "$(git
rev-parse --short=10 $r)"; done
upstream/cassandra-5.0 93b5aec70d
upstream/cassandra-6.0 45afe53827
upstream/trunk 617fd3b935
refs/pr/5047 4985da4b19
refs/pr/5224 c24cfcf173
refs/pr/5225 290d9d84d3
{noformat}
----
h3. Resolved conflict on PR #5047 ({{{}cassandra-5.0{}}}):
{noformat}
% git switch -c CASSANDRA-21595-5.0 upstream/cassandra-5.0
branch 'CASSANDRA-21595-5.0' set up to track 'upstream/cassandra-5.0'.
Switched to a new branch 'CASSANDRA-21595-5.0'
{noformat}
{noformat}
% git cherry-pick refs/pr/5047
Auto-merging CHANGES.txt
CONFLICT (content): Merge conflict in CHANGES.txt
error: could not apply 4985da4b19... clarify the unset, true and false
behaviours of cassandra.reset_bootstrap_progress
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
{noformat}
Updated {{CHANGES.txt}} with the correct order of the conflicting lines to:
{noformat}
* Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
{noformat}
Compared it to {{{}upstream{}}}:
{noformat}
% git diff upstream/cassandra-5.0 -- CHANGES.txt
diff --git a/CHANGES.txt b/CHANGES.txt
index 5ce20dd5f0..8559f93d26 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.0.10
+ * Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
* Bound and chunk the BTI partition index preload (CASSANDRA-21632)
* Restore volatile on CommitLogSegment.cdcState dropped in merge
(CASSANDRA-21665)
{noformat}
Staged the change:
{noformat}
% git add CHANGES.txt
{noformat}
Continued with the earlier {{{}git cherry-pick{}}}:
{noformat}
% git cherry-pick --continue
{noformat}
Modified the commit message with capitalised "Clarify" in the subject, added
the reviewers, and added the AI trailer:
{noformat}
patch by Alexandre Viau; reviewed by Mick Semb Wever, Uros Bojanic, Erick
Ramirez for CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
{{git cherry-pick}} output after saving the file:
{noformat}
[CASSANDRA-21595-5.0 1ad484998f] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: aviau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Fixed author name to match the credit in Alexandre's other commits:
{noformat}
% git commit --amend --author="Alexandre Viau <[email protected]>"
[CASSANDRA-21595-5.0 e7747def29] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: Alexandre Viau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Checked the amended commit:
{noformat}
% git log -1 --format=fuller
commit e7747def29de0c9712c6747fa280fdf76b30756b (HEAD -> CASSANDRA-21595-5.0)
Author: Alexandre Viau <[email protected]>
AuthorDate: Fri Aug 21 21:58:41 2026 -0400
Commit: Erick Ramirez <[email protected]>
CommitDate: Thu Oct 8 12:26:37 2026 +1100
Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress
The message did not explain that the property behaves differently when
unset, true and false, so an operator hitting the abort could not tell
which value to pick. Spell out all three behaviours in the message and
document them in topo_changes.adoc.
patch by Alexandre Viau; reviewed by Mick Semb Wever, Uros Bojanic, Erick
Ramirez for CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
----
h3. Resolved conflict on PR #5224 ({{{}cassandra-6.0{}}}):
{noformat}
% git switch -c CASSANDRA-21595-6.0 upstream/cassandra-6.0
branch 'CASSANDRA-21595-6.0' set up to track 'upstream/cassandra-6.0'.
Switched to a new branch 'CASSANDRA-21595-6.0'
{noformat}
{noformat}
% git cherry-pick refs/pr/5224
Auto-merging CHANGES.txt
CONFLICT (content): Merge conflict in CHANGES.txt
error: could not apply c24cfcf173... clarify the unset, true and false
behaviours of cassandra.reset_bootstrap_progress
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
{noformat}
Updated {{CHANGES.txt}} with the correct order of the conflicting lines to:
{noformat}
* Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
{noformat}
Compared it to {{{}upstream{}}}:
{noformat}
% git diff upstream/cassandra-6.0 -- CHANGES.txt
diff --git a/CHANGES.txt b/CHANGES.txt
index 4413bd5fc9..1ed4ce0e80 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -54,6 +54,7 @@
* Avoid megamorphic calls when serializing and deserializing fixed-length
values (CASSANDRA-21536)
* Avoid megamorphic calls for
Cell.timestamp/ttl/path/localDeletionTimeAsUnsignedInt methods (CASSANDRA-21526)
Merged from 5.0:
+ * Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
* Bound and chunk the BTI partition index preload (CASSANDRA-21632)
* Fix compressed scan read-ahead buffer Block leak and chunk-cache pollution
by scans (CASSANDRA-21671)
{noformat}
Staged the change:
{noformat}
% git add CHANGES.txt
{noformat}
Continued with the earlier {{{}git cherry-pick{}}}:
{noformat}
% git cherry-pick --continue
{noformat}
Modified the commit message with capitalised "Clarify" in the subject, added
the reviewers, and added the AI trailer:
{noformat}
patch by Alexandre Viau; reviewed by Mick Semb Wever, Erick Ramirez for
CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
{{git cherry-pick}} output after saving the file:
{noformat}
[CASSANDRA-21595-6.0 c77b4e45cf] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: aviau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Fixed author name to match the credit in Alexandre's other commits:
{noformat}
% git commit --amend --author="Alexandre Viau <[email protected]>"
[CASSANDRA-21595-6.0 e69c4b320b] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: Alexandre Viau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Checked the amended commit:
{noformat}
% git log -1 --format=fuller
commit e69c4b320bf981c301efe7fdb5fe397b93904a9f (HEAD -> CASSANDRA-21595-6.0)
Author: Alexandre Viau <[email protected]>
AuthorDate: Fri Aug 21 21:58:41 2026 -0400
Commit: Erick Ramirez <[email protected]>
CommitDate: Thu Oct 8 12:40:14 2026 +1100
Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress
The message did not explain that the property behaves differently when
unset, true and false, so an operator hitting the abort could not tell
which value to pick. Spell out all three behaviours in the message and
document them in topo_changes.adoc.
patch by Alexandre Viau; reviewed by Mick Semb Wever, Erick Ramirez for
CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
----
h3. Resolved conflict on PR #5225 ({{{}trunk{}}}):
{noformat}
% git switch -c CASSANDRA-21595-trunk upstream/trunk
branch 'CASSANDRA-21595-trunk' set up to track 'upstream/trunk'.
Switched to a new branch 'CASSANDRA-21595-trunk'
{noformat}
{noformat}
% git cherry-pick refs/pr/5225
Auto-merging CHANGES.txt
CONFLICT (content): Merge conflict in CHANGES.txt
error: could not apply 290d9d84d3... clarify the unset, true and false
behaviours of cassandra.reset_bootstrap_progress
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
{noformat}
Updated {{CHANGES.txt}} with the correct order of the conflicting lines to:
{noformat}
* Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
{noformat}
Compared it to {{{}upstream{}}}:
{noformat}
% git diff upstream/trunk -- CHANGES.txt
diff --git a/CHANGES.txt b/CHANGES.txt
index 44885cd1a4..e9de32fd8d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -66,6 +66,7 @@ Merged from 6.0:
* Avoid megamorphic calls when serializing and deserializing fixed-length
values (CASSANDRA-21536)
* Avoid megamorphic calls for
Cell.timestamp/ttl/path/localDeletionTimeAsUnsignedInt methods (CASSANDRA-21526)
Merged from 5.0:
+ * Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
* Bound and chunk the BTI partition index preload (CASSANDRA-21632)
* Fix compressed scan read-ahead buffer Block leak and chunk-cache pollution
by scans (CASSANDRA-21671)
{noformat}
Staged the change:
{noformat}
% git add CHANGES.txt
{noformat}
Continued with the earlier {{{}git cherry-pick{}}}:
{noformat}
% git cherry-pick --continue
{noformat}
Modified the commit message with capitalised "Clarify" in the subject, added
the reviewers, and added the AI trailer:
{noformat}
patch by Alexandre Viau; reviewed by Mick Semb Wever, Erick Ramirez for
CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
{{git cherry-pick}} output after saving the file:
{noformat}
[CASSANDRA-21595-6.0 c77b4e45cf] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: aviau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Fixed author name to match the credit in Alexandre's other commits:
{noformat}
% git commit --amend --author="Alexandre Viau <[email protected]>"
[CASSANDRA-21595-trunk 48f209e6a1] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: Alexandre Viau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Checked the amended commit:
{noformat}
% git log -1 --format=fuller
commit 48f209e6a1e78b56f7de9cd5d26af2171680faf0 (HEAD -> CASSANDRA-21595-trunk)
Author: Alexandre Viau <[email protected]>
AuthorDate: Fri Aug 21 21:58:41 2026 -0400
Commit: Erick Ramirez <[email protected]>
CommitDate: Thu Oct 8 12:47:28 2026 +1100
Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress
The message did not explain that the property behaves differently when
unset, true and false, so an operator hitting the abort could not tell
which value to pick. Spell out all three behaviours in the message and
document them in topo_changes.adoc.
patch by Alexandre Viau; reviewed by Mick Semb Wever, Gandherva
Gunathilak, Erick Ramirez for CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
----
h3. Summary
Here are the list of commits after (1) resolving the conflicts, and (2)
amending messages:
||Branch||Local branch||Commit||
|{{cassandra-5.0}}|{{CASSANDRA-21595-5.0}}|{{e7747def29}}|
|{{cassandra-6.0}}|{{CASSANDRA-21595-6.0}}|{{e69c4b320b}}|
|{{trunk}}|{{CASSANDRA-21595-trunk}}|{{48f209e6a1}}|
was (Author: JIRAUSER285101):
h2. Conflict resolution
GitHub flagged identical merge conflicts on the three PRs for {{CHANGES.txt}}
because the fork was behind.
Here's an example for the {{5.0}} PR:
{noformat}
% git fetch -q upstream pull/5047/head:refs/pr/5047
% git merge-tree --write-tree --name-only upstream/cassandra-5.0 refs/pr/5047
5bf3a8bf52502984b3d60c440e05c8743deb1218
CHANGES.txt
Auto-merging CHANGES.txt
CONFLICT (content): Merge conflict in CHANGES.txt
{noformat}
{noformat}
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
=======
* Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
{noformat}
Below are the steps for resolving the conflicts on each PR.
----
h3. Local prep
Updated local remote-tracking refs:
{noformat}
% cd path_to_local_fork_clone/cassandra
% git fetch upstream cassandra-5.0 cassandra-6.0 trunk
>From https://github.com/apache/cassandra
* branch cassandra-5.0 -> FETCH_HEAD
* branch cassandra-6.0 -> FETCH_HEAD
* branch trunk -> FETCH_HEAD
{noformat}
Downloaded the heads of the PRs from {{upstream}}:
{noformat}
% git fetch upstream pull/5047/head:refs/pr/5047 pull/5224/head:refs/pr/5224
pull/5225/head:refs/pr/5225 -f
{noformat}
Mapped the commit hash to the branches/refs:
{noformat}
% for r in upstream/cassandra-5.0 upstream/cassandra-6.0 upstream/trunk
refs/pr/5047 refs/pr/5224 refs/pr/5225; do printf '%-24s %s\n' "$r" "$(git
rev-parse --short=10 $r)"; done
upstream/cassandra-5.0 93b5aec70d
upstream/cassandra-6.0 45afe53827
upstream/trunk 617fd3b935
refs/pr/5047 4985da4b19
refs/pr/5224 c24cfcf173
refs/pr/5225 290d9d84d3
{noformat}
----
h3. Resolved conflict on PR #5047 ({{cassandra-5.0}}):
{noformat}
% git switch -c CASSANDRA-21595-5.0 upstream/cassandra-5.0
branch 'CASSANDRA-21595-5.0' set up to track 'upstream/cassandra-5.0'.
Switched to a new branch 'CASSANDRA-21595-5.0'
{noformat}
{noformat}
% git cherry-pick refs/pr/5047
Auto-merging CHANGES.txt
CONFLICT (content): Merge conflict in CHANGES.txt
error: could not apply 4985da4b19... clarify the unset, true and false
behaviours of cassandra.reset_bootstrap_progress
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
{noformat}
Updated {{CHANGES.txt}} with the correct order of the conflicting lines to:
{noformat}
* Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
{noformat}
Compared it to {{upstream}}:
{noformat}
% git diff upstream/cassandra-5.0 -- CHANGES.txt
diff --git a/CHANGES.txt b/CHANGES.txt
index 5ce20dd5f0..8559f93d26 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.0.10
+ * Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
* Bound and chunk the BTI partition index preload (CASSANDRA-21632)
* Restore volatile on CommitLogSegment.cdcState dropped in merge
(CASSANDRA-21665)
{noformat}
Staged the change:
{noformat}
% git add CHANGES.txt
{noformat}
Continued with the earlier {{git cherry-pick}}:
{noformat}
% git cherry-pick --continue
{noformat}
Modified the commit message with capitalised "Clarify" in the subject, added
the reviewers, and added the AI trailer:
{noformat}
patch by Alexandre Viau; reviewed by Mick Semb Wever, Uros Bojanic, Erick
Ramirez for CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
{{git cherry-pick}} output after saving the file:
{noformat}
[CASSANDRA-21595-5.0 1ad484998f] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: aviau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Fixed author name to match the credit in Alexandre's other commits:
{noformat}
% git commit --amend --author="Alexandre Viau <[email protected]>"
[CASSANDRA-21595-5.0 e7747def29] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: Alexandre Viau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Checked the amended commit:
{noformat}
% git log -1 --format=fuller
commit e7747def29de0c9712c6747fa280fdf76b30756b (HEAD -> CASSANDRA-21595-5.0)
Author: Alexandre Viau <[email protected]>
AuthorDate: Fri Aug 21 21:58:41 2026 -0400
Commit: Erick Ramirez <[email protected]>
CommitDate: Thu Oct 8 12:26:37 2026 +1100
Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress
The message did not explain that the property behaves differently when
unset, true and false, so an operator hitting the abort could not tell
which value to pick. Spell out all three behaviours in the message and
document them in topo_changes.adoc.
patch by Alexandre Viau; reviewed by Mick Semb Wever, Uros Bojanic, Erick
Ramirez for CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
----
h3. Resolved conflict on PR #5224 ({{cassandra-6.0}}):
{noformat}
% git switch -c CASSANDRA-21595-6.0 upstream/cassandra-6.0
branch 'CASSANDRA-21595-6.0' set up to track 'upstream/cassandra-6.0'.
Switched to a new branch 'CASSANDRA-21595-6.0'
{noformat}
{noformat}
% git cherry-pick refs/pr/5224
Auto-merging CHANGES.txt
CONFLICT (content): Merge conflict in CHANGES.txt
error: could not apply c24cfcf173... clarify the unset, true and false
behaviours of cassandra.reset_bootstrap_progress
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
{noformat}
Updated {{CHANGES.txt}} with the correct order of the conflicting lines to:
{noformat}
* Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
{noformat}
Compared it to {{upstream}}:
{noformat}
% git diff upstream/cassandra-6.0 -- CHANGES.txt
diff --git a/CHANGES.txt b/CHANGES.txt
index 4413bd5fc9..1ed4ce0e80 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -54,6 +54,7 @@
* Avoid megamorphic calls when serializing and deserializing fixed-length
values (CASSANDRA-21536)
* Avoid megamorphic calls for
Cell.timestamp/ttl/path/localDeletionTimeAsUnsignedInt methods (CASSANDRA-21526)
Merged from 5.0:
+ * Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
* Bound and chunk the BTI partition index preload (CASSANDRA-21632)
* Fix compressed scan read-ahead buffer Block leak and chunk-cache pollution
by scans (CASSANDRA-21671)
{noformat}
Staged the change:
{noformat}
% git add CHANGES.txt
{noformat}
Continued with the earlier {{git cherry-pick}}:
{noformat}
% git cherry-pick --continue
{noformat}
Modified the commit message with capitalised "Clarify" in the subject, added
the reviewers, and added the AI trailer:
{noformat}
patch by Alexandre Viau; reviewed by Mick Semb Wever, Erick Ramirez for
CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
{{git cherry-pick}} output after saving the file:
{noformat}
[CASSANDRA-21595-6.0 c77b4e45cf] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: aviau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Fixed author name to match the credit in Alexandre's other commits:
{noformat}
% git commit --amend --author="Alexandre Viau <[email protected]>"
[CASSANDRA-21595-6.0 e69c4b320b] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: Alexandre Viau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Checked the amended commit:
{noformat}
% git log -1 --format=fuller
commit e69c4b320bf981c301efe7fdb5fe397b93904a9f (HEAD -> CASSANDRA-21595-6.0)
Author: Alexandre Viau <[email protected]>
AuthorDate: Fri Aug 21 21:58:41 2026 -0400
Commit: Erick Ramirez <[email protected]>
CommitDate: Thu Oct 8 12:40:14 2026 +1100
Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress
The message did not explain that the property behaves differently when
unset, true and false, so an operator hitting the abort could not tell
which value to pick. Spell out all three behaviours in the message and
document them in topo_changes.adoc.
patch by Alexandre Viau; reviewed by Mick Semb Wever, Erick Ramirez for
CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
----
h3. Resolved conflict on PR #5225 ({{trunk}}):
{noformat}
% git switch -c CASSANDRA-21595-trunk upstream/trunk
branch 'CASSANDRA-21595-trunk' set up to track 'upstream/trunk'.
Switched to a new branch 'CASSANDRA-21595-trunk'
{noformat}
{noformat}
% git cherry-pick refs/pr/5225
Auto-merging CHANGES.txt
CONFLICT (content): Merge conflict in CHANGES.txt
error: could not apply 290d9d84d3... clarify the unset, true and false
behaviours of cassandra.reset_bootstrap_progress
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
{noformat}
Updated {{CHANGES.txt}} with the correct order of the conflicting lines to:
{noformat}
* Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
{noformat}
Compared it to {{upstream}}:
{noformat}
% git diff upstream/trunk -- CHANGES.txt
diff --git a/CHANGES.txt b/CHANGES.txt
index 44885cd1a4..e9de32fd8d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -66,6 +66,7 @@ Merged from 6.0:
* Avoid megamorphic calls when serializing and deserializing fixed-length
values (CASSANDRA-21536)
* Avoid megamorphic calls for
Cell.timestamp/ttl/path/localDeletionTimeAsUnsignedInt methods (CASSANDRA-21526)
Merged from 5.0:
+ * Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress in the abort message and docs
(CASSANDRA-21595)
* Isolate SAI index rebuilds from ZCS (CASSANDRA-21520)
* Bound and chunk the BTI partition index preload (CASSANDRA-21632)
* Fix compressed scan read-ahead buffer Block leak and chunk-cache pollution
by scans (CASSANDRA-21671)
{noformat}
Staged the change:
{noformat}
% git add CHANGES.txt
{noformat}
Continued with the earlier {{git cherry-pick}}:
{noformat}
% git cherry-pick --continue
{noformat}
Modified the commit message with capitalised "Clarify" in the subject, added
the reviewers, and added the AI trailer:
{noformat}
patch by Alexandre Viau; reviewed by Mick Semb Wever, Erick Ramirez for
CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
{{git cherry-pick}} output after saving the file:
{noformat}
[CASSANDRA-21595-6.0 c77b4e45cf] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: aviau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Fixed author name to match the credit in Alexandre's other commits:
{noformat}
% git commit --amend --author="Alexandre Viau <[email protected]>"
[CASSANDRA-21595-trunk 48f209e6a1] Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
Author: Alexandre Viau <[email protected]>
Date: Fri Aug 21 21:58:41 2026 -0400
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
Checked the amended commit:
{noformat}
% git log -1 --format=fuller
commit 48f209e6a1e78b56f7de9cd5d26af2171680faf0 (HEAD -> CASSANDRA-21595-trunk)
Author: Alexandre Viau <[email protected]>
AuthorDate: Fri Aug 21 21:58:41 2026 -0400
Commit: Erick Ramirez <[email protected]>
CommitDate: Thu Oct 8 12:47:28 2026 +1100
Clarify the unset, true and false behaviours of
cassandra.reset_bootstrap_progress
The message did not explain that the property behaves differently when
unset, true and false, so an operator hitting the abort could not tell
which value to pick. Spell out all three behaviours in the message and
document them in topo_changes.adoc.
patch by Alexandre Viau; reviewed by Mick Semb Wever, Gandherva
Gunathilak, Erick Ramirez for CASSANDRA-21595
Assisted-by: Claude Code:claude-sonnet-5-5
{noformat}
----
h3. Summary
Here are the list of commits after (1) resolving the conflicts, and (2) amended
messages:
|| Branch || Local branch || Commit ||
| {{cassandra-5.0}} | {{CASSANDRA-21595-5.0}} | {{e7747def29}} |
| {{cassandra-6.0}} | {{CASSANDRA-21595-6.0}} | {{e69c4b320b}} |
| {{trunk}} | {{CASSANDRA-21595-trunk}} | {{48f209e6a1}} |
> docs: distinguish between reset_bootstrap_progress (true, false, unset)
> -----------------------------------------------------------------------
>
> Key: CASSANDRA-21595
> URL: https://issues.apache.org/jira/browse/CASSANDRA-21595
> Project: Apache Cassandra
> Issue Type: Improvement
> Components: Consistency/Bootstrap and Decommission, Documentation
> Reporter: Alexandre Viau
> Assignee: Alexandre Viau
> Priority: Normal
> Labels: patch-available
> Fix For: 5.0.x, 6.0.x, 7.0
>
> Attachments: Screenshot 2026-10-07 at 9.57.36 AM.png,
> website-topo_changes-21595-post.jpg, website-topo_changes-21595-pre.jpg
>
> Time Spent: 3h 50m
> Remaining Estimate: 0h
>
> The only documenation available on `reset_bootstrap_progress` is the
> following:
> > In order to cleanup bootstrap state and start fresh, you may set the JVM
> > startup flag -Dcassandra.reset_bootstrap_progress=true.
> This gives the impression that if I don't want to start fresh, I should not
> do anything. However, this is false. If I want my node to resume bootstraping
> with existing data, I need to set it to `false`, which is different than the
> default of `unset`.
> I think this is impossible to infer from existing documentation. Only reading
> source code helped me understand.
>
> I opened a Merge Request on github here:
> https://github.com/apache/cassandra/pull/5047
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
