proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-13 12:59:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

packbuilder: honor git_object__synchronized_writing

Browse Source 
Honor `git_object__synchronized_writing` when creating a packfile and
corresponding index.
This commit is contained in:
Edward Thomson 2016-12-14 12:51:40 -05:00
parent e6ed0d2f03
commit 1c2c0ae2a4
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/indexer.c
View File

@ -17,6 +17,7 @@
#include "oid.h" #include "oid.h"
#include "oidmap.h" #include "oidmap.h"
#include "zstream.h" #include "zstream.h"
#include "object.h"
extern git_mutex git__mwindow_mutex; extern git_mutex git__mwindow_mutex;
@ -989,7 +990,9 @@ int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats)
return -1; return -1;
if (git_filebuf_open(&index_file, filename.ptr, if (git_filebuf_open(&index_file, filename.ptr,
GIT_FILEBUF_HASH_CONTENTS, idx->mode) < 0) GIT_FILEBUF_HASH_CONTENTS |
(git_object__synchronized_writing ? GIT_FILEBUF_FSYNC : 0),
idx->mode) < 0)
goto on_error; goto on_error;
/* Write out the header */ /* Write out the header */
@ -1066,6 +1069,11 @@ int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats)
return -1; return -1;
} }
if (git_object__synchronized_writing && p_fsync(idx->pack->mwf.fd) < 0) {
giterr_set(GITERR_OS, "failed to fsync packfile");
goto on_error;
}
/* We need to close the descriptor here so Windows doesn't choke on commit_at */ /* We need to close the descriptor here so Windows doesn't choke on commit_at */
if (p_close(idx->pack->mwf.fd) < 0) { if (p_close(idx->pack->mwf.fd) < 0) {
giterr_set(GITERR_OS, "failed to close packfile"); giterr_set(GITERR_OS, "failed to close packfile");

19
tests/pack/packbuilder.c
View File

@ -23,6 +23,7 @@ void test_pack_packbuilder__initialize(void)
cl_git_pass(git_vector_init(&_commits, 0, NULL)); cl_git_pass(git_vector_init(&_commits, 0, NULL));
_commits_is_initialized = 1; _commits_is_initialized = 1;
memset(&_stats, 0, sizeof(_stats)); memset(&_stats, 0, sizeof(_stats));
p_fsync__cnt = 0;
} }
void test_pack_packbuilder__cleanup(void) void test_pack_packbuilder__cleanup(void)
@ -30,6 +31,8 @@ void test_pack_packbuilder__cleanup(void)
git_oid *o; git_oid *o;
unsigned int i; unsigned int i;
cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION, 0));
if (_commits_is_initialized) { if (_commits_is_initialized) {
_commits_is_initialized = 0; _commits_is_initialized = 0;
git_vector_foreach(&_commits, i, o) { git_vector_foreach(&_commits, i, o) {
@ -188,6 +191,22 @@ void test_pack_packbuilder__permissions_readwrite(void)
test_write_pack_permission(0666, 0666); test_write_pack_permission(0666, 0666);
} }
void test_pack_packbuilder__does_not_fsync_by_default(void)
{
seed_packbuilder();
git_packbuilder_write(_packbuilder, ".", 0666, NULL, NULL);
cl_assert_equal_sz(0, p_fsync__cnt);
}
void test_pack_packbuilder__fsync_when_asked(void)
{
cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_SYNCHRONIZED_OBJECT_CREATION, 1));
p_fsync__cnt = 0;
seed_packbuilder();
git_packbuilder_write(_packbuilder, ".", 0666, NULL, NULL);
cl_assert_equal_sz(2, p_fsync__cnt);
}
static int foreach_cb(void *buf, size_t len, void *payload) static int foreach_cb(void *buf, size_t len, void *payload)
{ {
git_indexer *idx = (git_indexer *) payload; git_indexer *idx = (git_indexer *) payload;