Commit graph

356 commits

Author SHA1 Message Date
Kris Kennaway
391855dc68 Remove, don't comment out, unused variables 2005-10-11 04:02:49 +00:00
Kris Kennaway
f03134ec0a Remove unused variables. Don't bother protecting against negative
queue lengths since that doesn't arise.
2005-10-11 04:02:05 +00:00
Kris Kennaway
29028363d7 Update lockf to lockf -k in example usage 2005-10-11 03:56:42 +00:00
Kris Kennaway
bd58a06a02 Update the lockf command to add -k in example usage 2005-10-11 03:56:20 +00:00
Kris Kennaway
94cda32b84 When -norsync is set, don't bother to run md5 over the bindist.tar
and copy it to the client.  This has two benefits:

1) Avoids spamming the master with dozens of md5 processes when
   dosetupnode is spawned for all client machines at ocne

2) Avoids silly copy attempts on disconnected nodes for which the file
   is copied to itself
2005-10-11 03:55:27 +00:00
Kris Kennaway
ac6980959a Change lockf to lockf -k in a commented-out command, just in case it's
ever uncommented.
2005-10-11 03:53:39 +00:00
Kris Kennaway
b63664dd37 Add support for use_md_swap 2005-10-11 03:53:02 +00:00
Kris Kennaway
0faac9ad5f Add support for use_md_swap. When this variable is set in a
portbuild.conf, builds will each be done in a separate swap-backed md.
This dramatically improves build performance since

* Every transaction is not written to disk, so disk bandwidth is not
  a bottleneck

* Multiple builds do not contend with each other for the same set of
  filesystem locks and other per-device resources

The size of the md devices is controlled by the md_size variable.  '2g'
seems to be a good size.

Currently we mdconfig -u each device after each port build, since
otherwise dirty blocks accumulate and the md eventually uses a full
amount of backing store (2g in the above example).  This is a problem
if there is unsufficient swap backing to accomodate them all.

XXX This should be made configurable to avoid the performance penalty on
systems that do have enough swap backing
2005-10-11 03:52:37 +00:00
Kris Kennaway
f873829934 No need to hold the queue lock while polling client load 2005-10-11 03:48:11 +00:00
Kris Kennaway
86a1e3f264 * Use lockf -k instead of lockf. If there is ever contention from >1
process, you must use -k or lockf can give out two locks at once
2005-10-11 03:47:33 +00:00
Kris Kennaway
da7e71facd * Add support for use_md_swap 2005-10-11 03:45:49 +00:00
Kris Kennaway
e93c55ca9b * Unmount linprocfs around pkg_adding dependencies, to try and work
around silly failures in some ports when it is present

* Add a footer to completed builds that is recognised by pdispatch to
  retry truncated builds

* If ALWAYS_KEEP_DISTFILES is not present in the environment or port
  makefile, then clean up DISTDIR after the build finishes, to prevent
  collection of distfiles for this port.

* Finish flipping the switch on -noplistcheck - this is activated by
  passing in the NOPLISTCHECK environment variable instead of
  using PLISTCHECK in the opposite case
2005-10-11 03:40:57 +00:00
Kris Kennaway
917dfa95ab * Finish flipping the switch on -noplistcheck - this is activated by
passing in the NOPLISTCHECK environment variable instead of
  using PLISTCHECK in the opposite case

* Remove the unused -nodummy function

* Pass in ALWAYS_KEEP_DISTFILES when -distfiles is set
2005-10-11 03:37:57 +00:00
Kris Kennaway
353d47ddd9 * Remove support for the unused -nodummy function
* Finish flipping the switch on -noplistcheck - this is activated by
  passing in the NOPLISTCHECK environment variable instead of
  using PLISTCHECK in the opposite case

* Always pull in the distfiles from the client if they exist (needed
  for forthcoming ports tree changes to satisfy GPL license requirements)

* If the build did not complete "cleanly", e.g. it was interrupted by a
  network outage or client machine panic, then retry it until it succeeds
  instead of just leaving a dirty truncated log
