64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
|
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();
|