[
https://issues.apache.org/jira/browse/CASSANDRA-21595?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=18124971#comment-18124971
]
Erick Ramirez edited comment on CASSANDRA-21595 at 10/8/26 10:23 AM:
---------------------------------------------------------------------
h2. Final push
h3. Sanity checks
Checked the commit history reachable from {{trunk}}:
{noformat}
% git log --oneline --graph -6 trunk
* 4ab8bac4a5 (HEAD -> trunk) Merge branch 'cassandra-6.0' into trunk
|\
| * 05fecbc54e (cassandra-6.0) Merge branch 'cassandra-5.0' into cassandra-6.0
| |\
| | * 9d3283a80a (cassandra-5.0) Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
* | | 617fd3b935 (upstream/trunk, upstream/HEAD) Merge branch 'cassandra-6.0'
into trunk
|\| |
| * | 45afe53827 (upstream/cassandra-6.0) Block decommission if node is a
participant in a CMS reconfiguration
* | | e27ee64f7f Merge branch 'cassandra-6.0' into trunk
|\| |
{noformat}
Verified {{trunk}} hasn't changed since {{amend}}:
{noformat}
% git diff --stat upstream/trunk trunk
CHANGES.txt | 1 +
doc/modules/cassandra/pages/managing/operating/topo_changes.adoc | 38
+++++++++++++++++++++++++++++++++++---
src/java/org/apache/cassandra/dht/RangeStreamer.java | 15
+++++++++------
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
----
h3. Dry run
Attempted a {{push}} dry run and got no errors:
{noformat}
% git push upstream cassandra-5.0 cassandra-6.0 trunk --atomic -n
To https://github.com/apache/cassandra.git
93b5aec70d..9d3283a80a cassandra-5.0 -> cassandra-5.0
45afe53827..05fecbc54e cassandra-6.0 -> cassandra-6.0
617fd3b935..4ab8bac4a5 trunk -> trunk
{noformat}
----
h3. The real thing
Pushed for real with no issues:
{noformat}
% git push upstream cassandra-5.0 cassandra-6.0 trunk --atomic
Enumerating objects: 95, done.
Counting objects: 100% (91/91), done.
Delta compression using up to 12 threads
Compressing objects: 100% (39/39), done.
Writing objects: 100% (47/47), 5.92 KiB | 5.92 MiB/s, done.
Total 47 (delta 26), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (26/26), completed with 25 local objects.
remote:
remote: GitHub found 1 vulnerability on apache/cassandra's default branch (1
moderate). To find out more, visit:
remote: https://github.com/apache/cassandra/security/dependabot/5
remote:
To https://github.com/apache/cassandra.git
93b5aec70d..9d3283a80a cassandra-5.0 -> cassandra-5.0
45afe53827..05fecbc54e cassandra-6.0 -> cassandra-6.0
617fd3b935..4ab8bac4a5 trunk -> trunk
{noformat}
Verified the push really landed:
{noformat}
% git ls-remote https://github.com/apache/cassandra.git
refs/heads/cassandra-5.0 refs/heads/cassandra-6.0 refs/heads/trunk
9d3283a80ab7d8e3c2b290b222c794e8d41b2f70 refs/heads/cassandra-5.0
05fecbc54e68ac35283a16ce5df59228fa5ba145 refs/heads/cassandra-6.0
4ab8bac4a51f8aef0d55b2497699e1291baeda4b refs/heads/trunk
{noformat}
{noformat}
% git ls-remote https://gitbox.apache.org/repos/asf/cassandra.git
refs/heads/cassandra-5.0 refs/heads/cassandra-6.0 refs/heads/trunk
9d3283a80ab7d8e3c2b290b222c794e8d41b2f70 refs/heads/cassandra-5.0
05fecbc54e68ac35283a16ce5df59228fa5ba145 refs/heads/cassandra-6.0
4ab8bac4a51f8aef0d55b2497699e1291baeda4b refs/heads/trunk
{noformat}
----
h3. Committed
|| Branch || PR || Commit ||
| {{cassandra-5.0}} | [#5047|https://github.com/apache/cassandra/pull/5047] |
[9d3283a|https://github.com/apache/cassandra/commit/9d3283a80ab7d8e3c2b290b222c794e8d41b2f70]
|
| {{cassandra-6.0}} | [#5224|https://github.com/apache/cassandra/pull/5224] |
[05fecbc|https://github.com/apache/cassandra/commit/05fecbc54e68ac35283a16ce5df59228fa5ba145]
|
| {{trunk}} | [#5225|https://github.com/apache/cassandra/pull/5225] |
[4ab8bac|https://github.com/apache/cassandra/commit/4ab8bac4a51f8aef0d55b2497699e1291baeda4b]
|
was (Author: JIRAUSER285101):
h2. Final push
h3. Sanity checks
Checked the commit history reachable from {{trunk}}:
{noformat}
% git log --oneline --graph -6 trunk
* 4ab8bac4a5 (HEAD -> trunk) Merge branch 'cassandra-6.0' into trunk
|\
| * 05fecbc54e (cassandra-6.0) Merge branch 'cassandra-5.0' into cassandra-6.0
| |\
| | * 9d3283a80a (cassandra-5.0) Clarify the unset, true and false behaviours
of cassandra.reset_bootstrap_progress
* | | 617fd3b935 (upstream/trunk, upstream/HEAD) Merge branch 'cassandra-6.0'
into trunk
|\| |
| * | 45afe53827 (upstream/cassandra-6.0) Block decommission if node is a
participant in a CMS reconfiguration
* | | e27ee64f7f Merge branch 'cassandra-6.0' into trunk
|\| |
{noformat}
Verified {{trunk}} hasn't changed since {{amend}}:
{noformat}
% git diff --stat upstream/trunk trunk
CHANGES.txt | 1 +
doc/modules/cassandra/pages/managing/operating/topo_changes.adoc | 38
+++++++++++++++++++++++++++++++++++---
src/java/org/apache/cassandra/dht/RangeStreamer.java | 15
+++++++++------
3 files changed, 45 insertions(+), 9 deletions(-)
{noformat}
----
h3. Dry run
Attempted a {{push}} dry run and got no errors:
{noformat}
% git push upstream cassandra-5.0 cassandra-6.0 trunk --atomic -n
To https://github.com/apache/cassandra.git
93b5aec70d..9d3283a80a cassandra-5.0 -> cassandra-5.0
45afe53827..05fecbc54e cassandra-6.0 -> cassandra-6.0
617fd3b935..4ab8bac4a5 trunk -> trunk
{noformat}
----
h3. The real thing
Pushed for real with no issues:
{noformat}
% git push upstream cassandra-5.0 cassandra-6.0 trunk --atomic
Enumerating objects: 95, done.
Counting objects: 100% (91/91), done.
Delta compression using up to 12 threads
Compressing objects: 100% (39/39), done.
Writing objects: 100% (47/47), 5.92 KiB | 5.92 MiB/s, done.
Total 47 (delta 26), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (26/26), completed with 25 local objects.
remote:
remote: GitHub found 1 vulnerability on apache/cassandra's default branch (1
moderate). To find out more, visit:
remote: https://github.com/apache/cassandra/security/dependabot/5
remote:
To https://github.com/apache/cassandra.git
93b5aec70d..9d3283a80a cassandra-5.0 -> cassandra-5.0
45afe53827..05fecbc54e cassandra-6.0 -> cassandra-6.0
617fd3b935..4ab8bac4a5 trunk -> trunk
{noformat}
Verified the push really landed:
{noformat}
% git ls-remote https://github.com/apache/cassandra.git
refs/heads/cassandra-5.0 refs/heads/cassandra-6.0 refs/heads/trunk
9d3283a80ab7d8e3c2b290b222c794e8d41b2f70 refs/heads/cassandra-5.0
05fecbc54e68ac35283a16ce5df59228fa5ba145 refs/heads/cassandra-6.0
4ab8bac4a51f8aef0d55b2497699e1291baeda4b refs/heads/trunk
{noformat}
{noformat}
% git ls-remote https://gitbox.apache.org/repos/asf/cassandra.git
refs/heads/cassandra-5.0 refs/heads/cassandra-6.0 refs/heads/trunk
9d3283a80ab7d8e3c2b290b222c794e8d41b2f70 refs/heads/cassandra-5.0
05fecbc54e68ac35283a16ce5df59228fa5ba145 refs/heads/cassandra-6.0
4ab8bac4a51f8aef0d55b2497699e1291baeda4b refs/heads/trunk
{noformat}
----
h3. Status
Ticket is committed.
> 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]
