1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Commit Graph

494 Commits

Author SHA1 Message Date
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
Mark Linimon
aa1f54d2fe The explanations of each build error no longer live on bento, they live
on pointyhat.
2004-12-09 04:14:51 +00:00
Kris Kennaway
6686d9ac33 Construct permanent links to the error logs here too.
Submitted by:	linimon
Reminded by:	marcus
2004-12-05 00:18:05 +00:00
Kris Kennaway
f977b82737 Copy the statically-linked binaries from /rescue on the host, instead
of needing to also include the dynamic libraries that were confusing
some ports.  We still need libc.so.[56] for killall to work, though :(
2004-12-05 00:17:18 +00:00
Kris Kennaway
009e9c0f01 Be silent about attempts to unmount filesystems from within the chroot 2004-12-05 00:15:53 +00:00
Kris Kennaway
85fd51a02c Clean up the symlink in ${pb}/${arch}/${branch}/latest/${dir} when we find
a port that should not be listed here
2004-11-25 00:08:31 +00:00
Kris Kennaway
4b1cca1ab3 If sudo_cmd is set, assume we need to chown the files we created on
the client to the client_user so they can later write to them
2004-11-25 00:07:24 +00:00
Kris Kennaway
e5e059c3d8 Rework the -incremental support slightly; this should now be robust enough
to use.
2004-11-25 00:06:02 +00:00
Kris Kennaway
7b38de7527 Catch up to the changed format of the logs.
List the extra/removed/changed files separately, and colour-code the
serious errors (files left behind outside of /usr/local and /usr/X11R^;
files removed that were installed by another port, and files with changed
permissions or ownership)
2004-11-25 00:04:48 +00:00
Kris Kennaway
33afdf33e9 * Recursively list all files detected as having been left behind after
the port deinstall; mtree does not recurse into subdirectories it does
  not know about
* Break out the 'files incorrectly removed' and 'files incorrectly changed'
  into their own sections
2004-11-25 00:02:38 +00:00
Kirill Ponomarev
ae1ec8f3dc * Fix INDEX build if MAINTAINER is not defined. [1]
* Remove USE_QT2 since it's obsolete now. [2]

* Clarify comments about ARCH. [3]

* Speedup 'make readmes'.  Add a perl script "Tools/make_readmes"
  and modify bsd.port.subdir.mk to avoid recursing into individual
  port directories to create README.html. [4]

* Fix 'make search' to allow case insensitive search on 5-x/6-x. [5]

* Add the possibility to search the ports by category. [6]

* Remove tk42 and tcl76 from virtual categories since they're
  obsolete. [7]

* Introduce new variable - DISTVERSION, vendor version of the
  distribution, that can be set instead of PORTVERSION and is
  automatically converted in a conforming PORTVERSION. [8]

* Use --suffix instead of -b option for patch(1) to make it
  compatible with BSD patch(1) [9]

* Fix {WANT,WITH}_MYSQL_VER behavior, to deal with conflicting
  versions. [10]

PR:		ports/68895 [1], ports/69486 [2], ports/68539 [3],
		ports/70018 [4], ports/68896 [5], ports/73299 [6],
		ports/73570 [7], ports/67171 [8], ports/72182 [9]
Submitted by:	linimon [1][3], arved [2][7], cperciva [4],
		Matthew Seaman <m.seaman@infracaninophile.co.uk> [5],
		Radek Kozlowski <radek@raadradd.com> [6],
		eik [8], Andreas Hauser <andy-freebsd@splashground.de> [9],
		clement [10]
2004-11-19 13:45:07 +00:00
Dima Dorfman
77414b4220 Newline should go after the terminating punctuation (fix typo).
Approved by:	will
2004-11-07 04:09:39 +00:00
Kris Kennaway
e18fa3d926 Fix a couple of bugs in the extraction of this from dopackages, and
flatten the setupnode() function into the main body since it's only
called from one place.
2004-10-25 04:36:03 +00:00
Kris Kennaway
9acc2f0954 Redefine the -norestr option to mean 'don't build the list of
restricted ports' instead of 'don't build any restricted ports' since
the former is useful when we're not intending to publish the results
of a build, but the latter is not.

Move the build preprocessing (directory setup, old build rotation,
etc) out from under -nobuild, so that we can set up a new build using
that option.
2004-10-25 04:34:26 +00:00
Kris Kennaway
f233e968d9 If the symlink under latest/ exists, then use that to find the most recent
error log for the port, instead of assuming it exists in the current
build.
2004-10-25 04:31:14 +00:00
Kris Kennaway
c379808409 We now also do 6.x builds in the '6' branch. 2004-10-25 04:29:36 +00:00
Kris Kennaway
fb5e730f91 Use the absolute path to nc(1) to deal with it not being in the PATH.
Remove useless sleep(1).
2004-10-25 04:29:06 +00:00
Kris Kennaway
e12c61e3af Clean up the 'latest error log' symlink when the build is successful. 2004-10-25 04:28:07 +00:00
Kris Kennaway
0472be83f9 When a port build fails, create a symlink to the error log under
${arch}/${branch}/latest/${portdir}.  We will use this in the
processfail script, so that the "new package build errors" webpages do
not have out-of-date links but instead link to the most recent copy of
the build error.
2004-10-25 04:27:02 +00:00
Maxim Sobolev
4570e0b23c Strip out date/time from +++/--- headers in generated patchfiles, so that they
don't generate extra hunk each time patchfile is updated.
2004-10-14 14:39:44 +00:00
Kris Kennaway
db2201b8f6 Support ${client_user} and ${sudo_cmd} for running commands as root on
machines where we first connect to a non-root user and then increase
privileges.

Approved by:	portmgr (self)
2004-09-26 22:37:22 +00:00
Kris Kennaway
0147d90a3b * Break out setupnode into the dosetupnode script so it may be called
manually

* Support 6.x builds

Approved by:    portmgr (self)
2004-09-26 22:09:59 +00:00
Kris Kennaway
148e0d36af Break out the setupnode function of dopackages into a separate script so
that it may be called by hand.

Support new portbuild.conf variables

    client_user = user to connect to on the client (not necessarily
                  root).  This user must have write permission to the
                  /var/portbuild tree if disconnected=1 (i.e. we're
                  going to run rsync).
    rsync_gzip  = set to "-z" to enable compression on low-bandwidth
                  disconnected clients.

Approved by:    portmgr (self)
2004-09-26 22:09:09 +00:00
Kris Kennaway
cb3b4b98c7 * Bail out if we can't claim a chroot directory in the client (e.g. if
ssh times out)

