~ubuntu-branches/ubuntu/utopic/gridengine/utopic

« back to all changes in this revision

Viewing changes to source/daemons/qmaster/sge_calendar_qmaster.c

  • Committer: Bazaar Package Importer
  • Author(s): Mark Hymers
  • Date: 2008-11-27 23:17:37 UTC
  • Revision ID: james.westby@ubuntu.com-20081127231737-v1mrvbkmz1ttn4km
Tags: 6.2-3
* Fix the default configuration file to use full path names.
  Closes: #501972, #497855.
* Make gridengine-exec Depend: on c-shell | tcsh.  Closes: #497839.
* Add symlink farm to /var/lib/gridengine to allow for programs
  which rely on $SGE_ROOT/bin and $SGE_ROOT/utilbin.  Closes: #502000.
* Apply JG-2008-11-10-0 from upstream in order to fix a qmaster
  deadlock.
* Move qrsh_starter to gridengine-exec instead of gridengine-master.
  Closes: #501976.
* Remove linux32 from Build-Depends as it's now in util-linux.
* Ensure we don't fail in gridengine-common postinst when the sgeadmin user
  already exists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
270
270
 
271
271
   MONITOR_WAIT_TIME(SGE_LOCK(LOCK_GLOBAL, LOCK_WRITE), monitor);
272
272
 
273
 
   if (!(cep = calendar_list_locate(*object_type_get_master_list(SGE_TYPE_CALENDAR), cal_name)))
274
 
   {
 
273
   if (!(cep = calendar_list_locate(*object_type_get_master_list(SGE_TYPE_CALENDAR), cal_name))) {
275
274
      ERROR((SGE_EVENT, MSG_EVE_TE4CAL_S, cal_name));   
276
275
      SGE_UNLOCK(LOCK_GLOBAL, LOCK_WRITE);      
277
276
      DRETURN_VOID;
278
277
   }
279
278
      
280
279
   calendar_update_queue_states(ctx, cep, 0, NULL, &ppList, monitor);
 
280
 
 
281
   SGE_UNLOCK(LOCK_GLOBAL, LOCK_WRITE);
 
282
 
281
283
   lFreeList(&ppList);
282
 
 
283
284
   FREE(cal_name);
284
285
 
285
 
   SGE_UNLOCK(LOCK_GLOBAL, LOCK_WRITE);
286
 
 
287
286
   DRETURN_VOID;
288
287
} /* sge_calendar_event_handler() */
289
288