Skip to content

STAR-1683 Port remaining pieces of CNDB-4308#549

Merged
k-rus merged 1 commit intods-trunkfrom
STAR-1683
Oct 10, 2022
Merged

STAR-1683 Port remaining pieces of CNDB-4308#549
k-rus merged 1 commit intods-trunkfrom
STAR-1683

Conversation

@djatnieks
Copy link
Copy Markdown
Member

@djatnieks djatnieks commented Oct 7, 2022

Co-authored-by: Stefania Alborghetti stef1927@users.noreply.github.com

@djatnieks @stef1927
STAR-1683 Port remaining pieces of CNDB-4308
996b6af 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
@djatnieks
Copy link
Copy Markdown
Member Author

djatnieks commented Oct 7, 2022

Needed to fix CNDB SingleCompactorTest.garbageCollectionTest

djatnieks
djatnieks commented Oct 7, 2022
View reviewed changes
Comment thread src/java/org/apache/cassandra/db/ReadCommand.java
if (tombstones.checkAndTriggerWarning())
metric.tombstoneWarnings.inc();
metric.incLiveRows(liveRows);
metric.incTombstones(tombstones.get(), tombstones.checkAndTriggerWarning());
Copy link
Copy Markdown
Member Author

@djatnieks djatnieks Oct 7, 2022

Choose a reason for hiding this comment

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

This is the important part for the CNDB SingleCompactorTest.garbageCollectionTest

JeremiahDJordan
JeremiahDJordan reviewed Oct 7, 2022
View reviewed changes
Comment thread src/java/org/apache/cassandra/db/ReadCommand.java
metric.tombstoneScannedHistogram.update(tombstones.get());
metric.liveScannedHistogram.update(liveRows);

if (tombstones.checkAndTriggerWarning())
Copy link
Copy Markdown
Member

@JeremiahDJordan JeremiahDJordan Oct 7, 2022

Choose a reason for hiding this comment

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

Can we really get rid of the guardrail check here?

Copy link
Copy Markdown
Member Author

@djatnieks djatnieks Oct 7, 2022

Choose a reason for hiding this comment

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

Sorry, I should have mentioned it's previously been moved into TableMetrics.incTombstones:

    public void incTombstones(long tombstones, boolean triggerWarning)
    {
        tombstoneScannedHistogram.update(tombstones);
        tombstoneScannedCounter.inc(tombstones);
        if (triggerWarning)
            tombstoneWarnings.inc();
    }

and metric.liveScannedHistogram.update(liveRows) is now in TableMetrics.incLiveRows

@mfleming mfleming mentioned this pull request Oct 8, 2022
Merged
@mfleming
Copy link
Copy Markdown

mfleming commented Oct 8, 2022

Pretty sure this new test failure is unrelated @djatnieks . I hit it too in my PR.

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented Oct 9, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell B 1 Code Smell

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@djatnieks
Copy link
Copy Markdown
Member Author

djatnieks commented Oct 9, 2022

Pretty sure this new test failure is unrelated @djatnieks . I hit it too in my PR.

@mfleming I've tried re-running the PR gate build several times without success - do you think we can merge it anyway?

@mfleming
Copy link
Copy Markdown

mfleming commented Oct 9, 2022

Yeah, merge it anyway. I've seen org.apache.cassandra.distributed.test.sai.QueryWriteLifecycleTest.testWriteLifecycle failing for other PRs.

@k-rus k-rus merged commit 3039232 into ds-trunk Oct 10, 2022
@k-rus k-rus deleted the STAR-1683 branch October 10, 2022 07:43
jacek-lewandowski pushed a commit that referenced this pull request Oct 17, 2022
@djatnieks @stef1927 @jacek-lewandowski
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
8d56c58 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
jacek-lewandowski pushed a commit that referenced this pull request Oct 18, 2022
@djatnieks @stef1927 @jacek-lewandowski
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
9624082 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
mfleming pushed a commit that referenced this pull request Jul 10, 2023
@djatnieks @stef1927 @mfleming
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
4ae5d1c 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
djatnieks added a commit that referenced this pull request Jul 24, 2023
@djatnieks @stef1927
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
e574fc3 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
djatnieks added a commit that referenced this pull request Aug 22, 2023
@djatnieks @stef1927
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
8a092bc 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)
djatnieks added a commit that referenced this pull request Sep 12, 2023
@djatnieks @stef1927
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
1d28ad0 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)
jacek-lewandowski pushed a commit that referenced this pull request Feb 8, 2024
@djatnieks @jacek-lewandowski
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
bcfd018 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java
djatnieks added a commit that referenced this pull request Mar 29, 2024
@djatnieks
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
a1e9aee 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java
djatnieks added a commit that referenced this pull request Apr 1, 2024
@djatnieks
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
2dcc7dd 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java
djatnieks added a commit that referenced this pull request Apr 16, 2024
@djatnieks
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
d799ec9 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java
djatnieks added a commit that referenced this pull request May 17, 2024
@djatnieks
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
8079570 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java
jacek-lewandowski pushed a commit that referenced this pull request Jul 17, 2024
@djatnieks @jacek-lewandowski
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
085c0f0 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java
djatnieks added a commit that referenced this pull request Jan 30, 2025
@djatnieks
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
f169184 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java
djatnieks added a commit that referenced this pull request May 18, 2025
@djatnieks
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
9baf927 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java
michaelsembwever pushed a commit that referenced this pull request Feb 6, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
ff1c822 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java
michaelsembwever pushed a commit that referenced this pull request Feb 10, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
585e836 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Feb 11, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
1fe85ac 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Feb 12, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
61de54f 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Feb 14, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
e3382c4 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Feb 16, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
239c37c 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Feb 27, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
2569578 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Mar 2, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
04847a0 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Mar 4, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
fcb79b5 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Mar 5, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
9929904 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Mar 25, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
f39936f 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Mar 27, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
2f57caa 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
michaelsembwever pushed a commit that referenced this pull request Apr 14, 2026
@djatnieks @michaelsembwever
STAR-1683 Port remaining pieces of CNDB-4308 (#549)
301fe50 
Co-authored-by: Stefania Alborghetti <stef1927@users.noreply.github.com>
(cherry picked from commit 3039232)
(cherry picked from commit 9624082)
(cherry picked from commit e574fc3)

# Conflicts:
#	src/java/org/apache/cassandra/db/ReadCommand.java

 (Rebase of commit 9baf927)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JeremiahDJordan JeremiahDJordan JeremiahDJordan approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@djatnieks @mfleming @JeremiahDJordan @cassci-bot @k-rus