Date: Sat, 1 Dec 2012 21:00:01 GMT From: Nathan Whitehorn <nwhitehorn@freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/173246: maintainer update: sysutils/condor Message-ID: <201212012100.qB1L01nN092517@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/173246; it has been noted by GNATS. From: Nathan Whitehorn <nwhitehorn@freebsd.org> To: bug-followup@FreeBSD.org, jwbacon@tds.net Cc: Subject: Re: ports/173246: maintainer update: sysutils/condor Date: Sat, 01 Dec 2012 14:52:17 -0600 This is a multi-part message in MIME format. --Boundary_(ID_GNneARyUQAUxvBI0vFAwqg) Content-type: text/plain; CHARSET=US-ASCII; format=flowed Content-transfer-encoding: 7BIT I tried this out today and found a couple of minor errors: the path to the utmpx file was wrong (used the Solaris one) and it could become confused on reinstall if the /var/db/condor symlink already existed. The attached patch is the same as the original, but with these fixed. Two side notes: 1. It would be really nice if this could be committed soon. Condor 7.8.6 fixes a security flaw (http://research.cs.wisc.edu/htcondor/security/vulnerabilities/CONDOR-2012-0003.html) 2. Have any of the patches been sent back to upstream? I work at UW and would be happy to toss them over the fence if not. -Nathan --Boundary_(ID_GNneARyUQAUxvBI0vFAwqg) Content-type: text/plain; CHARSET=US-ASCII; name=condor786.diff Content-transfer-encoding: 7BIT Content-disposition: attachment; filename=condor786.diff Index: Makefile =================================================================== --- Makefile (revision 307967) +++ Makefile (working copy) @@ -6,7 +6,7 @@ # PORTNAME= condor -PORTVERSION= 7.6.6 +PORTVERSION= 7.8.6 CATEGORIES= sysutils net MASTER_SITES= # empty DISTNAME= condor_src-${PORTVERSION}-all-all @@ -57,16 +57,16 @@ condor_config_bind.1 \ condor_config_val.1 \ condor_configure.1 \ - condor_convert_history.1 \ + condor_continue.1 \ condor_dagman.1 \ condor_fetchlog.1 \ condor_findhost.1 \ + condor_gather_info.1 \ condor_glidein.1 \ condor_history.1 \ condor_hold.1 \ condor_load_history.1 \ condor_master.1 \ - condor_master_off.1 \ condor_off.1 \ condor_on.1 \ condor_power.1 \ @@ -76,13 +76,13 @@ condor_q.1 \ condor_qedit.1 \ condor_reconfig.1 \ - condor_reconfig_schedd.1 \ condor_release.1 \ condor_reschedule.1 \ condor_restart.1 \ condor_rm.1 \ condor_router_history.1 \ condor_router_q.1 \ + condor_router_rm.1 \ condor_run.1 \ condor_set_shutdown.1 \ condor_ssh_to_job.1 \ @@ -91,6 +91,7 @@ condor_store_cred.1 \ condor_submit.1 \ condor_submit_dag.1 \ + condor_suspend.1 \ condor_transfer_data.1 \ condor_updates_stats.1 \ condor_userlog.1 \ Index: distinfo =================================================================== --- distinfo (revision 307967) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (condor_src-7.6.6-all-all.tar.gz) = bb22398768b9414ae8fd63f5bd715310bc22df510f0505c45814be2f64535f8b -SIZE (condor_src-7.6.6-all-all.tar.gz) = 16663204 +SHA256 (condor_src-7.8.6-all-all.tar.gz) = 09d80d6a7c6ddbc5eedc89cbab52259be37c43bfba55af2e9fbaf238c47a4404 +SIZE (condor_src-7.8.6-all-all.tar.gz) = 17491084 Index: files/condor_config.in =================================================================== --- files/condor_config.in (revision 307967) +++ files/condor_config.in (working copy) @@ -57,7 +57,8 @@ ## Where is the local condor directory for each host? ## This is where the local config file(s), logs and -## spool/execute directories are located +## spool/execute directories are located. Should be a large +## partition if jobs may produce a lot of output. LOCAL_DIR = $(TILDE) ## Where is the machine-specific local config file for each host? @@ -84,7 +85,7 @@ ## Full path to a mail delivery program that understands that "-s" ## means you want to specify a subject: -MAIL = /bin/mail +MAIL = /usr/bin/mail ##-------------------------------------------------------------------- ## Network domain parameters: @@ -177,6 +178,7 @@ ## machine(s) where whoever is the condor administrator(s) works ## (assuming you trust all the users who log into that/those ## machine(s), since this is machine-wide access you're granting). + ALLOW_ADMINISTRATOR = $(CONDOR_HOST) ## If there are no machines that should have administrative access Index: files/condor_config.local.in =================================================================== --- files/condor_config.local.in (revision 307967) +++ files/condor_config.local.in (working copy) @@ -1,27 +1,39 @@ +############################################################################ +## condor_config.local +## Settings here override the defaults in condor_config. +## Make changes/additions here and leave condor_config unchanged so +## that defaults are documented. +############################################################################ + +############################################################################ ## What machine is your central manager? +## Use $(FULL_HOSTNAME) if this is the central manager, or the central +## manager's hostname otherwise. -CONDOR_HOST = $(FULL_HOSTNAME) +## CONDOR_HOST = $(FULL_HOSTNAME) +############################################################################ ## Pool's short description -COLLECTOR_NAME = Personal Condor at $(FULL_HOSTNAME) +## COLLECTOR_NAME = Condor pool at $(CONDOR_HOST) +############################################################################ ## When is this machine willing to start a job? START = TRUE - +############################################################################ ## When to suspend a job? SUSPEND = FALSE - +############################################################################ ## When to nicely stop a job? ## (as opposed to killing it instantaneously) PREEMPT = FALSE - +############################################################################ ## When to instantaneously kill a preempting job ## (e.g. if a job is in the pre-empting stage for too long) @@ -30,13 +42,42 @@ ########################################################################### # DAEMON LIST: # -# All hosts: MASTER -# Central manager: COLLECTOR, NEGOTIATOR -# Submit hosts: SCHEDD -# Execute hosts: STARTD +# All hosts: MASTER +# Central manager: COLLECTOR, NEGOTIATOR +# Submit hosts: SCHEDD +# Execute hosts: STARTD ## This macro determines what daemons the condor_master will start and ## keep its watchful eyes on. ## The list is a comma or space separated list of subsystem names -DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD +## Central manager +## DAEMON_LIST = MASTER, COLLECTOR, NEGOTIATOR, SCHEDD + +## Submit/execute host +DAEMON_LIST = MASTER, SCHEDD, STARTD + +## Execute-only host +## DAEMON_LIST = MASTER, STARTD + +########################################################################### +## Permissions for this host +## +## *.your.domain, x.y.z.*, hostname, $(MACRO) +## +## ALLOW_ADMINISTRATOR is required by condor_off +## If central manager is not this host, this entry allows both the central +## manager and this host to manage the pool. + +ALLOW_ADMINISTRATOR = $(CONDOR_HOST), $(FULL_HOSTNAME) + +## +## Enables condor_status, condor_q, ... + +ALLOW_READ = $(CONDOR_HOST), $(FULL_HOSTNAME) + +## +## Enables scheduling jobs here + +ALLOW_WRITE = $(CONDOR_HOST), $(FULL_HOSTNAME) + Index: files/patch-src-condor_sysapi-idle_time.cpp =================================================================== --- files/patch-src-condor_sysapi-idle_time.cpp (revision 307967) +++ files/patch-src-condor_sysapi-idle_time.cpp (working copy) @@ -1,6 +1,6 @@ ---- src/condor_sysapi/idle_time.cpp.orig 2012-01-17 10:53:14.000000000 -0600 -+++ src/condor_sysapi/idle_time.cpp 2012-04-07 14:37:17.000000000 -0500 -@@ -202,17 +202,22 @@ +--- src/condor_sysapi/idle_time.cpp.bak 2012-10-24 23:10:41.000000000 -0500 ++++ src/condor_sysapi/idle_time.cpp 2012-12-01 14:46:20.000000000 -0600 +@@ -205,19 +205,30 @@ return; } @@ -11,17 +11,25 @@ +#endif #if defined(LINUX) - static char *UtmpName = "/var/run/utmp"; - static char *AltUtmpName = "/var/adm/utmp"; + static const char *UtmpName = "/var/run/utmp"; + static const char *AltUtmpName = "/var/adm/utmp"; -#elif defined(CONDOR_FREEBSD) +// FreeBSD 9 made a clean break from utmp to utmpx +#elif defined(CONDOR_FREEBSD) && !defined(CONDOR_FREEBSD9) static char *UtmpName = "/var/run/utmp"; static char *AltUtmpName = ""; -#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11) ++// FreeBSD 9 made a clean break from utmp to utmpx +#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11) || defined(CONDOR_FREEBSD9) #include <utmpx.h> ++#if defined(CONDOR_FREEBSD9) +#define ut_name ut_user ++static char *UtmpName = "/var/run/utx.active"; ++static char *AltUtmpName = ""; ++#else static char *UtmpName = "/etc/utmpx"; static char *AltUtmpName = "/var/adm/utmpx"; ++#endif #undef UTMP_KIND + #define UTMP_KIND utmpx + #elif defined(HPUX11) Index: files/pkg-install.in =================================================================== --- files/pkg-install.in (revision 307967) +++ files/pkg-install.in (working copy) @@ -18,14 +18,20 @@ u=condor g=condor -homedir=/var/db/condor +# Place condor on a large partition so it can accommodate output files from +# jobs. The default /var/db/condor could result in /var filling up with +# job output. +homedir=/home/condor + case $2 in POST-INSTALL) for dir in log spool config execute; do mkdir -p $homedir/$dir done chown -Rh $u:$g $homedir + rm /var/db/condor + ln -s $homedir /var/db ;; DEINSTALL) @@ -33,5 +39,5 @@ rmdir $homedir/$dir 2>/dev/null done ;; +esac -esac Index: files/pkg-message.in =================================================================== --- files/pkg-message.in (revision 307967) +++ files/pkg-message.in (working copy) @@ -1,8 +1,15 @@ Sample condor_config and condor_config.local files are available in -%%ETCDIR%%. Copy them to %%PREFIX%%/etc and edit to taste +%%ETCDIR%%. Copy them to %%PREFIX%%/etc and edit condor_config.local to taste to get started. +Settings in condor_config.local override the defaults in condor_config. +Use condor_config as a reference, and make all changes to condor_config.local. + +Unless this is the central manager host, you will need to at least change +CONDOR_HOST. Also ensure that DAEMON_LIST and ALLOW_* are appropriate for +this host. + To start the condor daemons, add 'condor_enable="YES"' to /etc/rc.conf Index: pkg-plist =================================================================== --- pkg-plist (revision 307967) +++ pkg-plist (working copy) @@ -1,10 +1,11 @@ bin/classad_functional_tester bin/classad_version -bin/condor bin/condor_check_userlogs bin/condor_cod bin/condor_config_val +bin/condor_continue bin/condor_dagman +bin/condor_drain bin/condor_findhost bin/condor_gather_info bin/condor_history @@ -25,6 +26,8 @@ bin/condor_status bin/condor_submit bin/condor_submit_dag +bin/condor_suspend +bin/condor_test_match bin/condor_transfer_data bin/condor_userlog bin/condor_userlog_job_counter @@ -40,8 +43,10 @@ %%ETCDIR%%/examples/condor.boot.generic %%ETCDIR%%/examples/condor.boot.rpm %%ETCDIR%%/examples/condor.init +%%ETCDIR%%/examples/condor.plist %%ETCDIR%%/examples/condor.sysconfig %%ETCDIR%%/examples/condor_config.generic +%%ETCDIR%%/examples/condor_config.generic.redhat %%ETCDIR%%/examples/condor_config.local.central.manager %%ETCDIR%%/examples/condor_config.local.ckpt.server %%ETCDIR%%/examples/condor_config.local.dedicated.resource @@ -90,16 +95,11 @@ include/compat_classad.h include/compat_classad_list.h include/compat_classad_util.h -include/condor_ast.h -include/condor_astbase.h -include/condor_attrlist.h include/condor_classad.h include/condor_constants.h include/condor_event.h -include/condor_exprtype.h include/condor_header_features.h include/condor_holdcodes.h -include/condor_parser.h include/file_lock.h include/iso_dates.h include/read_user_log.h @@ -111,25 +111,22 @@ lib/Condor.pm lib/CondorJavaInfo.class lib/CondorJavaWrapper.class -lib/Execute.pm -lib/FileLock.pm +lib/CondorPersonal.pm +lib/CondorTest.pm +lib/CondorUtils.pm lib/condor_ssh_to_job_sshd_config_template lib/libchirp_client.a lib/libclassad.a lib/libcondorapi.a lib/scimark2lib.jar -libexec/bgp_available_partitions -libexec/bgp_back_partition -libexec/bgp_boot_partition -libexec/bgp_destroy_partition -libexec/bgp_generate_partition -libexec/bgp_query_work_loads -libexec/bgp_shutdown_partition +libexec/accountant_log_fixer libexec/condor_chirp +libexec/condor_defrag libexec/condor_job_router libexec/condor_kflops libexec/condor_limits_wrapper.sh libexec/condor_mips +libexec/condor_power_state libexec/condor_rooster libexec/condor_schedd.init libexec/condor_shared_port @@ -139,20 +136,12 @@ libexec/condor_transferer libexec/curl_plugin libexec/data_plugin -libexec/gridftp_wrapper.sh libexec/libvirt_simple_script.awk -libexec/power_state libexec/sshd.sh -sbin/cleanup_release -sbin/condor sbin/condor_advertise sbin/condor_c-gahp sbin/condor_c-gahp_worker_thread -sbin/condor_cleanup_local -sbin/condor_cold_start -sbin/condor_cold_stop sbin/condor_collector -sbin/condor_config_bind sbin/condor_configure sbin/condor_credd sbin/condor_fetchlog @@ -160,19 +149,13 @@ sbin/condor_had sbin/condor_init sbin/condor_install -sbin/condor_install_local -sbin/condor_lease_manager -sbin/condor_local_start -sbin/condor_local_stop sbin/condor_master -sbin/condor_master_off sbin/condor_negotiator sbin/condor_off sbin/condor_on sbin/condor_preen sbin/condor_procd sbin/condor_reconfig -sbin/condor_reconfig_schedd sbin/condor_replication sbin/condor_restart sbin/condor_root_switchboard @@ -180,28 +163,17 @@ sbin/condor_set_shutdown sbin/condor_shadow sbin/condor_startd -sbin/condor_startd_factory sbin/condor_starter sbin/condor_store_cred sbin/condor_transferd sbin/condor_updates_stats sbin/condor_vm-gahp -sbin/filelock_midwife -sbin/filelock_undertaker -sbin/install_release -sbin/uniq_pid_command -sbin/uniq_pid_midwife -sbin/uniq_pid_undertaker +sbin/remote_gahp src/chirp/chirp_client.c src/chirp/chirp_client.h src/chirp/chirp_protocol.h -src/startd_factory/BlueGeneP/htc_list_partitions.cpp -src/startd_factory/BlueGeneP/htc_tool.cpp -@dirrmtry src/startd_factory/BlueGeneP -@dirrmtry src/startd_factory @dirrmtry src/chirp @dirrmtry src -@dirrm include/classad -@dirrm %%ETCDIR%%/sysconfig +@dirrm include/classad@dirrm %%ETCDIR%%/sysconfig @dirrm %%ETCDIR%%/examples @dirrm %%ETCDIR%% --Boundary_(ID_GNneARyUQAUxvBI0vFAwqg)--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212012100.qB1L01nN092517>