object-file: embed transaction flush logic in commit function

When a "files" transaction is committed,
`flush_loose_object_transaction()` is invoked to handle performing a
hardware flush along with migrating the temporary object directory into
the primary and configuring the repository ODB source accordingly. The
function name here is a bit misleading because the helper is doing a bit
more than just "flushing" the transaction contents. Also, in a
subsequent commit, the transaction temporary directory is used to stage
packfiles and not just loose objects anymore.

Lift the helper function logic into `odb_transaction_files_commit()` to
more accurately signal to readers the operation being performed.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/object-file.c b/object-file.c
index 469e0f7e61bf65008ac6bb39248b3dab9dc6466a..160ae093cc722718b3ab1be4fbc321b2b4a9da28 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -543,41 +543,6 @@ static void odb_transaction_files_fsync(struct odb_transaction *base,
        }
 }
 
-/*
- * Cleanup after batch-mode fsync_object_files.
- */
-static void flush_loose_object_transaction(struct odb_transaction_files *transaction)
-{
-       struct strbuf temp_path = STRBUF_INIT;
-       struct tempfile *temp;
-
-       if (!transaction->objdir)
-               return;
-
-       /*
-        * Issue a full hardware flush against a temporary file to ensure
-        * that all objects are durable before any renames occur. The code in
-        * odb_transaction_files_fsync has already issued a writeout
-        * request, but it has not flushed any writeback cache in the storage
-        * hardware or any filesystem logs. This fsync call acts as a barrier
-        * to ensure that the data in each new object file is durable before
-        * the final name is visible.
-        */
-       strbuf_addf(&temp_path, "%s/bulk_fsync_XXXXXX",
-                   repo_get_object_directory(transaction->base.source->odb->repo));
-       temp = xmks_tempfile(temp_path.buf);
-       fsync_or_die(get_tempfile_fd(temp), get_tempfile_path(temp));
-       delete_tempfile(&temp);
-       strbuf_release(&temp_path);
-
-       /*
-        * Make the object files visible in the primary ODB after their data is
-        * fully durable.
-        */
-       tmp_objdir_migrate(transaction->objdir);
-       transaction->objdir = NULL;
-}
-
 /* Finalize a file on disk, and close it. */
 static void close_loose_object(struct odb_source_loose *loose,
                               int fd, const char *filename)
@@ -1677,7 +1642,34 @@ static void odb_transaction_files_commit(struct odb_transaction *base)
        struct odb_transaction_files *transaction =
                container_of(base, struct odb_transaction_files, base);
 
-       flush_loose_object_transaction(transaction);
+       if (transaction->objdir) {
+               struct strbuf temp_path = STRBUF_INIT;
+               struct tempfile *temp;
+
+               /*
+                * Issue a full hardware flush against a temporary file to ensure
+                * that all objects are durable before any renames occur. The code in
+                * odb_transaction_files_fsync has already issued a writeout
+                * request, but it has not flushed any writeback cache in the storage
+                * hardware or any filesystem logs. This fsync call acts as a barrier
+                * to ensure that the data in each new object file is durable before
+                * the final name is visible.
+                */
+               strbuf_addf(&temp_path, "%s/bulk_fsync_XXXXXX",
+                           repo_get_object_directory(transaction->base.source->odb->repo));
+               temp = xmks_tempfile(temp_path.buf);
+               fsync_or_die(get_tempfile_fd(temp), get_tempfile_path(temp));
+               delete_tempfile(&temp);
+               strbuf_release(&temp_path);
+
+               /*
+                * Make the object files visible in the primary ODB after their data is
+                * fully durable.
+                */
+               tmp_objdir_migrate(transaction->objdir);
+               transaction->objdir = NULL;
+       }
+
        flush_packfile_transaction(transaction);
 }