fix: Don't migrate twice now we have same store

Signed-off-by: Ryan Roberts <ryan@blockchaintp.com>
blockchaintp · Sep 28, 2021 · fa40be0 · fa40be0
1 parent a189922
commit fa40be0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/core/src/main/java/com/blockchaintp/daml/participant/CommitHighwaterMark.java b/core/src/main/java/com/blockchaintp/daml/participant/CommitHighwaterMark.java
@@ -19,7 +19,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
 import kr.pe.kwonnam.slf4jlambda.LambdaLogger;
@@ -33,7 +32,6 @@ public final class CommitHighwaterMark {
   private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
   private static final LambdaLogger LOG = LambdaLoggerFactory.getLogger(CommitHighwaterMark.class);
   private final ConcurrentSkipListSet<Long> open = new ConcurrentSkipListSet<>();
-  private final AtomicLong highWatermark = new AtomicLong();
 
   /**
    *

diff --git a/core/src/main/java/com/blockchaintp/daml/participant/Participant.java b/core/src/main/java/com/blockchaintp/daml/participant/Participant.java
@@ -146,12 +146,12 @@ public Future<SubmissionResult> commit(final String correlationId, final Raw.Env
             }
             return SubmissionResult.Acknowledged$.MODULE$;
           })).collect(Collectors.toList());
-
       try {
         var blockedRes = commits.stream().findFirst().get().get();
         return Future.successful(blockedRes);
       } catch (InterruptedException | ExecutionException e) {
-        return Future.successful(SubmissionResult.NotSupported$.MODULE$);
+        Thread.currentThread().interrupted();
+        return Future.successful(new SubmissionResult.InternalError(e.toString()));
       }
     }
   }

diff --git a/core/src/main/java/com/blockchaintp/daml/stores/postgres/PostgresStoreBuilder.java b/core/src/main/java/com/blockchaintp/daml/stores/postgres/PostgresStoreBuilder.java
@@ -44,8 +44,7 @@ public PostgresStoreBuilder(final String theUrl) {
    * @return A configured builder.
    */
   public PostgresStoreBuilder migrate() {
-    var flyway = Flyway.configure().locations("classpath:migrations/store", "classpath:migrations/txlog")
-        .dataSource(url, "", "").load();
+    var flyway = Flyway.configure().locations("classpath:migrations/store").dataSource(url, "", "").load();
 
     flyway.migrate();
 

diff --git a/postgres/src/main/scala/com/blockchaintp/daml/postgres/Main.scala b/postgres/src/main/scala/com/blockchaintp/daml/postgres/Main.scala
@@ -66,7 +66,6 @@ object Main extends App {
         .retrying(3)
         .build()
 
-      /// Only migrate the
       val txLog = PostgresTransactionLog
         .fromUrl(config.extra.txLogStore)
         .migrate()

diff --git a/qldb/src/main/scala/com/blockchaintp/daml/qldb/Main.scala b/qldb/src/main/scala/com/blockchaintp/daml/qldb/Main.scala
@@ -65,6 +65,17 @@ object Main extends App {
     "daml-on-qldb",
     new LedgerFactory((config: Config[ExtraConfig], builder: ParticipantBuilder[QldbIdentifier, QldbAddress]) => {
 
+      val txBlobStore = PostgresStore
+        .fromUrl(config.extra.txLogStore)
+        .migrate()
+        .retrying(3)
+        .build()
+
+      val stateBlobStore = PostgresStore
+        .fromUrl(config.extra.txLogStore)
+        .retrying(3)
+        .build()
+
       if (config.extra.createAws) {
         try {
           val qldbClient = QldbClient.builder
@@ -80,18 +91,6 @@ object Main extends App {
         }
       }
 
-      val txBlobStore = PostgresStore
-        .fromUrl(config.extra.txLogStore)
-        .migrate()
-        .retrying(3)
-        .build()
-
-      val stateBlobStore = PostgresStore
-        .fromUrl(config.extra.txLogStore)
-        .migrate()
-        .retrying(3)
-        .build()
-
       val sessionBuilder = QldbSessionClient.builder
         .region(Region.of(config.extra.region))
         .credentialsProvider(DefaultCredentialsProvider.builder.build())
@@ -115,6 +114,8 @@ object Main extends App {
       val stateStore = SplitStore
         .fromStores(stateQldbStore, stateBlobStore)
         .verified(true)
+        .withCaching(1000)
+        .withS3Index(false)
         .build()
 
       val qldbTransactionLog = QldbTransactionLog