From ebf510abfc2428cd95640ef794fc8057f065dee9 Mon Sep 17 00:00:00 2001 From: sebastian-alfers Date: Wed, 29 Nov 2023 11:05:15 +0100 Subject: [PATCH 1/2] chore: remove comment about potential deprecation of the use-app-timestamp config --- core/src/main/resources/reference.conf | 2 -- core/src/main/scala/akka/persistence/r2dbc/R2dbcSettings.scala | 1 - 2 files changed, 3 deletions(-) diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index c0b253f9..910447e7 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -371,8 +371,6 @@ akka.persistence.r2dbc { # Ignored for H2 db-timestamp-monotonic-increasing = off - # Enable this for testing or workaround of https://github.com/yugabyte/yugabyte-db/issues/10995 - # FIXME: This property will be removed when the Yugabyte issue has been resolved. # Ignored for H2 use-app-timestamp = off diff --git a/core/src/main/scala/akka/persistence/r2dbc/R2dbcSettings.scala b/core/src/main/scala/akka/persistence/r2dbc/R2dbcSettings.scala index 179740f9..80d1185c 100644 --- a/core/src/main/scala/akka/persistence/r2dbc/R2dbcSettings.scala +++ b/core/src/main/scala/akka/persistence/r2dbc/R2dbcSettings.scala @@ -87,7 +87,6 @@ object R2dbcSettings { val dbTimestampMonotonicIncreasing: Boolean = config.getBoolean("db-timestamp-monotonic-increasing") - // FIXME remove when https://github.com/yugabyte/yugabyte-db/issues/10995 has been resolved val useAppTimestamp: Boolean = config.getBoolean("use-app-timestamp") val logDbCallsExceeding: FiniteDuration = From 81d462112a29f48523e84d82176503790d2456e8 Mon Sep 17 00:00:00 2001 From: sebastian-alfers Date: Wed, 29 Nov 2023 11:45:52 +0100 Subject: [PATCH 2/2] add recommended config comment --- core/src/main/resources/reference.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index 910447e7..fb6ec574 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -371,6 +371,8 @@ akka.persistence.r2dbc { # Ignored for H2 db-timestamp-monotonic-increasing = off + # Enable this to generate timestamps from the Akka client side instead of using database timestamps. + # NTP or similar clock synchronization should be used, but some clock skew between clients is accepted. # Ignored for H2 use-app-timestamp = off