2005-10-11 03:36:50 +00:00
Kris Kennaway
1a15382c52 * Remove unused -nodummy argument
* Finish flipping the switch on -noplistcheck; set NOPLISTCHECK instead
  of PLISTCHECK in the opposite case

* Clean up the distfiles/ directory when starting build, so it is not
  contaminated by old distfiles

* Remove commented-out code to don't back up old distfiles/ directory,
  it's just too big to do this.
2005-10-11 03:31:41 +00:00
Kris Kennaway
85ae134a79 Silence some possible errors from chflags -R 2005-10-11 03:27:36 +00:00
Kris Kennaway
ddd72ac387 Silence possible errors from some recursive commands 2005-10-11 03:27:19 +00:00
Kris Kennaway
0280b07725 Check for extra files on !i386 also 2005-07-24 20:38:06 +00:00
Kris Kennaway
5faf427bee Support FreeBSD 7.x 2005-07-24 20:37:31 +00:00
Kris Kennaway
ea1d96a8a9 Drop the removed openoffice 1.0 ports from the quickports list 2005-07-24 20:37:20 +00:00
Kris Kennaway
a42f81135d Correct typo 2005-07-24 20:35:07 +00:00
Kris Kennaway
aa820a71ce Use WRKDIRPREFIX instead of hardcoded value.
Clean up after we're done.
2005-04-11 22:08:14 +00:00
Kris Kennaway
d23d4aaa34 Change rsync -l to -L for the tarballs/ directory (so that dangling
symlinks are not created on the target) and rsync the entire
directory so that extra files are deleted.
2005-04-03 04:37:09 +00:00
Kris Kennaway
9ebdc14d1d Build packages with WRKDIRPREFIX=/work (which does not exist by
default) instead of /tmp, since some packages incorrectly search this
build path at runtime to try to load things.

Requested by:	nectar
2005-04-02 20:20:21 +00:00
Kris Kennaway
3bb948c483 Increase the nc poll timeout to better deal with network latencies. 2005-04-02 20:19:03 +00:00
Kris Kennaway
da08048084 Flip over the -plistcheck switch to -noplistcheck since we now want to
make it the default behaviour.
2005-04-02 20:18:28 +00:00
Kris Kennaway
37d3297837 Update the list of files and directories to filter from the plist checking. 2005-04-02 20:17:47 +00:00
Kris Kennaway
54af5f8cd3 * Instead of using umount -f to unmount things, first use fstat to
look for processes holding open references within the FS and kill
them, then use regular umount.  This is necessary now that devfs
cannot be force-unmounted, and has the benefit that processes can't
hang around holding references to files between port builds.

* Preliminary work to support using ccache to accelerate builds.
2005-02-12 03:41:39 +00:00
Kris Kennaway
5afe4a4daa Only try to chown the portbuild directory if we are a disconnected client
(i.e. it is not mounted by nfs)
2005-02-12 03:39:16 +00:00
Kris Kennaway
9e2b178527 Instead of using umount -f to unmount things, first use fstat to look for
processes holding open references within the FS and kill them, then use
regular umount.  This is necessary now that devfs cannot be force-unmounted,
and has the benefit that processes can't hang around holding references to
files between port builds.
2005-02-12 03:38:37 +00:00
Kris Kennaway
ccb8be3838 * Instead of using umount -f to unmount things, first use fstat to
look for processes holding open references within the FS and kill
them, then use regular umount.  This is necessary now that devfs
cannot be force-unmounted, and has the benefit that processes can't
hang around holding references to files between port builds.

* Reduce possibility for error by testing for presence of executable
ldconfig inside the chroot before attempting to run it (e.g. it may not
be there if the chroot was not completely initialized)
2005-02-12 03:38:08 +00:00
Kris Kennaway
4e40e823b4 Update the plist checking to look for a subset of files and weed out some
false positives.
2005-02-12 03:34:21 +00:00
Kirill Ponomarev
043f5658ce Remove traling spaces. 2005-01-09 10:21:17 +00:00
Kris Kennaway
8466626037 Always set up the bindist-${hostname}.tar file since it's usually small.
This should probably be changed to only update it if it changes.

