fixed a memory leak in sge_execd

// BelongsTo: CS-582

Author: jgabler-hpc

source/daemons/execd/execd.cc

@@ -284,7 +284,7 @@ int main(int argc, char **argv)
       cl_com_free_sirm_message(&status);
    }
 
-   /* finalize daeamonize */
+   /* finalize daemonize */
    if (!getenv("SGE_ND")) {
       sge_daemonize_finalize();
    }
@@ -329,7 +329,7 @@ int main(int argc, char **argv)
    }
 
    /*
-    * We write pid file when we are connected to qmaster. Otherwise an old
+    * We write pid file when we are connected to qmaster. Otherwise, an old
     * execd might overwrite our pidfile.
     */
    sge_write_pid(EXECD_PID_FILE);
@@ -382,7 +382,6 @@ int main(int argc, char **argv)
    /* Start dispatching */
    execd_exit_state = sge_execd_process_messages();
 
-
    /*
     * This code is only reached when dispatcher terminates and execd goes down.
     */

source/libs/sgeobj/sge_suser.cc

@@ -255,7 +255,7 @@ int suser_check_new_job(const lListElem *job, u_long32 max_u_jobs, lList *master
 *                                int force_registration) 
 *
 *  FUNCTION
-*     This function checks whether a new "job" would exceed the maxium
+*     This function checks whether a new "job" would exceed the maximum
 *     number of allowed jobs per user ("max_u_jobs"). JB_owner of "job" 
 *     is the username which will be used by this function to compare
 *     the current number of registered jobs with "max_u_jobs". If the
@@ -287,10 +287,10 @@ int suser_register_new_job(const lListElem *job, u_long32 max_u_jobs,
 
    DENTER(TOP_LAYER);
 
-   if (!force_registration){
+   if (!force_registration) {
       ret = suser_check_new_job(job, max_u_jobs, master_suser_list);
    }
-   if (ret == 0){    
+   if (ret == 0) {
       submit_user = lGetString(job, JB_owner);
       suser = suser_list_add(&master_suser_list, nullptr, submit_user);
       suser_increase_job_counter(suser);

source/libs/spool/classic/read_write_job.cc

@@ -743,8 +743,6 @@ int job_list_read_from_disk(lList **job_list, const char *list_name, int check,
    lListElem *first_direntry;
    DSTRING_STATIC(dstr_path, SGE_PATH_MAX);
    const char *str_path;
-   int handle_as_zombie = (flags & SPOOL_HANDLE_AS_ZOMBIE) > 0;
-   lList *master_suser_list = *ocs::DataStore::get_master_list_rw(SGE_TYPE_SUSER);
 
    DENTER(TOP_LAYER); 
    sge_get_file_path(first_dir, sizeof(first_dir), JOBS_SPOOL_DIR, FORMAT_FIRST_PART, flags, 0, 0, nullptr);
@@ -868,9 +866,12 @@ int job_list_read_from_disk(lList **job_list, const char *list_name, int check,
 
             lSetList(job, JB_jid_successor_list, nullptr);
             job_list_add_job(job_list, list_name, job, 0);
-            
-            if (!handle_as_zombie) {
+
+            bool handle_as_zombie = (flags & SPOOL_HANDLE_AS_ZOMBIE) > 0;
+            bool in_execd = (flags & SPOOL_WITHIN_EXECD) > 0;
+            if (!handle_as_zombie && !in_execd) {
                job_list_register_new_job(*ocs::DataStore::get_master_list(SGE_TYPE_JOB), mconf_get_max_jobs(), 1);
+               lList *master_suser_list = *ocs::DataStore::get_master_list_rw(SGE_TYPE_SUSER);
                suser_register_new_job(job, mconf_get_max_u_jobs(), 1, master_suser_list);
             }
          }