Skip to content

Commit fade0b7

Browse files
committed
storage: fix log line in common case reclock compact calls
1 parent 6ff1386 commit fade0b7

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

src/storage/src/source/reclock.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -320,15 +320,17 @@ impl ReclockFollower {
320320

321321
impl ReclockFollowerInner {
322322
pub fn compact(&mut self, new_since: Antichain<Timestamp>) {
323-
if PartialOrder::less_equal(&new_since, &self.since) {
323+
if !PartialOrder::less_equal(&self.since, &new_since) {
324324
// As long as the assertion about `as_of` and `since` on creation
325325
// are correct, it is fine to ignore these compaction requests if
326-
// they don't advance the since.
326+
// they don't advance the since. Note that if the `new_since` and
327+
// old `since` are equal, we still attempt to compact the
328+
// in-memory trace.
327329
tracing::error!(
328330
?new_since,
329331
?self.since,
330332
"We are forced to skip the compaction in \
331-
the _ReclockFollower_ because the `new_since` >= the `since`. \
333+
the _ReclockFollower_ because the `new_since` was not beyond the `since`. \
332334
This is a bug that should be fixed."
333335
);
334336
return;
@@ -547,15 +549,17 @@ impl ReclockOperator {
547549

548550
/// Compacts the internal state
549551
pub async fn compact(&mut self, new_since: Antichain<Timestamp>) {
550-
if PartialOrder::less_equal(&new_since, &self.since) {
551-
// As long as the assertion about `as_of` and `since` on creation are
552-
// correct, it is fine to ignore these compaction requests if they
553-
// don't advance the since.
552+
if !PartialOrder::less_equal(&self.since, &new_since) {
553+
// As long as the assertion about `as_of` and `since` on creation
554+
// are correct, it is fine to ignore these compaction requests if
555+
// they don't advance the since. Note that if the `new_since` and
556+
// old `since` are equal, we still attempt to compact the
557+
// in-memory trace.
554558
tracing::error!(
555559
?new_since,
556560
?self.since,
557561
"We are forced to skip the compaction in \
558-
the _ReclockOperator_ because the `new_since` >= the `since`. \
562+
the _ReclockFollower_ because the `new_since` was not beyond the `since`. \
559563
This is a bug that should be fixed."
560564
);
561565
return;

0 commit comments

Comments
 (0)