Approved by:    portmgr (self)
2005-01-06 23:11:51 +00:00
Kris Kennaway
7e26c3751b Unset the __MAKE_CONF variable after setting up buildenv, because we
want to use the default value in the build chroot.

Approved by:    portmgr (self)
2005-01-06 23:10:53 +00:00
Kris Kennaway
db37071d1d Allow machines to use an alternate address for polling for job load (e.g.
if the machine is behind a NAT and is not directly addressable, we can
use a localhost port forward to contact it)

Approved by:    portmgr (self)
2005-01-06 23:09:31 +00:00
Kris Kennaway
0715403560 * Include portbuild.conf before portbuild.${hostname} to reset the default
value of variables

* Allow krion to drink from the email firehose

Approved by:    portmgr (self)
2005-01-06 23:07:50 +00:00
Kris Kennaway
dbfcfd10a4 * The mlist file now only has one field per line.
* Correctly calculate job concurrency in pass two as well

* In pass two run dosetupnode -rsync to avoid wasting time.

Approved by:    portmgr (self)
2005-01-06 23:06:41 +00:00
Kris Kennaway
d123521192 krion wants to drink from the pointyhat email firehose as well.
XXX This should be a portbuild.conf tunable

Approved by:    portmgr (self)
2005-01-06 23:05:27 +00:00
Kris Kennaway
db2150f0f7 Now that I have so many remote build machines, don't force trying to
fetch from ftp-master and pointyhat; they'll just get timeouts.
Instead, each machine is expected to set up their own MASTER_SITE_*
variables in etc/make.conf via a bindist-${hostname}.tar file.

Approved by:	portmgr (self)
2005-01-06 23:04:20 +00:00
Kris Kennaway
23bd58ef86 * Support the -norsync argument to only remove the existing build chroots
on a disconnected client, without running the time-consuming rsyncs.
  This is useful when a build is interrupted and needs to be restarted.

* After we have cleaned up the machine, reset the queue counter by using
  pollmachine -queue.  This has a race condition if other builds are being
  dispatched to the machine (e.g. builds on another branch):

  getmachine can claim a directory and increment the counter, then the
  machine is polled and finds e.g. 0 chroots in use, and resets the
  counter to 0, then claim-chroot is run and the build dispatched, with
  the counter now off-by-one.  This could be fixed by running
  claim-chroot with the .lock held, but this turns out to be too
  time-consuming.  A two-level lock approach might also fix this
  efficiently.
2004-12-28 05:50:37 +00:00
Kris Kennaway
01e42e5b2d * It does in fact make sense to specify -incremental and -noindex at the
same time, assuming that the admin has already built the INDEX and
  INDEX.old in advance.

* Adapt to new method of calculating build concurrency, by summing the
  value of ${maxjobs} listed in every portbuild.${machine}

* Support 5-exp builds
2004-12-28 05:45:30 +00:00
Kris Kennaway
0ebddec26a Fix the Xvfb code to run Xvfb before the build phase if detected
(i.e. if the package lists a dependency on the relevant package in the
PACKAGE_BUILDING case).  This allows packages that require an
available DISPLAY to again build (with some forthcoming fixes to
existing ports).

Improve the reporting of detected filesystem anomalies (extra files
left behind after deinstallation, changes to and removal of
pre-existing files)
2004-12-28 05:43:40 +00:00
Kris Kennaway
5ca3821cf5 Overhaul of the job scheduler. The new scheduler runs builds
synchronously instead of probabilistically scheduling jobs, which
means that the job load on a machine never exceeds a desired
threshold, and we can preferentially use faster machines when they are
available.  This has a dramatic effect on package build throughput,
although I don't yet have precise measurements of the performance
improvements.

Specifically, the changes are:

* Introduce the new variable maxjobs in portbuild.  This replaces the
build scheduling weights previously listed in the mlist file, which
now changes format to list the build machines only, ranked in order of
preference for job dispatches (i.e. faster machines first).

