Skip to content

Fix potential dataloss #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Srb1996 merged 2 commits into from
Sep 11, 2025
Merged

Fix potential dataloss #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d90f992
Fix dataloss, do not ignore interrupt exceptions while commit thread …
accountas Sep 2, 2025
912c7b3
Disable vertica integration tests due to missing image
accountas Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...-loader-core/src/main/scala/com/adform/streamloader/sink/batch/RecordBatchingSinker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class RecordBatchingSinker[B <: RecordBatch](

log.info(s"Committing batch $batch to storage")
Metrics.commitDuration.recordCallable(() =>
retryOnFailureIf(retryPolicy)(!batchCommittedAfterFailure(batch)) {
retryOnFailureIf(retryPolicy)(isRunning.get() && !batchCommittedAfterFailure(batch)) {
batchStorage.commitBatch(batch)
}
)
Expand All @@ -86,7 +86,7 @@ class RecordBatchingSinker[B <: RecordBatch](
log.warn("Failed discarding batch")
}
} catch {
case e if isInterruptionException(e) =>
case e if isInterruptionException(e) && !isRunning.get() =>
log.debug("Batch commit thread interrupted")
}
},
Expand Down
1 change: 0 additions & 1 deletion stream-loader-core/src/main/scala/com/adform/streamloader/util/Retry.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ object Retry extends Logging {
def isInterruptionException(e: Throwable): Boolean = e match {
case _: InterruptedException | _: InterruptedIOException | _: ClosedByInterruptException | _: InterruptException =>
true
case e: Throwable if e.getCause != null && isInterruptionException(e.getCause) => true
case _ => false
}

Expand Down
4 changes: 4 additions & 0 deletions stream-loader-tests/src/test/scala/com/adform/streamloader/VerticaIntegrationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.adform.streamloader.behaviors.BasicLoaderBehaviors
import com.adform.streamloader.fixtures._
import com.adform.streamloader.storage._
import com.zaxxer.hikari.{HikariConfig, HikariDataSource}
import org.scalatest.Ignore
import org.scalatest.concurrent.Eventually
import org.scalatest.funspec.AnyFunSpec
import org.scalatest.matchers.should.Matchers
Expand All @@ -21,6 +22,9 @@ import org.scalatestplus.scalacheck.Checkers
import scala.concurrent.ExecutionContext

@Slow
// Temporarily ignore Vertica tests, vertica-ce image is not available on DockerHub
// https://github.com/vertica/vertica-containers/issues/64
@Ignore
class VerticaIntegrationTests
extends AnyFunSpec
with Matchers
Expand Down
Loading