From 7e87290fca99e84edae3fa1130dea0073b73d006 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Thu, 21 Nov 2019 22:04:44 +0300
Subject: [PATCH] Clear second sector of the journal, init iov for callbacks

---
 blockstore_flush.cpp |  2 ++
 blockstore_init.cpp  | 15 ++++++++++-----
 blockstore_sync.cpp  |  5 ++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/blockstore_flush.cpp b/blockstore_flush.cpp
index 90fc134d..133d4647 100644
--- a/blockstore_flush.cpp
+++ b/blockstore_flush.cpp
@@ -342,12 +342,14 @@ resume_0:
                 // Sync batch is ready. Do it.
                 await_sqe(9);
                 data->callback = simple_callback;
+                data->iov = { 0 };
                 my_uring_prep_fsync(sqe, bs->data_fd, 0);
                 wait_count++;
                 if (bs->meta_fd != bs->data_fd)
                 {
                     await_sqe(10);
                     data->callback = simple_callback;
+                    data->iov = { 0 };
                     my_uring_prep_fsync(sqe, bs->meta_fd, 0);
                     wait_count++;
                 }
diff --git a/blockstore_init.cpp b/blockstore_init.cpp
index 82d635d2..0da111e5 100644
--- a/blockstore_init.cpp
+++ b/blockstore_init.cpp
@@ -109,6 +109,7 @@ blockstore_init_journal::blockstore_init_journal(blockstore *bs)
     this->bs = bs;
     simple_callback = [this](ring_data_t *data1)
     {
+        printf("%d %d\n", data1->res, data1->iov.iov_len);
         if (data1->res != data1->iov.iov_len)
         {
             throw std::runtime_error(std::string("I/O operation failed while reading journal: ") + strerror(-data1->res));
@@ -184,29 +185,33 @@ resume_1:
     if (iszero((uint64_t*)journal_buffer, 3))
     {
         // Journal is empty
-        // FIXME handle this wrapping to 512 better ... and align it to 4096
+        // FIXME handle this wrapping to 512 better
         bs->journal.used_start = 512;
         bs->journal.next_free = 512;
-        // Initialize journal "superblock"
+        // Initialize journal "superblock" and the first block
+        // Cool effect. Same operations result in journal replay.
+        // FIXME: Randomize initial crc32. Track crc32 when trimming.
         GET_SQE();
-        memset(journal_buffer, 0, 512);
+        memset(journal_buffer, 0, 1024);
         *((journal_entry_start*)journal_buffer) = {
             .crc32 = 0,
             .magic = JOURNAL_MAGIC,
             .type = JE_START,
             .size = sizeof(journal_entry_start),
             .reserved = 0,
-            .journal_start = bs->journal.used_start,
+            .journal_start = 512,
         };
         ((journal_entry_start*)journal_buffer)->crc32 = je_crc32((journal_entry*)journal_buffer);
-        data->iov = (struct iovec){ journal_buffer, 512 };
+        data->iov = (struct iovec){ journal_buffer, 1024 };
         data->callback = simple_callback;
         my_uring_prep_writev(sqe, bs->journal.fd, &data->iov, 1, bs->journal.offset);
         wait_count++;
         GET_SQE();
         my_uring_prep_fsync(sqe, bs->journal.fd, 0);
+        data->iov = { 0 };
         data->callback = simple_callback;
         wait_count++;
+        printf("Resetting journal\n");
         bs->ringloop->submit();
     resume_4:
         if (wait_count > 0)
diff --git a/blockstore_sync.cpp b/blockstore_sync.cpp
index 4af5471a..ceb4cf54 100644
--- a/blockstore_sync.cpp
+++ b/blockstore_sync.cpp
@@ -43,6 +43,7 @@ int blockstore::continue_sync(blockstore_operation *op)
         // No big writes, just fsync the journal
         BS_SUBMIT_GET_SQE(sqe, data);
         my_uring_prep_fsync(sqe, journal.fd, 0);
+        data->iov = { 0 };
         data->callback = cb;
         op->pending_ops = 1;
         op->sync_state = SYNC_JOURNAL_SYNC_SENT;
@@ -52,6 +53,7 @@ int blockstore::continue_sync(blockstore_operation *op)
         // 1st step: fsync data
         BS_SUBMIT_GET_SQE(sqe, data);
         my_uring_prep_fsync(sqe, data_fd, 0);
+        data->iov = { 0 };
         data->callback = cb;
         op->pending_ops = 1;
         op->sync_state = SYNC_DATA_SYNC_SENT;
@@ -98,6 +100,7 @@ int blockstore::continue_sync(blockstore_operation *op)
         // ... And a journal fsync
         my_uring_prep_fsync(sqe[s], journal.fd, 0);
         struct ring_data_t *data = ((ring_data_t*)sqe[s]->user_data);
+        data->iov = { 0 };
         data->callback = cb;
         op->pending_ops = 1 + s;
         op->sync_state = SYNC_JOURNAL_SYNC_SENT;
@@ -112,7 +115,7 @@ int blockstore::continue_sync(blockstore_operation *op)
 
 void blockstore::handle_sync_event(ring_data_t *data, blockstore_operation *op)
 {
-    if (data->res < data->iov.iov_len)
+    if (data->res != data->iov.iov_len)
     {
         throw std::runtime_error(
             "write operation failed ("+std::to_string(data->res)+" != "+std::to_string(data->iov.iov_len)+