* Support new portbuild.conf settings:

    client_user = user to connect to on the client (not necessarily root)

    sudo_cmd = If ssh'ing to a non-root user, run this command to gain
               root privs (set to empty string for client_user=root,
               or sudo for !root).  Cannot require interactivity, of
               course.

Approved by:    portmgr (self)
2004-09-26 22:04:57 +00:00
Kris Kennaway
82cb4888a4 Refuse to "clean" / if something goes wrong upstream and we are passed
the wrong path

Approved by:    portmgr (self)
2004-09-26 21:59:48 +00:00
Kris Kennaway
15d5c4a51f Pull in portbuild.$(hostname) for per-client customization
Approved by:    portmgr (self)
2004-09-26 21:59:09 +00:00
Kris Kennaway
49c4b887b4 Support 6.x builds
Approved by:	portmgr (self)
2004-09-26 21:57:27 +00:00
Kris Kennaway
ba970af6a2 * Support 6.x builds
* Default 4.x to XFree86 4.x, 5.x and above to x.org
* Don't pick up local customizations from OPTIONS

Approved by:	portmgr (self)
2004-09-26 21:56:39 +00:00
Joe Marcus Clarke
a2543a3dd2 Use a consistent PATH in both portbuild and dopackages. 2004-08-27 18:28:44 +00:00
Kirill Ponomarev
8f11239294 Avoid possible GNATS timeouts by using query-pr.real direclty. 2004-07-28 07:17:29 +00:00
Kris Kennaway
62b5c51fcb Clean up the specified chroot (umount filesystems, and scrub the
directories likely to contain changed files).
2004-07-14 10:45:26 +00:00
Kris Kennaway
2bec66d639 Atomically claim an unused chroot directory. The previous algorithm
was not atomic and could have ended up with two port builds trying to use
the same chroot.  Report the claimed directory back to the caller.
2004-07-14 10:44:36 +00:00
Kris Kennaway
f8194e5412 Bump up the cleanup timeout to directories that have been in use for
>48 hours, to cope with monster ports like openoffice and atlas.
2004-07-14 10:42:40 +00:00
Kris Kennaway
faec39b50e Back out the attempt to list the error type in the failure summary;
because this file is a chronological history of port builds that have
failed, the files listed may not be present in the current set of
error logs, and we currently have no easy way to find the most recent
failure log to use instead.
2004-07-14 10:41:03 +00:00
Kris Kennaway
b8ce56aee3 Generate permanent URLs in the error reports. The directories like
i386-5-latest that are linked to from the index.html are symlinks to
dated directories (e.5.`date`), so the URLs in the error reports will
expire with the start of the next build when the symlink is repointed.
This change makes the URLs in the error reports use the realpath of
the target file, so they do not expire.
2004-07-14 10:37:48 +00:00
Kris Kennaway
0d973156a7 * Add support for ${TRYBROKEN}.
* Clients no longer have ssh access to the master, so we need to
  push/pull everything on the client from here.  This means we need to
  know where the build took place so we can go in and get the files
  after it finishes.  Introduce the claim-chroot script which
  atomically claims a free chroot directory on the host and returns
  the name.  This directory is later populated by the portbuild script
  if it does not already contain an extracted bindist.

