<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[140719] trunk/dports/science/htcondor</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/140719">140719</a></dd>
<dt>Author</dt> <dd>aronnax@macports.org</dd>
<dt>Date</dt> <dd>2015-09-30 21:00:22 -0700 (Wed, 30 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>htcondor: update to 8.4.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencehtcondorPortfile">trunk/dports/science/htcondor/Portfile</a></li>
<li><a href="#trunkdportssciencehtcondorfilescondor_config">trunk/dports/science/htcondor/files/condor_config</a></li>
<li><a href="#trunkdportssciencehtcondorfilespatchbuildcmakeCondorPackageConfigcmakediff">trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff</a></li>
<li><a href="#trunkdportssciencehtcondorfilespatchsrccondor_scriptsmacosx_rewrite_libsdiff">trunk/dports/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff</a></li>
<li><a href="#trunkdportssciencehtcondorfilespatchsrccondor_utilscondor_configcppdiff">trunk/dports/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff</a></li>
<li><a href="#trunkdportssciencehtcondorfilespatchsrcpythonbindingsCMakeListstxtdiff">trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencehtcondorPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/htcondor/Portfile (140718 => 140719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/htcondor/Portfile 2015-10-01 02:29:01 UTC (rev 140718)
+++ trunk/dports/science/htcondor/Portfile 2015-10-01 04:00:22 UTC (rev 140719)
</span><span class="lines">@@ -7,9 +7,8 @@
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx"> PortGroup conflicts_build 1.0
</span><span class="cx">
</span><del>-github.setup htcondor htcondor 8_2_3 V
</del><ins>+github.setup htcondor htcondor 8_4_0 V
</ins><span class="cx"> version [strsed ${github.version} g/_/\./]
</span><del>-revision 1
</del><span class="cx"> maintainers aronnax
</span><span class="cx">
</span><span class="cx"> categories science parallel net
</span><span class="lines">@@ -87,8 +86,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-checksums rmd160 9bd1f88821b891c341aae71e1bfcf7a70af296d0 \
- sha256 d1e426f6dc20e5a8afeda16273d26f1d22891b2762c9369c97e438c4f77af6a9
</del><ins>+checksums rmd160 3f253ceadf68b14adc76b83bf6165e4b93974bcc \
+ sha256 95abe172abd8ebf42333c8267972babba097ff5309f98e201b8e364f2a3add57
</ins><span class="cx">
</span><span class="cx"> depends_build-append port:latex2html
</span><span class="cx">
</span><span class="lines">@@ -113,7 +112,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # FIXME: Globus support is disabled because Globus is not available in MacPorts.
</span><del>-configure.args-append -DWITH_GLOBUS:BOOL="0" -DBUILD_TESTING:BOOL="0"
</del><ins>+configure.args-append -DWITH_GLOBUS:BOOL="0" -DWITH_VOMS:BOOL="0" -DWITH_GSOAP:BOOL="0" -DBUILD_TESTING:BOOL="0"
</ins><span class="cx">
</span><span class="cx"> # Man pages are not part of the default build target.
</span><span class="cx"> post-build {
</span></span></pre></div>
<a id="trunkdportssciencehtcondorfilescondor_config"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/htcondor/files/condor_config (140718 => 140719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/htcondor/files/condor_config 2015-10-01 02:29:01 UTC (rev 140718)
+++ trunk/dports/science/htcondor/files/condor_config 2015-10-01 04:00:22 UTC (rev 140719)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> ## What machine is your central manager?
</span><span class="cx"> CONDOR_HOST = 127.0.0.1
</span><span class="cx">
</span><ins>+## Don't use DNS.
+NO_DNS = True
+
</ins><span class="cx"> ##--------------------------------------------------------------------
</span><span class="cx"> ## Pathnames:
</span><span class="cx"> ##--------------------------------------------------------------------
</span><span class="lines">@@ -144,7 +147,7 @@
</span><span class="cx"> ## FLOCK_FROM defines the machines where you would like to grant
</span><span class="cx"> ## people access to your pool via flocking. (i.e. you are granting
</span><span class="cx"> ## access to these machines to join your pool).
</span><del>-FLOCK_FROM =
</del><ins>+#FLOCK_FROM =
</ins><span class="cx"> ## An example of this is:
</span><span class="cx"> #FLOCK_FROM = somehost.friendly.domain, anotherhost.friendly.domain
</span><span class="cx">
</span><span class="lines">@@ -152,7 +155,7 @@
</span><span class="cx"> ## to flock to. (i.e. you are specifying the machines that you
</span><span class="cx"> ## want your jobs to be negotiated at -- thereby specifying the
</span><span class="cx"> ## pools they will run in.)
</span><del>-FLOCK_TO =
</del><ins>+#FLOCK_TO =
</ins><span class="cx"> ## An example of this is:
</span><span class="cx"> #FLOCK_TO = central_manager.friendly.domain, condor.cs.wisc.edu
</span><span class="cx">
</span><span class="lines">@@ -271,7 +274,7 @@
</span><span class="cx"> ## default values for any of these settings. If they are not
</span><span class="cx"> ## defined, no attributes can be set with condor_config_val.
</span><span class="cx">
</span><del>-## Do you want to allow condor_config_val -reset to work at all?
</del><ins>+## Do you want to allow condor_config_val -rset to work at all?
</ins><span class="cx"> ## This feature is disabled by default, so to enable, you must
</span><span class="cx"> ## uncomment the following setting and change the value to "True".
</span><span class="cx"> ## Note: changing this requires a restart not just a reconfig.
</span><span class="lines">@@ -334,7 +337,7 @@
</span><span class="cx"> ## Checkpoint server:
</span><span class="cx"> ##--------------------------------------------------------------------
</span><span class="cx"> ## Do you want to use a checkpoint server if one is available? If a
</span><del>-## checkpoint server isn't available or USE_CKPT_SERVER is set to
</del><ins>+## checkpoint server is not available or USE_CKPT_SERVER is set to
</ins><span class="cx"> ## False, checkpoints will be written to the local SPOOL directory on
</span><span class="cx"> ## the submission machine.
</span><span class="cx"> #USE_CKPT_SERVER = True
</span><span class="lines">@@ -398,25 +401,25 @@
</span><span class="cx"> #MAX_CONCURRENT_UPLOADS = 10
</span><span class="cx">
</span><span class="cx"> ## Condor needs to create a few lock files to synchronize access to
</span><del>-## various log files. Because of problems we've had with network
</del><ins>+## various log files. Because of problems we had with network
</ins><span class="cx"> ## filesystems and file locking over the years, we HIGHLY recommend
</span><span class="cx"> ## that you put these lock files on a local partition on each
</span><span class="cx"> ## machine. If you don't have your LOCAL_DIR on a local partition,
</span><span class="cx"> ## be sure to change this entry. Whatever user (or group) condor is
</span><span class="cx"> ## running as needs to have write access to this directory. If
</span><span class="cx"> ## you're not running as root, this is whatever user you started up
</span><del>-## the condor_master as. If you are running as root, and there's a
-## condor account, it's probably condor. Otherwise, it's whatever
</del><ins>+## the condor_master as. If you are running as root, and there is a
+## condor account, it is probably condor. Otherwise, it is whatever
</ins><span class="cx"> ## you've set in the CONDOR_IDS environment variable. See the Admin
</span><span class="cx"> ## manual for details on this.
</span><span class="cx"> LOCK = $(LOG)
</span><span class="cx">
</span><span class="cx"> ## If you don't use a fully qualified name in your /etc/hosts file
</span><span class="cx"> ## (or NIS, etc.) for either your official hostname or as an alias,
</span><del>-## Condor wouldn't normally be able to use fully qualified names in
</del><ins>+## Condor would not normally be able to use fully qualified names in
</ins><span class="cx"> ## places that it'd like to. You can set this parameter to the
</span><span class="cx"> ## domain you'd like appended to your hostname, if changing your host
</span><del>-## information isn't a good option. This parameter must be set in
</del><ins>+## information is not a good option. This parameter must be set in
</ins><span class="cx"> ## the global config file (not the LOCAL_CONFIG_FILE from above).
</span><span class="cx"> #DEFAULT_DOMAIN_NAME = your.domain.name
</span><span class="cx">
</span><span class="lines">@@ -435,7 +438,7 @@
</span><span class="cx"> ## we don't do anything, and leave in place whatever limit was in
</span><span class="cx"> ## effect when you started the Condor daemons. If this parameter is
</span><span class="cx"> ## set and "True", we increase the limit to as large as it gets. If
</span><del>-## it's set to "False", we set the limit at 0 (which means that no
</del><ins>+## it is set to "False", we set the limit at 0 (which means that no
</ins><span class="cx"> ## core files are even created). Core files greatly help the Condor
</span><span class="cx"> ## developers debug any problems you might be having.
</span><span class="cx"> #CREATE_CORE_FILES = True
</span><span class="lines">@@ -448,27 +451,6 @@
</span><span class="cx"> ## want.
</span><span class="cx"> #ABORT_ON_EXCEPTION = False
</span><span class="cx">
</span><del>-## Condor Glidein downloads binaries from a remote server for the
-## machines into which you're gliding. This saves you from manually
-## downloading and installing binaries for every architecture you
-## might want to glidein to. The default server is one maintained at
-## The University of Wisconsin. If you don't want to use the UW
-## server, you can set up your own and change the following to
-## point to it, instead.
-GLIDEIN_SERVER_URLS = \
- http://www.cs.wisc.edu/condor/glidein/binaries
-
-## List the sites you want to GlideIn to on the GLIDEIN_SITES. For example,
-## if you'd like to GlideIn to some Alliance GiB resources,
-## uncomment the line below.
-## Make sure that $(GLIDEIN_SITES) is included in ALLOW_READ and
-## ALLOW_WRITE, or else your GlideIns won't be able to join your pool.
-## This is _NOT_ done for you by default, because it is an even better
-## idea to use a strong security method (such as GSI) rather than
-## host-based security for authorizing glideins.
-#GLIDEIN_SITES = *.ncsa.uiuc.edu, *.cs.wisc.edu, *.mcs.anl.gov
-#GLIDEIN_SITES =
-
</del><span class="cx"> ## If your site needs to use UID_DOMAIN settings (defined above) that
</span><span class="cx"> ## are not real Internet domains that match the hostnames, you can
</span><span class="cx"> ## tell Condor to trust whatever UID_DOMAIN a submit machine gives to
</span><span class="lines">@@ -521,7 +503,7 @@
</span><span class="cx"> ## credentials when sending them over the wire between daemons.
</span><span class="cx"> ## Delegation can take up to a second, which is very slow when
</span><span class="cx"> ## submitting a large number of jobs. Copying exposes the credential
</span><del>-## to third parties if Condor isn't set to encrypt communications.
</del><ins>+## to third parties if Condor is not set to encrypt communications.
</ins><span class="cx"> ## By default, Condor will delegate rather than copy.
</span><span class="cx"> #DELEGATE_JOB_GSI_CREDENTIALS = True
</span><span class="cx">
</span><span class="lines">@@ -555,6 +537,7 @@
</span><span class="cx"> ## chooses a network interface automatically. It tries to choose a public
</span><span class="cx"> ## interface if one is available. If it cannot decide which of two interfaces
</span><span class="cx"> ## to choose from, it will pick the first one.
</span><ins>+BIND_ALL_INTERFACES = False
</ins><span class="cx"> NETWORK_INTERFACE = 127.0.0.1
</span><span class="cx">
</span><span class="cx"> ##--------------------------------------------------------------------
</span><span class="lines">@@ -565,53 +548,54 @@
</span><span class="cx"> ## The flags given in ALL_DEBUG are shared between all daemons.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-ALL_DEBUG =
</del><ins>+#ALL_DEBUG =
+#MAX_DEFAULT_LOG = 10 Mb
</ins><span class="cx">
</span><del>-MAX_COLLECTOR_LOG = 1000000
-COLLECTOR_DEBUG =
</del><ins>+#MAX_COLLECTOR_LOG = $(MAX_DEFAULT_LOG)
+#COLLECTOR_DEBUG =
</ins><span class="cx">
</span><del>-MAX_KBDD_LOG = 1000000
-KBDD_DEBUG =
</del><ins>+#MAX_KBDD_LOG = $(MAX_DEFAULT_LOG)
+#KBDD_DEBUG =
</ins><span class="cx">
</span><del>-MAX_NEGOTIATOR_LOG = 1000000
-NEGOTIATOR_DEBUG = D_MATCH
-MAX_NEGOTIATOR_MATCH_LOG = 1000000
</del><ins>+#MAX_NEGOTIATOR_LOG = $(MAX_DEFAULT_LOG)
+#NEGOTIATOR_DEBUG = D_MATCH
+#MAX_NEGOTIATOR_MATCH_LOG = $(MAX_DEFAULT_LOG)
</ins><span class="cx">
</span><del>-MAX_SCHEDD_LOG = 1000000
-SCHEDD_DEBUG = D_PID
</del><ins>+#MAX_SCHEDD_LOG = $(MAX_DEFAULT_LOG)
+#SCHEDD_DEBUG = D_PID
</ins><span class="cx">
</span><del>-MAX_SHADOW_LOG = 1000000
-SHADOW_DEBUG =
</del><ins>+#MAX_SHADOW_LOG = $(MAX_DEFAULT_LOG)
+#SHADOW_DEBUG =
</ins><span class="cx">
</span><del>-MAX_STARTD_LOG = 1000000
-STARTD_DEBUG =
</del><ins>+#MAX_STARTD_LOG = $(MAX_DEFAULT_LOG)
+#STARTD_DEBUG =
</ins><span class="cx">
</span><del>-MAX_STARTER_LOG = 1000000
</del><ins>+#MAX_STARTER_LOG = $(MAX_DEFAULT_LOG)
</ins><span class="cx">
</span><del>-MAX_MASTER_LOG = 1000000
-MASTER_DEBUG =
-## When the master starts up, should it truncate it's log file?
</del><ins>+#MAX_MASTER_LOG = $(MAX_DEFAULT_LOG)
+#MASTER_DEBUG =
+## Truncates master log start up?
</ins><span class="cx"> #TRUNC_MASTER_LOG_ON_OPEN = False
</span><span class="cx">
</span><del>-MAX_JOB_ROUTER_LOG = 1000000
-JOB_ROUTER_DEBUG =
</del><ins>+#MAX_JOB_ROUTER_LOG = $(MAX_DEFAULT_LOG)
+#JOB_ROUTER_DEBUG =
</ins><span class="cx">
</span><del>-MAX_ROOSTER_LOG = 1000000
-ROOSTER_DEBUG =
</del><ins>+#MAX_ROOSTER_LOG = $(MAX_DEFAULT_LOG)
+#ROOSTER_DEBUG =
</ins><span class="cx">
</span><del>-MAX_SHARED_PORT_LOG = 1000000
-SHARED_PORT_DEBUG =
</del><ins>+#MAX_SHARED_PORT_LOG = $(MAX_DEFAULT_LOG)
+#SHARED_PORT_DEBUG =
</ins><span class="cx">
</span><del>-MAX_HDFS_LOG = 1000000
-HDFS_DEBUG =
</del><ins>+#MAX_HDFS_LOG = $(MAX_DEFAULT_LOG)
+#HDFS_DEBUG =
</ins><span class="cx">
</span><span class="cx"> # High Availability Logs
</span><del>-MAX_HAD_LOG = 1000000
-HAD_DEBUG =
-MAX_REPLICATION_LOG = 1000000
-REPLICATION_DEBUG =
-MAX_TRANSFERER_LOG = 1000000
-TRANSFERER_DEBUG =
</del><ins>+#MAX_HAD_LOG = $(MAX_DEFAULT_LOG)
+#HAD_DEBUG =
+#MAX_REPLICATION_LOG = $(MAX_DEFAULT_LOG)
+#REPLICATION_DEBUG =
+#MAX_TRANSFERER_LOG = $(MAX_DEFAULT_LOG)
+#TRANSFERER_DEBUG =
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> ## The daemons touch their log file periodically, even when they have
</span><span class="lines">@@ -690,55 +674,50 @@
</span><span class="cx">
</span><span class="cx"> #####################################################################
</span><span class="cx"> ## This where you choose the configuration that you would like to
</span><del>-## use. It has no defaults so it must be defined. We start this
-## file off with the UWCS_* policy.
</del><ins>+## use. If you dont specify, the default policy is a no-preemption
+## policy. This is what older config files called TESTINGMODE_*
</ins><span class="cx"> ######################################################################
</span><span class="cx">
</span><del>-## Also here is what is referred to as the TESTINGMODE_*, which is
-## a quick hardwired way to test Condor with a simple no-preemption policy.
-## Replace UWCS_* with TESTINGMODE_* if you wish to do testing mode.
-## For example:
-## WANT_SUSPEND = $(UWCS_WANT_SUSPEND)
-## becomes
-## WANT_SUSPEND = $(TESTINGMODE_WANT_SUSPEND)
-
</del><span class="cx"> # When should we only consider SUSPEND instead of PREEMPT?
</span><del>-WANT_SUSPEND = $(TESTINGMODE_WANT_SUSPEND)
</del><ins>+#WANT_SUSPEND = False
</ins><span class="cx">
</span><span class="cx"> # When should we preempt gracefully instead of hard-killing?
</span><del>-WANT_VACATE = $(TESTINGMODE_WANT_VACATE)
</del><ins>+#WANT_VACATE = False
</ins><span class="cx">
</span><span class="cx"> ## When is this machine willing to start a job?
</span><del>-START = $(TESTINGMODE_START)
</del><ins>+#START = True
</ins><span class="cx">
</span><del>-## When should a local universe job be allowed to start?
-#START_LOCAL_UNIVERSE = TotalLocalJobsRunning < 200
-
-## When should a scheduler universe job be allowed to start?
-#START_SCHEDULER_UNIVERSE = TotalSchedulerJobsRunning < 200
-
</del><span class="cx"> ## When to suspend a job?
</span><del>-SUSPEND = $(TESTINGMODE_SUSPEND)
</del><ins>+#SUSPEND = False
</ins><span class="cx">
</span><span class="cx"> ## When to resume a suspended job?
</span><del>-CONTINUE = $(TESTINGMODE_CONTINUE)
</del><ins>+#CONTINUE = True
</ins><span class="cx">
</span><span class="cx"> ## When to nicely stop a job?
</span><span class="cx"> ## (as opposed to killing it instantaneously)
</span><del>-PREEMPT = $(TESTINGMODE_PREEMPT)
</del><ins>+#PREEMPT = False
</ins><span class="cx">
</span><span class="cx"> ## When to instantaneously kill a preempting job
</span><span class="cx"> ## (e.g. if a job is in the pre-empting stage for too long)
</span><del>-KILL = $(TESTINGMODE_KILL)
</del><ins>+#KILL = False
</ins><span class="cx">
</span><del>-PERIODIC_CHECKPOINT = $(TESTINGMODE_PERIODIC_CHECKPOINT)
-PREEMPTION_REQUIREMENTS = $(TESTINGMODE_PREEMPTION_REQUIREMENTS)
-PREEMPTION_RANK = $(TESTINGMODE_PREEMPTION_RANK)
-NEGOTIATOR_PRE_JOB_RANK = $(TESTINGMODE_NEGOTIATOR_PRE_JOB_RANK)
-NEGOTIATOR_POST_JOB_RANK = $(TESTINGMODE_NEGOTIATOR_POST_JOB_RANK)
-MaxJobRetirementTime = $(UWCS_MaxJobRetirementTime)
-CLAIM_WORKLIFE = $(TESTINGMODE_CLAIM_WORKLIFE)
</del><ins>+## A non-zero value here is another way to have a no-preemption policy
+## a job is given this many seconds to exit even when it is preempted.
+#MaxJobRetirementTime = 0
</ins><span class="cx">
</span><ins>+#PERIODIC_CHECKPOINT = ((time() - LastPeriodicCheckpoint)/60.0) > (180.0 + $RANDOM_INTEGER(-30,30,1))
+#PREEMPTION_REQUIREMENTS = False
+#PREEMPTION_RANK = $(UWCS_PREEMPTION_RANK)
+#NEGOTIATOR_PRE_JOB_RANK = RemoteOwner =?= UNDEFINED
+#NEGOTIATOR_POST_JOB_RANK = (RemoteOwner =?= UNDEFINED) * (ifthenElse(isUndefined(KFlops), 1000, Kflops) - SlotID - 1.0e10*(Offline=?=True))
+#CLAIM_WORKLIFE = 1200
+
+## When should a local universe job be allowed to start?
+#START_LOCAL_UNIVERSE = TotalLocalJobsRunning < 200
+
+## When should a scheduler universe job be allowed to start?
+#START_SCHEDULER_UNIVERSE = TotalSchedulerJobsRunning < 200
+
</ins><span class="cx"> #####################################################################
</span><span class="cx"> ## This is the UWisc - CS Department Configuration.
</span><span class="cx"> #####################################################################
</span><span class="lines">@@ -866,7 +845,7 @@
</span><span class="cx"> ## would take place, allowing control to pass on to
</span><span class="cx"> ## PREEMPTION_RANK.
</span><span class="cx"> UWCS_NEGOTIATOR_POST_JOB_RANK = \
</span><del>- (RemoteOwner =?= UNDEFINED) * (KFlops - SlotID - 1.0e10*(Offline=?=True))
</del><ins>+ (RemoteOwner =?= UNDEFINED) * (ifthenElse(isUndefined(KFlops), 1000, Kflops) - SlotID - 1.0e10*(Offline=?=True))
</ins><span class="cx">
</span><span class="cx"> ## The negotiator will not preempt a job running on a given machine
</span><span class="cx"> ## unless the PREEMPTION_REQUIREMENTS expression evaluates to true
</span><span class="lines">@@ -880,14 +859,15 @@
</span><span class="cx"> ## The PREEMPTION_RANK expression is used in a case where preemption
</span><span class="cx"> ## is the only option and all other negotiation ranks are equal. For
</span><span class="cx"> ## example, if the job has no preference, it is usually preferable to
</span><del>-## preempt a job with a small ImageSize instead of a job with a large
-## ImageSize. The default is to rank all preemptable matches the
-## same. However, the negotiator will always prefer to match the job
-## with an idle machine over a preemptable machine, if all other
-## negotiation ranks are equal.
-UWCS_PREEMPTION_RANK = (RemoteUserPrio * 1000000) - TARGET.ImageSize
</del><ins>+## preempt a job that has just started instead of a job with a longer
+## runtime, to cause less badput. The default is to rank all
+## preemptable matches the same. However, the negotiator will always
+## prefer to match the job with an idle machine over a preemptable
+## machine, if all other negotiation ranks are equal.
</ins><span class="cx">
</span><ins>+UWCS_PREEMPTION_RANK = (RemoteUserPrio * 1000000) - ifThenElse(isUndefined(TotalJobRuntime), 0, TotalJobRuntime)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #####################################################################
</span><span class="cx"> ## This is a Configuration that will cause your Condor jobs to
</span><span class="cx"> ## always run. This is intended for testing only.
</span><span class="lines">@@ -1064,7 +1044,7 @@
</span><span class="cx"> #HIGHPORT = 9700
</span><span class="cx"> #LOWPORT = 9600
</span><span class="cx">
</span><del>-## If a daemon doesn't respond for too long, do you want go generate
</del><ins>+## If a daemon does not respond for too long, do you want go generate
</ins><span class="cx"> ## a core file? This basically controls the type of the signal
</span><span class="cx"> ## sent to the child process, and mostly affects the Condor Master
</span><span class="cx"> #NOT_RESPONDING_WANT_CORE = False
</span><span class="lines">@@ -1086,7 +1066,7 @@
</span><span class="cx"> #MASTER, STARTD, SCHEDD, KBDD, COLLECTOR, NEGOTIATOR, EVENTD, \
</span><span class="cx"> #VIEW_SERVER, CONDOR_VIEW, VIEW_COLLECTOR, HAWKEYE, CREDD, HAD, \
</span><span class="cx"> #DBMSD, QUILL, JOB_ROUTER, ROOSTER, LEASEMANAGER, HDFS, SHARED_PORT, \
</span><del>-#DEFRAG
</del><ins>+#DEFRAG, GANGLIAD
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> ## Where are the binaries for these daemons?
</span><span class="lines">@@ -1104,6 +1084,7 @@
</span><span class="cx"> SHARED_PORT = $(LIBEXEC)/condor_shared_port
</span><span class="cx"> TRANSFERER = $(LIBEXEC)/condor_transferer
</span><span class="cx"> DEFRAG = $(LIBEXEC)/condor_defrag
</span><ins>+GANGLIAD = $(LIBEXEC)/condor_gangliad
</ins><span class="cx">
</span><span class="cx"> ## When the master starts up, it can place it's address (IP and port)
</span><span class="cx"> ## into a file. This way, tools running on the local machine don't
</span><span class="lines">@@ -1143,7 +1124,7 @@
</span><span class="cx"> #MASTER_UPDATE_INTERVAL = 300
</span><span class="cx">
</span><span class="cx"> ## How often do you want the master to check the time stamps of the
</span><del>-## daemons it's running? If any daemons have been modified, the
</del><ins>+## running daemons? If any daemons have been modified, the
</ins><span class="cx"> ## master restarts them.
</span><span class="cx"> #MASTER_CHECK_NEW_EXEC_INTERVAL = 300
</span><span class="cx">
</span><span class="lines">@@ -1178,13 +1159,21 @@
</span><span class="cx"> ##--------------------------------------------------------------------
</span><span class="cx"> ## condor_collector
</span><span class="cx"> ##--------------------------------------------------------------------
</span><del>-## Address to which Condor will send a weekly e-mail with output of
-## condor_status.
</del><ins>+## Address to which Condor will send a weekly e-mail with basic
+## non-specific information about your pool. See
+## http://htcondor.org/privacy.html for more information.
+## To disable this behavior, uncomment the below line to
+## explicitly set CONDOR_DEVELOPERS to NONE.
</ins><span class="cx"> #CONDOR_DEVELOPERS = condor-admin@cs.wisc.edu
</span><ins>+#CONDOR_DEVELOPERS = NONE
</ins><span class="cx">
</span><del>-## Global Collector to periodically advertise basic information about
-## your pool.
</del><ins>+## Global Collector to periodically advertise basic
+## non-specific information about your pool. See
+## http://htcondor.org/privacy.html for more information.
+## To disable this behavior, uncomment the below line to
+## explicitly set CONDOR_DEVELOPERS_COLLECTOR to NONE.
</ins><span class="cx"> #CONDOR_DEVELOPERS_COLLECTOR = condor.cs.wisc.edu
</span><ins>+#CONDOR_DEVELOPERS_COLLECTOR = NONE
</ins><span class="cx">
</span><span class="cx"> ## When the collector starts up, it can place it's address (IP and port)
</span><span class="cx"> ## into a file. This way, tools running on the local machine don't
</span><span class="lines">@@ -1194,7 +1183,14 @@
</span><span class="cx"> ## COLLECTOR_HOST, a useful technique for personal Condor installs.
</span><span class="cx"> COLLECTOR_ADDRESS_FILE = $(LOG)/.collector_address
</span><span class="cx">
</span><ins>+##
+## Conventional HTCondor installations start up as root, and can thus
+## set their own file descriptor limit. Upping the collector's doesn't
+## hurt anything and ameliorates a common scalability problem.
+##
+# COLLECTOR_MAX_FILE_DESCRIPTORS = 10240
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> ##--------------------------------------------------------------------
</span><span class="cx"> ## condor_negotiator
</span><span class="cx"> ##--------------------------------------------------------------------
</span><span class="lines">@@ -1244,15 +1240,13 @@
</span><span class="cx">
</span><span class="cx"> ## When a machine unclaimed, when should it run benchmarks?
</span><span class="cx"> ## LastBenchmark is initialized to 0, so this expression says as soon
</span><del>-## as we're unclaimed, run the benchmarks. Thereafter, if we're
-## unclaimed and it's been at least 4 hours since we ran the last
</del><ins>+## as we're unclaimed, run the benchmarks. Thereafter, if we are
+## unclaimed and it has been at least 4 hours since we ran the last
</ins><span class="cx"> ## benchmarks, run them again. The startd keeps a weighted average
</span><span class="cx"> ## of the benchmark results to provide more accurate values.
</span><del>-## Note, if you don't want any benchmarks run at all, either comment
-## RunBenchmarks out, or set it to "False".
-BenchmarkTimer = (time() - LastBenchmark)
-RunBenchmarks : (LastBenchmark == 0 ) || ($(BenchmarkTimer) >= (4 * $(HOUR)))
-#RunBenchmarks : False
</del><ins>+## Note, if you don't want any benchmarks run at all, set RunBenchmarks to "False".
+#RunBenchmarks = False
+#RunBenchmarks = (LastBenchmark == 0 ) || ((time() - LastBenchmark) >= (4 * $(HOUR)))
</ins><span class="cx">
</span><span class="cx"> ## When the startd does benchmarks, which set of benchmarks should we
</span><span class="cx"> ## run? The default is the same as pre-7.5.6: MIPS and KFLOPS.
</span><span class="lines">@@ -1299,7 +1293,7 @@
</span><span class="cx"> ## entry into the ClassAd. In particular, ClassAds require double
</span><span class="cx"> ## quotes (") around your strings. Numeric values can go in
</span><span class="cx"> ## directly, as can boolean expressions. For example, if you wanted
</span><del>-## the startd to advertise its list of console devices, when it's
</del><ins>+## the startd to advertise its list of console devices, when it is
</ins><span class="cx"> ## configured to run benchmarks, and how often it sends updates to
</span><span class="cx"> ## the central manager, you'd have to define the following helper
</span><span class="cx"> ## macro:
</span><span class="lines">@@ -1360,7 +1354,7 @@
</span><span class="cx"> ## Please read the section on "condor_startd Configuration File
</span><span class="cx"> ## Macros" in the Condor Administrators Manual for a further
</span><span class="cx"> ## discussion of this setting. Its use is not recommended. This
</span><del>-## must be an integer ("N" isn't a valid setting, that's just used to
</del><ins>+## must be an integer ("N" is not a valid setting, that's just used to
</ins><span class="cx"> ## represent the default).
</span><span class="cx"> #NUM_CPUS = N
</span><span class="cx">
</span><span class="lines">@@ -1368,7 +1362,7 @@
</span><span class="cx"> ## line out. You must restart the startd for this setting to take
</span><span class="cx"> ## effect. If set to 0 or a negative number, it is ignored.
</span><span class="cx"> ## By default, it is ignored. Otherwise, it must be a positive
</span><del>-## integer ("N" isn't a valid setting, that's just used to
</del><ins>+## integer ("N" is not a valid setting, that's just used to
</ins><span class="cx"> ## represent the default).
</span><span class="cx"> #MAX_NUM_CPUS = N
</span><span class="cx">
</span><span class="lines">@@ -1434,23 +1428,21 @@
</span><span class="cx"> ## report to your pool (if less than the total number of CPUs). This
</span><span class="cx"> ## setting is only considered if the "type" settings described above
</span><span class="cx"> ## are not in use. By default, all CPUs are reported. This setting
</span><del>-## must be an integer ("N" isn't a valid setting, that's just used to
</del><ins>+## must be an integer ("N" is not a valid setting, that's just used to
</ins><span class="cx"> ## represent the default).
</span><span class="cx"> #NUM_SLOTS = N
</span><span class="cx">
</span><span class="cx"> ## How many of the slots the startd is representing should
</span><span class="cx"> ## be "connected" to the console (in other words, notice when there's
</span><del>-## console activity)? This defaults to all slots (N in a
-## machine with N CPUs). This must be an integer ("N" isn't a valid
-## setting, that's just used to represent the default).
-#SLOTS_CONNECTED_TO_CONSOLE = N
</del><ins>+## console activity)? This defaults to all slots
+#SLOTS_CONNECTED_TO_CONSOLE = $(NUM_CPUS)
</ins><span class="cx">
</span><span class="cx"> ## How many of the slots the startd is representing should
</span><span class="cx"> ## be "connected" to the keyboard (for remote tty activity, as well
</span><del>-## as console activity). Defaults to 1.
-#SLOTS_CONNECTED_TO_KEYBOARD = 1
</del><ins>+## as console activity). Defaults to all slots
+#SLOTS_CONNECTED_TO_KEYBOARD = $(NUM_CPUS)
</ins><span class="cx">
</span><del>-## If there are slots that aren't connected to the
</del><ins>+## If there are slots that are not connected to the
</ins><span class="cx"> ## keyboard or the console (see the above two settings), the
</span><span class="cx"> ## corresponding idle time reported will be the time since the startd
</span><span class="cx"> ## was spawned, plus the value of this parameter. It defaults to 20
</span><span class="lines">@@ -1531,7 +1523,7 @@
</span><span class="cx"> #JOB_START_DELAY = 2
</span><span class="cx">
</span><span class="cx"> ## How many concurrent sub-processes should the schedd spawn to handle
</span><del>-## queries? (Unix only)
</del><ins>+## queries? (UNIX only)
</ins><span class="cx"> #SCHEDD_QUERY_WORKERS = 3
</span><span class="cx">
</span><span class="cx"> ## How often should the schedd send a keep alive message to any
</span><span class="lines">@@ -1580,6 +1572,14 @@
</span><span class="cx"> ## (Currently, these are periodic_hold, periodic_release, and periodic_remove.)
</span><span class="cx"> #PERIODIC_EXPR_INTERVAL = 60
</span><span class="cx">
</span><ins>+##
+## Conventional HTCondor installations start up as root, and can thus
+## set their own file descriptor limit. Upping the schedd's limit has
+## some minor downsides (larger buffers passed to select() and the like),
+## but upping it makes a class of difficult-to-debug problems much rarer.
+##
+# SCHEDD_MAX_FILE_DESCRIPTORS = 4096
+
</ins><span class="cx"> ######
</span><span class="cx"> ## Queue management settings:
</span><span class="cx"> ######
</span><span class="lines">@@ -1654,10 +1654,10 @@
</span><span class="cx"> #STARTER_LOCAL_LOGGING = TRUE
</span><span class="cx">
</span><span class="cx"> ## If the UID_DOMAIN settings match on both the execute and submit
</span><del>-## machines, but the UID of the user who submitted the job isn't in
</del><ins>+## machines, but the UID of the user who submitted the job is not in
</ins><span class="cx"> ## the passwd file of the execute machine, the starter will normally
</span><span class="cx"> ## exit with an error. Do you want the starter to just start up the
</span><del>-## job with the specified UID, even if it's not in the passwd file?
</del><ins>+## job with the specified UID, even if it is not in the passwd file?
</ins><span class="cx"> #SOFT_UID_DOMAIN = FALSE
</span><span class="cx">
</span><span class="cx"> ## honor the run_as_owner option from the condor submit file.
</span><span class="lines">@@ -1764,16 +1764,7 @@
</span><span class="cx"> ## Who should condor_preen send email to?
</span><span class="cx"> #PREEN_ADMIN = $(CONDOR_ADMIN)
</span><span class="cx">
</span><del>-## What files should condor_preen leave in the spool directory?
-VALID_SPOOL_FILES = job_queue.log, job_queue.log.tmp, history, \
- Accountant.log, Accountantnew.log, \
- local_univ_execute, .quillwritepassword, \
- .pgpass, \
- .schedd_address, .schedd_classad
</del><span class="cx">
</span><del>-## What files should condor_preen remove from the log directory?
-INVALID_LOG_FILES = core
-
</del><span class="cx"> ##--------------------------------------------------------------------
</span><span class="cx"> ## Java parameters:
</span><span class="cx"> ##--------------------------------------------------------------------
</span><span class="lines">@@ -1836,8 +1827,8 @@
</span><span class="cx"> ## Another option is to use /tmp as the location of the GridManager log.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-MAX_GRIDMANAGER_LOG = 1000000
-GRIDMANAGER_DEBUG =
</del><ins>+#MAX_GRIDMANAGER_LOG = $(MAX_DEFAULT_LOG)
+#GRIDMANAGER_DEBUG =
</ins><span class="cx">
</span><span class="cx"> GRIDMANAGER_LOG = $(LOG)/GridmanagerLog.$(USERNAME)
</span><span class="cx"> GRIDMANAGER_LOCK = $(LOCK)/GridmanagerLock.$(USERNAME)
</span><span class="lines">@@ -1846,13 +1837,17 @@
</span><span class="cx"> ## Various other settings that the Condor-G can use.
</span><span class="cx"> ##--------------------------------------------------------------------
</span><span class="cx">
</span><del>-## The number of seconds between status update requests. You can make
-## this short (5 seconds) if you want Condor to respond quickly to
-## instances as they terminate, or you can make it long (300 seconds = 5
-## minutes) if you know your instances will run for awhile and don't
-## mind delay between when they stop and when Condor responds to them
-## stopping.
-GRIDMANAGER_JOB_PROBE_INTERVAL = 300
</del><ins>+## Adjust how frequently the gridmanager checks the status of grid jobs.
+## GRIDMANAGER_JOB_PROBE_INTERVAL sets the minimum time between checks
+## for each job's status in seconds. For grid-types where each job's
+## status must be checked individually (gt2, gt5, nordugrid, batch),
+## GRIDMANAGER_JOB_PROBE_RATE sets the maximum number of status check
+## requests the gridmanager will send to each remote resource per
+## second. If enough jobs are submitted to a remote resource, the
+## interval between checks for each job will increase so as not to
+## exceed the set rate.
+#GRIDMANAGER_JOB_PROBE_INTERVAL = 60
+#GRIDMANAGER_JOB_PROBE_RATE = 5
</ins><span class="cx">
</span><span class="cx"> ## For grid-type gt2 jobs (pre-WS GRAM), limit the number of jobmanager
</span><span class="cx"> ## processes the gridmanager will let run on the headnode. Letting too
</span><span class="lines">@@ -1919,7 +1914,7 @@
</span><span class="cx"> ## UNIX permissions 1777 (just like /tmp )
</span><span class="cx"> ## Another option is to use /tmp as the location of the CGAHP log.
</span><span class="cx"> ##
</span><del>-MAX_C_GAHP_LOG = 1000000
</del><ins>+#MAX_C_GAHP_LOG = $(MAX_DEFAULT_LOG)
</ins><span class="cx">
</span><span class="cx"> #C_GAHP_LOG = $(LOG)/GridLogs/CGAHPLog.$(USERNAME)
</span><span class="cx"> C_GAHP_LOG = /tmp/CGAHPLog.$(USERNAME)
</span><span class="lines">@@ -1996,11 +1991,11 @@
</span><span class="cx"> ## CredD daemon debugging log
</span><span class="cx"> CREDD_LOG = $(LOG)/CredLog
</span><span class="cx"> CREDD_DEBUG = D_FULLDEBUG
</span><del>-MAX_CREDD_LOG = 4000000
</del><ins>+#MAX_CREDD_LOG = $(MAX_DEFAULT_LOG)
</ins><span class="cx">
</span><del>-## The credential owner submits the credential. This list specififies
</del><ins>+## The credential owner submits the credential. This list specifies
</ins><span class="cx"> ## other user who are also permitted to see all credentials. Defaults
</span><del>-## to root on Unix systems, and Administrator on Windows systems.
</del><ins>+## to root on UNIX systems, and Administrator on Windows systems.
</ins><span class="cx"> #CRED_SUPER_USERS =
</span><span class="cx">
</span><span class="cx"> ## Credential storage location. This directory must exist
</span><span class="lines">@@ -2020,199 +2015,9 @@
</span><span class="cx"> ## credentials, at this interval.
</span><span class="cx"> #CRED_CHECK_INTERVAL = 60
</span><span class="cx">
</span><del>-##
-##--------------------------------------------------------------------
-## Stork data placement server
-##--------------------------------------------------------------------
-## Where is the Stork binary installed?
-STORK = $(SBIN)/stork_server
</del><span class="cx">
</span><del>-## When Stork starts up, it can place it's address (IP and port)
-## into a file. This way, tools running on the local machine don't
-## need an additional "-n host:port" command line option. This
-## feature can be turned off by commenting out this setting.
-STORK_ADDRESS_FILE = $(LOG)/.stork_address
-
-## Specify a remote Stork server here,
-#STORK_HOST = $(CONDOR_HOST):$(STORK_PORT)
-
-## STORK_LOG_BASE specifies the basename for heritage Stork log files.
-## Stork uses this macro to create the following output log files:
-## $(STORK_LOG_BASE): Stork server job queue classad collection
-## journal file.
-## $(STORK_LOG_BASE).history: Used to track completed jobs.
-## $(STORK_LOG_BASE).user_log: User level log, also used by DAGMan.
-STORK_LOG_BASE = $(LOG)/Stork
-
-## Modern Condor DaemonCore logging feature.
-STORK_LOG = $(LOG)/StorkLog
-STORK_DEBUG = D_FULLDEBUG
-MAX_STORK_LOG = 4000000
-
-## Stork startup arguments
-## Start Stork on a well-known port. Uncomment to to simplify
-## connecting to a remote Stork. Note: that this interface may change
-## in a future release.
-#STORK_PORT = 34048
-STORK_PORT = 9621
-STORK_ARGS = -p $(STORK_PORT) -f -Serverlog $(STORK_LOG_BASE)
-
-## Stork environment. Stork modules may require external programs and
-## shared object libraries. These are located using the PATH and
-## LD_LIBRARY_PATH environments. Further, some modules may require
-## further specific environments. By default, Stork inherits a full
-## environment when invoked from condor_master or the shell. If the
-## default environment is not adequate for all Stork modules, specify
-## a replacement environment here. This environment will be set by
-## condor_master before starting Stork, but does not apply if Stork is
-## started directly from the command line.
-#STORK_ENVIRONMENT = TMP=/tmp;CONDOR_CONFIG=/special/config;PATH=/lib
-
-## Limits the number of concurrent data placements handled by Stork.
-#STORK_MAX_NUM_JOBS = 5
-
-## Limits the number of retries for a failed data placement.
-#STORK_MAX_RETRY = 5
-
-## Limits the run time for a data placement job, after which the
-## placement is considered failed.
-#STORK_MAXDELAY_INMINUTES = 10
-
-## Temporary credential storage directory used by Stork.
-#STORK_TMP_CRED_DIR = /tmp
-
-## Directory containing Stork modules.
-#STORK_MODULE_DIR = $(LIBEXEC)
-
</del><span class="cx"> ##
</span><span class="cx"> ##--------------------------------------------------------------------
</span><del>-## Quill Job Queue Mirroring Server
-##--------------------------------------------------------------------
-## Where is the Quill binary installed and what arguments should be passed?
-QUILL = $(SBIN)/condor_quill
-#QUILL_ARGS =
-
-# Where is the log file for the quill daemon?
-QUILL_LOG = $(LOG)/QuillLog
-
-# The identification and location of the quill daemon for local clients.
-QUILL_ADDRESS_FILE = $(LOG)/.quill_address
-
-# If this is set to true, then the rest of the QUILL arguments must be defined
-# for quill to function. If it is False or left undefined, then quill will not
-# be consulted by either the scheduler or the tools, but in the case of a
-# remote quill query where the local client has quill turned off, but the
-# remote client has quill turned on, things will still function normally.
-#QUILL_ENABLED = TRUE
-
-#
-# If Quill is enabled, by default it will only mirror the current job
-# queue into the database. For historical jobs, and classads from other
-# sources, the SQL Log must be enabled.
-#QUILL_USE_SQL_LOG=FALSE
-
-#
-# The SQL Log can be enabled on a per-daemon basis. For example, to collect
-# historical job information, but store no information about execute machines,
-# uncomment these two lines
-#QUILL_USE_SQL_LOG = FALSE
-#SCHEDD.QUILL_USE_SQL_LOG = TRUE
-
-# This will be the name of a quill daemon using this config file. This name
-# should not conflict with any other quill name--or schedd name.
-#QUILL_NAME = quill@postgresql-server.machine.com
-
-# The Postgreql server requires usernames that can manipulate tables. This will
-# be the username associated with this instance of the quill daemon mirroring
-# a schedd's job queue. Each quill daemon must have a unique username
-# associated with it otherwise multiple quill daemons will corrupt the data
-# held under an identical user name.
-#QUILL_DB_NAME = name_of_db
-
-# The required password for the DB user which quill will use to read
-# information from the database about the queue.
-#QUILL_DB_QUERY_PASSWORD = foobar
-
-# What kind of database server is this?
-# For now, only PGSQL is supported
-#QUILL_DB_TYPE = PGSQL
-
-# The machine and port of the postgres server.
-# Although this says IP Addr, it can be a DNS name.
-# It must match whatever format you used for the .pgpass file, however
-#QUILL_DB_IP_ADDR = machine.domain.com:5432
-
-# The login to use to attach to the database for updating information.
-# There should be an entry in file $SPOOL/.pgpass that gives the password
-# for this login id.
-#QUILL_DB_USER = quillwriter
-
-# Polling period, in seconds, for when quill reads transactions out of the
-# schedd's job queue log file and puts them into the database.
-#QUILL_POLLING_PERIOD = 10
-
-# Allows or disallows a remote query to the quill daemon and database
-# which is reading this log file. Defaults to true.
-#QUILL_IS_REMOTELY_QUERYABLE = TRUE
-
-# Add debugging flags to here if you need to debug quill for some reason.
-#QUILL_DEBUG = D_FULLDEBUG
-
-# Number of seconds the master should wait for the Quill daemon to respond
-# before killing it. This number might need to be increased for very
-# large logfiles.
-# The default is 3600 (one hour), but kicking it up to a few hours won't hurt
-#QUILL_NOT_RESPONDING_TIMEOUT = 3600
-
-# Should Quill hold open a database connection to the DBMSD?
-# Each open connection consumes resources at the server, so large pools
-# (100 or more machines) should set this variable to FALSE. Note the
-# default is TRUE.
-#QUILL_MAINTAIN_DB_CONN = TRUE
-
-##
-##--------------------------------------------------------------------
-## Database Management Daemon settings
-##--------------------------------------------------------------------
-## Where is the DBMSd binary installed and what arguments should be passed?
-DBMSD = $(SBIN)/condor_dbmsd
-DBMSD_ARGS = -f
-
-# Where is the log file for the quill daemon?
-DBMSD_LOG = $(LOG)/DbmsdLog
-
-# Interval between consecutive purging calls (in seconds)
-#DATABASE_PURGE_INTERVAL = 86400
-
-# Interval between consecutive database reindexing operations
-# This is only used when dbtype = PGSQL
-#DATABASE_REINDEX_INTERVAL = 86400
-
-# Number of days before purging resource classad history
-# This includes things like machine ads, daemon ads, submitters
-#QUILL_RESOURCE_HISTORY_DURATION = 7
-
-# Number of days before purging job run information
-# This includes job events, file transfers, matchmaker matches, etc
-# This does NOT include the final job ad. condor_history does not need
-# any of this information to work.
-#QUILL_RUN_HISTORY_DURATION = 7
-
-# Number of days before purging job classad history
-# This is the information needed to run condor_history
-#QUILL_JOB_HISTORY_DURATION = 3650
-
-# DB size threshold for warning the condor administrator. This is checked
-# after every purge. The size is given in gigabytes.
-#QUILL_DBSIZE_LIMIT = 20
-
-# Number of seconds the master should wait for the DBMSD to respond before
-# killing it. This number might need to be increased for very large databases
-# The default is 3600 (one hour).
-#DBMSD_NOT_RESPONDING_TIMEOUT = 3600
-
-##
-##--------------------------------------------------------------------
</del><span class="cx"> ## VM Universe Parameters
</span><span class="cx"> ##--------------------------------------------------------------------
</span><span class="cx"> ## Where is the Condor VM-GAHP installed? (Required)
</span><span class="lines">@@ -2226,7 +2031,7 @@
</span><span class="cx"> ## However, on Windows machine you must always define VM_GAHP_LOG.
</span><span class="cx"> #
</span><span class="cx"> VM_GAHP_LOG = $(LOG)/VMGahpLog
</span><del>-MAX_VM_GAHP_LOG = 1000000
</del><ins>+#MAX_VM_GAHP_LOG = $(MAX_DEFAULT_LOG)
</ins><span class="cx"> #VM_GAHP_DEBUG = D_FULLDEBUG
</span><span class="cx">
</span><span class="cx"> ## What kind of virtual machine program will be used for
</span><span class="lines">@@ -2293,7 +2098,7 @@
</span><span class="cx"> ## will occur.
</span><span class="cx"> ## For VMware, we send SIGSTOP to a process for VM in order to
</span><span class="cx"> ## stop the VM temporarily and send SIGCONT to resume the VM.
</span><del>-## For Xen, we pause CPU. Pausing CPU doesn't save the memory of VM
</del><ins>+## For Xen, we pause CPU. Pausing CPU does not save the memory of VM
</ins><span class="cx"> ## into a file. It only stops the execution of a VM temporarily.
</span><span class="cx"> #VM_SOFT_SUSPEND = TRUE
</span><span class="cx">
</span><span class="lines">@@ -2305,7 +2110,7 @@
</span><span class="cx"> ## Notice: In VMware VM universe, "nobody" can not create a VMware VM.
</span><span class="cx"> ## So we need to define "VM_UNIV_NOBODY_USER" with a regular user.
</span><span class="cx"> ## For VMware, the user defined in "VM_UNIV_NOBODY_USER" must have a
</span><del>-## home directory. So SOFT_UID_DOMAIN doesn't work for VMware VM universe job.
</del><ins>+## home directory. So SOFT_UID_DOMAIN does not work for VMware VM universe job.
</ins><span class="cx"> ## If neither "VM_UNIV_NOBODY_USER" nor "SLOTx_VMUSER"/"SLOTx_USER" is defined,
</span><span class="cx"> ## VMware VM universe job will run as "condor" instead of "nobody".
</span><span class="cx"> ## As a result, the preference of local users for a VMware VM universe job
</span><span class="lines">@@ -2377,38 +2182,7 @@
</span><span class="cx"> ## a disk image
</span><span class="cx"> #XEN_BOOTLOADER = /usr/bin/pygrub
</span><span class="cx">
</span><del>-##
-##--------------------------------------------------------------------
-## condor_lease_manager lease manager daemon
-##--------------------------------------------------------------------
-## Where is the LeaseManager binary installed?
-LeaseManager = $(SBIN)/condor_lease_manager
</del><span class="cx">
</span><del>-# Turn on the lease manager
-#DAEMON_LIST = $(DAEMON_LIST), LeaseManager
-
-# The identification and location of the lease manager for local clients.
-LeaseManger_ADDRESS_FILE = $(LOG)/.lease_manager_address
-
-## LeaseManager startup arguments
-#LeaseManager_ARGS = -local-name generic
-
-## LeaseManager daemon debugging log
-LeaseManager_LOG = $(LOG)/LeaseManagerLog
-LeaseManager_DEBUG = D_FULLDEBUG
-MAX_LeaseManager_LOG = 1000000
-
-# Basic parameters
-LeaseManager.GETADS_INTERVAL = 60
-LeaseManager.UPDATE_INTERVAL = 300
-LeaseManager.PRUNE_INTERVAL = 60
-LeaseManager.DEBUG_ADS = False
-
-LeaseManager.CLASSAD_LOG = $(SPOOL)/LeaseManagerState
-#LeaseManager.QUERY_ADTYPE = Any
-#LeaseManager.QUERY_CONSTRAINTS = MyType == "SomeType"
-#LeaseManager.QUERY_CONSTRAINTS = TargetType == "SomeType"
-
</del><span class="cx"> ##
</span><span class="cx"> ##--------------------------------------------------------------------
</span><span class="cx"> ## KBDD - keyboard activity detection daemon
</span><span class="lines">@@ -2498,16 +2272,16 @@
</span><span class="cx"> ## The host and port for hadoop's name node. If this machine is the
</span><span class="cx"> ## name node (see HDFS_SERVICES) then the specified port will be used
</span><span class="cx"> ## to run name node.
</span><del>-HDFS_NAMENODE = hdfs://example.com:9000
-HDFS_NAMENODE_WEB = example.com:8000
</del><ins>+#HDFS_NAMENODE = hdfs://example.com:9000
+#HDFS_NAMENODE_WEB = example.com:8000
</ins><span class="cx">
</span><del>-HDFS_BACKUPNODE = hdfs://example.com:50100
-HDFS_BACKUPNODE_WEB = example.com:50105
</del><ins>+#HDFS_BACKUPNODE = hdfs://example.com:50100
+#HDFS_BACKUPNODE_WEB = example.com:50105
</ins><span class="cx">
</span><span class="cx"> ## You need to pick one machine as name node by setting this parameter
</span><span class="cx"> ## to HDFS_NAMENODE. The remaining machines in a storage cluster will
</span><span class="cx"> ## act as data nodes (HDFS_DATANODE).
</span><del>-HDFS_NODETYPE = HDFS_DATANODE
</del><ins>+#HDFS_NODETYPE = HDFS_DATANODE
</ins><span class="cx">
</span><span class="cx"> ## If machine is selected to be NameNode then by a role should defined.
</span><span class="cx"> ## If it selected to be DataNode then this parameter is ignored.
</span><span class="lines">@@ -2517,7 +2291,7 @@
</span><span class="cx"> ## creating a backup of the namespace. Currently the NameNode
</span><span class="cx"> ## supports one Backup node at a time.
</span><span class="cx"> ## CHECKPOINT: Periodically creates checkpoints of the namespace.
</span><del>-HDFS_NAMENODE_ROLE = ACTIVE
</del><ins>+#HDFS_NAMENODE_ROLE = ACTIVE
</ins><span class="cx">
</span><span class="cx"> ## The two set of directories that are required by HDFS are for name
</span><span class="cx"> ## node (HDFS_NAMENODE_DIR) and data node (HDFS_DATANODE_DIR). The
</span><span class="lines">@@ -2525,8 +2299,8 @@
</span><span class="cx"> ## name node service and is used to store critical meta data for
</span><span class="cx"> ## files. The data node needs its directory to store file blocks and
</span><span class="cx"> ## their replicas.
</span><del>-HDFS_NAMENODE_DIR = /tmp/hadoop_name
-HDFS_DATANODE_DIR = /scratch/tmp/hadoop_data
</del><ins>+#HDFS_NAMENODE_DIR = /tmp/hadoop_name
+#HDFS_DATANODE_DIR = /scratch/tmp/hadoop_data
</ins><span class="cx">
</span><span class="cx"> ## Unlike name node address settings (HDFS_NAMENODE), that needs to be
</span><span class="cx"> ## well known across the storage cluster, data node can run on any
</span></span></pre></div>
<a id="trunkdportssciencehtcondorfilespatchbuildcmakeCondorPackageConfigcmakediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff (140718 => 140719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff 2015-10-01 02:29:01 UTC (rev 140718)
+++ trunk/dports/science/htcondor/files/patch-build-cmake-CondorPackageConfig.cmake.diff 2015-10-01 04:00:22 UTC (rev 140719)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- build/cmake/CondorPackageConfig.cmake.orig 2013-05-20 11:00:54.000000000 -0700
-+++ build/cmake/CondorPackageConfig.cmake 2013-05-20 11:01:42.000000000 -0700
-@@ -116,7 +116,7 @@
</del><ins>+--- build/cmake/CondorPackageConfig.cmake
++++ build/cmake/CondorPackageConfig.cmake
+@@ -118,7 +118,7 @@ set( C_LIB32 lib)
</ins><span class="cx"> set( C_LIBEXEC libexec )
</span><span class="cx"> set( C_SBIN sbin)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencehtcondorfilespatchsrccondor_scriptsmacosx_rewrite_libsdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff (140718 => 140719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff 2015-10-01 02:29:01 UTC (rev 140718)
+++ trunk/dports/science/htcondor/files/patch-src-condor_scripts-macosx_rewrite_libs.diff 2015-10-01 04:00:22 UTC (rev 140719)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- src/condor_scripts/macosx_rewrite_libs.orig 2013-06-07 00:27:47.000000000 -0700
-+++ src/condor_scripts/macosx_rewrite_libs 2013-06-07 00:27:52.000000000 -0700
</del><ins>+--- src/condor_scripts/macosx_rewrite_libs
++++ src/condor_scripts/macosx_rewrite_libs
</ins><span class="cx"> @@ -1,43 +1 @@
</span><span class="cx"> #!/bin/sh
</span><span class="cx"> -
</span></span></pre></div>
<a id="trunkdportssciencehtcondorfilespatchsrccondor_utilscondor_configcppdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff (140718 => 140719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff 2015-10-01 02:29:01 UTC (rev 140718)
+++ trunk/dports/science/htcondor/files/patch-src-condor_utils-condor_config.cpp.diff 2015-10-01 04:00:22 UTC (rev 140719)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- src/condor_utils/condor_config.cpp.orig 2013-05-16 14:43:02.000000000 -0700
-+++ src/condor_utils/condor_config.cpp 2013-05-16 14:45:12.000000000 -0700
</del><ins>+--- src/condor_utils/condor_config.cpp
++++ src/condor_utils/condor_config.cpp
</ins><span class="cx"> @@ -35,7 +35,7 @@
</span><span class="cx"> doesn't exist, we look in the following locations:
</span><span class="cx">
</span><span class="lines">@@ -9,28 +9,28 @@
</span><span class="cx"> 3) /usr/local/etc/
</span><span class="cx"> 4) ~condor/
</span><span class="cx">
</span><del>-@@ -576,7 +576,7 @@
</del><ins>+@@ -916,7 +916,7 @@ real_config(const char* host, int wantsQuiet, int config_options)
</ins><span class="cx"> fprintf(stderr,"\nNeither the environment variable %s_CONFIG,\n",
</span><span class="cx"> myDistro->GetUc() );
</span><span class="cx"> # if defined UNIX
</span><del>-- fprintf(stderr,"/etc/%s/, nor ~%s/ contain a %s_config source.\n",
-+ fprintf(stderr,"@prefix@/etc/%s/, nor ~%s/ contain a %s_config source.\n",
</del><ins>+- fprintf(stderr,"/etc/%s/, /usr/local/etc/, nor ~%s/ contain a %s_config source.\n",
++ fprintf(stderr,"@prefix@/etc/%s/, /usr/local/etc/, nor ~%s/ contain a %s_config source.\n",
</ins><span class="cx"> myDistro->Get(), myDistro->Get(), myDistro->Get() );
</span><span class="cx"> # elif defined WIN32
</span><span class="cx"> fprintf(stderr,"nor the registry contains a %s_config source.\n", myDistro->Get() );
</span><del>-@@ -586,7 +586,7 @@
</del><ins>+@@ -926,7 +926,7 @@ real_config(const char* host, int wantsQuiet, int config_options)
</ins><span class="cx"> fprintf( stderr,"Either set %s_CONFIG to point to a valid config "
</span><span class="cx"> "source,\n", myDistro->GetUc() );
</span><span class="cx"> # if defined UNIX
</span><del>-- fprintf( stderr,"or put a \"%s_config\" file in /etc/%s or ~%s/\n",
-+ fprintf( stderr,"or put a \"%s_config\" file in @prefix@/etc/%s or ~%s/\n",
</del><ins>+- fprintf( stderr,"or put a \"%s_config\" file in /etc/%s/ /usr/local/etc/ or ~%s/\n",
++ fprintf( stderr,"or put a \"%s_config\" file in @prefix@/etc/%s/ /usr/local/etc/ or ~%s/\n",
</ins><span class="cx"> myDistro->Get(), myDistro->Get(), myDistro->Get() );
</span><span class="cx"> # elif defined WIN32
</span><span class="cx"> fprintf( stderr,"or put a \"%s_config\" source in the registry at:\n"
</span><del>-@@ -1060,8 +1060,8 @@
- formatstr( locations[0], "%s/.%s/%s", pw->pw_dir, myDistro->Get(),
- file_name );
- }
</del><ins>+@@ -1477,8 +1477,8 @@ find_file(const char *env_name, const char *file_name, int config_options)
+ // 1) $HOME/.condor/condor_config
+ // $HOME/.condor/condor_config was added for BOSCO and never used, We are removing it in 8.3.1, but may put it back if users complain.
+ //find_user_file(locations[0], file_name, false);
</ins><span class="cx"> - // 2) /etc/condor/condor_config
</span><span class="cx"> - locations[1].formatstr( "/etc/%s/%s", myDistro->Get(), file_name );
</span><span class="cx"> + // 2) @prefix@/etc/condor/condor_config
</span></span></pre></div>
<a id="trunkdportssciencehtcondorfilespatchsrcpythonbindingsCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff (140718 => 140719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff 2015-10-01 02:29:01 UTC (rev 140718)
+++ trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff 2015-10-01 04:00:22 UTC (rev 140719)
</span><span class="lines">@@ -1,14 +1,14 @@
</span><del>---- src/python-bindings/CMakeLists.txt.orig 2014-07-17 11:44:13.000000000 -0700
-+++ src/python-bindings/CMakeLists.txt 2014-07-17 11:44:25.000000000 -0700
-@@ -11,9 +11,9 @@
- set ( CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_ORIG)
</del><ins>+--- src/python-bindings/CMakeLists.txt
++++ src/python-bindings/CMakeLists.txt
+@@ -101,9 +101,9 @@ else()
+ set ( CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_ORIG)
</ins><span class="cx">
</span><del>- if (PROPER AND "${PYTHON_VERSION_MAJOR}" MATCHES "3")
-- set ( PYTHON_BOOST_LIB boost_python3 )
-+ set ( PYTHON_BOOST_LIB boost_python3-mt )
- else()
-- set ( PYTHON_BOOST_LIB boost_python )
-+ set ( PYTHON_BOOST_LIB boost_python-mt )
- endif()
</del><ins>+ if (PROPER AND "${PYTHON_VERSION_MAJOR}" MATCHES "3")
+- set ( PYTHON_BOOST_LIB boost_python3 )
++ set ( PYTHON_BOOST_LIB boost_python3-mt )
+ else()
+- set ( PYTHON_BOOST_LIB boost_python )
++ set ( PYTHON_BOOST_LIB boost_python-mt )
+ endif()
</ins><span class="cx">
</span><del>- include_directories(${PYTHON_INCLUDE_DIRS} ${BOOST_INCLUDE})
</del><ins>+ include_directories(${PYTHON_INCLUDE_DIRS} ${BOOST_INCLUDE})
</ins></span></pre>
</div>
</div>
</body>
</html>