* The ${arch}/queue directory is used to list machines available for
jobs (file content is the number of jobs currently running on the
machine).  Changes to files in this directory are serialized using
lockf on the .lock file.

* Claim a machine with the getmachine script, with the .lock held.
This picks the machine with the fewestnumber of jobs running, which is
listed highest in the mlist file in case of multiple machines with
equal load.  The job counter is incremented, and the file removed if
the counter reaches ${maxjobs} for that machine.  If all machines are
busy, sleep for 15 seconds and retry.

* After we have claimed a machine, we run claim-chroot on it to claim
an empty chroot, as before.  If the claim fails, release the job from
the queue with the releasemachine script and retry after a 15 second
wait.

* When the build is finished, decrement the job counter with the
releasemachine script, with .lock held.

* The checkmachines script now exists only to poll the load averages
for admin convenience (every 2 minutes), and to ping for unreachable
machines.  When a machine cannot be reached, remove the entry in the
queue directory to stop further job dispatches to it.  This needs more
work to deal with reinitialization of machines after they become
available again.
2004-12-28 05:40:51 +00:00
Kris Kennaway
e47e305126 Overhaul of the job scheduler. The new scheduler runs builds
synchronously instead of probabilistically scheduling jobs, which
means that the job load on a machine never exceeds a desired
threshold, and we can preferentially use faster machines when they are
available.  This has a dramatic effect on package build throughput,
although I don't yet have precise measurements of the performance
improvements.

Specifically, the changes are:

* Introduce the new variable maxjobs in portbuild.  This replaces the
build scheduling weights previously listed in the mlist file, which
now changes format to list the build machines only, ranked in order of
preference for job dispatches (i.e. faster machines first).

* The ${arch}/queue directory is used to list machines available for
jobs (file content is the number of jobs currently running on the
machine).  Changes to files in this directory are serialized using
lockf on the .lock file.

* Claim a machine with the getmachine script, with the .lock held.
This picks the machine with the fewestnumber of jobs running, which is
listed highest in the mlist file in case of multiple machines with
equal load.  The job counter is incremented, and the file removed if
the counter reaches ${maxjobs} for that machine.  If all machines are
busy, sleep for 15 seconds and retry.

* After we have claimed a machine, we run claim-chroot on it to claim
an empty chroot, as before.  If the claim fails, release the job from
the queue with the releasemachine script and retry after a 15 second
wait.

* When the build is finished, decrement the job counter with the
releasemachine script, with .lock held.

* The checkmachines script now exists only to poll the load averages
for admin convenience (every 2 minutes), and to ping for unreachable
machines.  When a machine cannot be reached, remove the entry in the
queue directory to stop further job dispatches to it.  This needs more
work to deal with reinitialization of machines after they become
available again.

Additional changes to this file:

* Exit if passed a null package name, to avoid badness later on

* Send a nag-mail if pkg-plist errors are detected in the build
2004-12-28 05:40:15 +00:00
Kris Kennaway
b6626b754a * Catch up to change in formatting of 'extra files' section in logs
* Other minor changes
2004-12-28 04:31:29 +00:00
Kris Kennaway
a8da2d9253 /rescue/mount_linprocfs isn't functional when called by
/rescue/mount -t linprocfs, so assume that the i386 build hosts have
statically-built copies of the necessary binaries in /sbin, until this is
fixed.

Create /usr/X11R6 inside the chroot so that mtree has something to do, since
this directory is otherwise orphaned.
2004-12-28 04:30:11 +00:00
Kris Kennaway
df2f620935 Support 5-exp builds 2004-12-28 04:28:38 +00:00
Kris Kennaway
b1f044aa85 Use X_WINDOW_SYSTEM for 4.x builds too. 2004-12-10 06:33:04 +00:00
Kris Kennaway
b46b393082 Belatedly catch up to XFREE86_VERSION -> X_WINDOW_SYSTEM change; apply
the BSD.x11.dist if set to xfree86-3, otherwise use BSD.x11-4.dist.
2004-12-10 06:31:43 +00:00