From 140f5e01b8787865e718d3e01381c6bd1da7469a Mon Sep 17 00:00:00 2001 From: Timothy St. Clair Date: Feb 09 2012 17:01:41 +0000 Subject: 7.7.5 update --- diff --git a/.gitignore b/.gitignore index 0e0fc6d..0746cad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .*.swp /condor-7.7.3-c39a8b84-GIT.tar.gz +/condor-7.7.5-03a0f934-GIT.tar.gz diff --git a/condor-tmpfiles.conf b/condor-tmpfiles.conf old mode 100755 new mode 100644 diff --git a/condor.spec b/condor.spec index d97b96e..325f0ce 100644 --- a/condor.spec +++ b/condor.spec @@ -1,4 +1,4 @@ -%define tarball_version 7.7.3 +%define tarball_version 7.7.5 # Things for F15 or later %if 0%{?fedora} >= 15 @@ -35,8 +35,8 @@ Summary: Condor: High Throughput Computing Name: condor -Version: 7.7.3 -%define condor_base_release 0.3 +Version: 7.7.5 +%define condor_base_release 0.1 %if %git_build %define condor_release %condor_base_release.%{git_rev}git %else @@ -85,8 +85,9 @@ Source0: condor.tar.gz # # ecafed3e183e9fc6608dc9e55e4dd59b condor_src-7.7.1-all-all.tar.gz # 6a7a42515d5ae6c8cb3c69492697e04f condor_src-7.7.3-all-all.tar.gz +# d9e3e51f49835c6edbb511dce2232692 condor_src-7.7.5-all-all.tar.gz # Note: The md5sum of each generated tarball may be different -Source0: condor-7.7.3-c39a8b84-GIT.tar.gz +Source0: condor-7.7.5-03a0f934-GIT.tar.gz Source1: generate-tarball.sh %endif @@ -359,7 +360,7 @@ exit 0 %setup -q -n %{name}-%{tarball_version} %endif -%patch0 -p1 -F 2 +%patch0 -p1 -F 3 # fix errant execute permissions find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \; @@ -379,6 +380,7 @@ find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \; -DWITH_ZLIB:BOOL=FALSE \ -DWITH_POSTGRESQL:BOOL=FALSE \ -DWANT_CONTRIB:BOOL=ON \ + -DWITH_PIGEON:BOOL=FALSE \ %if %plumage -DWITH_PLUMAGE:BOOL=TRUE \ %else @@ -585,10 +587,8 @@ rm -rf %{buildroot}%{_sbindir}/install_release rm -rf %{buildroot}%{_sbindir}/uniq_pid_command rm -rf %{buildroot}%{_sbindir}/uniq_pid_midwife rm -rf %{buildroot}%{_sbindir}/uniq_pid_undertaker -rm -rf %{buildroot}%{_datadir}/condor/Execute.pm -rm -rf %{buildroot}%{_datadir}/condor/ExecuteLock.pm -rm -rf %{buildroot}%{_datadir}/condor/FileLock.pm -rm -rf %{buildroot}%{_datadir}/condor/Condor.pm +rm -rf %{buildroot}%{_datadir}/condor/*.pm +rm -rf %{buildroot}%{_datadir}/condor/Chirp.jar rm -rf %{buildroot}%{_usrsrc}/chirp/chirp_* rm -rf %{buildroot}%{_usrsrc}/startd_factory rm -rf %{buildroot}/usr/DOC @@ -631,22 +631,21 @@ rm -rf %{buildroot} %dir %_sysconfdir/condor/ %config(noreplace) %_sysconfdir/condor/condor_config %if %systemd -%dir %{_localstatedir}/run/%{name}/ %config(noreplace) %_sysconfdir/tmpfiles.d/%{name}.conf %{_unitdir}/condor.service %else +%dir %{_localstatedir}/run/%{name}/ %config(noreplace) %_sysconfdir/sysconfig/condor %_initrddir/condor %endif %dir %_datadir/condor/ -%_datadir/condor/Chirp.jar +#%_datadir/condor/Chirp.jar %_datadir/condor/CondorJavaInfo.class %_datadir/condor/CondorJavaWrapper.class -# dep problem in 7.7.3 #%_datadir/condor/Condor.pm %_datadir/condor/scimark2lib.jar -%_datadir/condor/gt4-gahp.jar -%_datadir/condor/gt42-gahp.jar +#%_datadir/condor/gt4-gahp.jar +#%_datadir/condor/gt42-gahp.jar %dir %_sysconfdir/condor/config.d/ %_sysconfdir/condor/config.d/00personal_condor.config %_sysconfdir/condor/condor_ssh_to_job_sshd_config_template @@ -655,7 +654,7 @@ rm -rf %{buildroot} %_libexecdir/condor/condor_ssh %_libexecdir/condor/sshd.sh %_libexecdir/condor/condor_job_router -%_libexecdir/condor/gridftp_wrapper.sh +#%_libexecdir/condor/gridftp_wrapper.sh %if %glexec %_libexecdir/condor/condor_glexec_setup %_libexecdir/condor/condor_glexec_run @@ -676,6 +675,8 @@ rm -rf %{buildroot} %_libexecdir/condor/condor_shared_port %_libexecdir/condor/condor_glexec_wrapper %_libexecdir/condor/glexec_starter_setup.sh +%_libexecdir/condor/condor_defrag +%_libexecdir/condor/condor_schedd.init %_mandir/man1/condor_advertise.1.gz %_mandir/man1/condor_check_userlogs.1.gz %_mandir/man1/condor_chirp.1.gz @@ -721,7 +722,7 @@ rm -rf %{buildroot} %_mandir/man1/condor_glidein.1.gz # bin/condor is a link for checkpoint, reschedule, vacate %_libdir/libcondor_utils.so -%_bindir/condor +#%_bindir/condor %_bindir/condor_submit_dag %_bindir/condor_prio %_bindir/condor_transfer_data @@ -759,9 +760,10 @@ rm -rf %{buildroot} %_bindir/condor_suspend %_bindir/condor_test_match %_bindir/condor_glidein +%_bindir/condor_drain # sbin/condor is a link for master_off, off, on, reconfig, # reconfig_schedd, restart -%_sbindir/condor +#%_sbindir/condor %_sbindir/condor_advertise %_sbindir/condor_c-gahp %_sbindir/condor_c-gahp_worker_thread @@ -791,8 +793,8 @@ rm -rf %{buildroot} %_sbindir/gahp_server %_sbindir/grid_monitor.sh %_sbindir/nordugrid_gahp -%_sbindir/gt4_gahp -%_sbindir/gt42_gahp +#%_sbindir/gt4_gahp +#%_sbindir/gt42_gahp %defattr(-,condor,condor,-) %dir %_var/lib/condor/ %dir %_var/lib/condor/execute/ @@ -838,6 +840,7 @@ rm -rf %{buildroot} %_sbindir/aviary_query_server %dir %_datadir/condor/aviary %_datadir/condor/aviary/jobcontrol.py* +%_datadir/condor/aviary/jobinventory.py* %_datadir/condor/aviary/jobquery.py* %_datadir/condor/aviary/submissions.py* %_datadir/condor/aviary/submit.py* @@ -911,7 +914,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc LICENSE-2.0.txt NOTICE.txt %_libdir/libclassad.so.2 -%_libdir/libclassad.so.7.7.3 +%_libdir/libclassad.so.%{tarball_version} ################# %files classads-devel @@ -1006,6 +1009,9 @@ fi %endif %changelog +* Thu Feb 9 2012 - 7.7.5-0.1 +- Fast forward to 7.7.5 pre release + * Sun Nov 27 2011 Dan Horák - 7.7.3-0.3 - mongodb supports only x86/x86_64 => limit plumage subpackage to these arches diff --git a/condor_config.generic.patch b/condor_config.generic.patch index 8318a82..c9f8db4 100644 --- a/condor_config.generic.patch +++ b/condor_config.generic.patch @@ -1,5 +1,5 @@ diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/condor_config.generic -index 3375e11..b921459 100644 +index a800f31..80ad566 100644 --- a/src/condor_examples/condor_config.generic +++ b/src/condor_examples/condor_config.generic @@ -1,12 +1,31 @@ @@ -79,7 +79,7 @@ index 3375e11..b921459 100644 ## you've set in the CONDOR_IDS environment variable. See the Admin ## manual for details on this. -LOCK = $(LOG) -+LOCK = /var/lock/condor ++LOCK = /var/lock/condor + +# Condor allows for creating surrogate lock files that always live on +# local disk. This is useful for the times when Condor would otherwise @@ -130,29 +130,29 @@ index 3375e11..b921459 100644 # High Availability Logs MAX_HAD_LOG = 1000000 HAD_DEBUG = -@@ -927,14 +969,18 @@ TESTINGMODE_CLAIM_WORKLIFE = 1200 +@@ -932,14 +974,18 @@ TESTINGMODE_CLAIM_WORKLIFE = 1200 ###################################################################### ## Pathnames -LOG = $(LOCAL_DIR)/log -+LOG = /var/log/condor ++LOG = /var/log/condor SPOOL = $(LOCAL_DIR)/spool EXECUTE = $(LOCAL_DIR)/execute BIN = $(RELEASE_DIR)/bin LIB = $(RELEASE_DIR)/lib -INCLUDE = $(RELEASE_DIR)/include -+INCLUDE = $(RELEASE_DIR)/include/condor ++INCLUDE = $(RELEASE_DIR)/include/condor SBIN = $(RELEASE_DIR)/sbin -LIBEXEC = $(RELEASE_DIR)/libexec -+SHARE = $(RELEASE_DIR)/share/condor -+RUN = /var/run/condor ++SHARE = $(RELEASE_DIR)/share/condor ++RUN = /var/run/condor +DATA = $(SPOOL) -+ETC = /etc/condor ++ETC = /etc/condor +LIBEXEC = $(RELEASE_DIR)/libexec/condor ## If you leave HISTORY undefined (comment it out), no history file ## will be created. -@@ -958,6 +1004,7 @@ HAD_LOG = $(LOG)/HADLog +@@ -963,6 +1009,7 @@ HAD_LOG = $(LOG)/HADLog REPLICATION_LOG = $(LOG)/ReplicationLog TRANSFERER_LOG = $(LOG)/TransfererLog HDFS_LOG = $(LOG)/HDFSLog @@ -160,24 +160,32 @@ index 3375e11..b921459 100644 ## Lock files SHADOW_LOCK = $(LOCK)/ShadowLock -@@ -1078,7 +1125,7 @@ DAEMON_LIST = MASTER, STARTD, SCHEDD - #DC_DAEMON_LIST = \ +@@ -1084,7 +1131,7 @@ DAEMON_LIST = MASTER, STARTD, SCHEDD #MASTER, STARTD, SCHEDD, KBDD, COLLECTOR, NEGOTIATOR, EVENTD, \ #VIEW_SERVER, CONDOR_VIEW, VIEW_COLLECTOR, HAWKEYE, CREDD, HAD, \ --#DBMSD, QUILL, JOB_ROUTER, ROOSTER, LEASEMANAGER, HDFS, SHARED_PORT -+#DBMSD, QUILL, JOB_ROUTER, ROOSTER, LEASEMANAGER, HDFS, SHARED_PORT, TRIGGERD + #DBMSD, QUILL, JOB_ROUTER, ROOSTER, LEASEMANAGER, HDFS, SHARED_PORT, \ +-#DEFRAG ++#DEFRAG TRIGGERD ## Where are the binaries for these daemons? -@@ -1094,6 +1141,7 @@ ROOSTER = $(LIBEXEC)/condor_rooster - HDFS = $(SBIN)/condor_hdfs +@@ -1094,7 +1141,6 @@ SCHEDD = $(SBIN)/condor_schedd + KBDD = $(SBIN)/condor_kbdd + NEGOTIATOR = $(SBIN)/condor_negotiator + COLLECTOR = $(SBIN)/condor_collector +-CKPT_SERVER = $(SBIN)/condor_ckpt_server + STARTER_LOCAL = $(SBIN)/condor_starter + JOB_ROUTER = $(LIBEXEC)/condor_job_router + ROOSTER = $(LIBEXEC)/condor_rooster +@@ -1102,6 +1148,7 @@ HDFS = $(SBIN)/condor_hdfs SHARED_PORT = $(LIBEXEC)/condor_shared_port TRANSFERER = $(LIBEXEC)/condor_transferer + DEFRAG = $(LIBEXEC)/condor_defrag +TRIGGERD = $(sbin)/condor_triggerd ## When the master starts up, it can place it's address (IP and port) ## into a file. This way, tools running on the local machine don't -@@ -1170,11 +1218,13 @@ PREEN_ARGS = -m -r +@@ -1178,11 +1225,13 @@ PREEN_ARGS = -m -r ##-------------------------------------------------------------------- ## Address to which Condor will send a weekly e-mail with output of ## condor_status. @@ -191,9 +199,9 @@ index 3375e11..b921459 100644 +## Default is condor.cs.wisc.edu +CONDOR_DEVELOPERS_COLLECTOR = NONE - - ##-------------------------------------------------------------------- -@@ -1183,6 +1233,7 @@ PREEN_ARGS = -m -r + ## When the collector starts up, it can place it's address (IP and port) + ## into a file. This way, tools running on the local machine don't +@@ -1199,6 +1248,7 @@ COLLECTOR_ADDRESS_FILE = $(LOG)/.collector_address ## Determine if the Negotiator will honor SlotWeight attributes, which ## may be used to give a slot greater weight when calculating usage. #NEGOTIATOR_USE_SLOT_WEIGHTS = True @@ -201,25 +209,37 @@ index 3375e11..b921459 100644 ## How often the Negotaitor starts a negotiation cycle, defined in -@@ -1620,7 +1671,7 @@ QUEUE_SUPER_USERS = root, condor - ##-------------------------------------------------------------------- - ## condor_starter +@@ -1668,7 +1718,7 @@ QUEUE_SUPER_USERS = root, condor + ## Such as when when Condor is running as a service. + ## /s is delete subdirectories + ## /c is continue on error +-WINDOWS_RMDIR = $(SBIN)\condor_rmdir.exe ++#WINDOWS_RMDIR = $(SBIN)\condor_rmdir.exe + #WINDOWS_RMDIR_OPTIONS = /s /c + ##-------------------------------------------------------------------- --## The condor_starter can renice the processes of Condor -+## The condor_starter can renice the processes from remote Condor - ## jobs on your execute machines. If you want this, uncomment the - ## following entry and set it to how "nice" you want the user - ## jobs. (1-19) The larger the number, the lower priority the -@@ -1661,7 +1712,7 @@ PROCD = $(SBIN)/condor_procd +@@ -1689,13 +1739,15 @@ PROCD = $(SBIN)/condor_procd # UNIX); the name will be something like: # \\.\pipe\condor_procd # -PROCD_ADDRESS = $(LOCK)/procd_pipe +PROCD_ADDRESS = $(RUN)/procd_pipe - # The procd currently uses a very simplistic logging system. Since this - # log will not be rotated like other Condor logs, it is only recommended -@@ -1770,7 +1821,7 @@ JAVA_MAXHEAP_ARGUMENT = -Xmx +-# Note that in other Condor daemons, turning on D_PROCFAMILY will +-# result in that daemon logging all of its interactions with the +-# ProcD. ++# The procd currently uses a very simplistic logging system. Since this ++# log will not be rotated like other Condor logs, it is only recommended ++# to set PROCD_LOG when attempting to debug a problem. In other Condor ++# daemons, turning on D_PROCFAMILY will result in that daemon logging ++# all of its interactions with the ProcD. + # +-PROCD_LOG = $(LOG)/ProcLog ++#PROCD_LOG = $(LOG)/ProcLog + + # This is the maximum period that the procd will use for taking + # snapshots (the actual period may be lower if a condor daemon registers +@@ -1788,7 +1840,7 @@ JAVA = /usr/bin/java ## them here. However, do not remove the existing entries, as Condor ## needs them. @@ -228,7 +248,7 @@ index 3375e11..b921459 100644 ## JAVA_CLASSPATH_ARGUMENT describes the command-line parameter ## used to introduce a new classpath: -@@ -2246,8 +2297,8 @@ MAX_VM_GAHP_LOG = 1000000 +@@ -2230,8 +2282,8 @@ MAX_VM_GAHP_LOG = 1000000 ## What kind of virtual machine program will be used for ## the VM universe? @@ -239,7 +259,7 @@ index 3375e11..b921459 100644 ## How much memory can be used for the VM universe? (Required) ## This value is the maximum amount of memory that can be used by the -@@ -2478,7 +2529,7 @@ KBDD_ADDRESS_FILE = $(LOG)/.kbdd_address +@@ -2458,7 +2510,7 @@ KBDD_ADDRESS_FILE = $(LOG)/.kbdd_address #SSH_TO_JOB_SSHD_ARGS = "-i -e -f %f" # sshd configuration template used by condor_ssh_to_job_sshd_setup. diff --git a/sources b/sources index 3dd54eb..c01d25c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30da64ba2567cd9e0ece868f8886a7dd condor-7.7.3-c39a8b84-GIT.tar.gz +df2006f0b5fc2bed1a21b215124e5188 condor-7.7.5-03a0f934-GIT.tar.gz