t/cmd/lfstest-count-tests.go: document our implementation
This commit is contained in:
parent
4f2372215f
commit
55fe3b99bb
@ -16,12 +16,33 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
// countFile is the path to a file (relative to the $LFSTEST_DIR) who's
|
||||||
|
// contents is the number of actively-running integration tests.
|
||||||
countFile = "test_count"
|
countFile = "test_count"
|
||||||
|
// lockFile is the path to a file (relative to the $LFSTEST_DIR) who's
|
||||||
|
// presence indicates that another invocation of the lfstest-count-tests
|
||||||
|
// program is modifying the test_count.
|
||||||
lockFile = "test_count.lock"
|
lockFile = "test_count.lock"
|
||||||
|
|
||||||
|
// lockAcquireTimeout is the maximum amount of time that we will wait
|
||||||
|
// for lockFile to become available (and thus the amount of time that we
|
||||||
|
// will wait in order to acquire the lock).
|
||||||
|
lockAcquireTimeout = 5 * time.Second
|
||||||
|
|
||||||
|
// errCouldNotAcquire indicates that the program could not acquire the
|
||||||
|
// lock needed to modify the test_count. It is a fatal error.
|
||||||
errCouldNotAcquire = fmt.Errorf("could not acquire lock, dying")
|
errCouldNotAcquire = fmt.Errorf("could not acquire lock, dying")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// countFn is a type signature that all functions who wish to modify the
|
||||||
|
// test_count must inhabit.
|
||||||
|
//
|
||||||
|
// The first and only formal parameter is the current number of running tests
|
||||||
|
// found in test_count after acquiring the lock.
|
||||||
|
//
|
||||||
|
// The returned tuple indicates (1) the new number that should be written to
|
||||||
|
// test_count, and (2) if there was an error in computing that value. If err is
|
||||||
|
// non-nil, the program will exit and test_count will not be updated.
|
||||||
type countFn func(int) (int, error)
|
type countFn func(int) (int, error)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@ -31,7 +52,8 @@ func main() {
|
|||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
ctx, cancel := context.WithTimeout(
|
||||||
|
context.Background(), lockAcquireTimeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
if err := acquire(ctx); err != nil {
|
if err := acquire(ctx); err != nil {
|
||||||
@ -40,6 +62,8 @@ func main() {
|
|||||||
defer release()
|
defer release()
|
||||||
|
|
||||||
if len(os.Args) == 1 {
|
if len(os.Args) == 1 {
|
||||||
|
// Calling with no arguments indicates that we simply want to
|
||||||
|
// read the contents of test_count.
|
||||||
callWithCount(func(n int) (int, error) {
|
callWithCount(func(n int) (int, error) {
|
||||||
fmt.Fprintf(os.Stdout, "%d\n", n)
|
fmt.Fprintf(os.Stdout, "%d\n", n)
|
||||||
return n, nil
|
return n, nil
|
||||||
@ -53,21 +77,37 @@ func main() {
|
|||||||
case "increment":
|
case "increment":
|
||||||
err = callWithCount(func(n int) (int, error) {
|
err = callWithCount(func(n int) (int, error) {
|
||||||
if n > 0 {
|
if n > 0 {
|
||||||
|
// If n>1, it is therefore true that a
|
||||||
|
// lfstest-gitserver invocation is already
|
||||||
|
// running.
|
||||||
|
//
|
||||||
|
// Hence, let's do nothing here other than
|
||||||
|
// increase the count.
|
||||||
return n + 1, nil
|
return n + 1, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The lfstest-gitserver invocation (see: below) does
|
||||||
|
// not itself create a gitserver.log in the appropriate
|
||||||
|
// directory. Thus, let's create it ourselves instead.
|
||||||
log, err := os.Create(fmt.Sprintf(
|
log, err := os.Create(fmt.Sprintf(
|
||||||
"%s/gitserver.log", os.Getenv("LFSTEST_DIR")))
|
"%s/gitserver.log", os.Getenv("LFSTEST_DIR")))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return n, err
|
return n, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The executable name depends on the X environment
|
||||||
|
// variable, which is set in script/cibuild.
|
||||||
var cmd *exec.Cmd
|
var cmd *exec.Cmd
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
cmd = exec.Command("lfstest-gitserver.exe")
|
cmd = exec.Command("lfstest-gitserver.exe")
|
||||||
} else {
|
} else {
|
||||||
cmd = exec.Command("lfstest-gitserver")
|
cmd = exec.Command("lfstest-gitserver")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The following are ported from the old
|
||||||
|
// test/testhelpers.sh, and comprise the requisite
|
||||||
|
// environment variables needed to run
|
||||||
|
// lfstest-gitserver.
|
||||||
cmd.Env = append(os.Environ(),
|
cmd.Env = append(os.Environ(),
|
||||||
fmt.Sprintf("LFSTEST_URL=%s", os.Getenv("LFSTEST_URL")),
|
fmt.Sprintf("LFSTEST_URL=%s", os.Getenv("LFSTEST_URL")),
|
||||||
fmt.Sprintf("LFSTEST_SSL_URL=%s", os.Getenv("LFSTEST_SSL_URL")),
|
fmt.Sprintf("LFSTEST_SSL_URL=%s", os.Getenv("LFSTEST_SSL_URL")),
|
||||||
@ -79,6 +119,8 @@ func main() {
|
|||||||
)
|
)
|
||||||
cmd.Stdout = log
|
cmd.Stdout = log
|
||||||
|
|
||||||
|
// Start performs a fork/execve, hence we can abandon
|
||||||
|
// this process once it has started.
|
||||||
if err := cmd.Start(); err != nil {
|
if err := cmd.Start(); err != nil {
|
||||||
return n, err
|
return n, err
|
||||||
}
|
}
|
||||||
@ -87,9 +129,14 @@ func main() {
|
|||||||
case "decrement":
|
case "decrement":
|
||||||
err = callWithCount(func(n int) (int, error) {
|
err = callWithCount(func(n int) (int, error) {
|
||||||
if n > 1 {
|
if n > 1 {
|
||||||
|
// If there is at least two tests running, we
|
||||||
|
// need not shutdown a lfstest-gitserver
|
||||||
|
// instance.
|
||||||
return n - 1, nil
|
return n - 1, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Otherwise, we need to POST to /shutdown, which will
|
||||||
|
// cause the lfstest-gitserver to abort itself.
|
||||||
url, err := ioutil.ReadFile(os.Getenv("LFS_URL_FILE"))
|
url, err := ioutil.ReadFile(os.Getenv("LFS_URL_FILE"))
|
||||||
if err == nil {
|
if err == nil {
|
||||||
_, err = http.Post(string(url)+"/shutdown",
|
_, err = http.Post(string(url)+"/shutdown",
|
||||||
@ -106,28 +153,42 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
// acquireTick is the constant time that one tick (i.e., one attempt at
|
||||||
|
// acquiring the lock) should last.
|
||||||
|
acquireTick = 10 * time.Millisecond
|
||||||
|
)
|
||||||
|
|
||||||
|
// acquire acquires the lock file necessary to perform updates to test_count,
|
||||||
|
// and returns an error if that lock cannot be acquired.
|
||||||
func acquire(ctx context.Context) error {
|
func acquire(ctx context.Context) error {
|
||||||
path, err := path(lockFile)
|
path, err := path(lockFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
tick := time.NewTicker(10 * time.Millisecond)
|
tick := time.NewTicker(acquireTick)
|
||||||
defer tick.Stop()
|
defer tick.Stop()
|
||||||
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-tick.C:
|
case <-tick.C:
|
||||||
|
// Try every tick of the above ticker before giving up
|
||||||
|
// and trying again.
|
||||||
_, err := os.OpenFile(path, os.O_CREATE|os.O_EXCL, 0666)
|
_, err := os.OpenFile(path, os.O_CREATE|os.O_EXCL, 0666)
|
||||||
if err == nil || !alreadyExists(err) {
|
if err == nil || !os.IsExist(err) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
|
// If the context.Context above has reached its
|
||||||
|
// deadline, we must give up.
|
||||||
return errCouldNotAcquire
|
return errCouldNotAcquire
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// release releases the lock file so that another process can take over, or
|
||||||
|
// returns an error.
|
||||||
func release() error {
|
func release() error {
|
||||||
path, err := path(lockFile)
|
path, err := path(lockFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -136,6 +197,10 @@ func release() error {
|
|||||||
return os.Remove(path)
|
return os.Remove(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// callWithCount calls the given countFn with the current count in test_count,
|
||||||
|
// and updates it with what the function returns.
|
||||||
|
//
|
||||||
|
// If the function produced an error, that will be returned instead.
|
||||||
func callWithCount(fn countFn) error {
|
func callWithCount(fn countFn) error {
|
||||||
path, err := path(countFile)
|
path, err := path(countFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -165,6 +230,9 @@ func callWithCount(fn countFn) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We want to write over the contents in the file, so "truncate" the
|
||||||
|
// file to a length of 0, and then seek to the beginning of the file to
|
||||||
|
// update the write head.
|
||||||
if err := f.Truncate(0); err != nil {
|
if err := f.Truncate(0); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -178,6 +246,8 @@ func callWithCount(fn countFn) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// path returns an absolute path corresponding to any given path relative to the
|
||||||
|
// 't' directory of the current checkout of Git LFS.
|
||||||
func path(s string) (string, error) {
|
func path(s string) (string, error) {
|
||||||
p := filepath.Join(filepath.Dir(os.Getenv("LFSTEST_DIR")), s)
|
p := filepath.Join(filepath.Dir(os.Getenv("LFSTEST_DIR")), s)
|
||||||
if err := os.MkdirAll(filepath.Dir(p), 0666); err != nil {
|
if err := os.MkdirAll(filepath.Dir(p), 0666); err != nil {
|
||||||
@ -186,13 +256,8 @@ func path(s string) (string, error) {
|
|||||||
return p, nil
|
return p, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func alreadyExists(err error) bool {
|
// fatal reports the given error (if non-nil), and then dies. If the error was
|
||||||
if err, ok := err.(*os.PathError); ok && err != nil {
|
// nil, nothing happens.
|
||||||
return err.Err.Error() == "file exists"
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func fatal(err error) {
|
func fatal(err error) {
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user