* Use the per-node portbuild.$(hostname) config file to decide where
  in the filesystem to claim the chroot on the build host.

* If a port failed unexpectedly (i.e. is not marked BROKEN), or if
  something strange happened when trying to pull in build results from
  a client, then send me email (XXX should be configurable).

* Clean up after the build finishes and we have everything we need, by
  dispatching the clean-chroot script on the client.
2004-07-14 10:33:19 +00:00
Kris Kennaway
a09ab19235 * Add a cleanup() function and use it so that we archive the ${WRKDIR}
if requested (".keep" file in the port directory), no matter where
  we fail.

* Add package dependencies before the corresponding build stage
  (e.g. FETCH_DEPENDS before 'make fetch'), and remove them again
  afterwards.  This allows us to catch ports that list their
  dependencies too early/late.

* No need to check for set[ug]id files here, the security-check target
  in bsd.port.mk does it for us.

* Exclude some more directories and files from showing up in the mtree
  before/after comparison, to trim down the false-positive in the
  pkg-plist check.

* Other minor changes
2004-07-14 10:19:12 +00:00
Kris Kennaway
57198c9845 * Remove the quickports stuff, it didn't (ever?) work as designed and
it's done properly^Wbetter in makeparallel

* Script accepts new arguments:

 -nodoccvs: skip cvs update of the doc tree

 -trybroken: try to build BROKEN ports (off by default because the
  i386 cluster is fast enough now that when doing incremental builds we
  were spending most of the time rebuilding things we know are probably
  going to fail anyway.  Conversely, the other clusters are slow enough
  that we also usually don't want to waste time on BROKEN ports).

 -incremental: compare the interesting fields of the new INDEX with
  the previous one, remove packages and log files for the old ports that
  have changed, and rebuild the rest.  This substantially cuts down on
  build times since we don't rebuild ports that we know have not
  changed.  XXX checkpoint of work-in-progress, not yet working as
  committed.

* When setting up the nodes, read in per-node config files
  ("portbuild.$(hostname)") before dispatching the setupnode script on
  each node.  For disconnected nodes (which don't mount the master via
  NFS), we also rsync the interesting files required by the builds
  (ports/src/doc trees, bindist tarballs, scripts) into place on the
  client.  They will be mounted locally via nullfs in the build chroots.

* Break out the restricted.sh generation into a makerestr script so it
  can be called manually as needed.

* Remove the -nocvsup argument which has been unused for a long time.

* For now, don't prune the list of failed ports with prunefail,
  since when -trybroken is not specified, every BROKEN port ends up in
  the duds file (so the build is skipped), and as a result we would
  prune almost everything from the list of failed ports.  XXX
  prunefailure should be run conditionally on -trybroken, or I should
  find a way to prune in both cases.

* Don't run index in the background, it was thrashing against makeduds
  and not saving any time by doing it concurrently.

* Build with 'make quickports all' to kick off the quickports builds
  earlier.

* Delete restricted and/or cdrom distfiles *after* post-processing the
  distfiles, otherwise the script doesn't remove any of them since
  they're not in the expected place.

* Miscellaneous other minor changes and cleanups
2004-07-14 10:09:58 +00:00
Kris Kennaway
0ba3e2d4d2 Parse the slightly-different format of the build logs. 2004-07-14 09:27:26 +00:00
Kris Kennaway
c17d1fc995 Parse the slightly-different format of the build logs. 2004-07-14 09:18:48 +00:00