Skip to content

[RFC] Make archival asynchronous #11296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 52 commits into from
Nov 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
64ac844
Make archival asynchronous
kevans91 May 4, 2020
9397c13
Archive links: drop initial delay to three-quarters of a second
kevans91 May 5, 2020
6785d39
archiver: restructure a little bit to facilitate testing
kevans91 May 5, 2020
5434d6e
gofmt nit: no space around binary + operator
kevans91 May 5, 2020
3b8eac4
services: archiver: appease golangci-lint, lock queueMutex
kevans91 May 5, 2020
59786fe
archiver: tests: fix several timing nits
kevans91 May 5, 2020
759b4d1
archiver: tests: no underscore in var name, ungh
kevans91 May 5, 2020
be77f9e
archiver: tests: Test* is run in a separate context than TestMain
kevans91 May 5, 2020
67d491b
archiver: tests: hopefully final tweak
kevans91 May 5, 2020
c134aef
repo: Download: restore some semblance of previous behavior
kevans91 May 5, 2020
6b25f43
archiver: tests: simplify a bit further
kevans91 May 6, 2020
eb15781
archiver: tests: resolve potential source of flakiness
kevans91 May 6, 2020
d134c3f
archiver: setup infrastructure for notifying consumers of completion
kevans91 May 6, 2020
ee6f508
repo: archive: make GET endpoint synchronous again
kevans91 May 6, 2020
75261f5
archiver: tests: amend test to include WaitForCompletion()
kevans91 May 7, 2020
709c356
archiver: tests: fix test by calling NewContext()
kevans91 May 8, 2020
9fc8bed
archiver: tests: integrate new WaitForCompletion a little better
kevans91 May 8, 2020
bcc5214
archiver: tests: combine numQueued declaration with next-instruction …
kevans91 May 8, 2020
27155ab
routers: repo: reap unused archiving flag from DownloadStatus()
kevans91 May 8, 2020
9e97b7c
services: archiver: restructure to use a channel
kevans91 May 8, 2020
8a50113
services: archiver: use defer to unlock now that we can
kevans91 May 8, 2020
397885f
Revert "archiver: tests: combine numQueued declaration with next-inst…
kevans91 May 8, 2020
a6bff86
archiver: tests: first attempt at WaitForCompletion() tests
kevans91 May 8, 2020
f2b3f65
archiver: tests: slight improvement, less busy-loop
kevans91 May 8, 2020
a039d15
archiver: address lint nits
kevans91 May 8, 2020
c96693b
services: archiver: only close the channel once
kevans91 May 8, 2020
5deb83e
services: archiver: use a struct{} for the wait channel
kevans91 May 10, 2020
f831cc2
archiver: tests: fix expectations
kevans91 May 10, 2020
43a6b48
archiver: tests: set cchan to nil for comparison
kevans91 May 10, 2020
90bdd2c
archiver: move ctx.Error's back into the route handlers
kevans91 May 10, 2020
ed517bc
services: archiver: use regex to match a hash
kevans91 May 10, 2020
d148570
routers: repo: remove the weird /archive/status endpoint
kevans91 May 10, 2020
b81fa9b
archiver: tests: bump reasonable timeout to 15s
kevans91 May 10, 2020
82c1dab
archiver: tests: actually release timedReq
kevans91 May 10, 2020
091d053
archiver: tests: run through inFlight instead of manually checking
kevans91 May 10, 2020
c5fb22f
Merge branch 'master' into archival-service
kevans91 Aug 13, 2020
5417cdd
initArchiveLinks: prevent default behavior from clicking
kevans91 Aug 13, 2020
081032a
archiver: alias gitea's context, golang context import pending
kevans91 Aug 13, 2020
eca24cd
archiver: simplify logic, just reconstruct slices
kevans91 Aug 13, 2020
57de90d
archiver: don't block shutdown on waiting for archive
kevans91 Aug 13, 2020
58a55c6
archiver: simplify shutdown logic
kevans91 Aug 14, 2020
8708f17
Merge branch 'master' into archival-service
kevans91 Aug 14, 2020
4a5cab6
Merge branch 'master' into archival-service
kevans91 Sep 11, 2020
b2ae10e
Merge branch 'master' into archival-service
kevans91 Sep 11, 2020
8c2afd7
Style issues
kevans91 Sep 11, 2020
c222dce
Merge branch 'master' into archival-service
lunny Sep 13, 2020
8d0dcaa
Merge branch 'master' into archival-service
kevans91 Oct 4, 2020
1405c56
Merge remote-tracking branch 'origin/archival-service' into archival-…
kevans91 Oct 4, 2020
1c8bd80
Merge branch 'master' into archival-service
kevans91 Nov 7, 2020
e303a5b
Fix mis-merge
kevans91 Nov 7, 2020
8c4930f
Merge branch 'master' into archival-service
lafriks Nov 7, 2020
c93c520
Merge branch 'master' into archival-service
lafriks Nov 7, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions integrations/api_repo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ func TestAPISearchRepo(t *testing.T) {
expectedResults
}{
{name: "RepositoriesMax50", requestURL: "/api/v1/repos/search?limit=50&private=false", expectedResults: expectedResults{
nil: {count: 27},
user: {count: 27},
user2: {count: 27}},
nil: {count: 28},
user: {count: 28},
user2: {count: 28}},
},
{name: "RepositoriesMax10", requestURL: "/api/v1/repos/search?limit=10&private=false", expectedResults: expectedResults{
nil: {count: 10},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ref: refs/heads/master
6 changes: 6 additions & 0 deletions integrations/gitea-repositories-meta/user27/repo49.git/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[core]
repositoryformatversion = 0
filemode = false
bare = true
symlinks = false
ignorecase = true
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh
#
# An example hook script to check the commit log message taken by
# applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit. The hook is
# allowed to edit the commit message file.
#
# To enable this hook, rename this file to "applypatch-msg".

. git-sh-setup
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
:
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/sh
#
# An example hook script to check the commit log message.
# Called by "git commit" with one argument, the name of the file
# that has the commit message. The hook should exit with non-zero
# status after issuing an appropriate message if it wants to stop the
# commit. The hook is allowed to edit the commit message file.
#
# To enable this hook, rename this file to "commit-msg".

# Uncomment the below to add a Signed-off-by line to the message.
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
# hook is more suited to it.
#
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

# This example catches duplicate Signed-off-by lines.

test "" = "$(grep '^Signed-off-by: ' "$1" |
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
echo >&2 Duplicate Signed-off-by lines.
exit 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
#!/usr/bin/perl

use strict;
use warnings;
use IPC::Open2;

# An example hook script to integrate Watchman
# (https://facebook.github.io/watchman/) with git to speed up detecting
# new and modified files.
#
# The hook is passed a version (currently 1) and a time in nanoseconds
# formatted as a string and outputs to stdout all files that have been
# modified since the given time. Paths must be relative to the root of
# the working tree and separated by a single NUL.
#
# To enable this hook, rename this file to "query-watchman" and set
# 'git config core.fsmonitor .git/hooks/query-watchman'
#
my ($version, $time) = @ARGV;

# Check the hook interface version

if ($version == 1) {
# convert nanoseconds to seconds
$time = int $time / 1000000000;
} else {
die "Unsupported query-fsmonitor hook version '$version'.\n" .
"Falling back to scanning...\n";
}

my $git_work_tree;
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
$git_work_tree = Win32::GetCwd();
$git_work_tree =~ tr/\\/\//;
} else {
require Cwd;
$git_work_tree = Cwd::cwd();
}

my $retry = 1;

launch_watchman();

sub launch_watchman {

my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
or die "open2() failed: $!\n" .
"Falling back to scanning...\n";

# In the query expression below we're asking for names of files that
# changed since $time but were not transient (ie created after
# $time but no longer exist).
#
# To accomplish this, we're using the "since" generator to use the
# recency index to select candidate nodes and "fields" to limit the
# output to file names only. Then we're using the "expression" term to
# further constrain the results.
#
# The category of transient files that we want to ignore will have a
# creation clock (cclock) newer than $time_t value and will also not
# currently exist.

my $query = <<" END";
["query", "$git_work_tree", {
"since": $time,
"fields": ["name"],
"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
}]
END

print CHLD_IN $query;
close CHLD_IN;
my $response = do {local $/; <CHLD_OUT>};

die "Watchman: command returned no output.\n" .
"Falling back to scanning...\n" if $response eq "";
die "Watchman: command returned invalid output: $response\n" .
"Falling back to scanning...\n" unless $response =~ /^\{/;

my $json_pkg;
eval {
require JSON::XS;
$json_pkg = "JSON::XS";
1;
} or do {
require JSON::PP;
$json_pkg = "JSON::PP";
};

my $o = $json_pkg->new->utf8->decode($response);

if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
$retry--;
qx/watchman watch "$git_work_tree"/;
die "Failed to make watchman watch '$git_work_tree'.\n" .
"Falling back to scanning...\n" if $? != 0;

# Watchman will always return all files on the first query so
# return the fast "everything is dirty" flag to git and do the
# Watchman query just to get it over with now so we won't pay
# the cost in git to look up each individual file.
print "/\0";
eval { launch_watchman() };
exit 0;
}

die "Watchman: $o->{error}.\n" .
"Falling back to scanning...\n" if $o->{error};

binmode STDOUT, ":utf8";
local $, = "\0";
print @{$o->{files}};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env bash
data=$(cat)
exitcodes=""
hookname=$(basename $0)
GIT_DIR=${GIT_DIR:-$(dirname $0)}

for hook in ${GIT_DIR}/hooks/${hookname}.d/*; do
test -x "${hook}" && test -f "${hook}" || continue
echo "${data}" | "${hook}"
exitcodes="${exitcodes} $?"
done

for i in ${exitcodes}; do
[ ${i} -eq 0 ] || exit ${i}
done
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
"$GITEA_ROOT/gitea" hook --config="$GITEA_ROOT/$GITEA_CONF" post-receive
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh
#
# An example hook script to prepare a packed repository for use over
# dumb transports.
#
# To enable this hook, rename this file to "post-update".

exec git update-server-info
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed
# by applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-applypatch".

. git-sh-setup
precommit="$(git rev-parse --git-path hooks/pre-commit)"
test -x "$precommit" && exec "$precommit" ${1+"$@"}
:
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".

if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi

# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --bool hooks.allownonascii)

# Redirect output to stderr.
exec 1>&2

# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.

This can cause problems if you want to work with people on other platforms.

To be portable it is advisable to rename the file.

If you know what you are doing you can disable this check using:

git config hooks.allownonascii true
EOF
exit 1
fi

# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#!/bin/sh

# An example hook script to verify what is about to be pushed. Called by "git
# push" after it has checked the remote status, but before anything has been
# pushed. If this script exits with a non-zero status nothing will be pushed.
#
# This hook is called with the following parameters:
#
# $1 -- Name of the remote to which the push is being done
# $2 -- URL to which the push is being done
#
# If pushing without using a named remote those arguments will be equal.
#
# Information about the commits which are being pushed is supplied as lines to
# the standard input in the form:
#
# <local ref> <local sha1> <remote ref> <remote sha1>
#
# This sample shows how to prevent push of commits where the log message starts
# with "WIP" (work in progress).

remote="$1"
url="$2"

z40=0000000000000000000000000000000000000000

while read local_ref local_sha remote_ref remote_sha
do
if [ "$local_sha" = $z40 ]
then
# Handle delete
:
else
if [ "$remote_sha" = $z40 ]
then
# New branch, examine all commits
range="$local_sha"
else
# Update to existing branch, examine new commits
range="$remote_sha..$local_sha"
fi

# Check for WIP commit
commit=`git rev-list -n 1 --grep '^WIP' "$range"`
if [ -n "$commit" ]
then
echo >&2 "Found WIP commit in $local_ref, not pushing"
exit 1
fi
fi
done

exit 0
Loading