rpms/torque/FC-5 torque-2.1.0p0-mom_sync_jobs-fixes.patch, NONE, 1.1 torque.spec, 1.5, 1.6
Garrick Staples (garrick)
fedora-extras-commits at redhat.com
Sat May 13 05:13:20 UTC 2006
Author: garrick
Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346
Modified Files:
torque.spec
Added Files:
torque-2.1.0p0-mom_sync_jobs-fixes.patch
Log Message:
* Fri May 12 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-2
- fix pbs_server segfault when mom_job_sync is enabled
torque-2.1.0p0-mom_sync_jobs-fixes.patch:
--- NEW FILE torque-2.1.0p0-mom_sync_jobs-fixes.patch ---
Index: src/server/node_manager.c
===================================================================
RCS file: /usr/local/nfs/src/cvs_repository/torque/src/server/node_manager.c,v
retrieving revision 1.64
retrieving revision 1.66
diff -r1.64 -r1.66
736,738c736
< if ((pjob == NULL) ||
< ((pjob->ji_qs.ji_substate != JOB_SUBSTATE_SUSPEND) &&
< (pjob->ji_qs.ji_substate != JOB_SUBSTATE_RUNNING)))
---
> if (pjob == NULL)
740c738
< /* job is reported by mom but server has no record of job on node */
---
> /* job is reported by mom but server has no record of job */
742c740
< sprintf(log_buffer,"stray job %s found on %s (substate=%d)",
---
> sprintf(log_buffer,"stray job %s found on %s",
744,745c742
< np->nd_name,
< (pjob != NULL) ? pjob->ji_qs.ji_substate : -1);
---
> np->nd_name);
749,755d745
< if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL)
< {
< log_err(-1,id,"unable to allocate DeleteJob request - big trouble!");
<
< break;
< }
<
762c752,772
< strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr);
---
> if (conn >= 0)
> {
> if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL)
> {
> log_err(-1,id,"unable to allocate DeleteJob request - big trouble!");
>
> svr_disconnect(conn);
> }
> else
> {
> strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr);
>
> if (issue_Drequest(conn,preq,release_req,0) != 0)
> {
> /* release_req will free preq and close connection if successful */
> free_br(preq);
>
> svr_disconnect(conn);
> }
> }
> }
764,766c774
< issue_Drequest(conn,preq,release_req,0);
<
< /* release_req will free preq and close connection */
---
> DIS_rpp_reset();
Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- torque.spec 11 May 2006 21:58:11 -0000 1.5
+++ torque.spec 13 May 2006 05:13:20 -0000 1.6
@@ -3,7 +3,7 @@
%define name torque
%define version 2.1.0p0
#%%define snap 200604251602
-%define release 1
+%define release 2
# The following options are supported:
# --with server_name=hostname
@@ -91,6 +91,7 @@
Source4: xpbs.png
Source5: xpbsmon.png
Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch
License: Freely redistributable (See PBS_License.txt)
Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/
@@ -119,6 +120,7 @@
%prep
%setup -q -n torque-%{version}%{?snap:-snap.%snap}
%patch1 -p1
+%patch2 -p0
%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
@@ -423,6 +425,9 @@
%changelog
+* Fri May 12 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-2
+- fix pbs_server segfault when mom_job_sync is enabled
+
* Thu May 11 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-1
- bump to final release
More information about the fedora-extras-commits
mailing list