BF: CS-662: verify delayed job reporting of sge_execd after reconnecting to sge_qmaster (cleanup)

Author: ernst-bablick

source/daemons/execd/execd_ck_to_do.cc

@@ -394,7 +394,8 @@ update_wallclock_usage(u_long64 now, const lListElem *job, const lListElem *ja_t
 #define OLD_JOB_INTERVAL 60
 
 int do_ck_to_do(bool is_qmaster_down) {
-   u_long64 now;
+   DENTER(TOP_LAYER);
+   u_long64 now = sge_get_gmt64();
    static u_long64 next_pdc = 0;
    static u_long64 next_signal = 0;
    static u_long64 next_old_job = 0;
@@ -404,13 +405,7 @@ int do_ck_to_do(bool is_qmaster_down) {
    int return_value = 0;
    const char *qualified_hostname = component_get_qualified_hostname();
 
-   DENTER(TOP_LAYER);
 
-   /*
-    *  get current time (now)
-    *  ( don't update the now time inside this function )
-    */
-   now = sge_get_gmt64();
 
 #ifdef KERBEROS
    krb_renew_tgts(Master_Job_List);
@@ -566,8 +561,8 @@ int do_ck_to_do(bool is_qmaster_down) {
       if (next_report <= now) {
          next_report = now + sge_gmt32_to_gmt64(mconf_get_load_report_time());
 
-         /* if pdc_interval is equals load_report time syncronize both calls to
-            make the online usage acurate as possible */
+         /* if pdc_interval is equals load_report time synchronize both calls to
+            make the online usage accurate as possible */
          if (sge_gmt32_to_gmt64(mconf_get_load_report_time()) == mconf_get_pdc_interval()) {
             next_pdc = next_report;
          }

source/daemons/execd/execd_get_new_conf.cc

@@ -66,15 +66,13 @@
 **   executed on startup. This function is triggered by the execd
 **   dispatcher table when the tag TAG_GET_NEW_CONF is received.
 */
-int do_get_new_conf(ocs::gdi::ClientServerBase::struct_msg_t *aMsg)
-{
+int do_get_new_conf(ocs::gdi::ClientServerBase::struct_msg_t *aMsg) {
+   DENTER(TOP_LAYER);
    int ret;
    bool use_qidle = mconf_get_use_qidle();
    u_long32 dummy; /* always 0 */ 
    u_long32 old_reprioritization_enabled = mconf_get_reprioritize();
 
-   DENTER(TOP_LAYER);
-
    unpackint(&(aMsg->buf), &dummy);
 
    const char *old_spool = mconf_get_execd_spool_dir();

source/daemons/qmaster/qmaster_to_execd.cc

@@ -91,13 +91,10 @@ host_notify_about_X(lListElem *host, u_long32 x, ocs::gdi::ClientServerBase::Cli
 *******************************************************************************/
 static int
 host_notify_about_X(lListElem *host, u_long32 x, ocs::gdi::ClientServerBase::ClientServerBaseTag tag, int progname_id) {
-   const char *hostname = nullptr;
-   sge_pack_buffer pb;
-   int ret = -1;
-
    DENTER(TOP_LAYER);
+   int ret = -1;
 
-   hostname = lGetHost(host, EH_name);
+   const char *hostname = lGetHost(host, EH_name);
    if (progname_id == EXECD) {
       unsigned long last_heard_from;
       u_short id = 1;
@@ -111,6 +108,7 @@ host_notify_about_X(lListElem *host, u_long32 x, ocs::gdi::ClientServerBase::Cli
       }
    }
 
+   sge_pack_buffer pb;
    if (init_packbuffer(&pb, 256) == PACK_SUCCESS) {
       u_long32 dummy = 0;
 

source/libs/mir/sge_queue_mirror.cc

@@ -51,14 +51,14 @@ sge_callback_result
 cqueue_update_master_list(sge_evc_class_t *evc, sge_object_type type, 
                           sge_event_action action, lListElem *event, void *clientdata)
 {
+   DENTER(TOP_LAYER);
    sge_callback_result ret = SGE_EMA_OK;
    const char *name = nullptr;
    lList *qinstance_list = nullptr;
    lListElem *cqueue = nullptr;
    lList **list = nullptr;
    const lDescr *list_descr = nullptr;
 
-   DENTER(TOP_LAYER);
    name = lGetString(event, ET_strkey);
    list = ocs::DataStore::get_master_list_rw(SGE_TYPE_CQUEUE);
    list_descr = lGetListDescr(lGetList(event, ET_new_version));

source/libs/sgeobj/ocs_DataStore.cc

@@ -27,7 +27,7 @@
 #include "sge_object.h"
 #include "ocs_DataStore.h"
 
-#define DATA_STORE_LAYER TOP_LAYER
+#define DATA_STORE_LAYER BASIS_LAYER
 
 namespace ocs {
    // the key to get thread local memory