Originally, when designing pluggable object databases the goal was that
the object database can have multiple sources, and every source attached
to it could use a different backend. This would have allowed for quite a
lot of flexibility, as you could trivially mix and match different kinds
of object storages in whatever way you like.
But while well-intentioned, this design led to a bunch of conceptual
problems:
- We're now trying to read objects in source order, whereas we
previously tried to read objects via packfiles before trying to read
them via loose objects. This led to a performance regression when
using alternates or when using a quarantine directory.
- Some data structures are supposed to only ever exist once, like for
example bitmaps and commit graphs. At the same time, those data
structures also span across the union of all objects, so they may
cross sources.
- It is unclear how we can extend GIT_OBJECT_DIRECTORY or
GIT_ALTERNATE_OBJECT_DIRECTORIES to become backend-agnostic in a
backwards-compatible way. In general, introducing an object storage
extension into the current status quo where alternates may have to
be extended to become generic was proving to be painful.
- Some mechanisms of alternates assume way too much about how exactly
their backends work. Alternate refs for example assume that the
alternate is backed by a filesystem path, and that this filesystem
path may also allow us to read references. This is not a given
though, as backends may not even have local data at all.
In short, there are a bunch of conceptual mismatches when we have
alternates and pluggable object databases coexist. So while the original
idea was nice, it does not result in a system that is easy to reason
about.
Correct course by moving alternates into the "files" source itself so
that it becomes an implementation detail thereof so that we can avoid
all of these shortcomings. While it's unfortunate that we cannot easily
mix and match sources now, that ability doesn't go away. It's still very
much feasible to introduce a new backend that allows for exactly that
use case, and such a backend may also be a lot more flexible as we can
now add new logic to determine which objects should be stored where. So
the original motivation for having per-source backends can still be
realized with the new architecture.
Note that as part of this move, we also handle the GIT_OBJECT_DIRECTORY
and GIT_ALTERNATE_OBJECT_DIRECTORIES environment variables in the
"files" backend. This may be surprising at first, but object directories
are very much a concept of that backend, too. So these variables would
have bad interactions with other backends, and they create a bit of a
mismatch with the eventual object storage extension that we plan to
introduce.
Note that this commit is way larger than I'd like it to be. I'm sorry, I
couldn't find a way to split it up further. That being said, most of the
changes are straight-forward conversions that go from iterating over
sources to iterating over object directories. The more involved changes
are moving the infrastructure to track individual sources from "odb.c"
and moving them into "odb/source-files.c".
This also serves to show a bit of a who's-who of commands that don't
work properly with pluggable object databases. Almost all of these
commands are related to housekeeping though -- some of them will be
converted eventually, like for example commit graphs or MIDXs. But many
of them will stay incompatible going forward as they are simply too
specific to the "files" backend.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
363 lines
8.5 KiB
C
363 lines
8.5 KiB
C
#include "git-compat-util.h"
|
|
#include "tmp-objdir.h"
|
|
#include "abspath.h"
|
|
#include "chdir-notify.h"
|
|
#include "dir.h"
|
|
#include "environment.h"
|
|
#include "object-file.h"
|
|
#include "path.h"
|
|
#include "string-list.h"
|
|
#include "strbuf.h"
|
|
#include "strvec.h"
|
|
#include "quote.h"
|
|
#include "odb.h"
|
|
#include "odb/source.h"
|
|
#include "odb/source-files.h"
|
|
#include "odb/source-loose.h"
|
|
#include "repository.h"
|
|
|
|
struct tmp_objdir {
|
|
struct repository *repo;
|
|
struct strbuf path;
|
|
struct strvec env;
|
|
struct odb_files_dir *temp_dir;
|
|
struct odb_files_dir *orig_dir;
|
|
int will_destroy;
|
|
};
|
|
|
|
/*
|
|
* Allow only one tmp_objdir at a time in a running process, which simplifies
|
|
* our atexit cleanup routines. It's doubtful callers will ever need
|
|
* more than one, and we can expand later if so. You can have many such
|
|
* tmp_objdirs simultaneously in many processes, of course.
|
|
*/
|
|
static struct tmp_objdir *the_tmp_objdir;
|
|
|
|
static void tmp_objdir_free(struct tmp_objdir *t)
|
|
{
|
|
strbuf_release(&t->path);
|
|
strvec_clear(&t->env);
|
|
free(t);
|
|
}
|
|
|
|
static void tmp_objdir_reparent(const char *old_cwd,
|
|
const char *new_cwd,
|
|
void *cb_data)
|
|
{
|
|
struct tmp_objdir *t = cb_data;
|
|
char *path;
|
|
|
|
path = reparent_relative_path(old_cwd, new_cwd,
|
|
t->path.buf);
|
|
strbuf_reset(&t->path);
|
|
strbuf_addstr(&t->path, path);
|
|
free(path);
|
|
}
|
|
|
|
/*
|
|
* Restore the primary source that was previously replaced by
|
|
* `tmp_objdir_create()`.
|
|
*/
|
|
static void tmp_objdir_restore_source(struct tmp_objdir *t)
|
|
{
|
|
struct odb_source_files *files = odb_source_files_downcast(t->repo->objects->source);
|
|
struct odb_files_dir *cur_dir = files->dirs;
|
|
|
|
if (t->temp_dir != files->dirs)
|
|
BUG("expected %s as primary object store; found %s",
|
|
t->temp_dir->abspath, cur_dir->abspath);
|
|
|
|
if (t->temp_dir->next != t->orig_dir)
|
|
BUG("we expect the old primary object store to be the first alternate");
|
|
|
|
t->repo->disable_ref_updates = false;
|
|
files->dirs = t->orig_dir;
|
|
odb_files_dir_free(cur_dir);
|
|
}
|
|
|
|
int tmp_objdir_destroy(struct tmp_objdir *t)
|
|
{
|
|
int err;
|
|
|
|
if (!t)
|
|
return 0;
|
|
|
|
if (t == the_tmp_objdir)
|
|
the_tmp_objdir = NULL;
|
|
|
|
if (t->orig_dir)
|
|
tmp_objdir_restore_source(t);
|
|
|
|
err = remove_dir_recursively(&t->path, 0);
|
|
|
|
chdir_notify_unregister(tmp_objdir_reparent, t);
|
|
tmp_objdir_free(t);
|
|
|
|
return err;
|
|
}
|
|
|
|
static void remove_tmp_objdir(void)
|
|
{
|
|
tmp_objdir_destroy(the_tmp_objdir);
|
|
}
|
|
|
|
void tmp_objdir_discard_objects(struct tmp_objdir *t)
|
|
{
|
|
remove_dir_recursively(&t->path, REMOVE_DIR_KEEP_TOPLEVEL);
|
|
}
|
|
|
|
/*
|
|
* These env_* functions are for setting up the child environment; the
|
|
* "replace" variant overrides the value of any existing variable with that
|
|
* "key". The "append" variant puts our new value at the end of a list,
|
|
* separated by PATH_SEP (which is what separate values in
|
|
* GIT_ALTERNATE_OBJECT_DIRECTORIES).
|
|
*/
|
|
static void env_append(struct strvec *env, const char *key, const char *val)
|
|
{
|
|
struct strbuf quoted = STRBUF_INIT;
|
|
const char *old;
|
|
|
|
/*
|
|
* Avoid quoting if it's not necessary, for maximum compatibility
|
|
* with older parsers which don't understand the quoting.
|
|
*/
|
|
if (*val == '"' || strchr(val, PATH_SEP)) {
|
|
strbuf_addch("ed, '"');
|
|
quote_c_style(val, "ed, NULL, 1);
|
|
strbuf_addch("ed, '"');
|
|
val = quoted.buf;
|
|
}
|
|
|
|
old = getenv(key);
|
|
if (!old)
|
|
strvec_pushf(env, "%s=%s", key, val);
|
|
else
|
|
strvec_pushf(env, "%s=%s%c%s", key, old, PATH_SEP, val);
|
|
|
|
strbuf_release("ed);
|
|
}
|
|
|
|
static void env_replace(struct strvec *env, const char *key, const char *val)
|
|
{
|
|
strvec_pushf(env, "%s=%s", key, val);
|
|
}
|
|
|
|
static int setup_tmp_objdir(const char *root)
|
|
{
|
|
char *path;
|
|
int ret = 0;
|
|
|
|
path = xstrfmt("%s/pack", root);
|
|
ret = mkdir(path, 0777);
|
|
free(path);
|
|
|
|
return ret;
|
|
}
|
|
|
|
struct tmp_objdir *tmp_objdir_create(struct repository *r,
|
|
const char *prefix,
|
|
int will_destroy)
|
|
{
|
|
struct odb_source_files *files = odb_source_files_downcast(r->objects->source);
|
|
static int installed_handlers;
|
|
struct tmp_objdir *t;
|
|
|
|
if (the_tmp_objdir)
|
|
BUG("only one tmp_objdir can be used at a time");
|
|
|
|
t = xcalloc(1, sizeof(*t));
|
|
t->repo = r;
|
|
t->will_destroy = will_destroy;
|
|
strbuf_init(&t->path, 0);
|
|
strvec_init(&t->env);
|
|
|
|
/*
|
|
* Use a string starting with tmp_ so that the builtin/prune.c code
|
|
* can recognize any stale objdirs left behind by a crash and delete
|
|
* them.
|
|
*/
|
|
strbuf_addf(&t->path, "%s/tmp_objdir-%s-XXXXXX",
|
|
repo_get_object_directory(r), prefix);
|
|
|
|
if (!is_absolute_path(t->path.buf))
|
|
chdir_notify_register(tmp_objdir_reparent, t);
|
|
|
|
if (!mkdtemp(t->path.buf)) {
|
|
/* free, not destroy, as we never touched the filesystem */
|
|
tmp_objdir_free(t);
|
|
return NULL;
|
|
}
|
|
|
|
the_tmp_objdir = t;
|
|
if (!installed_handlers) {
|
|
atexit(remove_tmp_objdir);
|
|
installed_handlers++;
|
|
}
|
|
|
|
if (setup_tmp_objdir(t->path.buf)) {
|
|
tmp_objdir_destroy(t);
|
|
return NULL;
|
|
}
|
|
|
|
env_append(&t->env, ALTERNATE_DB_ENVIRONMENT,
|
|
absolute_path(repo_get_object_directory(r)));
|
|
env_replace(&t->env, DB_ENVIRONMENT, absolute_path(t->path.buf));
|
|
env_replace(&t->env, GIT_QUARANTINE_ENVIRONMENT,
|
|
absolute_path(t->path.buf));
|
|
|
|
/*
|
|
* Make a new primary source and link the old primary source in as an
|
|
* alternate. Disable ref updates while a temporary source is active,
|
|
* since the objects in the database may roll back.
|
|
*/
|
|
t->temp_dir = odb_files_dir_new(t->repo->objects, t->path.buf, false);
|
|
t->temp_dir->loose->will_destroy = will_destroy;
|
|
t->temp_dir->next = files->dirs;
|
|
|
|
t->orig_dir = files->dirs;
|
|
files->dirs = t->temp_dir;
|
|
t->repo->disable_ref_updates = true;
|
|
|
|
return t;
|
|
}
|
|
|
|
/*
|
|
* Make sure we copy packfiles and their associated metafiles in the correct
|
|
* order. All of these ends_with checks are slightly expensive to do in
|
|
* the midst of a sorting routine, but in practice it shouldn't matter.
|
|
* We will have a relatively small number of packfiles to order, and loose
|
|
* objects exit early in the first line.
|
|
*/
|
|
static int pack_copy_priority(const char *name)
|
|
{
|
|
if (!starts_with(name, "pack"))
|
|
return 0;
|
|
if (ends_with(name, ".keep"))
|
|
return 1;
|
|
if (ends_with(name, ".pack"))
|
|
return 2;
|
|
if (ends_with(name, ".rev"))
|
|
return 3;
|
|
if (ends_with(name, ".idx"))
|
|
return 4;
|
|
return 5;
|
|
}
|
|
|
|
static int pack_copy_cmp(const char *a, const char *b)
|
|
{
|
|
return pack_copy_priority(a) - pack_copy_priority(b);
|
|
}
|
|
|
|
static int read_dir_paths(struct string_list *out, const char *path)
|
|
{
|
|
DIR *dh;
|
|
struct dirent *de;
|
|
|
|
dh = opendir(path);
|
|
if (!dh)
|
|
return -1;
|
|
|
|
while ((de = readdir(dh)))
|
|
if (de->d_name[0] != '.')
|
|
string_list_append(out, de->d_name);
|
|
|
|
closedir(dh);
|
|
return 0;
|
|
}
|
|
|
|
static int migrate_paths(struct tmp_objdir *t,
|
|
struct strbuf *src, struct strbuf *dst,
|
|
enum finalize_object_file_flags flags);
|
|
|
|
static int migrate_one(struct tmp_objdir *t,
|
|
struct strbuf *src, struct strbuf *dst,
|
|
enum finalize_object_file_flags flags)
|
|
{
|
|
struct stat st;
|
|
|
|
if (stat(src->buf, &st) < 0)
|
|
return -1;
|
|
if (S_ISDIR(st.st_mode)) {
|
|
if (!mkdir(dst->buf, 0777)) {
|
|
if (adjust_shared_perm(t->repo, dst->buf))
|
|
return -1;
|
|
} else if (errno != EEXIST)
|
|
return -1;
|
|
return migrate_paths(t, src, dst, flags);
|
|
}
|
|
return finalize_object_file_flags(t->repo, src->buf, dst->buf, flags);
|
|
}
|
|
|
|
static int is_loose_object_shard(const char *name)
|
|
{
|
|
return strlen(name) == 2 && isxdigit(name[0]) && isxdigit(name[1]);
|
|
}
|
|
|
|
static int migrate_paths(struct tmp_objdir *t,
|
|
struct strbuf *src, struct strbuf *dst,
|
|
enum finalize_object_file_flags flags)
|
|
{
|
|
size_t src_len = src->len, dst_len = dst->len;
|
|
struct string_list paths = STRING_LIST_INIT_DUP;
|
|
int ret = 0;
|
|
|
|
if (read_dir_paths(&paths, src->buf) < 0)
|
|
return -1;
|
|
paths.cmp = pack_copy_cmp;
|
|
string_list_sort(&paths);
|
|
|
|
for (size_t i = 0; i < paths.nr; i++) {
|
|
const char *name = paths.items[i].string;
|
|
enum finalize_object_file_flags flags_copy = flags;
|
|
|
|
strbuf_addf(src, "/%s", name);
|
|
strbuf_addf(dst, "/%s", name);
|
|
|
|
if (is_loose_object_shard(name))
|
|
flags_copy |= FOF_SKIP_COLLISION_CHECK;
|
|
|
|
ret |= migrate_one(t, src, dst, flags_copy);
|
|
|
|
strbuf_setlen(src, src_len);
|
|
strbuf_setlen(dst, dst_len);
|
|
}
|
|
|
|
string_list_clear(&paths, 0);
|
|
return ret;
|
|
}
|
|
|
|
int tmp_objdir_migrate(struct tmp_objdir *t)
|
|
{
|
|
struct strbuf src = STRBUF_INIT, dst = STRBUF_INIT;
|
|
int ret;
|
|
|
|
if (!t)
|
|
return 0;
|
|
|
|
if (t->orig_dir) {
|
|
if (t->will_destroy)
|
|
BUG("migrating an ODB that was marked for destruction");
|
|
tmp_objdir_restore_source(t);
|
|
t->orig_dir = NULL;
|
|
}
|
|
|
|
strbuf_addbuf(&src, &t->path);
|
|
strbuf_addstr(&dst, repo_get_object_directory(t->repo));
|
|
|
|
ret = migrate_paths(t, &src, &dst, 0);
|
|
|
|
strbuf_release(&src);
|
|
strbuf_release(&dst);
|
|
|
|
tmp_objdir_destroy(t);
|
|
return ret;
|
|
}
|
|
|
|
const char **tmp_objdir_env(const struct tmp_objdir *t)
|
|
{
|
|
if (!t)
|
|
return NULL;
|
|
return t->env.v;
|
|
}
|