mirror of
https://github.com/ostreedev/ostree.git
synced 2024-12-22 17:35:55 +03:00
8c1542134c
The code has been sitting around for a while but since I disabled it by default, I doubt anyone is really using it or relying on it. This patch and turns on locking by default, and also drops the API which was only public in the experimental API builds. Conceptually these are two distinct things, and we may actually want to split up the patches. I don't think this will break anyone, but it's hard to say for sure. It's also going to be hard to find out until we actually release I suspect... But anyone who is broken should be able to add `locking=false` into their repo config. On the flip side Endless has been shipping with this enabled and it is reported to help. The reason to drop the APIs: I'm a bit concerned about the interactions over time between libostree's use of the API and any apps that start using it. For example, if an app specifies a SHARED lock in their code, then later internally we decide to temporarily grab an `EXCLUSIVE`, but the app had a second thread/process that was `EXCLUSIVE` already, and that process was waiting on the first bit of code, then we could deadlock. I can't think of a real world situation where this would happen yet though. We are likely to in the future have say `fsck` take an external lock, `checkout` grab a shared one, etc. Closes: #1555 Approved by: jlebon
109 lines
3.4 KiB
Python
Executable File
109 lines
3.4 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
#
|
|
# Copyright (C) 2017 Colin Walters <walters@verbum.org>
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with this library; if not, write to the
|
|
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
# Boston, MA 02111-1307, USA.
|
|
|
|
from __future__ import division
|
|
from __future__ import print_function
|
|
import os
|
|
import sys
|
|
import shutil
|
|
import subprocess
|
|
from multiprocessing import cpu_count
|
|
|
|
def fatal(msg):
|
|
sys.stderr.write(msg)
|
|
sys.stderr.write('\n')
|
|
sys.exit(1)
|
|
|
|
# Create 20 files with content based on @dname + a serial, basically to have
|
|
# different files with different checksums.
|
|
def mktree(dname, serial=0):
|
|
print('Creating tree', dname, file=sys.stderr)
|
|
os.mkdir(dname, 0o755)
|
|
for v in range(20):
|
|
with open('{}/{}'.format(dname, v), 'w') as f:
|
|
f.write('{} {} {}\n'.format(dname, serial, v))
|
|
|
|
subprocess.check_call(['ostree', '--repo=repo', 'init', '--mode=bare'])
|
|
# like the bit in libtest, but let's do it unconditionally since it's simpler,
|
|
# and we don't need xattr coverage for this
|
|
with open('repo/config', 'a') as f:
|
|
f.write('disable-xattrs=true\n')
|
|
|
|
def commit(v):
|
|
tdir='tree{}'.format(v)
|
|
cmd = ['ostree', '--repo=repo', 'commit', '--fsync=0', '-b', tdir, '--tree=dir='+tdir]
|
|
proc = subprocess.Popen(cmd)
|
|
print('PID {}'.format(proc.pid), *cmd, file=sys.stderr)
|
|
return proc
|
|
def prune():
|
|
cmd = ['ostree', '--repo=repo', 'prune', '--refs-only']
|
|
proc = subprocess.Popen(cmd)
|
|
print('PID {}:'.format(proc.pid), *cmd, file=sys.stderr)
|
|
return proc
|
|
|
|
def wait_check(proc):
|
|
pid = proc.pid
|
|
proc.wait()
|
|
if proc.returncode != 0:
|
|
sys.stderr.write("process {} exited with code {}\n".format(proc.pid, proc.returncode))
|
|
return False
|
|
else:
|
|
sys.stderr.write('PID {} exited OK\n'.format(pid))
|
|
return True
|
|
|
|
print("1..2")
|
|
|
|
def run(n_committers, n_pruners):
|
|
# The number of committers needs to be even since we only create half as
|
|
# many trees
|
|
n_committers += n_committers % 2
|
|
|
|
committers = set()
|
|
pruners = set()
|
|
|
|
print('n_committers', n_committers, 'n_pruners', n_pruners, file=sys.stderr)
|
|
n_trees = n_committers // 2
|
|
for v in range(n_trees):
|
|
mktree('tree{}'.format(v))
|
|
|
|
for v in range(n_committers):
|
|
committers.add(commit(v // 2))
|
|
for v in range(n_pruners):
|
|
pruners.add(prune())
|
|
|
|
failed = False
|
|
for committer in committers:
|
|
if not wait_check(committer):
|
|
failed = True
|
|
for pruner in pruners:
|
|
if not wait_check(pruner):
|
|
failed = True
|
|
if failed:
|
|
fatal('A child process exited abnormally')
|
|
|
|
for v in range(n_trees):
|
|
shutil.rmtree('tree{}'.format(v))
|
|
|
|
# No concurrent pruning
|
|
run(cpu_count() // 2 + 2, 0)
|
|
print("ok no concurrent prunes")
|
|
|
|
run(cpu_count() // 2 + 4, 3)
|
|
print("ok concurrent prunes")
|